Menu
▾
▴
[Nagios-checkins] CVS: nagios/cgi cgiutils.c,1.8,1.9 cgiutils.h.in,1.3,1.4 config.c,1.3,1.4
|
From: Ethan G. <ega...@us...> - 2002-05-09 03:47:44
|
Update of /cvsroot/nagios/nagios/cgi
In directory usw-pr-cvs1:/tmp/cvs-serv26835/cgi
Modified Files:
cgiutils.c cgiutils.h.in config.c
Log Message:
Bug fixes and such
Index: cgiutils.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/cgiutils.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** cgiutils.c 27 Apr 2002 05:44:07 -0000 1.8
--- cgiutils.c 9 May 2002 03:47:39 -0000 1.9
***************
*** 4,8 ****
*
* Copyright (c) 1999-2002 Ethan Galstad (na...@na...)
! * Last Modified: 04-26-2002
*
* License:
--- 4,8 ----
*
* Copyright (c) 1999-2002 Ethan Galstad (na...@na...)
! * Last Modified: 05-02-2002
*
* License:
***************
*** 1647,1650 ****
--- 1647,1651 ----
if(type==SSI_HEADER){
+ printf("\n<!-- Produced by Nagios (http://www.nagios.org). Copyright (c) 1999-2002 Ethan Galstad. -->\n");
include_ssi_file(common_ssi_file);
include_ssi_file(cgi_ssi_file);
***************
*** 1653,1656 ****
--- 1654,1658 ----
include_ssi_file(cgi_ssi_file);
include_ssi_file(common_ssi_file);
+ printf("\n<!-- Produced by Nagios (http://www.nagios.org). Copyright (c) 1999-2002 Ethan Galstad. -->\n");
}
***************
*** 1800,1807 ****
- #ifdef CONTEXT_HELP
-
/* displays context-sensitive help window */
void display_context_help(char *chid){
char *icon=CONTEXT_HELP_ICON1;
--- 1802,1808 ----
/* displays context-sensitive help window */
void display_context_help(char *chid){
+ #ifdef CONTEXT_HELP
char *icon=CONTEXT_HELP_ICON1;
***************
*** 1812,1817 ****
printf("<a href='%s%s.html' target='cshw' onClick='javascript:window.open(\"%s%s.html\",\"cshw\",\"width=550,height=600,toolbar=0,location=0,status=0,resizable=1,scrollbars=1\");return true'><img src='%s%s' border=0 alt='Display context-sensitive help for this screen'></a>\n",url_context_help_path,chid,url_context_help_path,chid,url_images_path,icon);
return;
}
-
- #endif
--- 1813,1817 ----
printf("<a href='%s%s.html' target='cshw' onClick='javascript:window.open(\"%s%s.html\",\"cshw\",\"width=550,height=600,toolbar=0,location=0,status=0,resizable=1,scrollbars=1\");return true'><img src='%s%s' border=0 alt='Display context-sensitive help for this screen'></a>\n",url_context_help_path,chid,url_context_help_path,chid,url_images_path,icon);
+ #endif
return;
}
Index: cgiutils.h.in
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/cgiutils.h.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** cgiutils.h.in 9 Mar 2002 03:36:22 -0000 1.3
--- cgiutils.h.in 9 May 2002 03:47:39 -0000 1.4
***************
*** 3,7 ****
* CGIUTILS.H - Header file for common CGI functions
* Copyright (c) 1999-2002 Ethan Galstad (na...@na...)
! * Last Modified: 03-08-2002
*
* License:
--- 3,7 ----
* CGIUTILS.H - Header file for common CGI functions
* Copyright (c) 1999-2002 Ethan Galstad (na...@na...)
! * Last Modified: 05-02-2002
*
* License:
***************
*** 439,445 ****
void status_data_error(void);
- #ifdef CONTEXT_HELP
void display_context_help(char *); /* displays context-sensitive help window */
- #endif
#endif
--- 439,443 ----
Index: config.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/config.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** config.c 20 Apr 2002 20:01:42 -0000 1.3
--- config.c 9 May 2002 03:47:39 -0000 1.4
***************
*** 4,8 ****
*
* Copyright (c) 1999-2002 Ethan Galstad (na...@na...)
! * Last Modified: 04-20-2002
*
* This CGI program will display various configuration information.
--- 4,8 ----
*
* Copyright (c) 1999-2002 Ethan Galstad (na...@na...)
! * Last Modified: 05-03-2002
*
* This CGI program will display various configuration information.
***************
*** 150,180 ****
printf("<td align=right valign=bottom width=50%%>\n");
! printf("<form method=\"get\" action=\"%s\">\n",CONFIG_CGI);
! printf("<table border=0>\n");
!
! printf("<tr><td align=left class='reportSelectSubTitle'>Object Type:</td></tr>\n");
! printf("<tr><td align=left class='reportSelectItem'>");
! printf("<select name='type'>\n");
! printf("<option value='hosts' %s>Hosts\n",(display_type==DISPLAY_HOSTS)?"SELECTED":"");
! printf("<option value='hostdependencies' %s>Host Dependencies\n",(display_type==DISPLAY_HOSTDEPENDENCIES)?"SELECTED":"");
! printf("<option value='hostescalations' %s>Host Escalations\n",(display_type==DISPLAY_HOSTESCALATIONS)?"SELECTED":"");
! printf("<option value='hostgroups' %s>Host Groups\n",(display_type==DISPLAY_HOSTGROUPS)?"SELECTED":"");
! printf("<option value='hostgroupescalations' %s>Host Group Escalations\n",(display_type==DISPLAY_HOSTGROUPESCALATIONS)?"SELECTED":"");
! printf("<option value='services' %s>Services\n",(display_type==DISPLAY_SERVICES)?"SELECTED":"");
! printf("<option value='servicedependencies' %s>Service Dependencies\n",(display_type==DISPLAY_SERVICEDEPENDENCIES)?"SELECTED":"");
! printf("<option value='serviceescalations' %s>Service Escalations\n",(display_type==DISPLAY_SERVICEESCALATIONS)?"SELECTED":"");
! printf("<option value='contacts' %s>Contacts\n",(display_type==DISPLAY_CONTACTS)?"SELECTED":"");
! printf("<option value='contactgroups' %s>Contact Groups\n",(display_type==DISPLAY_CONTACTGROUPS)?"SELECTED":"");
! printf("<option value='timeperiods' %s>Timeperiods\n",(display_type==DISPLAY_TIMEPERIODS)?"SELECTED":"");
! printf("<option value='commands' %s>Commands\n",(display_type==DISPLAY_COMMANDS)?"SELECTED":"");
! printf("</select>\n");
! printf("</td></tr>\n");
! printf("<tr><td class='reportSelectItem'><input type='submit' value='Update'></td></tr>\n");
! printf("</table>\n");
! printf("</form>\n");
! if(display_type==DISPLAY_NONE)
! display_type=DISPLAY_HOSTS;
#ifdef CONTEXT_HELP
--- 150,180 ----
printf("<td align=right valign=bottom width=50%%>\n");
! if(display_type!=DISPLAY_NONE){
! printf("<form method=\"get\" action=\"%s\">\n",CONFIG_CGI);
! printf("<table border=0>\n");
! printf("<tr><td align=left class='reportSelectSubTitle'>Object Type:</td></tr>\n");
! printf("<tr><td align=left class='reportSelectItem'>");
! printf("<select name='type'>\n");
! printf("<option value='hosts' %s>Hosts\n",(display_type==DISPLAY_HOSTS)?"SELECTED":"");
! printf("<option value='hostdependencies' %s>Host Dependencies\n",(display_type==DISPLAY_HOSTDEPENDENCIES)?"SELECTED":"");
! printf("<option value='hostescalations' %s>Host Escalations\n",(display_type==DISPLAY_HOSTESCALATIONS)?"SELECTED":"");
! printf("<option value='hostgroups' %s>Host Groups\n",(display_type==DISPLAY_HOSTGROUPS)?"SELECTED":"");
! printf("<option value='hostgroupescalations' %s>Host Group Escalations\n",(display_type==DISPLAY_HOSTGROUPESCALATIONS)?"SELECTED":"");
! printf("<option value='services' %s>Services\n",(display_type==DISPLAY_SERVICES)?"SELECTED":"");
! printf("<option value='servicedependencies' %s>Service Dependencies\n",(display_type==DISPLAY_SERVICEDEPENDENCIES)?"SELECTED":"");
! printf("<option value='serviceescalations' %s>Service Escalations\n",(display_type==DISPLAY_SERVICEESCALATIONS)?"SELECTED":"");
! printf("<option value='contacts' %s>Contacts\n",(display_type==DISPLAY_CONTACTS)?"SELECTED":"");
! printf("<option value='contactgroups' %s>Contact Groups\n",(display_type==DISPLAY_CONTACTGROUPS)?"SELECTED":"");
! printf("<option value='timeperiods' %s>Timeperiods\n",(display_type==DISPLAY_TIMEPERIODS)?"SELECTED":"");
! printf("<option value='commands' %s>Commands\n",(display_type==DISPLAY_COMMANDS)?"SELECTED":"");
! printf("</select>\n");
! printf("</td></tr>\n");
!
! printf("<tr><td class='reportSelectItem'><input type='submit' value='Update'></td></tr>\n");
! printf("</table>\n");
! printf("</form>\n");
! }
#ifdef CONTEXT_HELP
***************
*** 1726,1729 ****
--- 1726,1756 ----
printf("<div align=center class='reportSelectTitle'>Select Type of Config Data You Wish To View</div>\n");
+
+ printf("<form method=\"get\" action=\"%s\">\n",CONFIG_CGI);
+ printf("<table border=0>\n");
+
+ printf("<div align=center>\n");
+ printf("<tr><td align=left class='reportSelectSubTitle'>Object Type:</td></tr>\n");
+ printf("<tr><td align=left class='reportSelectItem'>");
+ printf("<select name='type'>\n");
+ printf("<option value='hosts' %s>Hosts\n",(display_type==DISPLAY_HOSTS)?"SELECTED":"");
+ printf("<option value='hostdependencies' %s>Host Dependencies\n",(display_type==DISPLAY_HOSTDEPENDENCIES)?"SELECTED":"");
+ printf("<option value='hostescalations' %s>Host Escalations\n",(display_type==DISPLAY_HOSTESCALATIONS)?"SELECTED":"");
+ printf("<option value='hostgroups' %s>Host Groups\n",(display_type==DISPLAY_HOSTGROUPS)?"SELECTED":"");
+ printf("<option value='hostgroupescalations' %s>Host Group Escalations\n",(display_type==DISPLAY_HOSTGROUPESCALATIONS)?"SELECTED":"");
+ printf("<option value='services' %s>Services\n",(display_type==DISPLAY_SERVICES)?"SELECTED":"");
+ printf("<option value='servicedependencies' %s>Service Dependencies\n",(display_type==DISPLAY_SERVICEDEPENDENCIES)?"SELECTED":"");
+ printf("<option value='serviceescalations' %s>Service Escalations\n",(display_type==DISPLAY_SERVICEESCALATIONS)?"SELECTED":"");
+ printf("<option value='contacts' %s>Contacts\n",(display_type==DISPLAY_CONTACTS)?"SELECTED":"");
+ printf("<option value='contactgroups' %s>Contact Groups\n",(display_type==DISPLAY_CONTACTGROUPS)?"SELECTED":"");
+ printf("<option value='timeperiods' %s>Timeperiods\n",(display_type==DISPLAY_TIMEPERIODS)?"SELECTED":"");
+ printf("<option value='commands' %s>Commands\n",(display_type==DISPLAY_COMMANDS)?"SELECTED":"");
+ printf("</select>\n");
+ printf("</td></tr>\n");
+
+ printf("<tr><td class='reportSelectItem'><input type='submit' value='Continue'></td></tr>\n");
+ printf("</table>\n");
+ printf("</form>\n");
+ printf("</div>\n");
return;
|