- [DEV-137] minor fixes (Artem)

git-svn-id: svn://svn.zabbix.com/trunk@5866 97f52cf1-0a1b-0410-bd0e-c28be96e8082

3 files changed, 29 insertions, 38 deletions

diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index 5f795e3c..8f507699 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -453,20 +453,20 @@
 // affects multibyte strings [in mb_ereg char "-" must be backslashed]!!!
 if((ini_get('mbstring.func_overload') > 5)){
 	define('ZBX_MBSTRINGS_OVERLOADED',1);
-	define('ZBX_EREG_SPACE_SYMB','\-');
+	define('ZBX_EREG_MINUS_SYMB','\-');
 }
 else{
-	define('ZBX_EREG_SPACE_SYMB','-');
+	define('ZBX_EREG_MINUS_SYMB','-');
 }
-	define('ZBX_EREG_INTERNAL_NAMES', '([0-9a-zA-Z_.[:space:][.'.ZBX_EREG_SPACE_SYMB.'.]$]+)');
-	define('ZBX_EREG_KEY_NAME', '([0-9a-zA-Z_.,[.:.][:space:][.'.ZBX_EREG_SPACE_SYMB.'.]$]+)');
+	define('ZBX_EREG_INTERNAL_NAMES', '([0-9a-zA-Z_.[:space:][.'.ZBX_EREG_MINUS_SYMB.'.]$]+)');
+	define('ZBX_EREG_KEY_NAME', '([0-9a-zA-Z_.,[.:.][:space:][.'.ZBX_EREG_MINUS_SYMB.'.]$]+)');
 	define('ZBX_EREG_PARAMS', '([[:print:]]+){0,1}');
-	define('ZBX_EREG_SIGN', '([&|><=+*/#[.'.ZBX_EREG_SPACE_SYMB.'.]])');
-	define('ZBX_EREG_NUMBER', '([[.'.ZBX_EREG_SPACE_SYMB.'.]+]*[0-9]+[.]{0,1}[0-9]*[A-Z]{0,1})');
+	define('ZBX_EREG_SIGN', '([&|><=+*/#[.'.ZBX_EREG_MINUS_SYMB.'.]])');
+	define('ZBX_EREG_NUMBER', '([[.'.ZBX_EREG_MINUS_SYMB.'.]+]*[0-9]+[.]{0,1}[0-9]*[A-Z]{0,1})');
 //-------
 
 	/* Character '-' must be last in the list of symbols, otherwise it won't be accepted */
-	define('ZBX_EREG_DNS_FORMAT', '([0-9a-zA-Z\_\.\$[.'.ZBX_EREG_SPACE_SYMB.'.]]+)');
+	define('ZBX_EREG_DNS_FORMAT', '([0-9a-zA-Z\_\.\$[.'.ZBX_EREG_MINUS_SYMB.'.]]+)');
 	define('ZBX_EREG_HOST_FORMAT', ZBX_EREG_INTERNAL_NAMES);
 	
 	define('ZBX_EREG_NODE_FORMAT', ZBX_EREG_INTERNAL_NAMES);
diff --git a/frontends/php/include/maps.inc.php b/frontends/php/include/maps.inc.php
index ea87f386..f194169b 100644
--- a/frontends/php/include/maps.inc.php
+++ b/frontends/php/include/maps.inc.php
@@ -458,8 +458,7 @@
          *     Eugene Grigorjev 
          *
          */
-	function get_info_by_selementid($selementid)
-	{
+	function get_info_by_selementid($selementid){
 		global $colors;
 
 		$el_name = '';
@@ -502,14 +501,11 @@
 		if( isset($sql[$el_type]) ){
 			$db_triggers = DBselect($sql[$el_type]);
 			$trigger = DBfetch($db_triggers);
-			if($trigger)
-			{
-				if(isset($trigger['el_name']))
-				{
+			if($trigger){
+				if(isset($trigger['el_name'])){
 					$el_name = $trigger['el_name'];
 				}
-				else
-				{
+				else{
 					$el_name = expand_trigger_description_by_data($trigger);
 				}
 
@@ -520,56 +516,51 @@
 						$tr_info[$type] = array('count' => 0);
 
 					$tr_info[$type]['count']++;
-					if(!isset($tr_info[$type]['priority']) || $tr_info[$type]['priority'] < $trigger["priority"])
-					{
+					if(!isset($tr_info[$type]['priority']) || $tr_info[$type]['priority'] < $trigger["priority"]){
 						$tr_info[$type]['priority']	= $trigger["priority"];
 						if($el_type != SYSMAP_ELEMENT_TYPE_TRIGGER && $type!=TRIGGER_VALUE_UNKNOWN)
 							$tr_info[$type]['info']		= expand_trigger_description_by_data($trigger);
 					}
 				} while ($trigger = DBfetch($db_triggers));
 			}
-			elseif($el_type == SYSMAP_ELEMENT_TYPE_HOST)
-			{
+			else if($el_type == SYSMAP_ELEMENT_TYPE_HOST){
 				$host = get_host_by_hostid($db_element["elementid"]);
 				$el_name = $host['host'];
-				if($host["status"] == HOST_STATUS_TEMPLATE)
-				{
+				if($host["status"] == HOST_STATUS_TEMPLATE){
 					$tr_info[TRIGGER_VALUE_UNKNOWN]['count']	= 1;
 					$tr_info[TRIGGER_VALUE_UNKNOWN]['priority']	= 0;
 					$tr_info[TRIGGER_VALUE_UNKNOWN]['info']		= S_TEMPLATE_SMALL;
 					$tr_info[TRIGGER_VALUE_UNKNOWN]['host_status']	= $host["status"];
 				}
-				elseif($host["status"] == HOST_STATUS_NOT_MONITORED)
-				{
+				else if($host["status"] == HOST_STATUS_NOT_MONITORED){
 					$tr_info[TRIGGER_VALUE_UNKNOWN]['count']	= 0;
 					$tr_info[TRIGGER_VALUE_UNKNOWN]['priority']	= 0;
 					$tr_info[TRIGGER_VALUE_UNKNOWN]['info']		= S_DISABLED_BIG;
 					$tr_info[TRIGGER_VALUE_UNKNOWN]['host_status']	= $host["status"];
 				}
-				else
-				{
+				else{
 					$tr_info[TRIGGER_VALUE_FALSE]['count']		= 0;
 					$tr_info[TRIGGER_VALUE_FALSE]['priority']	= 0;
 					$tr_info[TRIGGER_VALUE_FALSE]['info']		= S_OK_BIG;
 				}
 			}
 		}
-		elseif($el_type==SYSMAP_ELEMENT_TYPE_MAP)
-		{
-			SDI("5");
+		else if($el_type==SYSMAP_ELEMENT_TYPE_MAP){
+		
 			$db_map = DBfetch(DBselect('select name FROM sysmaps WHERE sysmapid='.$db_element["elementid"]));
 			$el_name = $db_map['name'];
 
 			$db_subelements = DBselect("select selementid FROM sysmaps_elements".
 				" WHERE sysmapid=".$db_element["elementid"]);
-			while($db_subelement = DBfetch($db_subelements))
-			{// recursion
+			while($db_subelement = DBfetch($db_subelements)){ // recursion
+			
 				$inf = get_info_by_selementid($db_subelement["selementid"]);
 				$type = $inf['type'];
+				
 				if(!isset($tr_info[$type]['count'])) $tr_info[$type]['count'] = 0;
 				$tr_info[$type]['count'] += isset($inf['count']) ? $inf['count'] : 1;
-				if(!isset($tr_info[$type]['priority']) || $tr_info[$type]['priority'] < $inf["priority"])
-				{
+				
+				if(!isset($tr_info[$type]['priority']) || $tr_info[$type]['priority'] < $inf["priority"]){
 					$tr_info[$type]['priority'] = $inf['priority'];
 					$tr_info[$type]['info'] = $inf['info'];
 				}
diff --git a/frontends/php/tr_status.php b/frontends/php/tr_status.php
index 9503f0bd..7053ac6e 100644
--- a/frontends/php/tr_status.php
+++ b/frontends/php/tr_status.php
@@ -132,7 +132,7 @@ include_once "include/page_header.php";
 //--------
 
 	$config=select_config();
-	
+
 /* FILTER */
 	if(isset($_REQUEST['filter_rst'])){
 		$_REQUEST['show_actions']	= get_request('show_actions',	0);
@@ -170,16 +170,16 @@ include_once "include/page_header.php";
 	if(TRIGGERS_OPTION_NOFALSEFORB && ($_REQUEST['show_triggers'] == TRIGGERS_OPTION_NOFALSEFORB)){
 		$_REQUEST['show_events'] = EVENTS_OPTION_NOFALSEFORB;
 	}
-	
+
 	if(($_REQUEST['show_events'] == EVENTS_OPTION_NOFALSEFORB) && ($_REQUEST['show_triggers'] != TRIGGERS_OPTION_NOFALSEFORB)){
 		$_REQUEST['show_events'] = EVENTS_OPTION_NOEVENT;
 	}
 
-	if(!$config['event_ack_enable'] && (($_REQUEST['show_events'] != EVENTS_OPTION_NOEVENT) || ($_REQUEST['show_events'] != EVENTS_OPTION_ALL))){
+	if((EVENT_ACK_DISABLED == $config['event_ack_enable']) && !str_in_array($_REQUEST['show_events'],array(EVENTS_OPTION_NOEVENT,EVENTS_OPTION_ALL))){
 		$_REQUEST['show_events'] = EVENTS_OPTION_NOEVENT;
 	}
 //--
-	
+
 	if(isset($_REQUEST['filter_set']) || isset($_REQUEST['filter_rst'])){
 		update_profile('web.tr_status.filter.show_actions',$_REQUEST['show_actions'], PROFILE_TYPE_INT);
 		update_profile('web.tr_status.filter.show_details',$_REQUEST['show_details'], PROFILE_TYPE_INT);
@@ -309,7 +309,7 @@ include_once "include/page_header.php";
 	$filterForm->SetMethod('post');
 
 	$filterForm->AddVar('fullscreen',$_REQUEST['fullscreen']);
-	
+
 	$tr_select = new CComboBox('show_triggers',$show_triggers,'javasctipt: submit();');
 	if(TRIGGERS_OPTION_ONLYTRUE){
 		$tr_select->Additem(TRIGGERS_OPTION_ONLYTRUE,S_SHOW_ONLY_TRUE);
@@ -342,7 +342,7 @@ include_once "include/page_header.php";
 
 //------- JP -------
 	if($show_triggers==TRIGGERS_OPTION_NOFALSEFORB){
-		$ev_select->Additem(EVENTS_OPTION_NOFALSEFORB,' - ','yes');
+		$ev_select->AddItem(EVENTS_OPTION_NOFALSEFORB,' - ','yes');
 		$ev_select->AddOption('disabled','disabled');
 	}
 //---