Update of /cvsroot/nagios/nagios/cgi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3708/cgi
Modified Files:
extinfo.c status.c statusmap.c
Log Message:
Bug fixes are good for the soul
Index: extinfo.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/extinfo.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** extinfo.c 2 Feb 2005 18:51:21 -0000 1.54
--- extinfo.c 11 Mar 2005 01:16:34 -0000 1.55
***************
*** 4,8 ****
*
* Copyright (c) 1999-2005 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 02-02-2005
*
* License:
--- 4,8 ----
*
* Copyright (c) 1999-2005 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 03-10-2005
*
* License:
***************
*** 1008,1012 ****
printf("<TR><TD CLASS='dataVar'>Host Status:</td><td
CLASS='dataVal'><DIV
CLASS='%s'> %s %s </DIV></td></tr>\n",bg_class,state_string,(temp_hoststatus->problem_has_been_acknowledged==TRUE)?"(Has
been acknowledged)":"");
! printf("<TR><TD CLASS='dataVar'>Status Information:</td><td
CLASS='dataVal'>%s</td></tr>\n",temp_hoststatus->plugin_output);
printf("<TR><TD CLASS='dataVar'>Performance Data:</td><td
CLASS='dataVal'>%s</td></tr>\n",(temp_hoststatus->perf_data==NULL)?"":temp_hoststatus->perf_data);
--- 1008,1012 ----
printf("<TR><TD CLASS='dataVar'>Host Status:</td><td
CLASS='dataVal'><DIV
CLASS='%s'> %s %s </DIV></td></tr>\n",bg_class,state_string,(temp_hoststatus->problem_has_been_acknowledged==TRUE)?"(Has
been acknowledged)":"");
! printf("<TR><TD CLASS='dataVar'>Status Information:</td><td
CLASS='dataVal'>%s</td></tr>\n",(temp_hoststatus->plugin_output==NULL)?"":temp_hoststatus->plugin_output);
printf("<TR><TD CLASS='dataVar'>Performance Data:</td><td
CLASS='dataVal'>%s</td></tr>\n",(temp_hoststatus->perf_data==NULL)?"":temp_hoststatus->perf_data);
***************
*** 1318,1322 ****
printf("<TR><TD CLASS='dataVar'>Current Status:</TD><TD
CLASS='dataVal'><DIV
CLASS='%s'> %s %s </DIV></TD></TR>\n",bg_class,state_string,(temp_svcstatus->problem_has_been_acknowledged==TRUE)?"(Has
been acknowledged)":"");
! printf("<TR><TD CLASS='dataVar'>Status Information:</TD><TD
CLASS='dataVal'>%s</TD></TR>\n",temp_svcstatus->plugin_output);
printf("<TR><TD CLASS='dataVar'>Performance Data:</td><td
CLASS='dataVal'>%s</td></tr>\n",(temp_svcstatus->perf_data==NULL)?"":temp_svcstatus->perf_data);
--- 1318,1322 ----
printf("<TR><TD CLASS='dataVar'>Current Status:</TD><TD
CLASS='dataVal'><DIV
CLASS='%s'> %s %s </DIV></TD></TR>\n",bg_class,state_string,(temp_svcstatus->problem_has_been_acknowledged==TRUE)?"(Has
been acknowledged)":"");
! printf("<TR><TD CLASS='dataVar'>Status Information:</TD><TD
CLASS='dataVal'>%s</TD></TR>\n",(temp_svcstatus->plugin_output==NULL)?"":temp_svcstatus->plugin_output);
printf("<TR><TD CLASS='dataVar'>Performance Data:</td><td
CLASS='dataVal'>%s</td></tr>\n",(temp_svcstatus->perf_data==NULL)?"":temp_svcstatus->perf_data);
Index: statusmap.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/statusmap.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** statusmap.c 6 Nov 2004 05:44:12 -0000 1.27
--- statusmap.c 11 Mar 2005 01:16:35 -0000 1.28
***************
*** 3,8 ****
* STATUSMAP.C - Nagios Network Status Map CGI
*
! * Copyright (c) 1999-2004 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 11-05-2004
*
* Description:
--- 3,8 ----
* STATUSMAP.C - Nagios Network Status Map CGI
*
! * Copyright (c) 1999-2005 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 03-10-2005
*
* Description:
***************
*** 2022,2026 ****
printf("</b></td></tr>");
! printf("<tr><td class=\\\"popupText\\\">Status Information:</td><td
class=\\\"popupText\\\"><b>%s</b></td></tr>",temp_status->plugin_output);
current_time=time(NULL);
--- 2022,2026 ----
printf("</b></td></tr>");
! printf("<tr><td class=\\\"popupText\\\">Status Information:</td><td
class=\\\"popupText\\\"><b>%s</b></td></tr>",(temp_status->plugin_output==NULL)?"":temp_status->plugin_output);
current_time=time(NULL);
Index: status.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/status.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** status.c 6 Nov 2004 05:44:12 -0000 1.37
--- status.c 11 Mar 2005 01:16:35 -0000 1.38
***************
*** 3,8 ****
* STATUS.C - Nagios Status CGI
*
! * Copyright (c) 1999-2004 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 11-05-2004
*
* License:
--- 3,8 ----
* STATUS.C - Nagios Status CGI
*
! * Copyright (c) 1999-2005 Ethan Galstad (nagios@xxxxxxxxxx)
! * Last Modified: 03-10-2005
*
* License:
***************
*** 1705,1709 ****
printf("<TD CLASS='status%s'
nowrap>%s</TD>\n",status_bg_class,state_duration);
printf("<TD
CLASS='status%s'>%d/%d</TD>\n",status_bg_class,temp_status->current_attempt,temp_status->max_attempts);
! printf("<TD
CLASS='status%s'>%s </TD>\n",status_bg_class,temp_status->plugin_output);
printf("</TR>\n");
--- 1705,1709 ----
printf("<TD CLASS='status%s'
nowrap>%s</TD>\n",status_bg_class,state_duration);
printf("<TD
CLASS='status%s'>%d/%d</TD>\n",status_bg_class,temp_status->current_attempt,temp_status->max_attempts);
! printf("<TD
CLASS='status%s'>%s </TD>\n",status_bg_class,(temp_status->plugin_output==NULL)?"":temp_status->plugin_output);
printf("</TR>\n");
***************
*** 2087,2091 ****
printf("<TD CLASS='status%s'
nowrap>%s</TD>\n",status_bg_class,date_time);
printf("<TD CLASS='status%s'
nowrap>%s</TD>\n",status_bg_class,state_duration);
! printf("<TD
CLASS='status%s'>%s </TD>\n",status_bg_class,temp_status->plugin_output);
printf("</TR>\n");
--- 2087,2091 ----
printf("<TD CLASS='status%s'
nowrap>%s</TD>\n",status_bg_class,date_time);
printf("<TD CLASS='status%s'
nowrap>%s</TD>\n",status_bg_class,state_duration);
! printf("<TD
CLASS='status%s'>%s </TD>\n",status_bg_class,(temp_status->plugin_output==NULL)?"":temp_status->plugin_output);
printf("</TR>\n");
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
|
