- added changes for better support Konqueror Browser (Artem)

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

3 files changed, 11 insertions, 16 deletions

diff --git a/frontends/php/include/events.inc.php b/frontends/php/include/events.inc.php
index a4c0874d..8fc29b18 100644
--- a/frontends/php/include/events.inc.php
+++ b/frontends/php/include/events.inc.php
@@ -309,25 +309,19 @@ function get_latest_events($row,$show_unknown=0){
 			' WHERE e.objectid='.$row['triggerid'].
 				' AND e.eventid < '.$row['eventid'].
 				' AND e.object='.EVENT_OBJECT_TRIGGER.
-//				' AND '.zbx_sql_mod('e.object',1000).'='.EVENT_OBJECT_TRIGGER.   
 				' AND e.value='.TRIGGER_VALUE_FALSE.
 			' ORDER BY e.object DESC, e.objectid DESC, e.eventid DESC';
-//			' ORDER BY e.eventid DESC';
-
-
-	if($rez = DBfetch(DBselect($sql,1))) $eventz[] = $rez['eventid'];
+	if($rez = DBfetch(DBselect($sql,1))) $eventz[$rez['value']] = $rez['eventid'];
 	
 	$sql = 'SELECT e.eventid, e.value '.
 			' FROM events e'.
 			' WHERE e.objectid='.$row['triggerid'].
 				' AND e.eventid < '.$row['eventid'].
 				' AND e.object='.EVENT_OBJECT_TRIGGER.
-//				' AND '.zbx_sql_mod('e.object',1000).'='.EVENT_OBJECT_TRIGGER.   
 				' AND e.value='.TRIGGER_VALUE_TRUE.
 			' ORDER BY e.object DESC, e.objectid DESC, e.eventid DESC';
-//			' ORDER BY e.eventid DESC';
 
-	if($rez = DBfetch(DBselect($sql,1))) $eventz[] = $rez['eventid'];
+	if($rez = DBfetch(DBselect($sql,1))) $eventz[$rez['value']] = $rez['eventid'];
 
 	if($show_unknown != 0){
 		$sql = 'SELECT e.eventid, e.value '.
@@ -335,11 +329,9 @@ function get_latest_events($row,$show_unknown=0){
 				' WHERE e.objectid='.$row['triggerid'].
 					' AND e.eventid < '.$row['eventid'].
 					' AND e.object='.EVENT_OBJECT_TRIGGER.
-//					' AND '.zbx_sql_mod('e.object',1000).'='.EVENT_OBJECT_TRIGGER.   
 					' AND e.value='.TRIGGER_VALUE_UNKNOWN.
 				' ORDER BY e.object DESC, e.objectid DESC, e.eventid DESC';
-//				' ORDER BY e.eventid DESC';
-		if($rez = DBfetch(DBselect($sql,1))) $eventz[] = $rez['eventid'];
+		if($rez = DBfetch(DBselect($sql,1))) $eventz[$rez['value']] = $rez['eventid'];
 	}
 
 /*******************************************/
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 9d2e3574..d1dfb14e 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -2223,9 +2223,12 @@
 	}
 
 
-	function	insert_login_form()
-	{
-		$frmLogin = new CFormTable('Login','index.php',"post","multipart/form-data");
+	function	insert_login_form(){\
+// author: 	Aly
+// description:
+//			konqueror bug #138024; adding usless param(login=1) to the form's action path to avoid bug!!
+
+		$frmLogin = new CFormTable('Login','index.php?login=1',"post","multipart/form-data");
 		$frmLogin->SetHelp('web.index.login');
 		$frmLogin->AddRow('Login name', new CTextBox('name'));
 		$frmLogin->AddRow('Password', new CPassBox('password'));
diff --git a/frontends/php/include/page_footer.php b/frontends/php/include/page_footer.php
index dc4df95f..aef44e5a 100644
--- a/frontends/php/include/page_footer.php
+++ b/frontends/php/include/page_footer.php
@@ -65,8 +65,8 @@ function zbxCallPostScripts()
 					"page_footer_l"),
 				new CCol(array(
 						new CSpan(SPACE.SPACE."|".SPACE.SPACE,"divider"),
-						S_CONNECTED_AS.SPACE."'".$USER_DETAILS["alias"]."'".
-						(ZBX_DISTRIBUTED ? SPACE.S_FROM_SMALL.SPACE."'".$USER_DETAILS["node"]['name']."'" : '')
+						new CSpan(S_CONNECTED_AS.SPACE."'".$USER_DETAILS["alias"]."'".
+						(ZBX_DISTRIBUTED ? SPACE.S_FROM_SMALL.SPACE."'".$USER_DETAILS["node"]['name']."'" : ''),'footer_sign')
 					),
 					"page_footer_r")
 				));