diff --git a/Changelog b/Changelog index f45cf4414..52e946392 100644 --- a/Changelog +++ b/Changelog @@ -10,6 +10,7 @@ ENHANCEMENTS * classic ui: Added option to suppress coloring of hosts/services in maintenance (Matthew Brooks) #992 * classic ui: Added option to show partial hostgroups (Matthew Brooks) #1013 * classic ui: changing drop down menu in status.cgi to jquery-dd #1644 +* classic ui: default downtime duration is configurable in cgi.cfg #1642 FIXES * core: remove duplicated unlinks for check result files with multiple results #1615 diff --git a/cgi/cgiutils.c b/cgi/cgiutils.c index c7d46f0d5..e9ad28ef0 100644 --- a/cgi/cgiutils.c +++ b/cgi/cgiutils.c @@ -143,6 +143,7 @@ int enforce_comments_on_actions=FALSE; int week_starts_on_monday=FALSE; int show_partial_hostgroups=FALSE; +int default_downtime_duration=7200; extern hostgroup *hostgroup_list; extern contactgroup *contactgroup_list; @@ -553,6 +554,9 @@ int read_cgi_config_file(char *filename){ else if(!strcmp(var,"lock_author_names")) lock_author_names=(atoi(val)>0)?TRUE:FALSE; + else if(!strcmp(var,"default_downtime_duration")) + default_downtime_duration=atoi(val); + else if(!strcmp(var,"use_ssl_authentication")) use_ssl_authentication=(atoi(val)>0)?TRUE:FALSE; diff --git a/cgi/cmd.c b/cgi/cmd.c index bd4d98178..81d545375 100644 --- a/cgi/cmd.c +++ b/cgi/cmd.c @@ -61,6 +61,7 @@ extern int daemon_check; extern int enforce_comments_on_actions; extern int date_format; extern int use_logging; +extern int default_downtime_duration; extern scheduled_downtime *scheduled_downtime_list; extern comment *comment_list; @@ -823,6 +824,7 @@ void print_help_box(char *content) { void print_form_element(int element,int cmd) { time_t t; + int t_hour,t_min; char buffer[MAX_INPUT_BUFFER]; switch(element) { @@ -930,7 +932,7 @@ void print_form_element(int element,int cmd) { case PRINT_CHECK_TIME: time(&t); if (element == PRINT_END_TIME ) - t+=(unsigned long)7200; + t+=(unsigned long)default_downtime_duration; get_time_string(&t,buffer,sizeof(buffer)-1,SHORT_DATE_TIME); printf("
\n"); + printf("\t\t\t | \n",t_hour); printf("\t\t\t | Hours | \n"); - printf("\t\t\t\n"); + printf("\t\t\t | \n",t_min); printf("\t\t\t | Minutes | \n"); printf("\t\t