[Nagios-checkins] nagios/cgi status.c,1.64,1.65

[Ethan G. <ega...@us...>]

Update of /cvsroot/nagios/nagios/cgi
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22781/cgi

Modified Files:
	status.c 
Log Message:
Doc updates, new status CGI filter properties

Index: status.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/status.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** status.c	15 Aug 2007 17:03:00 -0000	1.64
--- status.c	28 Aug 2007 16:41:50 -0000	1.65
***************
*** 4799,4802 ****
--- 4799,4808 ----
  		return FALSE;
  
+ 	if((host_properties & HOST_HARD_STATE) && temp_hoststatus->state_type==SOFT_STATE)
+ 		return FALSE;
+ 
+ 	if((host_properties & HOST_SOFT_STATE) && temp_hoststatus->state_type==HARD_STATE)
+ 		return FALSE;
+ 
  	return TRUE;
          }
***************
*** 4861,4864 ****
--- 4867,4876 ----
  		return FALSE;
  
+ 	if((service_properties & SERVICE_HARD_STATE) && temp_servicestatus->state_type==SOFT_STATE)
+ 		return FALSE;
+ 
+ 	if((service_properties & SERVICE_SOFT_STATE) && temp_servicestatus->state_type==HARD_STATE)
+ 		return FALSE;
+ 
  	return TRUE;
          }
***************
*** 4979,4982 ****
--- 4991,5002 ----
  				found=1;
  		                }
+ 			if(host_properties & HOST_HARD_STATE){
+ 				printf("%s In Hard State",(found==1)?" &":"");
+ 				found=1;
+ 		                }
+ 			if(host_properties & HOST_SOFT_STATE){
+ 				printf("%s In Soft State",(found==1)?" &":"");
+ 				found=1;
+ 		                }
  	                }
  		printf("</td>");
***************
*** 5092,5095 ****
--- 5112,5123 ----
  				found=1;
  		                }
+ 			if(service_properties & SERVICE_HARD_STATE){
+ 				printf("%s In Hard State",(found==1)?" &amp;":"");
+ 				found=1;
+ 		                }
+ 			if(service_properties & SERVICE_SOFT_STATE){
+ 				printf("%s In Soft State",(found==1)?" &amp;":"");
+ 				found=1;
+ 		                }
  	                }
  		printf("</td></tr>");