Author: Lars Michelsen <[email protected]>
Date: Tue Feb 5 14:46:22 2013 +0100
Committer: Lars Michelsen <[email protected]>
Commit-Date: Tue Feb 5 14:46:22 2013 +0100
2 bugfixes in new code
---
pack | 9 +++++++--
share/frontend/nagvis-js/js/NagVisObject.js | 7 +++++--
.../core/classes/GlobalBackendmklivestatus.php | 3 ++-
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/pack b/pack
index e333522..d116914 100755
--- a/pack
+++ b/pack
@@ -17,8 +17,13 @@ case "$1" in
BRANCH=nagvis-1.4
;;
*)
- echo "ERROR: No param given (master|1.7|1.6|1.5|1.4)."
- exit 1
+ if [ -z "$1" ]; then
+ echo "ERROR: No param given (master|1.7|1.6|1.5|1.4)."
+ exit 1
+ else
+ V=$1
+ BRANCH=$1
+ fi
;;
esac
diff --git a/share/frontend/nagvis-js/js/NagVisObject.js
b/share/frontend/nagvis-js/js/NagVisObject.js
index b5fd2bb..eb63d34 100644
--- a/share/frontend/nagvis-js/js/NagVisObject.js
+++ b/share/frontend/nagvis-js/js/NagVisObject.js
@@ -341,10 +341,13 @@ var NagVisObject = Base.extend({
}
if (to_be_checked) {
- if (op == '=' && to_be_checked != val)
+ if (op == '=' && to_be_checked != val) {
hide = true;
- else if (op == '~' && to_be_checked.indexOf(val) == -1)
+ } else if (op == '~' && to_be_checked.indexOf(val) == -1) {
hide = true;
+ }
+ } else {
+ hide = true;
}
}
diff --git a/share/server/core/classes/GlobalBackendmklivestatus.php
b/share/server/core/classes/GlobalBackendmklivestatus.php
index a51c4ef..c4b7176 100644
--- a/share/server/core/classes/GlobalBackendmklivestatus.php
+++ b/share/server/core/classes/GlobalBackendmklivestatus.php
@@ -788,7 +788,8 @@ class GlobalBackendmklivestatus implements
GlobalBackendInterface {
$arrTmpReturn['last_hard_state_change'] = $e[13];
$arrTmpReturn['perfdata'] = $e[14];
$arrTmpReturn['check_command'] = $e[21];
- $arrTmpReturn['custom_variables'] = array_combine($e[22],
$e[23]);
+ if(isset($e[22][0]) && isset($e[23][0]))
+ $arrTmpReturn['custom_variables'] =
array_combine($e[22], $e[23]);
}
if($specific) {
------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
