diff --git a/pandora_console/godmode/agentes/planned_downtime.editor.php b/pandora_console/godmode/agentes/planned_downtime.editor.php index 4aceac701e..40d3f3b1e3 100644 --- a/pandora_console/godmode/agentes/planned_downtime.editor.php +++ b/pandora_console/godmode/agentes/planned_downtime.editor.php @@ -354,8 +354,8 @@ if ($create_downtime || $update_downtime) { __('Not created. Error inserting data').'. '.__('The end date must be higher than the current time') ); } else if ($type_execution == 'periodically' - && (($type_periodicity == 'weekly' && $periodically_time_from >= $periodically_time_to) - || ($type_periodicity == 'monthly' && $periodically_day_from == $periodically_day_to && $periodically_time_from >= $periodically_time_to)) + && $type_periodicity == 'monthly' + && $periodically_day_from == $periodically_day_to ) { ui_print_error_message( __('Not created. Error inserting data').'. '.__('The end time must be higher than the start time') diff --git a/pandora_console/include/functions_planned_downtimes.php b/pandora_console/include/functions_planned_downtimes.php index a9b701241b..7ce2b424ad 100644 --- a/pandora_console/include/functions_planned_downtimes.php +++ b/pandora_console/include/functions_planned_downtimes.php @@ -246,12 +246,10 @@ function planned_downtimes_get_malformed() $sql = "SELECT * FROM tplanned_downtime WHERE type_execution = 'periodically' - AND ((type_periodicity = 'monthly' + AND (type_periodicity = 'monthly' AND (periodically_day_from > periodically_day_to OR (periodically_day_from = periodically_day_to - AND periodically_time_from >= periodically_time_to))) - OR (type_periodicity = 'weekly' - AND periodically_time_from >= periodically_time_to))"; + AND periodically_time_from >= periodically_time_to)))"; $malformed_downtimes = db_get_all_rows_sql($sql); if ($malformed_downtimes === false) {