diff --git a/pandora_console/extras/mr/52.sql b/pandora_console/extras/mr/52.sql index bde9fd57c3..2d0cd15fa4 100644 --- a/pandora_console/extras/mr/52.sql +++ b/pandora_console/extras/mr/52.sql @@ -3,4 +3,15 @@ ALTER TABLE `tpolicy_queue` MODIFY COLUMN `progress` int(10) NOT NULL default '0 CREATE INDEX `IDX_tservice_element` ON `tservice_element`(`id_service`,`id_agente_modulo`); ALTER TABLE tevent_response ADD COLUMN display_command tinyint(1) default 0; +ALTER TABLE `talert_templates` ADD COLUMN `schedule` TEXT; +ALTER TABLE `tevent_alert` ADD COLUMN `schedule` TEXT; + +SOURCE procedures/alertTemplates.sql; +CALL `migrateRanges`(); +DROP PROCEDURE `migrateRanges`; + +SOURCE procedures/alertEvents.sql; +CALL `migrateEventRanges`(); +DROP PROCEDURE `migrateEventRanges`; + COMMIT; \ No newline at end of file diff --git a/pandora_console/extras/mr/procedures/alertEvents.sql b/pandora_console/extras/mr/procedures/alertEvents.sql new file mode 100644 index 0000000000..070a464ea2 --- /dev/null +++ b/pandora_console/extras/mr/procedures/alertEvents.sql @@ -0,0 +1,40 @@ + +CREATE PROCEDURE migrateEventRanges() +BEGIN + DECLARE done INT DEFAULT FALSE; + DECLARE i INT; + DECLARE r TEXT; + DECLARE cur1 CURSOR FOR SELECT `id` FROM `tevent_alert`; + DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; + + UPDATE `tevent_alert` SET `schedule` = '{"monday":_1_,"tuesday":_2_,"wednesday":_3_,"thursday":_4_,"friday":_5_,"saturday":_6_,"sunday":_7_}'; + UPDATE `tevent_alert` SET `time_from` = "00:00:00", `time_to` = "00:00:00" WHERE `time_from` = `time_to`; + + OPEN cur1; + read_loop: LOOP + FETCH cur1 INTO i; + + IF done THEN + LEAVE read_loop; + END IF; + + SELECT concat('[{"start":"', `time_from`, '","end":"', `time_to`, '"}]') into r FROM `tevent_alert` WHERE `id` = i; + + UPDATE `tevent_alert` SET `schedule` = REPLACE(`schedule`, "_1_", r) WHERE `monday` > 0 AND `id` = i; + UPDATE `tevent_alert` SET `schedule` = REPLACE(`schedule`, "_2_", r) WHERE `tuesday` > 0 AND `id` = i; + UPDATE `tevent_alert` SET `schedule` = REPLACE(`schedule`, "_3_", r) WHERE `wednesday` > 0 AND `id` = i; + UPDATE `tevent_alert` SET `schedule` = REPLACE(`schedule`, "_4_", r) WHERE `thursday` > 0 AND `id` = i; + UPDATE `tevent_alert` SET `schedule` = REPLACE(`schedule`, "_5_", r) WHERE `friday` > 0 AND `id` = i; + UPDATE `tevent_alert` SET `schedule` = REPLACE(`schedule`, "_6_", r) WHERE `saturday` > 0 AND `id` = i; + UPDATE `tevent_alert` SET `schedule` = REPLACE(`schedule`, "_7_", r) WHERE `sunday` > 0 AND `id` = i; + + UPDATE `tevent_alert` SET `schedule` = REPLACE(`schedule`, "_1_", '""') WHERE `monday` = 0 AND `id` = i; + UPDATE `tevent_alert` SET `schedule` = REPLACE(`schedule`, "_2_", '""') WHERE `tuesday` = 0 AND `id` = i; + UPDATE `tevent_alert` SET `schedule` = REPLACE(`schedule`, "_3_", '""') WHERE `wednesday` = 0 AND `id` = i; + UPDATE `tevent_alert` SET `schedule` = REPLACE(`schedule`, "_4_", '""') WHERE `thursday` = 0 AND `id` = i; + UPDATE `tevent_alert` SET `schedule` = REPLACE(`schedule`, "_5_", '""') WHERE `friday` = 0 AND `id` = i; + UPDATE `tevent_alert` SET `schedule` = REPLACE(`schedule`, "_6_", '""') WHERE `saturday` = 0 AND `id` = i; + UPDATE `tevent_alert` SET `schedule` = REPLACE(`schedule`, "_7_", '""') WHERE `sunday` = 0 AND `id` = i; + END LOOP; + CLOSE cur1; +END ; \ No newline at end of file diff --git a/pandora_console/extras/mr/procedures/alertTemplates.sql b/pandora_console/extras/mr/procedures/alertTemplates.sql new file mode 100644 index 0000000000..4547fef8ed --- /dev/null +++ b/pandora_console/extras/mr/procedures/alertTemplates.sql @@ -0,0 +1,40 @@ + +CREATE PROCEDURE migrateRanges() +BEGIN + DECLARE done INT DEFAULT FALSE; + DECLARE i INT; + DECLARE r TEXT; + DECLARE cur1 CURSOR FOR SELECT `id` FROM `talert_templates`; + DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; + + UPDATE `talert_templates` SET `schedule` = '{"monday":_1_,"tuesday":_2_,"wednesday":_3_,"thursday":_4_,"friday":_5_,"saturday":_6_,"sunday":_7_}'; + UPDATE `talert_templates` SET `time_from` = "00:00:00", `time_to` = "00:00:00" WHERE `time_from` = `time_to`; + + OPEN cur1; + read_loop: LOOP + FETCH cur1 INTO i; + + IF done THEN + LEAVE read_loop; + END IF; + + SELECT concat('[{"start":"', `time_from`, '","end":"', `time_to`, '"}]') into r FROM `talert_templates` WHERE `id` = i; + + UPDATE `talert_templates` SET `schedule` = REPLACE(`schedule`, "_1_", r) WHERE `monday` > 0 AND `id` = i; + UPDATE `talert_templates` SET `schedule` = REPLACE(`schedule`, "_2_", r) WHERE `tuesday` > 0 AND `id` = i; + UPDATE `talert_templates` SET `schedule` = REPLACE(`schedule`, "_3_", r) WHERE `wednesday` > 0 AND `id` = i; + UPDATE `talert_templates` SET `schedule` = REPLACE(`schedule`, "_4_", r) WHERE `thursday` > 0 AND `id` = i; + UPDATE `talert_templates` SET `schedule` = REPLACE(`schedule`, "_5_", r) WHERE `friday` > 0 AND `id` = i; + UPDATE `talert_templates` SET `schedule` = REPLACE(`schedule`, "_6_", r) WHERE `saturday` > 0 AND `id` = i; + UPDATE `talert_templates` SET `schedule` = REPLACE(`schedule`, "_7_", r) WHERE `sunday` > 0 AND `id` = i; + + UPDATE `talert_templates` SET `schedule` = REPLACE(`schedule`, "_1_", '""') WHERE `monday` = 0 AND `id` = i; + UPDATE `talert_templates` SET `schedule` = REPLACE(`schedule`, "_2_", '""') WHERE `tuesday` = 0 AND `id` = i; + UPDATE `talert_templates` SET `schedule` = REPLACE(`schedule`, "_3_", '""') WHERE `wednesday` = 0 AND `id` = i; + UPDATE `talert_templates` SET `schedule` = REPLACE(`schedule`, "_4_", '""') WHERE `thursday` = 0 AND `id` = i; + UPDATE `talert_templates` SET `schedule` = REPLACE(`schedule`, "_5_", '""') WHERE `friday` = 0 AND `id` = i; + UPDATE `talert_templates` SET `schedule` = REPLACE(`schedule`, "_6_", '""') WHERE `saturday` = 0 AND `id` = i; + UPDATE `talert_templates` SET `schedule` = REPLACE(`schedule`, "_7_", '""') WHERE `sunday` = 0 AND `id` = i; + END LOOP; + CLOSE cur1; +END ; \ No newline at end of file diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql index 32c5c65123..3848aad972 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql @@ -715,6 +715,7 @@ ALTER TABLE `tevent_alert` ADD COLUMN `id_template_conditions` int(10) unsigned ALTER TABLE `tevent_alert` ADD COLUMN `id_template_fields` int(10) unsigned NOT NULL default 0; ALTER TABLE `tevent_alert` ADD COLUMN `last_evaluation` bigint(20) NOT NULL default 0; ALTER TABLE `tevent_alert` ADD COLUMN `pool_occurrences` int unsigned not null default 0; +ALTER TABLE `tevent_alert` ADD COLUMN `schedule` TEXT; -- ----------------------------------------------------- -- Table `tevent_alert_action` @@ -1317,6 +1318,7 @@ ALTER TABLE talert_templates ADD COLUMN `field18_recovery` TEXT NOT NULL DEFAULT ALTER TABLE talert_templates ADD COLUMN `field19_recovery` TEXT NOT NULL DEFAULT ""; ALTER TABLE talert_templates ADD COLUMN `field20_recovery` TEXT NOT NULL DEFAULT ""; ALTER TABLE `talert_templates` ADD COLUMN `disable_event` tinyint(1) DEFAULT 0; +ALTER TABLE `talert_templates` ADD COLUMN `schedule` TEXT; -- --------------------------------------------------------------------- -- Table `talert_snmp` @@ -1451,13 +1453,13 @@ ALTER TABLE `ttag` MODIFY COLUMN `name` text NOT NULL default ''; INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge', '100'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30'); -INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 51); +INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 52); INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png'); UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager'; DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise'; -INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package', 759); +INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package', 760); INSERT INTO `tconfig` (`token`, `value`) VALUES ('status_monitor_fields', 'policy,agent,data_type,module_name,server_type,interval,status,graph,warn,data,timestamp'); UPDATE `tconfig` SET `value` = 'mini_severity,evento,id_agente,estado,timestamp' WHERE `token` LIKE 'event_fields'; DELETE FROM `tconfig` WHERE `token` LIKE 'integria_api_password'; diff --git a/pandora_console/godmode/alerts/alert_view.php b/pandora_console/godmode/alerts/alert_view.php index cc467b99f8..cdc4cb39f1 100644 --- a/pandora_console/godmode/alerts/alert_view.php +++ b/pandora_console/godmode/alerts/alert_view.php @@ -1,17 +1,32 @@ class = 'databox'; $table_details->width = '100%'; $table_details->size = []; @@ -103,7 +126,7 @@ $data[1] = ''.html_print_image($img, true, ['title' => $policyInfo['name']]).''; + $policy = ''; + $policy .= html_print_image( + $img, + true, + ['title' => $policyInfo['name']] + ); + $policy .= ''; } $data[0] = __('Policy'); @@ -121,8 +150,7 @@ if (enterprise_installed() && $alert['id_policy_alerts'] != 0) { $table_details->data[] = $data; } -// TABLE DETAILS END -// TABLE CONDITIONS +$table_conditions = new stdClass; $table_conditions->class = 'databox'; $table_conditions->width = '100%'; $table_conditions->size = []; @@ -155,9 +183,13 @@ switch ($template['type']) { case 'max_min': if ($template['matches_value']) { - $condition = __('The alert would fire when the value is between and '); + $condition = __( + 'The alert would fire when the value is between and ' + ); } else { - $condition = __('The alert would fire when the value is not between and '); + $condition = __( + 'The alert would fire when the value is not between and ' + ); } $condition = str_replace('', $template['min_value'], $condition); @@ -200,111 +232,27 @@ switch ($template['type']) { case 'always': $condition = __('Always'); + break; + + default: + // Not possible. + break; } $data[0] = $condition; $table_conditions->data[] = $data; -// DAYS -$table_days->class = 'databox alert_days'; -$table_days->width = '100%'; -$table_days->size = []; -$table_days->data = []; -$table_days->style = []; -$table_days->styleTable = 'padding: 1px; margin: 0px; text-align: center; height: 80px;'; -$table_days->head[0] = __('Mon'); -$table_days->head[1] = __('Tue'); -$table_days->head[2] = __('Wed'); -$table_days->head[3] = __('Thu'); -$table_days->head[4] = __('Fri'); -$table_days->head[5] = __('Sat'); -$table_days->head[6] = __('Sun'); -$table_days->data[0] = array_fill(0, 7, html_print_image('images/blade.png', true)); +$table_conditions->colspan[1][0] = 2; +$schedule = io_safe_output( + $template['schedule'] +); -$days = []; -if ($template['monday']) { - $table_days->data[0][0] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); -} - -if ($template['tuesday']) { - $table_days->data[0][1] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); -} - -if ($template['wednesday']) { - $table_days->data[0][2] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); -} - -if ($template['thursday']) { - $table_days->data[0][3] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); -} - -if ($template['friday']) { - $table_days->data[0][4] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); -} - -if ($template['saturday']) { - $table_days->data[0][5] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); -} - -if ($template['sunday']) { - $table_days->data[0][6] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); -} - -$data[0] = html_print_table($table_days, true); -unset($table_days); - -// TIME -$table_time->class = 'databox alert_time'; -$table_time->width = '100%'; -$table_time->size = []; -$table_time->data = []; -$table_time->style = []; -$table_time->styleTable = 'padding: 1px; margin: 0px; text-align: center; height: 80px; width: 100%;'; - -// $data[0] = __('Time from') . ' / ' . __('Time to'); -if ($template['time_from'] == $template['time_to']) { - $table_time->head[0] = '00:00:00
-
23:59:59'; - $table_time->data[0][0] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); -} else { - $from_array = explode(':', $template['time_from']); - $from = ($from_array[0] * SECONDS_1HOUR + $from_array[1] * SECONDS_1MINUTE + $from_array[2]); - $to_array = explode(':', $template['time_to']); - $to = ($to_array[0] * SECONDS_1HOUR + $to_array[1] * SECONDS_1MINUTE + $to_array[2]); - if ($to > $from) { - if ($template['time_from'] != '00:00:00') { - $table_time->head[0] = '00:00:00
-
'.$template['time_from']; - $table_time->data[0][0] = html_print_image('images/blade.png', true); - } - - $table_time->head[1] = $template['time_from'].'
-
'.$template['time_to']; - $table_time->data[0][1] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); - - if ($template['time_to'] != '23:59:59') { - $table_time->head[2] = $template['time_to'].'
-
23:59:59'; - $table_time->data[0][2] = html_print_image('images/blade.png', true); - } - } else { - if ($template['time_to'] != '00:00:00') { - $table_time->head[0] = '00:00:00
-
'.$template['time_to']; - $table_time->data[0][0] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); - } - - $table_time->head[1] = $template['time_to'].'
-
'.$template['time_from']; - $table_time->data[0][1] = html_print_image('images/blade.png', true, ['class' => 'invert_filter']); - - if ($template['time_from'] != '23:59:59') { - $table_time->head[2] = $template['time_from'].'
-
23:59:59'; - $table_time->data[0][2] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); - } - } - - $data[1] = $template['time_from'].' / '.$template['time_to']; -} - -$data[1] = html_print_table($table_time, true); -unset($table_time); +$data[0] = ''; +$data[0] .= html_print_input_hidden('schedule', $schedule, true); +$data[0] .= '
'; +$data[1] = ''; $table_conditions->data[] = $data; $data[0] = __('Use special days list'); @@ -319,7 +267,8 @@ $data[0] = __('Number of alerts').' ('.__('Min').'/'.__('Max').')'; $data[1] = $template['min_alerts'].'/'.$template['max_alerts']; $table_conditions->data[] = $data; -// TABLE CONDITIONS END +// TABLE CONDITIONS END. +$table = new stdClass; $table->class = 'alert_list databox'; $table->width = '98%'; $table->size = []; @@ -339,7 +288,8 @@ unset($table); $actions = alerts_get_actions_escalation($actions, $default_action); -// ESCALATION +// ESCALATION. +$table = new stdClass; $table->class = 'alert_list databox alternate alert_escalation'; $table->width = '98%'; $table->size = []; @@ -354,19 +304,33 @@ $table->style[0] = 'font-weight: bold; text-align: left;'; if (count($actions) == 1 && isset($actions[0])) { $table->head[1] = __('Every time that the alert is fired'); $table->data[0][0] = $actions[0]['name']; - $table->data[0][1] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); + $table->data[0][1] = html_print_image( + 'images/tick.png', + true, + ['class' => 'invert_filter'] + ); } else { foreach ($actions as $kaction => $action) { $table->data[$kaction][0] = $action['name']; - if ($kaction == 0) { - $table->data[$kaction][0] .= ui_print_help_tip(__('The default actions will be executed every time that the alert is fired and no other action is executed'), true); + if ((int) $kaction === 0) { + $table->data[$kaction][0] .= ui_print_help_tip( + __('The default actions will be executed every time that the alert is fired and no other action is executed'), + true + ); } foreach ($action['escalation'] as $k => $v) { if ($v > 0) { - $table->data[$kaction][$k] = html_print_image('images/tick.png', true, ['class' => 'invert_filter']); + $table->data[$kaction][$k] = html_print_image( + 'images/tick.png', + true, + ['class' => 'invert_filter'] + ); } else { - $table->data[$kaction][$k] = html_print_image('images/blade.png', true); + $table->data[$kaction][$k] = html_print_image( + 'images/blade.png', + true + ); } if (count($table->head) <= count($action['escalation'])) { @@ -382,12 +346,16 @@ if (count($actions) == 1 && isset($actions[0])) { } } - $action_threshold = $action['module_action_threshold'] > 0 ? $action['module_action_threshold'] : $action['action_threshold']; + $action_threshold = ($action['module_action_threshold'] > 0) ? $action['module_action_threshold'] : $action['action_threshold']; if ($action_threshold == 0) { $table->data[$kaction][($k + 1)] = __('No'); } else { - $table->data[$kaction][($k + 1)] = human_time_description_raw($action_threshold, true, 'tiny'); + $table->data[$kaction][($k + 1)] = human_time_description_raw( + $action_threshold, + true, + 'tiny' + ); } $table->head[($k + 1)] = __('Threshold'); @@ -397,7 +365,8 @@ if (count($actions) == 1 && isset($actions[0])) { html_print_table($table); unset($table); echo ''; -// ESCALATION TABLE +// ESCALATION TABLE. +$table = new stdClass; $table->class = 'alert_list databox'; $table->width = '98%'; $table->size = []; @@ -405,7 +374,7 @@ $table->head = []; $table->data = []; $table->rowstyle[1] = 'font-weight: bold;'; -if ($default_action != 0) { +if ((int) $default_action != 0) { $actions_select[0] = $default_action['name']; } @@ -416,17 +385,43 @@ foreach ($actions as $kaction => $action) { $table->data[0][0] = __('Select the desired action and mode to see the Firing/Recovery fields for this action'); $table->colspan[0][0] = 2; -$table->data[1][0] = __('Action').'
'.html_print_select($actions_select, 'firing_action_select', -1, '', __('Select the action'), -1, true, false, false); +$table->data[1][0] = __('Action'); +$table->data[1][0] .= '
'; +$table->data[1][0] .= html_print_select( + $actions_select, + 'firing_action_select', + -1, + '', + __('Select the action'), + -1, + true, + false, + false +); $modes = []; $modes['firing'] = __('Firing'); $modes['recovering'] = __('Recovering'); -$table->data[1][1] = ''; +$table->data[1][1] = ''; html_print_table($table); -unset($table); +$table = new stdClass; $table->class = 'alert_list databox alternate'; $table->width = '98%'; $table->size = []; @@ -437,13 +432,33 @@ $table->style[1] = 'width: 30%;'; $table->style[2] = 'width: 30%;'; $table->style[3] = 'font-weight: bold; width: 30%;'; -$table->title = __('Firing fields').ui_print_help_tip(__('Fields passed to the command executed by this action when the alert is fired'), true); +$table->title = __('Firing fields'); +$table->title .= ui_print_help_tip( + __('Fields passed to the command executed by this action when the alert is fired'), + true +); -$table->head[0] = __('Field').ui_print_help_tip(__('Fields configured on the command associated to the action'), true); -$table->head[1] = __('Template fields').ui_print_help_tip(__('Triggering fields configured in template'), true); -$table->head[2] = __('Action fields').ui_print_help_tip(__('Triggering fields configured in action'), true); +$table->head[0] = __('Field'); +$table->head[0] .= ui_print_help_tip( + __('Fields configured on the command associated to the action'), + true +); +$table->head[1] = __('Template fields'); +$table->head[1] .= ui_print_help_tip( + __('Triggering fields configured in template'), + true +); +$table->head[2] = __('Action fields'); +$table->head[2] .= ui_print_help_tip( + __('Triggering fields configured in action'), + true +); -$table->head[3] = __('Executed on firing').ui_print_help_tip(__('Fields used on execution when the alert is fired'), true); +$table->head[3] = __('Executed on firing'); +$table->head[3] .= ui_print_help_tip( + __('Fields used on execution when the alert is fired'), + true +); $firing_fields = []; @@ -456,14 +471,12 @@ foreach ($actions as $kaction => $action) { $descriptions = json_decode($command['fields_descriptions'], true); foreach ($descriptions as $kdesc => $desc) { - if (empty($desc)) { - // continue; - } - $field = 'field'.($kdesc + 1); $data = []; - $data[0] = $firing_fields[$kaction]['description'][$field] = $desc; - if (!empty($data[0])) { + $data[0] = $desc; + $firing_fields[$kaction]['description'][$field] = $desc; + + if (empty($data[0]) === false) { $data[0] = ''.$data[0].'
'; } @@ -473,12 +486,14 @@ foreach ($actions as $kaction => $action) { ).')'; $data[1] = $template[$field]; $data[2] = $action[$field]; - $data[3] = $firing_fields[$kaction]['value'][$field] = empty($action[$field]) ? $template[$field] : $action[$field]; + $data[3] = (empty($action[$field]) === true) ? $template[$field] : $action[$field]; + + $firing_fields[$kaction]['value'][$field] = (empty($action[$field]) === true) ? $template[$field] : $action[$field]; $first_level = $template[$field]; $second_level = $action[$field]; - if (!empty($second_level) || !empty($first_level)) { - if (empty($second_level)) { + if (empty($second_level) === false || empty($first_level) === false) { + if (empty($second_level) === false) { $table->cellclass[count($table->data)][1] = 'used_field'; $table->cellclass[count($table->data)][2] = 'empty_field'; } else { @@ -493,7 +508,7 @@ foreach ($actions as $kaction => $action) { $table->rowclass[] = 'firing_action firing_action_'.$kaction; - if ($command_preview != 'Internal type') { + if ($command_preview !== 'Internal type') { $command_preview = str_replace('_'.$field.'_', $data[3], $command_preview); } } @@ -504,20 +519,32 @@ foreach ($actions as $kaction => $action) { echo ''; -// Firing table +// Firing table. echo ''; -// Recovering table + +ui_require_css_file('main.min', 'include/javascript/fullcalendar/'); +ui_require_javascript_file('main.min', 'include/javascript/fullcalendar/'); +ui_require_javascript_file('pandora_fullcalendar'); ?>