- fixed limit error in alarms (Eugene)

 - fixed (2. SQL errors in frontend) (Eugene)
from URL: http://www.zabbix.com/forum/showthread.php?t=2837


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

5 files changed, 11 insertions, 3 deletions

diff --git a/frontends/php/acknow.php b/frontends/php/acknow.php
index 6371b241..2121893d 100644
--- a/frontends/php/acknow.php
+++ b/frontends/php/acknow.php
@@ -21,6 +21,7 @@
 <?php
 	$page["title"]="S_ACKNOWLEDGES";
 	$page["file"]="acknow.php";
+	$page["menu.url"] = "tr_status.php";
 
 	include "include/config.inc.php";
 	include "include/forms.inc.php";
diff --git a/frontends/php/alarms.php b/frontends/php/alarms.php
index 6baae0ca..c6c5e7f1 100644
--- a/frontends/php/alarms.php
+++ b/frontends/php/alarms.php
@@ -22,6 +22,8 @@
 	include "include/config.inc.php";
 	$page["title"] = "S_ALARMS";
 	$page["file"] = "alarms.php";
+	$page["menu.url"] = "tr_status.php";
+
 	show_header($page["title"],0,0);
 ?>
 
@@ -35,7 +37,7 @@
 ?>
 
 <?php
-	get_request("limit","NO");
+	$_REQUEST["limit"] = get_request("limit","NO");
 	if(is_numeric($_REQUEST["limit"]))
 		$_REQUEST["limit"] = 100;
 
diff --git a/frontends/php/history.php b/frontends/php/history.php
index aafab46b..22a611f7 100644
--- a/frontends/php/history.php
+++ b/frontends/php/history.php
@@ -20,6 +20,7 @@
 ?>
 <?php
 	$page["file"]="history.php";
+	$page["menu.url"]="latest.php";
 
 	include "include/config.inc.php";
 	include "include/forms.inc.php";
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 5122429a..bbe2e755 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -1020,7 +1020,10 @@ COpt::profiling_start("page");
 		{
 			global $page;
 			$class = "horizontal_menu";
-			$url	= $page["file"];
+			if(isset($page["menu.url"]))
+				$url = $page["menu.url"];
+			else
+				$url	= $page["file"];
 		}
 		else
 		{
diff --git a/frontends/php/include/db.inc.php b/frontends/php/include/db.inc.php
index 1a998e3d..2af83b98 100644
--- a/frontends/php/include/db.inc.php
+++ b/frontends/php/include/db.inc.php
@@ -26,7 +26,8 @@
 //	$DB_TYPE	="POSTGRESQL";
 	$DB_TYPE	="MYSQL";
 	$DB_SERVER	="localhost";
-	$DB_DATABASE	="zabbix";
+//	$DB_DATABASE	="zabbix";
+	$DB_DATABASE	="osmiy";
 	$DB_USER	="root";
 	$DB_PASSWORD	="";
 // END OF DATABASE CONFIGURATION