From 7883e08af56dbb1fb15441315ca1e3c678b00ce9 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Tue, 10 Mar 2015 15:36:23 +0100 Subject: [PATCH] Working in the files for the next cherry pick. --- .../godmode/alerts/alert_commands.php | 27 ++++--- .../godmode/alerts/configure_alert_action.php | 75 +++++++++++++------ 2 files changed, 69 insertions(+), 33 deletions(-) diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php index f3b7961e84..3dd4699cc3 100644 --- a/pandora_console/godmode/alerts/alert_commands.php +++ b/pandora_console/godmode/alerts/alert_commands.php @@ -63,17 +63,19 @@ if (is_ajax ()) { // Get the html rows of the fields form // Descriptions are stored in json - $fields_descriptions = empty($command['fields_descriptions']) ? '' : json_decode(io_safe_output($command['fields_descriptions']), true); + $fields_descriptions = empty($command['fields_descriptions']) ? + '' : json_decode(io_safe_output($command['fields_descriptions']), true); // Fields values are stored in json - $fields_values = empty($command['fields_values']) ? '' : io_safe_output(json_decode($command['fields_values'], true)); + $fields_values = empty($command['fields_values']) ? + '' : io_safe_output(json_decode($command['fields_values'], true)); $fields_rows = array(); for ($i = 1; $i <= 10; $i++) { - + $field_description = $fields_descriptions[$i - 1]; $field_value = $fields_values[$i - 1]; - + if (!empty($field_description)) { $fdesc = $field_description . '
' . sprintf(__('Field %s'), $i) . ''; @@ -92,7 +94,7 @@ if (is_ajax ()) { $field_value = io_safe_output($field_value); // HTML type if (preg_match ("/^_html_editor_$/i", $field_value)) { - + $editor_type_chkbx = "
"; $editor_type_chkbx .= __('Basic') . "  "; $editor_type_chkbx .= html_print_radio_button_extended ('editor_type_value_'.$i, 0, '', false, false, "removeTinyMCE('textarea_field".$i."_value')", '', true); @@ -102,7 +104,7 @@ if (is_ajax ()) { $editor_type_chkbx .= "
"; $ffield = $editor_type_chkbx; $ffield .= html_print_textarea ('field'.$i.'_value', 1, 1, '', 'class="fields"', true); - + $editor_type_chkbx = "
"; $editor_type_chkbx .= __('Basic') . "  "; $editor_type_chkbx .= html_print_radio_button_extended ('editor_type_recovery_value_'.$i, 0, '', false, false, "removeTinyMCE('textarea_field".$i."_recovery_value')", '', true); @@ -132,13 +134,18 @@ if (is_ajax ()) { } } - $ffield = html_print_select($fields_value_select, 'field'.$i.'_value', '', '', '', 0, true, false, false); - $rfield = html_print_select($fields_value_select, 'field'.$i.'_recovery_value', '', '', '', 0, true, false, false); + $ffield = html_print_select($fields_value_select, + 'field'.$i.'_value', '', '', '', 0, true, false, false, 'fields'); + $rfield = html_print_select($fields_value_select, + 'field'.$i.'_recovery_value', '', '', '', 0, true, false, false, 'fields_recovery'); } } else { - $ffield = html_print_textarea ('field'.$i.'_value', 1, 1, '', 'style="min-height:40px" class="fields"', true); - $rfield = html_print_textarea ('field'.$i.'_recovery_value', 1, 1, '', 'style="min-height:40px" class="fields_recovery"', true); + $ffield = html_print_textarea ('field' . $i . '_value', + 1, 1, '', 'style="min-height:40px" class="fields"', true); + $rfield = html_print_textarea ( + 'field' . $i . '_recovery_value', 1, 1, '', + 'style="min-height:40px" class="fields_recovery"', true); } diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php index 6de6b1cf40..553f33a67c 100644 --- a/pandora_console/godmode/alerts/configure_alert_action.php +++ b/pandora_console/godmode/alerts/configure_alert_action.php @@ -53,14 +53,18 @@ if ($al_action !== false) { if (defined('METACONSOLE')) alerts_meta_print_header(); else - ui_print_page_header (__('Alerts').' » '.__('Configure alert action'), "images/gm_alerts.png", false, "alert_config", true); + ui_print_page_header (__('Alerts') . ' » ' . + __('Configure alert action'), "images/gm_alerts.png", false, + "alert_config", true); } else { // Header if (defined('METACONSOLE')) alerts_meta_print_header(); else - ui_print_page_header (__('Alerts').' » '.__('Configure alert action'), "images/gm_alerts.png", false, "alert_config", true); + ui_print_page_header (__('Alerts') . ' » ' . + __('Configure alert action'), "images/gm_alerts.png", false, + "alert_config", true); } @@ -79,11 +83,14 @@ if ($id) { } // Hidden div with help hint to fill with javascript -html_print_div(array('id' => 'help_alert_macros_hint', 'content' => ui_print_help_icon ('alert_macros', true), 'hidden' => true)); +html_print_div( + array('id' => 'help_alert_macros_hint', + 'content' => ui_print_help_icon ('alert_macros', true), + 'hidden' => true)); $table->id = 'table_macros'; $table->width = '98%'; -if (defined('METACONSOLE')){ +if (defined('METACONSOLE')) { $table->class = 'databox data'; $table->width = '100%'; if ($id) { @@ -150,19 +157,30 @@ $table->data[5][2] = html_print_textarea ('command_recovery_preview', 5, 30, '', $row = 6; for ($i = 1; $i <= 10; $i++) { - $table->data['field' . $i][0] = html_print_image('images/spinner.gif', true); - $table->data['field' . $i][1] = html_print_image('images/spinner.gif', true); - $table->data['field' . $i][2] = html_print_image('images/spinner.gif', true); + $table->data['field' . $i][0] = html_print_image( + 'images/spinner.gif', true); + $table->data['field' . $i][1] = html_print_image( + 'images/spinner.gif', true); + $table->data['field' . $i][2] = html_print_image( + 'images/spinner.gif', true); + // Store the value in a hidden to keep it on first execution - $table->data['field' . $i][1] .= html_print_input_hidden('field' . $i . '_value', + $table->data['field' . $i][1] .= html_print_input_hidden( + 'field' . $i . '_value', !empty($action['field' . $i]) ? - $action['field' . $i] : '', true); - $table->data['field' . $i][2] .= html_print_input_hidden('field' . $i . '_recovery_value', + $action['field' . $i] : '', + true); + $table->data['field' . $i][2] .= html_print_input_hidden( + 'field' . $i . '_recovery_value', !empty($action['field' . $i . '_recovery']) ? - $action['field' . $i . '_recovery'] : '', true); + $action['field' . $i . '_recovery'] : '', + true); } -echo '
'; +echo ''; $table_html = html_print_table ($table, true); //////////////////////////////////////////////////////////////////////// @@ -253,33 +271,37 @@ $(document).ready (function () { render_command_preview (original_command); command_description = js_html_entity_decode (data["description"]); render_command_description(command_description); - + + for (i = 1; i <= 10; i++) { var old_value = ''; var old_recovery_value = ''; var field_row = data["fields_rows"][i]; var $table_macros_field = $('#table_macros-field' + i); - + // If the row is empty, hide it if (field_row == '') { $table_macros_field.hide(); continue; } - + // Only keep the value if is provided from hidden (first time) if (($("[name=field" + i + "_value]").attr('id')) - == ("hidden-field" + i + "_value")) { + == ("hidden-field" + i + "_value")) { + old_value = $("[name=field" + i + "_value]").val(); } if (($("[name=field" + i + "_recovery_value]").attr('id')) - == ("hidden-field" + i + "_recovery_value")) { - old_recovery_value = $("[name=field" + i + "_recovery_value]").val(); + == ("hidden-field" + i + "_recovery_value")) { + + old_recovery_value = + $("[name=field" + i + "_recovery_value]").val(); } - + // Replace the old column with the new $table_macros_field.replaceWith(field_row); - + $("[name=field" + i + "_value]").val(old_value); $("[name=field" + i + "_recovery_value]").val(old_recovery_value); @@ -289,7 +311,8 @@ $(document).ready (function () { $(td_content) .html( - $(td_content).html() + $('#help_alert_macros_hint').html()); + $(td_content).html() + + $('#help_alert_macros_hint').html()); } $table_macros_field.show(); @@ -316,10 +339,16 @@ $(document).ready (function () { render_command_preview(original_command); render_command_recovery_preview(original_command); - $(".fields").keyup (function() { + $(".fields").keyup(function() { render_command_preview(original_command); }); - $(".fields_recovery").keyup (function() { + $(".fields_recovery").keyup(function() { + render_command_recovery_preview(original_command); + }); + $("select.fields").change(function() { + render_command_preview(original_command); + }); + $("select.fields_recovery").change(function() { render_command_recovery_preview(original_command); }); },