[Nagios-checkins] CVS: nagios/cgi cgiutils.h.in,1.5,1.6 status.c,1.6,1.7 tac.c,1.5,1.6

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

Update of /cvsroot/nagios/nagios/cgi
In directory usw-pr-cvs1:/tmp/cvs-serv27693/cgi

Modified Files:
	cgiutils.h.in status.c tac.c 
Log Message:
Misc web interface updates

Index: cgiutils.h.in
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/cgiutils.h.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** cgiutils.h.in	15 May 2002 00:24:30 -0000	1.5
--- cgiutils.h.in	28 Jul 2002 04:24:13 -0000	1.6
***************
*** 3,7 ****
   * CGIUTILS.H - Header file for common CGI functions
   * Copyright (c) 1999-2002  Ethan Galstad (na...@na...)
!  * Last Modified: 05-14-2002
   *
   * License:
--- 3,7 ----
   * CGIUTILS.H - Header file for common CGI functions
   * Copyright (c) 1999-2002  Ethan Galstad (na...@na...)
!  * Last Modified: 07-27-2002
   *
   * License:
***************
*** 123,126 ****
--- 123,127 ----
  #define DISABLED_ICON			"disabled.gif"
  #define ENABLED_ICON			"enabled.gif"
+ #define PASSIVE_ONLY_ICON		"passiveonly.gif"
  #define NOTIFICATIONS_DISABLED_ICON	"ndisabled.gif"
  #define ACKNOWLEDGEMENT_ICON            "ack.gif"

Index: status.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/status.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** status.c	5 Jul 2002 05:36:02 -0000	1.6
--- status.c	28 Jul 2002 04:24:13 -0000	1.7
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2002 Ethan Galstad (na...@na...)
!  * Last Modified: 07-03-2002
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2002 Ethan Galstad (na...@na...)
!  * Last Modified: 07-27-2002
   *
   * License:
***************
*** 1435,1441 ****
  				printf("&service=%s#comments'><IMG SRC='%s%s' BORDER=0 WIDTH=%d HEIGHT=%d ALT='This service problem has been acknowledged'></A></TD>",url_encode(temp_status->description),url_images_path,ACKNOWLEDGEMENT_ICON,STATUS_ICON_WIDTH,STATUS_ICON_HEIGHT);
  			        }
! 			if(temp_status->checks_enabled==FALSE){
  				printf("<TD ALIGN=center valign=center><A HREF='%s?type=%d&host=%s",EXTINFO_CGI,DISPLAY_SERVICE_INFO,url_encode(temp_status->host_name));
! 				printf("&service=%s'><IMG SRC='%s%s' BORDER=0 WIDTH=%d HEIGHT=%d ALT='Active checks of the service have been disabled'></A></TD>",url_encode(temp_status->description),url_images_path,DISABLED_ICON,STATUS_ICON_WIDTH,STATUS_ICON_HEIGHT);
  			        }
  			if(temp_status->notifications_enabled==FALSE){
--- 1435,1445 ----
  				printf("&service=%s#comments'><IMG SRC='%s%s' BORDER=0 WIDTH=%d HEIGHT=%d ALT='This service problem has been acknowledged'></A></TD>",url_encode(temp_status->description),url_images_path,ACKNOWLEDGEMENT_ICON,STATUS_ICON_WIDTH,STATUS_ICON_HEIGHT);
  			        }
! 			if(temp_status->checks_enabled==FALSE && temp_status->accept_passive_service_checks==FALSE){
! 				printf("<TD ALIGN=center valign=center><A HREF='%s?type=%d&host=%s",EXTINFO_CGI,DISPLAY_SERVICE_INFO,url_encode(temp_status->host_name));
! 				printf("&service=%s'><IMG SRC='%s%s' BORDER=0 WIDTH=%d HEIGHT=%d ALT='Active and passive checks have been disabled for this service'></A></TD>",url_encode(temp_status->description),url_images_path,DISABLED_ICON,STATUS_ICON_WIDTH,STATUS_ICON_HEIGHT);
! 			        }
! 			else if(temp_status->checks_enabled==FALSE){
  				printf("<TD ALIGN=center valign=center><A HREF='%s?type=%d&host=%s",EXTINFO_CGI,DISPLAY_SERVICE_INFO,url_encode(temp_status->host_name));
! 				printf("&service=%s'><IMG SRC='%s%s' BORDER=0 WIDTH=%d HEIGHT=%d ALT='Active checks of the service have been disabled - only passive checks are being accepted'></A></TD>",url_encode(temp_status->description),url_images_path,PASSIVE_ONLY_ICON,STATUS_ICON_WIDTH,STATUS_ICON_HEIGHT);
  			        }
  			if(temp_status->notifications_enabled==FALSE){
***************
*** 1817,1820 ****
--- 1821,1825 ----
  				        }
  			        }
+ 			printf("<TD><a href='%s?host=%s'><img src='%s%s' border=0 alt='View Service Details For This Host'></a></TD>\n",STATUS_CGI,url_encode(temp_status->host_name),url_images_path,STATUS_DETAIL_ICON);
  			printf("</TR>\n");
  			printf("</TABLE>\n");

Index: tac.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/tac.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** tac.c	31 May 2002 02:41:17 -0000	1.5
--- tac.c	28 Jul 2002 04:24:13 -0000	1.6
***************
*** 4,8 ****
   *
   * Copyright (c) 2001-2002 Ethan Galstad (na...@na...)
!  * Last Modified: 05-30-2002
   *
   * This CGI program will display the contents of the Nagios
--- 4,8 ----
   *
   * Copyright (c) 2001-2002 Ethan Galstad (na...@na...)
!  * Last Modified: 07-27-2002
   *
   * This CGI program will display the contents of the Nagios
***************
*** 1517,1523 ****
  
  		if(passive_checks_disabled_services>0)
! 			printf("<tr><td width=100%% class='featureItemDisabled'><a href='%s?host=all&type=detail&serviceprops=%d'>%d Service%s Disabled</a></td></tr>\n",STATUS_CGI,SERVICE_PASSIVE_CHECKS_DISABLED,passive_checks_disabled_services,(passive_checks_disabled_services==1)?"":"s");
  		else
! 			printf("<tr><td width=100%% class='featureItemEnabled'>All Services Enabled</td></tr>\n");
  
  		printf("</table>\n");
--- 1517,1523 ----
  
  		if(passive_checks_disabled_services>0)
! 			printf("<tr><td width=100%% class='featureItemDisabledPassiveChecks'><a href='%s?host=all&type=detail&serviceprops=%d'>%d Service%s Disabled</a></td></tr>\n",STATUS_CGI,SERVICE_PASSIVE_CHECKS_DISABLED,passive_checks_disabled_services,(passive_checks_disabled_services==1)?"":"s");
  		else
! 			printf("<tr><td width=100%% class='featureItemEnabledPassiveChecks'>All Services Enabled</td></tr>\n");
  
  		printf("</table>\n");