- added housekeeping procedure for table sessions (Alexei)

 - changed width=\"X%\" to width=X% in *.php (Alexei)
 - Status of a trigger will blink if it was changes during last 60
 seconds (Alexei)
 - Zabbix daemons to update triggers.lastchange when triggers.values
 is changed (Alexei)
 - added misc/init.d/debian/zabbix-[suckerd|trapperd] (Alexei)
 - removed misc/init.d/debian/zabbix-server (Alexei)
 - send_email() will timeout after 10 seconds (Alexei)
 - DBadd_alarm() renamed to add_alarm() (Alexei)
 - support for SCO OpenServer (Alexei). Thanks to Alexender Kirhenstein.
 - ./configure will correctly define socklen_t (Alexei)
 - <center> changed to <div align=center> (Alexei)
 - reason of problem in screen IT Services (Alexei)
 - added frontends.php/helpdesk.php (Alexei)
 - added tables: problems, problems_comments,categories (Alexei)
 - added "...#form" to button Change in form Configuration of Users (Alexei)
 - "Just for information" changed to "Information" (Alexei)
 - fixed ./configure to correctly find zlib (Alexei)
 - housekeeping to delete no more than HousekeepingFrequency*3600 records
 from table history and history_str at once (MySQL only) (Alexei)


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

5 files changed, 29 insertions, 14 deletions

diff --git a/include/common.h b/include/common.h
index 3018a20e..ad841c77 100644
--- a/include/common.h
+++ b/include/common.h
@@ -1,5 +1,7 @@
 /*#define TESTTEST*/
 
+#define	IT_HELPDESK
+
 #ifndef ZABBIX_COMMON_H
 #define ZABBIX_COMMON_H
  
diff --git a/include/db.c b/include/db.c
index 90e6451b..b397b92c 100644
--- a/include/db.c
+++ b/include/db.c
@@ -354,7 +354,7 @@ int	latest_alarm(int triggerid, int status)
 	return ret;
 }
 
-int	DBadd_alarm(int triggerid,int status,int clock)
+int	add_alarm(int triggerid,int status,int clock)
 {
 	char	sql[MAX_STRING_LEN+1];
 
@@ -374,17 +374,26 @@ int	DBadd_alarm(int triggerid,int status,int clock)
 	return SUCCEED;
 }
 
-int	update_trigger_value(int triggerid,int value,int clock)
+#ifdef	IT_HELPDESK
+void	update_problems(int triggerid, int value, int clock)
+{
+}
+#endif
+
+int	DBupdate_trigger_value(int triggerid,int value,int clock)
 {
 	char	sql[MAX_STRING_LEN+1];
 
 	zabbix_log(LOG_LEVEL_DEBUG,"In update_trigger_value()");
-	DBadd_alarm(triggerid,value,clock);
+	add_alarm(triggerid,value,clock);
 
-	sprintf(sql,"update triggers set value=%d where triggerid=%d",value,triggerid);
-	zabbix_log(LOG_LEVEL_DEBUG,"SQL [%s]",sql);
+	sprintf(sql,"update triggers set value=%d,lastchange=%d where triggerid=%d",value,clock,triggerid);
 	DBexecute(sql);
 
+#ifdef	IT_HELPDESK
+	update_problems(triggerid,value,clock);
+#endif
+
 	zabbix_log(LOG_LEVEL_DEBUG,"End of update_trigger_value()");
 	return SUCCEED;
 }
@@ -406,7 +415,7 @@ void update_triggers_status_to_unknown(int hostid,int clock)
 	for(i=0;i<DBnum_rows(result);i++)
 	{
 		triggerid=atoi(DBget_field(result,i,0));
-		update_trigger_value(triggerid,TRIGGER_VALUE_UNKNOWN,clock);
+		DBupdate_trigger_value(triggerid,TRIGGER_VALUE_UNKNOWN,clock);
 	}
 
 	DBfree_result(result);
@@ -450,7 +459,7 @@ void DBupdate_triggers_status_after_restart(void)
 		lastchange=atoi(DBget_field(result2,0,0));
 		DBfree_result(result2);
 
-		update_trigger_value(triggerid,TRIGGER_VALUE_UNKNOWN,lastchange);
+		DBupdate_trigger_value(triggerid,TRIGGER_VALUE_UNKNOWN,lastchange);
 	}
 
 	DBfree_result(result);
diff --git a/include/db.h b/include/db.h
index cb0d4901..d553c912 100644
--- a/include/db.h
+++ b/include/db.h
@@ -131,9 +131,10 @@ void	DBupdate_host_status(int hostid,int status,int clock);
 int	DBupdate_item_status_to_notsupported(int itemid);
 int	DBadd_history(int itemid, double value);
 int	DBadd_history_str(int itemid, char *value);
-int	DBadd_alarm(int triggerid, int status,int clock);
+/*int	DBadd_alarm(int triggerid, int status,int clock);*/
 int	DBadd_alert(int actionid, char *type, char *sendto, char *subject, char *message);
 void	DBupdate_triggers_status_after_restart(void);
 int	DBget_prev_trigger_value(int triggerid);
+int	DBupdate_trigger_value(int triggerid,int value,int clock);
 
 #endif
diff --git a/include/functions.c b/include/functions.c
index 1e9f7212..450c2792 100644
--- a/include/functions.c
+++ b/include/functions.c
@@ -240,7 +240,7 @@ void	update_functions(DB_ITEM *item)
 /*
  * Send email
  */ 
-int	send_mail(char *smtp_server,char *smtp_helo,char *smtp_email,char *mailto,char *mailsubject,char *mailbody)
+int	send_email(char *smtp_server,char *smtp_helo,char *smtp_email,char *mailto,char *mailsubject,char *mailbody)
 {
 	int	s;
 	int	i,e;
@@ -728,10 +728,11 @@ void	update_triggers( int suckers, int flag, int sucker_num, int lastclock )
 			if(trigger.value != TRIGGER_VALUE_TRUE)
 			{
 				now = time(NULL);
-				sprintf(sql,"update triggers set value=%d, lastchange=%d where triggerid=%d",TRIGGER_VALUE_TRUE,now,trigger.triggerid);
+				DBupdate_trigger_value(trigger.triggerid,TRIGGER_VALUE_TRUE,now);
+/*				sprintf(sql,"update triggers set value=%d, lastchange=%d where triggerid=%d",TRIGGER_VALUE_TRUE,now,trigger.triggerid);
 				DBexecute(sql);
 
-				DBadd_alarm(trigger.triggerid, TRIGGER_VALUE_TRUE, now);
+				DBadd_alarm(trigger.triggerid, TRIGGER_VALUE_TRUE, now);*/
 			}
 			if((trigger.value == TRIGGER_VALUE_FALSE)
 			||
@@ -755,10 +756,12 @@ void	update_triggers( int suckers, int flag, int sucker_num, int lastclock )
 			if(trigger.value != TRIGGER_VALUE_FALSE)
 			{
 				now = time(NULL);
-				sprintf(sql,"update triggers set value=%d, lastchange=%d where triggerid=%d",TRIGGER_VALUE_FALSE,now,trigger.triggerid);
+				DBupdate_trigger_value(trigger.triggerid,TRIGGER_VALUE_FALSE,now);
+
+/*				sprintf(sql,"update triggers set value=%d, lastchange=%d where triggerid=%d",TRIGGER_VALUE_FALSE,now,trigger.triggerid);
 				DBexecute(sql);
 
-				DBadd_alarm(trigger.triggerid, TRIGGER_VALUE_FALSE,now);
+				DBadd_alarm(trigger.triggerid, TRIGGER_VALUE_FALSE,now);*/
 			}
 
 			if((trigger.value == TRIGGER_VALUE_TRUE)
diff --git a/include/functions.h b/include/functions.h
index 33052d6a..58f20ce6 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -7,6 +7,6 @@ void    update_triggers (int suckers, int flag,int sucker_num,int lastclock);
 int	get_lastvalue(char *value,char *host,char *key,char *function,char *parameter);
 int	process_data(int sockfd,char *server,char *key, char *value);
 void	process_new_value(DB_ITEM *item,char *value);
-int	send_mail(char *smtp_server,char *smtp_helo,char *smtp_email,char *mailto,char *mailsubject,char *mailbody);
+int	send_email(char *smtp_server,char *smtp_helo,char *smtp_email,char *mailto,char *mailsubject,char *mailbody);
 
 #endif