- Frontend improvements (Eugene)

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

6 files changed, 49 insertions, 82 deletions

diff --git a/frontends/php/actionconf.php b/frontends/php/actionconf.php
index 0f4f1576..05de71a7 100644
--- a/frontends/php/actionconf.php
+++ b/frontends/php/actionconf.php
@@ -149,6 +149,7 @@
 	}
 	else
 	{
+/* table header */
 		$form = new CForm("actionconf.php");
 
 		$cmbType = new CComboBox("actiontype",$_REQUEST["actiontype"],"submit()");
@@ -161,7 +162,7 @@
 
 		show_header2(S_ACTIONS, $form);
 
-
+/* table */
 		$tblActions = new CTableInfo(S_NO_ACTIONS_DEFINED);
 		$tblActions->SetHeader(array(S_SOURCE,S_CONDITIONS,S_SEND_MESSAGE_TO,
 			S_DELAY,S_SUBJECT,S_REPEATS,S_ACTIONS));
@@ -210,7 +211,5 @@
 		$tblActions->Show();
 	}
 
-	show_messages();
-
 	show_page_footer();
 ?>
diff --git a/frontends/php/actions.php b/frontends/php/actions.php
index a1addc62..59dab0c0 100644
--- a/frontends/php/actions.php
+++ b/frontends/php/actions.php
@@ -42,7 +42,8 @@
 	if(isset($_REQUEST["start"])&&isset($_REQUEST["prev"]))
 	{
 		$_REQUEST["start"]-=100;
-		if($_REQUEST["start"]<=0)	unset($_REQUEST["start"]);
+		if($_REQUEST["start"]<=0)
+			unset($_REQUEST["start"]);
 	}
 	if(isset($_REQUEST["next"]))
 	{
@@ -65,8 +66,7 @@
 	$form = new CForm();
 
 	$btnPrev = new CButton("prev","<< Prev 100");
-	if(isset($_REQUEST["start"]))
-	{
+	if(isset($_REQUEST["start"]))	{
 		$form->AddVar("start",$_REQUEST["start"]);
 	} else {
 		$btnPrev->SetEnable('no');
diff --git a/frontends/php/alarms.php b/frontends/php/alarms.php
index b11ba206..859b94a0 100644
--- a/frontends/php/alarms.php
+++ b/frontends/php/alarms.php
@@ -52,21 +52,19 @@
 	$expression=explode_exp($expression,1);
 	$description=expand_trigger_description($_REQUEST["triggerid"]);
 
-	$h1=S_ALARMS_BIG.":$description<br>$expression";
+	$form = new CForm();
+	$form->AddVar("triggerid",$_REQUEST["triggerid"]);
+	$cmbLimit = new CComboBox("limit",$_REQUEST["limit"],"submit()");
+	$cmbLimit->AddItem('NO',S_SHOW_ALL);
+	$cmbLimit->AddItem("100",S_SHOW_ONLY_LAST_100);
+	$form->AddItem($cmbLimit);
 
-	$h2="";
-	$h2=$h2."<input name=\"triggerid\" type=\"hidden\" value=".$_REQUEST["triggerid"].">";
-	$h2=$h2."<select class=\"biginput\" name=\"limit\" onChange=\"submit()\">";
-	$h2=$h2.form_select("limit","NO",S_SHOW_ALL);
-	$h2=$h2.form_select("limit","100",S_SHOW_ONLY_LAST_100);
-	$h2=$h2."</select>";
-
-	show_header2($h1, $h2, "<form name=\"selection\" method=\"get\" action=\"alarms.php\">", "</form>");
+	show_header2(S_ALARMS_BIG.":$description<br>$expression", $form);
 ?>
 
-<FONT COLOR="#000000">
 <?php
-	$sql="select clock,value,triggerid from alarms where triggerid=".$_REQUEST["triggerid"]." order by clock desc $limit";
+	$sql="select clock,value,triggerid from alarms where triggerid=".$_REQUEST["triggerid"].
+		" order by clock desc $limit";
 	$result=DBselect($sql);
 
 	$table = new CTableInfo();
diff --git a/frontends/php/audit.php b/frontends/php/audit.php
index 9dee41ef..5f802b88 100644
--- a/frontends/php/audit.php
+++ b/frontends/php/audit.php
@@ -30,11 +30,13 @@
 ?>
 
 <?php
-	if(isset($_REQUEST["start"])&&isset($_REQUEST["do"])&&($_REQUEST["do"]=="<< Prev 100"))
+	if(isset($_REQUEST["start"])&&isset($_REQUEST["prev"]))
 	{
 		$_REQUEST["start"]-=100;
+		if($_REQUEST["start"]<=0)
+			unset($_REQUEST["start"]);
 	}
-	if(isset($_REQUEST["do"])&&($_REQUEST["do"]=="Next 100 >>"))
+	if(isset($_REQUEST["next"]))
 	{
 		if(isset($_REQUEST["start"]))
 		{
@@ -45,29 +47,23 @@
 			$_REQUEST["start"]=100;
 		}
 	}
-	if(isset($_REQUEST["start"])&&($_REQUEST["start"]<=0))
-	{
-		unset($_REQUEST["start"]);
-	}
 ?>
 
 <?php
-	show_table3_header_begin();
-	echo "&nbsp;".S_AUDIT_LOG_BIG;
-	show_table3_h_delimiter(20);
-	echo "<form name=\"form2\" method=\"get\" action=\"audit.php\">";
-	if(isset($_REQUEST["start"]))
-	{
-		echo "<input class=\"biginput\" name=\"start\" type=hidden value=".$_REQUEST["start"]." size=8>";
-  		echo "<input class=\"button\" type=\"submit\" name=\"do\" value=\"<< Prev 100\">";
-	}
-	else
-	{
-  		echo "<input class=\"button\" type=\"submit\" disabled name=\"do\" value=\"<< Prev 100\">";
+	$form = new CForm();
+
+	$btnPrev = new CButton("prev","<< Prev 100");
+	if(isset($_REQUEST["start"]))   {
+		$form->AddVar("start",$_REQUEST["start"]);
+	} else {
+		$btnPrev->SetEnable('no');
 	}
-  	echo "<input class=\"button\" type=\"submit\" name=\"do\" value=\"Next 100 >>\">";
-	echo "</form>";
-	show_table_header_end();
+	$form->AddItem($btnPrev);
+
+	$form->AddItem(new CButton("next","Next 100 >>"));
+
+	show_header2(S_AUDIT_LOG_BIG,$form);
+
 ?>
 
 <?php
@@ -78,11 +74,14 @@
 
 	if(!isset($_REQUEST["start"]))
 	{
-		$sql="select u.alias,a.clock,a.action,a.resource,a.details from audit a, users u where u.userid=a.userid and a.auditid>$maxauditid-200 order by clock desc limit 200";
+		$sql="select u.alias,a.clock,a.action,a.resource,a.details from audit a, users u".
+			" where u.userid=a.userid and a.auditid>$maxauditid-200 order by clock desc limit 200";
 	}
 	else
 	{
-		$sql="select u.alias,a.clock,a.action,a.resource,a.details from audit a, users u where u.userid=a.userid and a.auditid>$maxauditid-".($_REQUEST["start"]+200)." order by clock desc limit ".($_REQUEST["start"]+200);
+		$sql="select u.alias,a.clock,a.action,a.resource,a.details from audit a, users u".
+			" where u.userid=a.userid and a.auditid>$maxauditid-".($_REQUEST["start"]+200).
+			" order by clock desc limit ".($_REQUEST["start"]+200);
 
 	}
 	$result=DBselect($sql);
@@ -93,60 +92,31 @@
 	while($row=DBfetch($result))
 	{
 		$i++;
-		if(isset($_REQUEST["start"])&&($i<$_REQUEST["start"]))
-		{
-			continue;
-		}
+		if(isset($_REQUEST["start"])&&($i<$_REQUEST["start"]))	continue;
 		if($i>100)	break;
 
 		if($row["resource"]==AUDIT_RESOURCE_USER)
-		{
 			$resource=S_USER;
-		}
 		else if($row["resource"]==AUDIT_RESOURCE_ZABBIX_CONFIG)
-		{
 			$resource=S_CONFIGURATION_OF_ZABBIX;
-		}
 		else if($row["resource"]==AUDIT_RESOURCE_MEDIA_TYPE)
-		{
 			$resource=S_MEDIA_TYPE;
-		}
 		else if($row["resource"]==AUDIT_RESOURCE_HOST)
-		{
 			$resource=S_HOST;
-		}
 		else if($row["resource"]==AUDIT_RESOURCE_ACTION)
-		{
 			$resource=S_ACTION;
-		}
 		else if($row["resource"]==AUDIT_RESOURCE_GRAPH)
-		{
 			$resource=S_GRAPH;
-		}
 		else if($row["resource"]==AUDIT_RESOURCE_GRAPH_ELEMENT)
-		{
 			$resource=S_GRAPH_ELEMENT;
-		}
 		else
-		{
 			$resource=S_UNKNOWN_RESOURCE;
-		}
-		if($row["action"]==AUDIT_ACTION_ADD)
-		{
-			$action=S_ADDED;
-		}
-		else if($row["action"]==AUDIT_ACTION_UPDATE)
-		{
-			$action=S_UPDATED;
-		}
-		else if($row["action"]==AUDIT_ACTION_DELETE)
-		{
-			$action=S_DELETED;
-		}
-		else
-		{
-			$action=S_UNKNOWN_ACTION;
-		}
+
+		if($row["action"]==AUDIT_ACTION_ADD)			$action = S_ADDED;
+		else if($row["action"]==AUDIT_ACTION_UPDATE)		$action = S_UPDATED;
+		else if($row["action"]==AUDIT_ACTION_DELETE)		$action = S_DELETED;
+		else							$action = S_UNKNOWN_ACTION;
+
 		$table->addRow(array(
 			date("Y.M.d H:i:s",$row["clock"]),
 			$row["alias"],
diff --git a/frontends/php/bulkloader.php b/frontends/php/bulkloader.php
index a7e923d8..bc0334bb 100644
--- a/frontends/php/bulkloader.php
+++ b/frontends/php/bulkloader.php
@@ -25,11 +25,11 @@
 	$fileuploaded=0;
 	show_header($page["title"],0,0);
 	if(!check_anyright("Default permission","U"))
-		{
-			show_table_header("<font color=\"AA0000\">".S_NO_PERMISSIONS."</font>");
-			show_page_footer();
-			exit;
-		}
+	{
+		show_table_header("<font color=\"AA0000\">".S_NO_PERMISSIONS."</font>");
+		show_page_footer();
+		exit;
+	}
 	insert_confirm_javascript();
 	
 	if(isset($_FILES['uploadfile']))
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index e3548d51..0798b75a 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -1071,7 +1071,7 @@ function SDI($msg) { echo "DEBUG INFO: $msg ".BR; } # DEBUG INFO!!!
 				),
 		"configuration"=>array(
 				"label"=>S_CONFIGURATION,
-				"pages"=>array("config.php","users.php","audit.php","hosts.php","items.php","triggers.php","sysmaps.php","graphs.php","screenconf.php","services.php","sysmap.php","media.php","screenedit.php","graph.php","actionconf.php"),
+				"pages"=>array("config.php","users.php","audit.php","hosts.php","items.php","triggers.php","sysmaps.php","graphs.php","screenconf.php","services.php","sysmap.php","media.php","screenedit.php","graph.php","actionconf.php","bulkloader.php"),
 				"level2"=>array(
 					array("label"=>S_GENERAL,"url"=>"config.php"),
 					array("label"=>S_USERS,"url"=>"users.php"),