diff options
author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-04-11 09:58:06 +0000 |
---|---|---|
committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-04-11 09:58:06 +0000 |
commit | 5cdc91f40d8fdb6e8c4c525a230565bfa87afb86 (patch) | |
tree | 88bafeb47426f360e35e54d1b8e844252c898801 | |
parent | cd58120468d324ee96922fc156f9e6ca651addb1 (diff) | |
download | zabbix-5cdc91f40d8fdb6e8c4c525a230565bfa87afb86.tar.gz zabbix-5cdc91f40d8fdb6e8c4c525a230565bfa87afb86.tar.xz zabbix-5cdc91f40d8fdb6e8c4c525a230565bfa87afb86.zip |
- allowed unicode in frontend for testing purposes (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5610 97f52cf1-0a1b-0410-bd0e-c28be96e8082
-rw-r--r-- | frontends/php/include/db.inc.php | 43 | ||||
-rw-r--r-- | frontends/php/include/defines.inc.php | 8 | ||||
-rw-r--r-- | frontends/php/include/screens.inc.php | 32 | ||||
-rw-r--r-- | frontends/php/screens.php | 7 |
4 files changed, 44 insertions, 46 deletions
diff --git a/frontends/php/include/db.inc.php b/frontends/php/include/db.inc.php index c62b030c..76af876c 100644 --- a/frontends/php/include/db.inc.php +++ b/frontends/php/include/db.inc.php @@ -616,53 +616,47 @@ else { return (' '.DBid2nodeid($id_name).' in ('.$nodes.') '); } - function in_node( $id_var, $nodes = null ) - { - if ( is_null($nodes) ) $nodes = get_current_nodeid(); + function in_node( $id_var, $nodes = null ){ + if(is_null($nodes)) + $nodes = get_current_nodeid(); - if ( empty($nodes) ) $nodes = 0; + if(empty($nodes)) + $nodes = 0; - if ( is_numeric($nodes) ) - { + if(is_numeric($nodes)){ $nodes = array($nodes); } - else if ( is_string($nodes) ) - { - if ( !eregi('([0-9\,]+)', $nodes ) ) + else if(is_string($nodes)){ + if(!eregi('([0-9\,]+)',$nodes)) fatal_error('Incorrect "nodes" for "in_node". Passed ['.$nodes.']'); - + $nodes = explode(',', $nodes); } - else if ( !is_array($nodes) ) - { + else if (!is_array($nodes)){ fatal_error('Incorrect type of "nodes" for "in_node". Passed ['.gettype($nodes).']'); } - return uint_in_array(id2nodeid($id_var), $nodes); + return uint_in_array(id2nodeid($id_var), $nodes); } - function get_dbid($table,$field) - { + function get_dbid($table,$field){ $nodeid = get_current_nodeid(false); $found = false; - do - { + do{ global $ZBX_LOCALNODEID; $min=bcadd(bcmul($nodeid,"100000000000000"),bcmul($ZBX_LOCALNODEID,"100000000000")); $max=bcadd(bcadd(bcmul($nodeid,"100000000000000"),bcmul($ZBX_LOCALNODEID,"100000000000")),"99999999999"); $row = DBfetch(DBselect("select nextid from ids where nodeid=$nodeid and table_name='$table' and field_name='$field'")); - if(!$row) - { + if(!$row){ $row=DBfetch(DBselect("select max($field) as id from $table where $field>=$min and $field<=$max")); - if(!$row || is_null($row["id"])) - { + if(!$row || is_null($row["id"])){ + DBexecute("insert into ids (nodeid,table_name,field_name,nextid) ". " values ($nodeid,'$table','$field',$min)"); } - else - { + else{ /* $ret1 = $row["id"]; if($ret1 >= $max) { @@ -674,8 +668,7 @@ else { } continue; } - else - { + else{ $ret1 = $row["nextid"]; if((bccomp($ret1,$min) < 0) || !(bccomp($ret1,$max) < 0)) { DBexecute("delete from ids where nodeid=$nodeid and table_name='$table' and field_name='$field'"); diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php index 9eeb3d03..53461d93 100644 --- a/frontends/php/include/defines.inc.php +++ b/frontends/php/include/defines.inc.php @@ -495,8 +495,8 @@ if((ini_get('mbstring.func_overload') > 5)){ define('ZBX_EXPRESSION_MACRO_ID', 13); define('ZBX_EXPRESSION_RIGHT_ID', 14); - define('ZBX_MIN_PERIOD', 3600); - define('ZBX_MAX_PERIOD', 12*31*24*3600); + define('ZBX_MIN_PERIOD', 3600); // ~1 hour + define('ZBX_MAX_PERIOD', 12*31*24*3600); // ~1 year define('ZBX_PERIOD_DEFAULT', ZBX_MIN_PERIOD); define('ZBX_HISTORY_COUNT',5); @@ -507,6 +507,10 @@ if((ini_get('mbstring.func_overload') > 5)){ define('ZBX_FAVORITES_ALL', -1); +// Allow for testing + define('ZBX_ALLOW_UNICODE',1); + + /* Define if your logs are in non-standard format */ /* define('ZBX_LOG_ENCODING_DEFAULT', 'Shift_JIS');*/ diff --git a/frontends/php/include/screens.inc.php b/frontends/php/include/screens.inc.php index 65da8df3..25184ec4 100644 --- a/frontends/php/include/screens.inc.php +++ b/frontends/php/include/screens.inc.php @@ -310,7 +310,7 @@ if($editmode == 1 && $screenitemid!=0) $action = "screenedit.php?form=update".url_param("screenid"). "&screenitemid=$screenitemid#form"; - elseif ($editmode == 1 && $screenitemid==0) + else if ($editmode == 1 && $screenitemid==0) $action = "screenedit.php?form=update".url_param("screenid")."&x=$c&y=$r#form"; else $action = NULL; @@ -321,12 +321,12 @@ { // click on empty field $item = get_screen_item_form(); } - elseif($editmode == 1 && isset($_REQUEST["form"]) && + else if($editmode == 1 && isset($_REQUEST["form"]) && isset($_REQUEST["screenitemid"]) && (bccomp($_REQUEST["screenitemid"], $screenitemid)==0)) { // click on element $item = get_screen_item_form(); } - elseif( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_GRAPH) ) + else if( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_GRAPH) ) { if($editmode == 0) $action = "charts.php?graphid=$resourceid".url_param("period").url_param("stime"); @@ -424,7 +424,7 @@ } } } - elseif( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_SIMPLE_GRAPH) ) + else if( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_SIMPLE_GRAPH) ) { if($editmode == 0) $action = "history.php?action=showgraph&itemid=$resourceid". @@ -446,7 +446,7 @@ $action ); } - elseif( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_MAP) ) + else if( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_MAP) ) { $image_map = new CImg("map.php?noedit=1&sysmapid=$resourceid". "&width=$width&height=$height"); @@ -459,7 +459,7 @@ $item = new CLink($image_map, $action); } } - elseif( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_PLAIN_TEXT) ){ + else if( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_PLAIN_TEXT) ){ // Host feature if(($dynamic == SCREEN_DYNAMIC_ITEM) && isset($_REQUEST['hostid']) && ($_REQUEST['hostid']>0)){ if($newitemid = get_same_item_for_host($resourceid,$_REQUEST['hostid'],false)){ @@ -473,51 +473,51 @@ $item = array(get_screen_plaintext($resourceid,$elements)); if($editmode == 1) array_push($item,new CLink(S_CHANGE,$action)); } - elseif( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_HOSTS_INFO) ) + else if( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_HOSTS_INFO) ) { $item = array(new CHostsInfo($resourceid, $style)); if($editmode == 1) array_push($item,new CLink(S_CHANGE,$action)); } - elseif( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_TRIGGERS_INFO) ) + else if( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_TRIGGERS_INFO) ) { $item = array(new CTriggersInfo($style)); if($editmode == 1) array_push($item,new CLink(S_CHANGE,$action)); } - elseif( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_SERVER_INFO) ) + else if( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_SERVER_INFO) ) { $item = array(new CServerInfo()); if($editmode == 1) array_push($item,new CLink(S_CHANGE,$action)); } - elseif( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_CLOCK) ) + else if( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_CLOCK) ) { $item = new CFlashClock($width, $height, $style, $action); } - elseif( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_SCREEN) ) + else if( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_SCREEN) ) { $item = array(get_screen($resourceid, 2, $effectiveperiod)); if($editmode == 1) array_push($item,new CLink(S_CHANGE,$action)); } - elseif( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_TRIGGERS_OVERVIEW) ) + else if( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_TRIGGERS_OVERVIEW) ) { $item = array(get_triggers_overview($resourceid,$style)); if($editmode == 1) array_push($item,new CLink(S_CHANGE,$action)); } - elseif( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_DATA_OVERVIEW) ) + else if( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_DATA_OVERVIEW) ) { $item = array(get_items_data_overview($resourceid,$style)); if($editmode == 1) array_push($item,new CLink(S_CHANGE,$action)); } - elseif( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_URL) ) + else if( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_URL) ) { $item = array(new CIFrame($url,$width,$height,"auto")); if($editmode == 1) array_push($item,BR(),new CLink(S_CHANGE,$action)); } - elseif( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_ACTIONS) ) + else if( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_ACTIONS) ) { $item = array(get_history_of_actions(0, $elements)); if($editmode == 1) array_push($item,new CLink(S_CHANGE,$action)); } - elseif( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_EVENTS) ) + else if( ($screenitemid!=0) && ($resourcetype==SCREEN_RESOURCE_EVENTS) ) { $item = array(get_history_of_triggers_events(0, $elements)); if($editmode == 1) array_push($item,new CLink(S_CHANGE,$action)); diff --git a/frontends/php/screens.php b/frontends/php/screens.php index b22c46bb..16a45187 100644 --- a/frontends/php/screens.php +++ b/frontends/php/screens.php @@ -252,15 +252,16 @@ include_once "include/page_header.php"; $cmbGroup->AddItem(0,S_ALL_SMALL); $cmbHosts->AddItem(0,S_DEFAULT); - - $result=DBselect('SELECT DISTINCT g.groupid, g.name '. + $sql = 'SELECT DISTINCT g.groupid, g.name '. ' FROM groups g, hosts_groups hg, hosts h, items i '. ' WHERE g.groupid in ('.$availiable_groups.') '. ' AND hg.groupid=g.groupid '. ' AND h.status='.HOST_STATUS_MONITORED. ' AND h.hostid=i.hostid '. ' AND hg.hostid=h.hostid '. - ' ORDER BY g.name'); + ' ORDER BY g.name'; + + $result=DBselect($sql); while($row=DBfetch($result)){ $cmbGroup->AddItem( $row['groupid'], |