diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-12-28 13:44:14 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-12-28 13:44:14 +0000 |
| commit | 1d60e86ae09578cbb684975403f52ce80eb42ed0 (patch) | |
| tree | e3d5555b02254133ecf12e8ef7e30afb669bb406 /frontends/php/include/import.inc.php | |
| parent | 6742b51b998f18ff3ab0ba0fb78d4c30913ebf7e (diff) | |
| download | zabbix-1d60e86ae09578cbb684975403f52ce80eb42ed0.tar.gz zabbix-1d60e86ae09578cbb684975403f52ce80eb42ed0.tar.xz zabbix-1d60e86ae09578cbb684975403f52ce80eb42ed0.zip | |
- [ZBX-237] fixed problem importing/exporting data (Artem)
- [DEV-90] fixes SQL for pgsql (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5207 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/import.inc.php')
| -rw-r--r-- | frontends/php/include/import.inc.php | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/frontends/php/include/import.inc.php b/frontends/php/include/import.inc.php index 571e2aff..d3d6a3c3 100644 --- a/frontends/php/include/import.inc.php +++ b/frontends/php/include/import.inc.php @@ -35,7 +35,7 @@ $this->item = array('exist' => 0, 'missed' => 0); $this->trigger = array('exist' => 0, 'missed' => 0); $this->graph = array('exist' => 0, 'missed' => 0); - + $this->accessible_groups = get_accessible_groups_by_user($USER_DETAILS, PERM_READ_WRITE, null, PERM_RES_IDS_ARRAY, get_current_nodeid()); @@ -117,7 +117,8 @@ break; // case } - if( count($this->accessible_nodes) > 0 ){ +// if( count($this->accessible_nodes) > 0 ){ + if(!in_array(get_current_nodeid(),$this->accessible_nodes)){ error('Host ['.$data['name'].'] skipped - Access deny.'); break; // case } @@ -492,6 +493,8 @@ if(!isset($data['graphtype'])) $data['graphtype'] = 0; if(!isset($data['yaxismin'])) $data['yaxismin'] = 0; if(!isset($data['yaxismax'])) $data['yaxismax'] = 0; + if(!isset($data['show_legend'])) $data['show_legend'] = 0; + if(!isset($data['show_3d'])) $data['show_3d'] = 0; if(!isset($data['items'])) $data['items'] = array(); if(!isset($this->data[XML_TAG_HOST]['hostid']) || !$this->data[XML_TAG_HOST]['hostid']) @@ -536,8 +539,9 @@ $data['show_work_period'], $data['show_triggers'], $data['graphtype'], + $data['show_legend'], + $data['show_3d'], $graph['templateid']); - DBexecute('delete from graphs_items where graphid='.$data['graphid']); } else @@ -563,7 +567,10 @@ $data['yaxismax'], $data['show_work_period'], $data['show_triggers'], - $data['graphtype']); + $data['graphtype'], + $data['show_legend'], + $data['show_3d'] + ); } foreach($data['items'] as $item) |