[Nagios-checkins] nagios/cgi cgiauth.c,1.4,1.5 extinfo.c,1.55,1.56

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

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

Modified Files:
	cgiauth.c extinfo.c 
Log Message:
Bug fixes in extinfo CGI and service dependencies

Index: extinfo.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/extinfo.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** extinfo.c	11 Mar 2005 01:16:34 -0000	1.55
--- extinfo.c	24 Mar 2005 23:45:12 -0000	1.56
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2005 Ethan Galstad (na...@na...)
!  * Last Modified: 03-10-2005
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2005 Ethan Galstad (na...@na...)
!  * Last Modified: 03-23-2005
   *
   * License:
***************
*** 310,331 ****
  				printf("<DIV CLASS='data'>Member of</DIV><DIV CLASS='dataTitle'>");
  				for(temp_hostgroup=hostgroup_list;temp_hostgroup!=NULL;temp_hostgroup=temp_hostgroup->next){
! 					hostgroupmember *temp_member=temp_hostgroup->members;
! 				        while(temp_member!=NULL){
! 
! 				                /* we found a match */
! 				                if(!strcmp(temp_member->host_name,temp_host->name)) {
! 							if (found==TRUE)
! 								printf(", ");	
! 							printf("<A HREF='%s?hostgroup=%s&style=overview'>%s</A>",STATUS_CGI,url_encode(temp_hostgroup->group_name),temp_hostgroup->group_name);
! 							found=TRUE;
! 							}
! 						
! 				                temp_member=temp_member->next;
! 			                	}		
  					}
  			
! 				if(found==FALSE) {
! 						printf("No hostgroups");
! 					}
  				printf("</DIV><BR>\n");
  				printf("<DIV CLASS='data'>%s</DIV>\n",temp_host->address);
--- 310,323 ----
  				printf("<DIV CLASS='data'>Member of</DIV><DIV CLASS='dataTitle'>");
  				for(temp_hostgroup=hostgroup_list;temp_hostgroup!=NULL;temp_hostgroup=temp_hostgroup->next){
! 					if(is_host_member_of_hostgroup(temp_hostgroup,temp_host)==TRUE){
! 						if(found==TRUE)
! 							printf(", ");	
! 						printf("<A HREF='%s?hostgroup=%s&style=overview'>%s</A>",STATUS_CGI,url_encode(temp_hostgroup->group_name),temp_hostgroup->group_name);
! 						found=TRUE;
! 						}
  					}
  			
! 				if(found==FALSE)
! 					printf("No hostgroups");
  				printf("</DIV><BR>\n");
  				printf("<DIV CLASS='data'>%s</DIV>\n",temp_host->address);
***************
*** 337,358 ****
                                  printf("<DIV CLASS='data'>Member of</DIV><DIV CLASS='dataTitle'>");
                                  for(temp_servicegroup=servicegroup_list;temp_servicegroup!=NULL;temp_servicegroup=temp_servicegroup->next){
!                                         servicegroupmember *temp_member=temp_servicegroup->members;
!                                         while(temp_member!=NULL){
! 
!                                                 /* we found a match */
!                                                 if(!strcmp(temp_member->host_name,temp_host->name)) {
!                                                         if (found==TRUE)
!                                                                 printf(", ");
!                                                         printf("<A HREF='%s?servicegroup=%s&style=overview'>%s</A>",STATUS_CGI,url_encode(temp_servicegroup->group_name),temp_servicegroup->group_name);
!                                                         found=TRUE;
!                                                         }
! 
!                                                 temp_member=temp_member->next;
!                                                 }
                                          }
  
!                                 if(found==FALSE) {
!                                                 printf("No servicegroups.");
!                                         }
                                  printf("</DIV><BR>\n");
  
--- 329,342 ----
                                  printf("<DIV CLASS='data'>Member of</DIV><DIV CLASS='dataTitle'>");
                                  for(temp_servicegroup=servicegroup_list;temp_servicegroup!=NULL;temp_servicegroup=temp_servicegroup->next){
! 					if(is_service_member_of_servicegroup(temp_servicegroup,temp_service)==TRUE){
! 						if(found==TRUE)
! 							printf(", ");
! 						printf("<A HREF='%s?servicegroup=%s&style=overview'>%s</A>",STATUS_CGI,url_encode(temp_servicegroup->group_name),temp_servicegroup->group_name);
! 						found=TRUE;
! 					        }
                                          }
  
!                                 if(found==FALSE)
! 					printf("No servicegroups.");
                                  printf("</DIV><BR>\n");
  
***************
*** 1915,1919 ****
  
  	if(total_comments==0)
! 		printf("<TR CLASS='commentOdd'><TD CLASS='commentOdd' COLSPAN=9>There are no service comments</TD></TR>");
  
  	printf("</TD></TR>\n");
--- 1899,1903 ----
  
  	if(total_comments==0)
! 		printf("<TR CLASS='commentOdd'><TD CLASS='commentOdd' COLSPAN=10>There are no service comments</TD></TR>");
  
  	printf("</TD></TR>\n");

Index: cgiauth.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/cgiauth.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** cgiauth.c	31 Oct 2004 22:23:26 -0000	1.4
--- cgiauth.c	24 Mar 2005 23:45:06 -0000	1.5
***************
*** 3,8 ****
   * CGIAUTH.C - Authorization utilities for Nagios CGIs
   *
!  * Copyright (c) 1999-2004 Ethan Galstad (na...@na...)
!  * Last Modified:   10-31-2004
   *
   * License:
--- 3,8 ----
   * CGIAUTH.C - Authorization utilities for Nagios CGIs
   *
!  * Copyright (c) 1999-2005 Ethan Galstad (na...@na...)
!  * Last Modified:   03-23-2005
   *
   * License:
***************
*** 231,235 ****
  
  
! /* check if user is authorized to view information about AT LEAST ONE host in a particular hostgroup */
  int is_authorized_for_hostgroup(hostgroup *hg, authdata *authinfo){
  	hostgroupmember *temp_hostgroupmember;
--- 231,235 ----
  
  
! /* check if user is authorized to view information about all hosts in a particular hostgroup */
  int is_authorized_for_hostgroup(hostgroup *hg, authdata *authinfo){
  	hostgroupmember *temp_hostgroupmember;
***************
*** 252,256 ****
  
  
! /* check if user is authorized to view information about AT LEAST ONE service in a particular servicegroup */
  int is_authorized_for_servicegroup(servicegroup *sg, authdata *authinfo){
  	servicegroupmember *temp_servicegroupmember;
--- 252,256 ----
  
  
! /* check if user is authorized to view information about all services in a particular servicegroup */
  int is_authorized_for_servicegroup(servicegroup *sg, authdata *authinfo){
  	servicegroupmember *temp_servicegroupmember;