Report Period: | \n");
printf("\n");
--- nagios-2.10/cgi/statusmap.c
+++ nagios-2.10/cgi/statusmap.c
@@ -698,7 +698,7 @@ void display_page_header(void){
printf("\n");
printf("\n");
printf(" | \n");
--- nagios-2.10/cgi/statuswml.c
+++ nagios-2.10/cgi/statuswml.c
@@ -621,7 +621,7 @@ void display_hostgroup_overview(void){
printf("\n");
printf(" \n");
- printf("Status Overview
\n",STATUSWML_CGI,hostgroup_name);
+ printf("Status Overview
\n",STATUSWML_CGI,url_encode(hostgroup_name));
/* check all hostgroups */
for(temp_hostgroup=hostgroup_list;temp_hostgroup!=NULL;temp_hostgroup=temp_hostgroup->next){
@@ -704,7 +704,7 @@ void display_hostgroup_summary(void){
printf("\n");
printf("\n");
- printf("Status Summary
\n",STATUSWML_CGI,hostgroup_name);
+ printf("Status Summary
\n",STATUSWML_CGI,url_encode(hostgroup_name));
/* check all hostgroups */
for(temp_hostgroup=hostgroup_list;temp_hostgroup!=NULL;temp_hostgroup=temp_hostgroup->next){
@@ -926,7 +926,7 @@ void display_host(void){
printf(" | \n");
printf(" \n");
- printf("View Services\n",STATUSWML_CGI,host_name);
+ printf("View Services\n",STATUSWML_CGI,url_encode(host_name));
printf("Host Commands\n");
printf("\n");
@@ -945,23 +945,23 @@ void display_host(void){
printf("Acknowledge Problem\n");
if(temp_hoststatus->checks_enabled==FALSE)
- printf("Enable Host Checks \n",COMMAND_CGI,host_name,CMD_ENABLE_HOST_CHECK,CMDMODE_COMMIT);
+ printf("Enable Host Checks \n",COMMAND_CGI,url_encode(host_name),CMD_ENABLE_HOST_CHECK,CMDMODE_COMMIT);
else
- printf("Disable Host Checks \n",COMMAND_CGI,host_name,CMD_DISABLE_HOST_CHECK,CMDMODE_COMMIT);
+ printf("Disable Host Checks \n",COMMAND_CGI,url_encode(host_name),CMD_DISABLE_HOST_CHECK,CMDMODE_COMMIT);
if(temp_hoststatus->notifications_enabled==FALSE)
- printf("Enable Host Notifications \n",COMMAND_CGI,host_name,CMD_ENABLE_HOST_NOTIFICATIONS,CMDMODE_COMMIT);
+ printf("Enable Host Notifications \n",COMMAND_CGI,url_encode(host_name),CMD_ENABLE_HOST_NOTIFICATIONS,CMDMODE_COMMIT);
else
- printf("Disable Host Notifications \n",COMMAND_CGI,host_name,CMD_DISABLE_HOST_NOTIFICATIONS,CMDMODE_COMMIT);
+ printf("Disable Host Notifications \n",COMMAND_CGI,url_encode(host_name),CMD_DISABLE_HOST_NOTIFICATIONS,CMDMODE_COMMIT);
- printf("Enable All Service Checks \n",COMMAND_CGI,host_name,CMD_ENABLE_HOST_SVC_CHECKS,CMDMODE_COMMIT);
+ printf("Enable All Service Checks \n",COMMAND_CGI,url_encode(host_name),CMD_ENABLE_HOST_SVC_CHECKS,CMDMODE_COMMIT);
- printf("Disable All Service Checks \n",COMMAND_CGI,host_name,CMD_DISABLE_HOST_SVC_CHECKS,CMDMODE_COMMIT);
+ printf("Disable All Service Checks \n",COMMAND_CGI,url_encode(host_name),CMD_DISABLE_HOST_SVC_CHECKS,CMDMODE_COMMIT);
- printf("Enable All Service Notifications \n",COMMAND_CGI,host_name,CMD_ENABLE_HOST_SVC_NOTIFICATIONS,CMDMODE_COMMIT);
+ printf("Enable All Service Notifications \n",COMMAND_CGI,url_encode(host_name),CMD_ENABLE_HOST_SVC_NOTIFICATIONS,CMDMODE_COMMIT);
- printf("Disable All Service Notifications \n",COMMAND_CGI,host_name,CMD_DISABLE_HOST_SVC_NOTIFICATIONS,CMDMODE_COMMIT);
+ printf("Disable All Service Notifications \n",COMMAND_CGI,url_encode(host_name),CMD_DISABLE_HOST_SVC_NOTIFICATIONS,CMDMODE_COMMIT);
printf("\n");
@@ -981,7 +981,7 @@ void display_host(void){
printf("\n");
printf("\n");
- printf("\n",COMMAND_CGI,host_name,CMD_ACKNOWLEDGE_HOST_PROBLEM,CMDMODE_COMMIT);
+ printf("\n",COMMAND_CGI,url_encode(host_name),CMD_ACKNOWLEDGE_HOST_PROBLEM,CMDMODE_COMMIT);
printf("\n");
printf("\n");
@@ -1001,7 +1001,7 @@ void display_host_services(void){
/**** MAIN SCREEN (CARD 1) ****/
printf("\n");
printf("\n");
- printf("Host '%s' Services \n",host_name,host_name,STATUSWML_CGI,host_name);
+ printf("Host '%s' Services \n",url_encode(host_name),host_name,STATUSWML_CGI,url_encode(host_name));
printf(" \n");
@@ -1142,7 +1142,7 @@ void display_service(void){
printf(" \n");
printf(" \n");
- printf("View Host\n",STATUSWML_CGI,host_name);
+ printf("View Host\n",STATUSWML_CGI,url_encode(host_name));
printf("Svc. Commands\n");
printf("\n");
@@ -1158,16 +1158,16 @@ void display_service(void){
printf("Acknowledge Problem\n");
if(temp_servicestatus->checks_enabled==FALSE)
- printf("Enable Checks \n",COMMAND_CGI,host_name,service_desc,CMD_ENABLE_SVC_CHECK,CMDMODE_COMMIT);
+ printf("Enable Checks \n",COMMAND_CGI,url_encode(host_name),url_encode(service_desc),CMD_ENABLE_SVC_CHECK,CMDMODE_COMMIT);
else{
- printf("Disable Checks \n",COMMAND_CGI,host_name,service_desc,CMD_DISABLE_SVC_CHECK,CMDMODE_COMMIT);
- printf("Schedule Immediate Check \n",COMMAND_CGI,host_name,service_desc,(unsigned long)current_time,CMD_SCHEDULE_SVC_CHECK,CMDMODE_COMMIT);
+ printf("Disable Checks \n",COMMAND_CGI,url_encode(host_name),url_encode(service_desc),CMD_DISABLE_SVC_CHECK,CMDMODE_COMMIT);
+ printf("Schedule Immediate Check \n",COMMAND_CGI,url_encode(host_name),url_encode(service_desc),(unsigned long)current_time,CMD_SCHEDULE_SVC_CHECK,CMDMODE_COMMIT);
}
if(temp_servicestatus->notifications_enabled==FALSE)
- printf("Enable Notifications \n",COMMAND_CGI,host_name,service_desc,CMD_ENABLE_SVC_NOTIFICATIONS,CMDMODE_COMMIT);
+ printf("Enable Notifications \n",COMMAND_CGI,url_encode(host_name),url_encode(service_desc),CMD_ENABLE_SVC_NOTIFICATIONS,CMDMODE_COMMIT);
else
- printf("Disable Notifications \n",COMMAND_CGI,host_name,service_desc,CMD_DISABLE_SVC_NOTIFICATIONS,CMDMODE_COMMIT);
+ printf("Disable Notifications \n",COMMAND_CGI,url_encode(host_name),url_encode(service_desc),CMD_DISABLE_SVC_NOTIFICATIONS,CMDMODE_COMMIT);
printf("\n");
@@ -1187,7 +1187,7 @@ void display_service(void){
printf("\n");
printf("\n");
- printf("\n",COMMAND_CGI,host_name,service_desc,CMD_ACKNOWLEDGE_SVC_PROBLEM,CMDMODE_COMMIT);
+ printf("\n",COMMAND_CGI,url_encode(host_name),url_encode(service_desc),CMD_ACKNOWLEDGE_SVC_PROBLEM,CMDMODE_COMMIT);
printf("\n");
printf("\n");
--- nagios-2.10/cgi/trends.c
+++ nagios-2.10/cgi/trends.c
@@ -451,9 +451,9 @@ int main(int argc, char **argv){
printf("\n");
printf("\n",(unsigned long)t1);
printf("\n",(unsigned long)t2);
- printf("\n",host_name);
+ printf("\n",url_encode(host_name));
if(display_type==DISPLAY_SERVICE_TRENDS)
- printf("\n",svc_description);
+ printf("\n",url_encode(svc_description));
printf("\n",(assume_initial_states==TRUE)?"yes":"no");
printf("\n",(assume_state_retention==TRUE)?"yes":"no");
@@ -897,9 +897,9 @@ int main(int argc, char **argv){
printf(" |