[Nagios-checkins] nagios/cgi config.c,1.33,1.34

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

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

Modified Files:
	config.c 
Log Message:
Individual contacts (instead of contactgroups) now used in host, service, host escalation, and service escalation definitions

Index: config.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/config.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** config.c	22 May 2006 03:59:19 -0000	1.33
--- config.c	18 Jul 2006 21:34:56 -0000	1.34
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2006 Ethan Galstad (na...@na...)
!  * Last Modified: 05-21-2006
   *
   * This CGI program will display various configuration information.
--- 4,8 ----
   *
   * Copyright (c) 1999-2006 Ethan Galstad (na...@na...)
!  * Last Modified: 07-18-2006
   *
   * This CGI program will display various configuration information.
***************
*** 403,407 ****
  	host *temp_host;
  	hostsmember *temp_hostsmember;
! 	contactgroupsmember *temp_contactgroupsmember;
  	int options=0;
  	int odd=0;
--- 403,407 ----
  	host *temp_host;
  	hostsmember *temp_hostsmember;
! 	contactsmember *temp_contactsmember;
  	int options=0;
  	int odd=0;
***************
*** 434,438 ****
  	printf("<TH CLASS='data'>Check Freshness</TH>\n");
  	printf("<TH CLASS='data'>Freshness Threshold</TH>\n");
! 	printf("<TH CLASS='data'>Default Contact Groups</TH>\n");
  	printf("<TH CLASS='data'>Notification Interval</TH>");
  	printf("<TH CLASS='data'>First Notification Delay</TH>");
--- 434,438 ----
  	printf("<TH CLASS='data'>Check Freshness</TH>\n");
  	printf("<TH CLASS='data'>Freshness Threshold</TH>\n");
! 	printf("<TH CLASS='data'>Default Contacts</TH>\n");
  	printf("<TH CLASS='data'>Notification Interval</TH>");
  	printf("<TH CLASS='data'>First Notification Delay</TH>");
***************
*** 523,533 ****
  		printf("<TD CLASS='%s'>",bg_class);
  
! 		/* find all the contact groups for this host... */
! 		for(temp_contactgroupsmember=temp_host->contact_groups;temp_contactgroupsmember!=NULL;temp_contactgroupsmember=temp_contactgroupsmember->next){
  
! 			if(temp_contactgroupsmember!=temp_host->contact_groups)
  				printf(", ");
  
! 			printf("<A HREF='%s?type=contactgroups#%s'>%s</A>\n",CONFIG_CGI,url_encode(temp_contactgroupsmember->group_name),temp_contactgroupsmember->group_name);
  		        }
  		printf("</TD>\n");
--- 523,533 ----
  		printf("<TD CLASS='%s'>",bg_class);
  
! 		/* find all the contacts for this host... */
! 		for(temp_contactsmember=temp_host->contacts;temp_contactsmember!=NULL;temp_contactsmember=temp_contactsmember->next){
  
! 			if(temp_contactsmember!=temp_host->contacts)
  				printf(", ");
  
! 			printf("<A HREF='%s?type=contacts#%s'>%s</A>\n",CONFIG_CGI,url_encode(temp_contactsmember->contact_name),temp_contactsmember->contact_name);
  		        }
  		printf("</TD>\n");
***************
*** 1089,1093 ****
  void display_services(void){
  	service *temp_service;
! 	contactgroupsmember *temp_contactgroupsmember;
  	char command_line[MAX_INPUT_BUFFER];
  	char *command_name="";
--- 1089,1093 ----
  void display_services(void){
  	service *temp_service;
! 	contactsmember *temp_contactsmember;
  	char command_line[MAX_INPUT_BUFFER];
  	char *command_name="";
***************
*** 1131,1135 ****
  	printf("<TH CLASS='data'>Check Freshness</TH>\n");
  	printf("<TH CLASS='data'>Freshness Threshold</TH>\n");
! 	printf("<TH CLASS='data'>Default Contact Groups</TH>\n");
  	printf("<TH CLASS='data'>Enable Notifications</TH>\n");
  	printf("<TH CLASS='data'>Notification Interval</TH>\n");
--- 1131,1135 ----
  	printf("<TH CLASS='data'>Check Freshness</TH>\n");
  	printf("<TH CLASS='data'>Freshness Threshold</TH>\n");
! 	printf("<TH CLASS='data'>Default Contacts</TH>\n");
  	printf("<TH CLASS='data'>Enable Notifications</TH>\n");
  	printf("<TH CLASS='data'>Notification Interval</TH>\n");
***************
*** 1214,1223 ****
  
  		printf("<TD CLASS='%s'>",bg_class);
! 		for(temp_contactgroupsmember=temp_service->contact_groups;temp_contactgroupsmember!=NULL;temp_contactgroupsmember=temp_contactgroupsmember->next){
  
! 			if(temp_contactgroupsmember!=temp_service->contact_groups)
  				printf(", ");
  
! 			printf("<A HREF='%s?type=contactgroups#%s'>%s</A>",CONFIG_CGI,url_encode(temp_contactgroupsmember->group_name),temp_contactgroupsmember->group_name);
  	                }
  		if(temp_service->contact_groups==NULL)
--- 1214,1223 ----
  
  		printf("<TD CLASS='%s'>",bg_class);
! 		for(temp_contactsmember=temp_service->contacts;temp_contactsmember!=NULL;temp_contactsmember=temp_contactsmember->next){
  
! 			if(temp_contactsmember!=temp_service->contacts)
  				printf(", ");
  
! 			printf("<A HREF='%s?type=contacts#%s'>%s</A>",CONFIG_CGI,url_encode(temp_contactsmember->contact_name),temp_contactsmember->contact_name);
  	                }
  		if(temp_service->contact_groups==NULL)
***************
*** 1642,1646 ****
  void display_serviceescalations(void){
  	serviceescalation *temp_se;
! 	contactgroupsmember *temp_contactgroupsmember;
  	int options=FALSE;
  	int odd=0;
--- 1642,1646 ----
  void display_serviceescalations(void){
  	serviceescalation *temp_se;
! 	contactsmember *temp_contactsmember;
  	int options=FALSE;
  	int odd=0;
***************
*** 1668,1672 ****
  	printf("<TH CLASS='data'>Host</TH>");
  	printf("<TH CLASS='data'>Description</TH>");
! 	printf("<TH CLASS='data'>Contact Groups</TH>");
  	printf("<TH CLASS='data'>First Notification</TH>");
  	printf("<TH CLASS='data'>Last Notification</TH>");
--- 1668,1672 ----
  	printf("<TH CLASS='data'>Host</TH>");
  	printf("<TH CLASS='data'>Description</TH>");
! 	printf("<TH CLASS='data'>Contacts</TH>");
  	printf("<TH CLASS='data'>First Notification</TH>");
  	printf("<TH CLASS='data'>Last Notification</TH>");
***************
*** 1696,1705 ****
  
  		printf("<TD CLASS='%s'>",bg_class);
! 		for(temp_contactgroupsmember=temp_se->contact_groups;temp_contactgroupsmember!=NULL;temp_contactgroupsmember=temp_contactgroupsmember->next){
  
! 			if(temp_contactgroupsmember!=temp_se->contact_groups)
  				printf(", ");
  
! 			printf("<A HREF='%s?type=contactgroups#%s'>%s</A>\n",CONFIG_CGI,url_encode(temp_contactgroupsmember->group_name),temp_contactgroupsmember->group_name);
  		        }
  		printf("</TD>\n");
--- 1696,1705 ----
  
  		printf("<TD CLASS='%s'>",bg_class);
! 		for(temp_contactsmember=temp_se->contacts;temp_contactsmember!=NULL;temp_contactsmember=temp_contactsmember->next){
  
! 			if(temp_contactsmember!=temp_se->contacts)
  				printf(", ");
  
! 			printf("<A HREF='%s?type=contacts#%s'>%s</A>\n",CONFIG_CGI,url_encode(temp_contactsmember->contact_name),temp_contactsmember->contact_name);
  		        }
  		printf("</TD>\n");
***************
*** 1852,1856 ****
  void display_hostescalations(void){
  	hostescalation *temp_he;
! 	contactgroupsmember *temp_contactgroupsmember;
  	int options=FALSE;
  	int odd=0;
--- 1852,1856 ----
  void display_hostescalations(void){
  	hostescalation *temp_he;
! 	contactsmember *temp_contactsmember;
  	int options=FALSE;
  	int odd=0;
***************
*** 1874,1878 ****
  	printf("<TR>\n");
  	printf("<TH CLASS='data'>Host</TH>");
! 	printf("<TH CLASS='data'>Contact Groups</TH>");
  	printf("<TH CLASS='data'>First Notification</TH>");
  	printf("<TH CLASS='data'>Last Notification</TH>");
--- 1874,1878 ----
  	printf("<TR>\n");
  	printf("<TH CLASS='data'>Host</TH>");
! 	printf("<TH CLASS='data'>Contacts</TH>");
  	printf("<TH CLASS='data'>First Notification</TH>");
  	printf("<TH CLASS='data'>Last Notification</TH>");
***************
*** 1899,1908 ****
  
  		printf("<TD CLASS='%s'>",bg_class);
! 		for(temp_contactgroupsmember=temp_he->contact_groups;temp_contactgroupsmember!=NULL;temp_contactgroupsmember=temp_contactgroupsmember->next){
  
! 			if(temp_contactgroupsmember!=temp_he->contact_groups)
  				printf(", ");
  
! 			printf("<A HREF='%s?type=contactgroups#%s'>%s</A>\n",CONFIG_CGI,url_encode(temp_contactgroupsmember->group_name),temp_contactgroupsmember->group_name);
  		        }
  		printf("</TD>\n");
--- 1899,1908 ----
  
  		printf("<TD CLASS='%s'>",bg_class);
! 		for(temp_contactsmember=temp_he->contacts;temp_contactsmember!=NULL;temp_contactsmember=temp_contactsmember->next){
  
! 			if(temp_contactsmember!=temp_he->contacts)
  				printf(", ");
  
! 			printf("<A HREF='%s?type=contacts#%s'>%s</A>\n",CONFIG_CGI,url_encode(temp_contactsmember->contact_name),temp_contactsmember->contact_name);
  		        }
  		printf("</TD>\n");