Added status line to PHP froms.

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

15 files changed, 88 insertions, 84 deletions

diff --git a/ChangeLog b/ChangeLog
index e120a19f..baf13af8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,9 @@
 Changes for 1.0alpha9:
 
- - Added error checking to hosts.html
- - Added error checking to users.html
- - Added error checking to config.html
- - Added error checking to items.html
+
+ - Fixed nasty bug in DB structure. One of indexes of table functions was incorrectly defined as unique.
+ - added patches to upgrades/dbpatches/1.0alpha8_to_1.0alpha9
+ - Added status line to all PHP forms (like, "[Host added]")
 
 Changes for 1.0alpha8:
 
diff --git a/create/data/data.sql b/create/data/data.sql
index 6f9e5725..b76eed6d 100644
--- a/create/data/data.sql
+++ b/create/data/data.sql
@@ -147,7 +147,7 @@ insert into triggers_template (triggertemplateid,itemtemplateid,description,expr
 insert into triggers_template (triggertemplateid,itemtemplateid,description,expression)
 	values (8,8,'Low number of free inodes on %s\'s volume /usr','{:.last(0)}<10000');
 insert into triggers_template (triggertemplateid,itemtemplateid,description,expression)
-	values (9,9,'Too many processes running on %s','{:.last(0)}>300');
+	values (9,9,'Too many processes on %s','{:.last(0)}>300');
 insert into triggers_template (triggertemplateid,itemtemplateid,description,expression)
 	values (10,10,'Processor load is too high on %s','{:.last(0)}>5');
 insert into triggers_template (triggertemplateid,itemtemplateid,description,expression)
@@ -191,6 +191,6 @@ insert into triggers_template (triggertemplateid,itemtemplateid,description,expr
 insert into triggers_template (triggertemplateid,itemtemplateid,description,expression)
 	values (46,46,'/usr/sbin/sshd has been changed on server %s','{:.diff(0)}>0');
 insert into triggers_template (triggertemplateid,itemtemplateid,description,expression)
-	values (47,47,'/usr/bin/sshd has been changed on server %s','{:.diff(0)}>0');
+	values (47,47,'/usr/bin/ssh has been changed on server %s','{:.diff(0)}>0');
 insert into triggers_template (triggertemplateid,itemtemplateid,description,expression)
 	values (48,48,'/etc/services has been changed on server %s','{:.diff(0)}>0');
diff --git a/create/mysql/schema.sql b/create/mysql/schema.sql
index 4ee6586b..e53a9b63 100644
--- a/create/mysql/schema.sql
+++ b/create/mysql/schema.sql
@@ -146,9 +146,8 @@ CREATE TABLE functions (
   function varchar(10) DEFAULT '' NOT NULL,
   parameter int(4) DEFAULT '0' NOT NULL,
   PRIMARY KEY (functionid),
-  KEY itemid (itemid),
   KEY triggerid (triggerid),
-  UNIQUE itemidfunctionparameter (itemid,function,parameter)
+  KEY itemidfunctionparameter (itemid,function,parameter)
 );
 
 #
diff --git a/create/postgresql/schema.sql b/create/postgresql/schema.sql
index 651d734b..5193453d 100644
--- a/create/postgresql/schema.sql
+++ b/create/postgresql/schema.sql
@@ -169,9 +169,8 @@ CREATE TABLE functions (
   FOREIGN KEY (triggerid) REFERENCES triggers
 );
 
-CREATE INDEX functions_itemid on functions (itemid);
 CREATE INDEX funtions_triggerid on functions (triggerid);
-CREATE UNIQUE INDEX functions_i_f_p on functions (itemid,function,parameter);
+CREATE INDEX functions_i_f_p on functions (itemid,function,parameter);
 
 --
 -- Table structure for table 'history'
diff --git a/doc/manual.txt b/doc/manual.txt
index fb27a39e..d71f75c8 100644
--- a/doc/manual.txt
+++ b/doc/manual.txt
@@ -35,6 +35,7 @@
 
 6. Chapter 6 (Upgrading)
 6.1 Zabbix 1.0alpha8
+6.2 Zabbix 1.0alpha9
 
 7. Chapter 7 (Misc)
 7.1 pinger.pl
@@ -625,6 +626,10 @@ alter table alerts modify message text default '' not null;
 
 This unloads DNS and makes zabbix_suckerd faster.
 
+6.2 Zabbix 1.0alpha9
+
+Do not forget to install DB patches.
+
 7. Chapter 7 (Misc)
 
 7.1 pinger.pl
diff --git a/frontends/php/actions.html b/frontends/php/actions.html
index 138bc4d9..2d1f5704 100644
--- a/frontends/php/actions.html
+++ b/frontends/php/actions.html
@@ -11,16 +11,19 @@
 	{
 		if($register=="add")
 		{
-			add_action( $triggerid, $userid, $good, $delay, $subject, $message );
+			$result=add_action( $triggerid, $userid, $good, $delay, $subject, $message );
+			show_messages($result,"Action added","Cannot add action");
 		}
 		if($register=="update")
 		{
-			update_action( $actionid, $userid, $good, $delay, $subject, $message );
+			$result=update_action( $actionid, $userid, $good, $delay, $subject, $message );
+			show_messages($result,"Action updated","Cannot update action");
 			unset($actionid);
 		}
 		if($register=="delete")
 		{
-			delete_action($actionid);
+			$result=delete_action($actionid);
+			show_messages($result,"Action deleted","Cannot delete action");
 			unset($actionid);
 		}
 	}
diff --git a/frontends/php/graph.html b/frontends/php/graph.html
index dca018cb..ddf3f1c1 100644
--- a/frontends/php/graph.html
+++ b/frontends/php/graph.html
@@ -15,11 +15,13 @@
 	{
 		if($register=="add")
 		{
-			add_item_to_graph($graphid,$itemid,$color);
+			$result=add_item_to_graph($graphid,$itemid,$color);
+			show_messages($result,"Item added","Cannot add item");
 		}
 		if($register=="delete")
 		{
-			delete_graphs_item($gitemid);
+			$result=delete_graphs_item($gitemid);
+			show_messages($result,"Item deleted","Cannot delete item");
 			unset($gitemid);
 		}
 	}
diff --git a/frontends/php/graphs.html b/frontends/php/graphs.html
index 7e0fe08b..5aba4104 100644
--- a/frontends/php/graphs.html
+++ b/frontends/php/graphs.html
@@ -15,15 +15,18 @@
 	{
 		if($register=="add")
 		{
-			add_graph($name,$width,$height);
+			$result=add_graph($name,$width,$height);
+			show_messages($result,"Graph added","Cannot add graph");
 		}
 		if($register=="update")
 		{
-			update_graph($graphid,$name,$width,$height);
+			$result=update_graph($graphid,$name,$width,$height);
+			show_messages($result,"Graph updated","Cannot update graph");
 		}
 		if($register=="delete")
 		{
-			delete_graph($graphid);
+			$result=delete_graph($graphid);
+			show_messages($result,"Graph deleted","Cannot delete graph");
 			unset($graphid);
 		}
 	}
diff --git a/frontends/php/include/config.inc b/frontends/php/include/config.inc
index 885ec7f3..9bb8c09c 100644
--- a/frontends/php/include/config.inc
+++ b/frontends/php/include/config.inc
@@ -7,7 +7,7 @@
 	{
 		if(!$bool)
 		{
-			$msg=$errmsg;
+			$msg="ERROR:".$errmsg;
 			$color="#AA0000";
 		}
 		else
@@ -643,14 +643,13 @@
 				$itemid=DBget_field($res,0,0);
 #				echo "ITEMID:$itemid<BR>";
 	
-#				$sql="select functionid from functions where function='$function' and parameter=$parameter";
+#				$sql="select functionid,count(*) from functions where function='$function' and parameter=$parameter group by 1";
 #				echo $sql,"<Br>";
-#				$res=mysql_query($sql,$mysql);
-#				$row=mysql_fetch_row($res);
-
-#				if($row)
+#				$res=DBselect($sql);
+#
+#				if(DBget_field($res,0,1)>0)
 #				{
-#					$functionid=$row[0];
+#					$functionid=DBget_field($res,0,0);
 #				}
 #				else
 #				{
@@ -659,6 +658,7 @@
 					$res=DBexecute($sql);
 					if(!$res)
 					{
+#						echo "ERROR<br>";
 						return	$res;
 					}
 					$functionid=DBinsert_id($res,"functions","functionid");
@@ -927,6 +927,7 @@
 	{
 		$description=addslashes($description);
 		$sql="insert into triggers  (description,priority,istrue,comments) values ('$description',$priority,$istrue,'$comments')";
+#		echo $sql,"<br>";
 		$result=DBexecute($sql);
 		if(!$result)
 		{
@@ -934,9 +935,11 @@
 		}
  
 		$triggerid=DBinsert_id($result,"triggers","triggerid");
+#		echo $triggerid,"<br>";
  
 		$expression=implode_exp($expression,$triggerid);
 		$sql="update triggers set expression='$expression' where triggerid=$triggerid";
+#		echo $sql,"<br>";
 		return	DBexecute($sql);
 	}
 
diff --git a/frontends/php/media.html b/frontends/php/media.html
index 51cc3243..26347c21 100644
--- a/frontends/php/media.html
+++ b/frontends/php/media.html
@@ -17,19 +17,23 @@
 	{
 		if($register=="enable")
 		{
-			activate_media( $mediaid );
+			$result=activate_media( $mediaid );
+			show_messages($result,"Media activated","Cannot activate media");
 		}
 		elseif($register=="disable")
 		{
-			disactivate_media( $mediaid );
+			$result=disactivate_media( $mediaid );
+			show_messages($result,"Media disabled","Cannot disable media");
 		}
 		elseif($register=="add")
 		{
-			add_media( $userid, $type, $sendto);
+			$result=add_media( $userid, $type, $sendto);
+			show_messages($result,"Media added","Cannot add media");
 		}
 		elseif($register=="delete")
 		{
-			delete_media( $mediaid );
+			$result=delete_media( $mediaid );
+			show_messages($result,"Media deleted","Cannot delete media");
 			unset($mediaid);
 		}
 	}
diff --git a/frontends/php/report1.html b/frontends/php/report1.html
index 77a4d920..2ba4cbed 100644
--- a/frontends/php/report1.html
+++ b/frontends/php/report1.html
@@ -20,7 +20,7 @@
 	<td>Is zabbix_sucker running ?</td>
 	<?
 		$str="No";
-		if(exec("ps -aef|grep zabbix_sucker|grep -v grep|wc -l")>0)
+		if(exec("ps -aef|grep zabbix_suckerd|grep -v grep|wc -l")>0)
 		{
 			$str="Yes";
 		}
diff --git a/frontends/php/sysmap.html b/frontends/php/sysmap.html
index 6e3a178d..873a8bec 100644
--- a/frontends/php/sysmap.html
+++ b/frontends/php/sysmap.html
@@ -15,24 +15,29 @@
 	{
 		if($register=="add")
 		{
-			add_host_to_sysmap($sysmapid,$hostid,$label,$x,$y,$icon);
+			$result=add_host_to_sysmap($sysmapid,$hostid,$label,$x,$y,$icon);
+			show_messages($result,"Host added","Cannot add host");
 		}
 		if($register=="update")
 		{
-			update_sysmap_host($shostid,$sysmapid,$hostid,$label,$x,$y,$icon);
+			$result=update_sysmap_host($shostid,$sysmapid,$hostid,$label,$x,$y,$icon);
+			show_messages($result,"Host updated","Cannot update host");
 		}
 		if($register=="add link")
 		{
-			add_link($sysmapid,$shostid1,$shostid2);
+			$result=add_link($sysmapid,$shostid1,$shostid2);
+			show_messages($result,"Link added","Cannot add link");
 		}
 		if($register=="delete_link")
 		{
-			delete_link($linkid);
+			$result=delete_link($linkid);
+			show_messages($result,"Link deleted","Cannot delete link");
 			unset($linkid);
 		}
 		if($register=="delete")
 		{
-			delete_sysmaps_host($shostid);
+			$result=delete_sysmaps_host($shostid);
+			show_messages($result,"Host deleted","Cannot delete host");
 			unset($shostid);
 		}
 	}
diff --git a/frontends/php/sysmaps.html b/frontends/php/sysmaps.html
index c701b527..a794b25b 100644
--- a/frontends/php/sysmaps.html
+++ b/frontends/php/sysmaps.html
@@ -10,15 +10,18 @@
 	{
 		if($register=="add")
 		{
-			add_sysmap($name,$width,$height);
+			$result=add_sysmap($name,$width,$height);
+			show_messages($result,"Network map added","Cannot add network map");
 		}
 		if($register=="update")
 		{
-			update_sysmap($sysmapid,$name,$width,$height);
+			$result=update_sysmap($sysmapid,$name,$width,$height);
+			show_messages($result,"Network map updated","Cannot update network map");
 		}
 		if($register=="delete")
 		{
-			delete_sysmap($sysmapid);
+			$result=delete_sysmap($sysmapid);
+			show_messages($result,"Network map deleted","Cannot delete network map");
 			unset($sysmapid);
 		}
 	}
diff --git a/frontends/php/tr_comments.html b/frontends/php/tr_comments.html
index 1ab8e8d6..6ef72c79 100644
--- a/frontends/php/tr_comments.html
+++ b/frontends/php/tr_comments.html
@@ -14,7 +14,8 @@
 <?
 	if(isset($register) && ($register=="update"))
 	{
-		update_trigger_comments($triggerid,$comments);
+		$result=update_trigger_comments($triggerid,$comments);
+		show_messages($result,"Trigger comment updated","Cannot update trigger comment");
 	}
 ?>
 
diff --git a/include/functions.c b/include/functions.c
index 3e4ea4de..82c30893 100644
--- a/include/functions.c
+++ b/include/functions.c
@@ -26,22 +26,18 @@ int	evaluate_LAST(float *last,int itemid,int parameter)
 {
 	DB_RESULT	*result;
 
-	char		c[1024];
+	char		c[256];
 	char		*field;
 
 	sprintf(c,"select lastvalue from items where itemid=%d and lastvalue is not null", itemid );
 
 	result = DBselect(c);
-	if(result==NULL)
-	{
-		DBfree_result(result);
-		return	FAIL;
-	}
-	if(DBnum_rows(result)==0)
+	if((result==NULL)||(DBnum_rows(result)==0))
 	{
 		DBfree_result(result);
 		return	FAIL;
 	}
+
 	field = DBget_field(result,0,0);
 	if( field == NULL )
 	{
@@ -59,7 +55,7 @@ int	evaluate_MIN(float *min,int itemid,int parameter)
 {
 	DB_RESULT	*result;
 
-	char		c[1024];
+	char		c[256];
 	char		*field;
 
 	int		now;
@@ -67,20 +63,16 @@ int	evaluate_MIN(float *min,int itemid,int parameter)
 	now=time(NULL);
 
 	sprintf(c,"select min(value) from history where clock>%d-%d and itemid=%d",now,parameter,itemid);
+	syslog(LOG_WARNING, "SQL:%s", c );
 
 	result = DBselect(c);
-	if(result==NULL)
+	if((result==NULL)||(DBnum_rows(result)==0))
 	{
 		syslog(LOG_NOTICE, "Result for MIN is empty" );
 		DBfree_result(result);
 		return	FAIL;
 	}
-	if(DBnum_rows(result)==0)
-	{
-		syslog( LOG_NOTICE, "Result for MIN is empty" );
-		DBfree_result(result);
-		return	FAIL;
-	}
+
 	field = DBget_field(result,0,0);
 	if( field == NULL )
 	{
@@ -99,7 +91,7 @@ int	evaluate_MAX(float *max,int itemid,int parameter)
 {
 	DB_RESULT	*result;
 
-	char		c[1024];
+	char		c[256];
 	char		*field;
 
 	int		now;
@@ -109,19 +101,17 @@ int	evaluate_MAX(float *max,int itemid,int parameter)
 	sprintf(c,"select max(value) from history where clock>%d-%d and itemid=%d",now,parameter,itemid);
 
 	result = DBselect(c);
-	if(result==NULL)
-	{
-		DBfree_result(result);
-		return	FAIL;
-	}
-	if(DBnum_rows(result)==0)
+	if((result==NULL)||(DBnum_rows(result)==0))
 	{
+		syslog(LOG_NOTICE, "Result for MAX is empty" );
 		DBfree_result(result);
 		return	FAIL;
 	}
+
 	field = DBget_field(result,0,0);
 	if( field == NULL )
 	{
+		syslog( LOG_NOTICE, "Result for MAX is empty" );
 		DBfree_result(result);
 		return	FAIL;
 	}	
@@ -142,19 +132,17 @@ int	evaluate_PREV(float *prev,int itemid,int parameter)
 	sprintf(c,"select prevvalue from items where itemid=%d and prevvalue is not null", itemid );
 
 	result = DBselect(c);
-	if(result==NULL)
-	{
-		DBfree_result(result);
-		return	FAIL;
-	}
-	if(DBnum_rows(result)==0)
+	if((result==NULL)||(DBnum_rows(result)==0))
 	{
+		syslog(LOG_NOTICE, "Result for PREV is empty" );
 		DBfree_result(result);
 		return	FAIL;
 	}
+
 	field = DBget_field(result,0,0);
 	if( field == NULL )
 	{
+		syslog(LOG_NOTICE, "Result for PREV is empty" );
 		DBfree_result(result);
 		return	FAIL;
 	}
@@ -240,15 +228,9 @@ int	update_functions( int itemid )
 	sprintf(c,"select function,parameter from functions where itemid=%d group by 1,2 order by 1,2",itemid );
 
 	result = DBselect(c);
-	if(result==NULL)
-	{
-		syslog( LOG_NOTICE, "No functions to update.");
-		DBfree_result(result);
-		return SUCCEED; 
-	}
-
 	rows=DBnum_rows(result);
-	if(rows == 0)
+
+	if((result==NULL)||(rows==0))
 	{
 		syslog( LOG_NOTICE, "No functions to update.");
 		DBfree_result(result);
@@ -260,8 +242,8 @@ int	update_functions( int itemid )
 		function.function=DBget_field(result,i,0);
 		function.parameter=atoi(DBget_field(result,i,1));
 		syslog( LOG_DEBUG, "ItemId:%d Evaluating %s(%d)\n",itemid,function.function,function.parameter);
-		ret = evaluate_FUNCTION(&value,itemid,function.function,function.parameter);
 
+		ret = evaluate_FUNCTION(&value,itemid,function.function,function.parameter);
 		if( FAIL == ret)	
 		{
 			syslog( LOG_WARNING, "Evaluation failed for function:%s\n",function.function);
@@ -651,20 +633,15 @@ int	get_lastvalue(float *Result,char *host,char *key,char *function,char *parame
 
 	sprintf( c, "select i.itemid from items i,hosts h where h.host='%s' and h.hostid=i.hostid and i.key_='%s'", host, key );
 	result = DBselect(c);
-
-	if(result == NULL)
-	{
-        	DBfree_result(result);
-		syslog(LOG_WARNING, "Query failed" );
-		return FAIL;	
-	}
         rows = DBnum_rows(result);
-	if(rows == 0)
+
+	if((result == NULL)||(rows==0))
 	{
         	DBfree_result(result);
 		syslog(LOG_WARNING, "Query failed" );
 		return FAIL;	
 	}
+
         itemid=atoi(DBget_field(result,0,0));
 	syslog(LOG_DEBUG, "Itemid:%d", itemid );
         DBfree_result(result);