diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | frontends/php/include/classes/graph.inc.php | 15 | ||||
| -rw-r--r-- | frontends/php/include/services.inc.php | 2 |
3 files changed, 16 insertions, 3 deletions
@@ -1,5 +1,7 @@ Changes for 1.3: + - fixed errors while adding a host to IT service (Alexei) + - fixed warning in classes.inc.php while displaying graphs (Alexei) - fixed warning in trigger selection popup (Alexei) - added spec file for ZABBIX agent. Thanks to Alexey Zilber. (Alexei) - fixed count of problems displayin for submaps (Eugene) diff --git a/frontends/php/include/classes/graph.inc.php b/frontends/php/include/classes/graph.inc.php index 074bafcf..e42a0d81 100644 --- a/frontends/php/include/classes/graph.inc.php +++ b/frontends/php/include/classes/graph.inc.php @@ -283,7 +283,7 @@ function getLastValue($num) { $data = &$this->data[$this->items[$num]["itemid"]][$this->items[$num]["type"]]; - for($i=899;$i>=0;$i--) + if(isset($data)) for($i=$this->sizeX-1;$i>=0;$i--) { if(isset($data->count[$i]) && ($data->count[$i] > 0)) { @@ -574,7 +574,7 @@ } $data = &$this->data[$this->items[$i]["itemid"]][$this->items[$i]["type"]]; - if(isset($data->min)) + if(isset($data)&&isset($data->min)) { $str=sprintf("%s: %s [%s] [min:%s max:%s last:%s]", str_pad($this->items[$i]["host"],$max_host_len," "), @@ -758,6 +758,8 @@ $data = &$this->data[$this->items[$i]["itemid"]][$type]; + if(!isset($data)) continue; + if($type == GRAPH_ITEM_AGGREGATED) $calc_fnc = CALC_FNC_ALL; else @@ -839,6 +841,8 @@ $data = &$this->data[$this->items[$i]["itemid"]][$type]; + if(!isset($data)) continue; + if($type == GRAPH_ITEM_AGGREGATED) $calc_fnc = CALC_FNC_ALL; else @@ -1048,12 +1052,17 @@ for($i=$this->num-2; $i >= 0; $i--) { $curr_data = &$this->data[$this->items[$i]["itemid"]][$this->items[$i]["type"]]; + + if(!isset($curr_data)) continue; + for($j = $i+1; $j < $this->num; $j++) { if($this->items[$j]["axisside"] != $this->items[$i]["axisside"]) continue; $prev_data = &$this->data[$this->items[$i+1]["itemid"]][$this->items[$i+1]["type"]]; + if(!isset($prev_data)) continue; + for($ci = 0; $ci < $this->sizeX; $ci++) { foreach(array('min','max','avg') as $var_name) @@ -1173,6 +1182,8 @@ $data = &$this->data[$this->items[$item]["itemid"]][$this->items[$item]["type"]]; + if(!isset($data)) continue; + if($this->items[$item]["type"] == GRAPH_ITEM_AGGREGATED) { $drawtype = GRAPH_DRAW_TYPE_LINE; diff --git a/frontends/php/include/services.inc.php b/frontends/php/include/services.inc.php index 62fb69a3..80dbe883 100644 --- a/frontends/php/include/services.inc.php +++ b/frontends/php/include/services.inc.php @@ -24,7 +24,7 @@ if(is_null($triggerid)) $triggerid = 'NULL'; $sql="insert into services (name,status,triggerid,algorithm,showsla,goodsla,sortorder)". - " values (".zbx_dbstr($name).",0,$triggerid,$algorithm,$showsla,$goodsla,$sortorder)"; + " values (".zbx_dbstr($name).",0,$triggerid,".zbx_dbstr($algorithm).",$showsla,".zbx_dbstr($goodsla).",$sortorder)"; $result=DBexecute($sql); if(!$result) { |