status.c (nagios-4.4.3) | : | status.c (nagios-4.4.4) | ||
---|---|---|---|---|
skipping to change at line 1594 | skipping to change at line 1594 | |||
/* make sure user has rights to see this... */ | /* make sure user has rights to see this... */ | |||
if(is_authorized_for_service(temp_service, ¤t_authdata) == FALSE) | if(is_authorized_for_service(temp_service, ¤t_authdata) == FALSE) | |||
continue; | continue; | |||
user_has_seen_something = TRUE; | user_has_seen_something = TRUE; | |||
/* get the host status information */ | /* get the host status information */ | |||
temp_hoststatus = find_hoststatus(temp_service->host_name); | temp_hoststatus = find_hoststatus(temp_service->host_name); | |||
/* see if we should display services for hosts with tis type of s tatus */ | /* see if we should display services for hosts with this type of status */ | |||
if(!(host_status_types & temp_hoststatus->status)) | if(!(host_status_types & temp_hoststatus->status)) | |||
continue; | continue; | |||
/* see if we should display this type of service status */ | /* see if we should display this type of service status */ | |||
if(!(service_status_types & temp_status->status)) | if(!(service_status_types & temp_status->status)) | |||
continue; | continue; | |||
/* check host properties filter */ | /* check host properties filter */ | |||
if(passes_host_properties_filter(temp_hoststatus) == FALSE) | if(passes_host_properties_filter(temp_hoststatus) == FALSE) | |||
continue; | continue; | |||
skipping to change at line 1784 | skipping to change at line 1784 | |||
printf("<td ALIGN=center valign=center><a href='%s?type=%d&host=%s#comments'><IMG SRC='%s%s' border=0 WIDTH=%d HEIGHT=%d ALT='This host problem has been acknowledged' TITLE='This host problem has been acknowledged'></a></td>", EXTINFO_CGI, DISPLAY_HOST_INFO, url_encode(temp_status ->host_name), url_images_path, ACKNOWLEDGEMENT_ICON, STATUS_ICON_WIDTH, STATUS_I CON_HEIGHT); | printf("<td ALIGN=center valign=center><a href='%s?type=%d&host=%s#comments'><IMG SRC='%s%s' border=0 WIDTH=%d HEIGHT=%d ALT='This host problem has been acknowledged' TITLE='This host problem has been acknowledged'></a></td>", EXTINFO_CGI, DISPLAY_HOST_INFO, url_encode(temp_status ->host_name), url_images_path, ACKNOWLEDGEMENT_ICON, STATUS_ICON_WIDTH, STATUS_I CON_HEIGHT); | |||
} | } | |||
/* only show comments if this is a non-read-only user */ | /* only show comments if this is a non-read-only user */ | |||
if(is_authorized_for_read_only(¤t_authdata) == FALSE) { | if(is_authorized_for_read_only(¤t_authdata) == FALSE) { | |||
if(total_comments > 0) | if(total_comments > 0) | |||
printf("<td ALIGN=center valign=c enter><a href='%s?type=%d&host=%s#comments'><IMG SRC='%s%s' border=0 WIDTH=%d HE IGHT=%d ALT='This host has %d comment%s associated with it' TITLE='This host has %d comment%s associated with it'></a></td>", EXTINFO_CGI, DISPLAY_HOST_INFO, ur l_encode(temp_status->host_name), url_images_path, COMMENT_ICON, STATUS_ICON_WID TH, STATUS_ICON_HEIGHT, total_comments, (total_comments == 1) ? "" : "s", total_ comments, (total_comments == 1) ? "" : "s"); | printf("<td ALIGN=center valign=c enter><a href='%s?type=%d&host=%s#comments'><IMG SRC='%s%s' border=0 WIDTH=%d HE IGHT=%d ALT='This host has %d comment%s associated with it' TITLE='This host has %d comment%s associated with it'></a></td>", EXTINFO_CGI, DISPLAY_HOST_INFO, ur l_encode(temp_status->host_name), url_images_path, COMMENT_ICON, STATUS_ICON_WID TH, STATUS_ICON_HEIGHT, total_comments, (total_comments == 1) ? "" : "s", total_ comments, (total_comments == 1) ? "" : "s"); | |||
} | } | |||
if(temp_hoststatus->notifications_enabled == FALS E) { | if(temp_hoststatus->notifications_enabled == FALS E) { | |||
printf("<td ALIGN=center valign=center><a href='%s?type=%d&host=%s'><IMG SRC='%s%s' border=0 WIDTH=%d HEIGHT=%d ALT='Noti fications for this host have been disabled' TITLE='Notifications for this host h ave been disabled'></a></td>", EXTINFO_CGI, DISPLAY_HOST_INFO, url_encode(temp_s tatus->host_name), url_images_path, NOTIFICATIONS_DISABLED_ICON, STATUS_ICON_WID TH, STATUS_ICON_HEIGHT); | printf("<td ALIGN=center valign=center><a href='%s?type=%d&host=%s'><IMG SRC='%s%s' border=0 WIDTH=%d HEIGHT=%d ALT='Noti fications for this host have been disabled' TITLE='Notifications for this host h ave been disabled'></a></td>", EXTINFO_CGI, DISPLAY_HOST_INFO, url_encode(temp_s tatus->host_name), url_images_path, NOTIFICATIONS_DISABLED_ICON, STATUS_ICON_WID TH, STATUS_ICON_HEIGHT); | |||
} | } | |||
if(temp_hoststatus->checks_enabled == FALSE) { | if(temp_hoststatus->checks_enabled == FALSE && te | |||
printf("<td ALIGN=center valign=center><a | mp_hoststatus->accept_passive_checks == FALSE) { | |||
href='%s?type=%d&host=%s'><IMG SRC='%s%s' border=0 WIDTH=%d HEIGHT=%d ALT='Chec | printf("<td ALIGN=center valign=center><a | |||
ks of this host have been disabled'd TITLE='Checks of this host have been disabl | href='%s?type=%d&host=%s'><IMG SRC='%s%s' border=0 WIDTH=%d HEIGHT=%d ALT='Acti | |||
ed'></a></td>", EXTINFO_CGI, DISPLAY_HOST_INFO, url_encode(temp_status->host_nam | ve and passive checks of this host have been disabled' TITLE='Checks of this hos | |||
e), url_images_path, DISABLED_ICON, STATUS_ICON_WIDTH, STATUS_ICON_HEIGHT); | t have been disabled'></a></td>", EXTINFO_CGI, DISPLAY_HOST_INFO, url_encode(tem | |||
p_status->host_name), url_images_path, DISABLED_ICON, STATUS_ICON_WIDTH, STATUS_ | ||||
ICON_HEIGHT); | ||||
} | ||||
else if (temp_hoststatus->checks_enabled == FALSE | ||||
) { | ||||
printf("<td ALIGN=center valign=center><a | ||||
href='%s?type=%d&host=%s'><IMG SRC='%s%s' border=0 WIDTH=%d HEIGHT=%d ALT='Acti | ||||
ve checks of this host have been disabled - only passive checks are being accept | ||||
ed' TITLE='Checks of this host have been disabled'></a></td>", EXTINFO_CGI, DISP | ||||
LAY_HOST_INFO, url_encode(temp_status->host_name), url_images_path, PASSIVE_ONLY | ||||
_ICON, STATUS_ICON_WIDTH, STATUS_ICON_HEIGHT); | ||||
} | } | |||
if(temp_hoststatus->is_flapping == TRUE) { | if(temp_hoststatus->is_flapping == TRUE) { | |||
printf("<td ALIGN=center valign=center><a href='%s?type=%d&host=%s'><IMG SRC='%s%s' border=0 WIDTH=%d HEIGHT=%d ALT='This host is flapping between states' TITLE='This host is flapping between states'>< /a></td>", EXTINFO_CGI, DISPLAY_HOST_INFO, url_encode(temp_status->host_name), u rl_images_path, FLAPPING_ICON, STATUS_ICON_WIDTH, STATUS_ICON_HEIGHT); | printf("<td ALIGN=center valign=center><a href='%s?type=%d&host=%s'><IMG SRC='%s%s' border=0 WIDTH=%d HEIGHT=%d ALT='This host is flapping between states' TITLE='This host is flapping between states'>< /a></td>", EXTINFO_CGI, DISPLAY_HOST_INFO, url_encode(temp_status->host_name), u rl_images_path, FLAPPING_ICON, STATUS_ICON_WIDTH, STATUS_ICON_HEIGHT); | |||
} | } | |||
if(temp_hoststatus->scheduled_downtime_depth > 0) { | if(temp_hoststatus->scheduled_downtime_depth > 0) { | |||
printf("<td ALIGN=center valign=center><a href='%s?type=%d&host=%s'><IMG SRC='%s%s' border=0 WIDTH=%d HEIGHT=%d ALT='This host is currently in a period of scheduled downtime' TITLE='This host is curren tly in a period of scheduled downtime'></a></td>", EXTINFO_CGI, DISPLAY_HOST_INF O, url_encode(temp_status->host_name), url_images_path, SCHEDULED_DOWNTIME_ICON, STATUS_ICON_WIDTH, STATUS_ICON_HEIGHT); | printf("<td ALIGN=center valign=center><a href='%s?type=%d&host=%s'><IMG SRC='%s%s' border=0 WIDTH=%d HEIGHT=%d ALT='This host is currently in a period of scheduled downtime' TITLE='This host is curren tly in a period of scheduled downtime'></a></td>", EXTINFO_CGI, DISPLAY_HOST_INF O, url_encode(temp_status->host_name), url_images_path, SCHEDULED_DOWNTIME_ICON, STATUS_ICON_WIDTH, STATUS_ICON_HEIGHT); | |||
} | } | |||
if(temp_host->notes_url != NULL) { | if(temp_host->notes_url != NULL) { | |||
printf("<td align=center valign=center>") ; | printf("<td align=center valign=center>") ; | |||
printf("<a href='"); | printf("<a href='"); | |||
End of changes. 2 change blocks. | ||||
7 lines changed or deleted | 18 lines changed or added |