From ee128242bc49db71cab8153b68fd654226872aab Mon Sep 17 00:00:00 2001 From: enriquecd Date: Mon, 17 Apr 2017 18:51:59 +0200 Subject: [PATCH 1/2] Change sec url string in message and vconsole section - #688 - 2 --- .../reporting/visual_console_builder.data.php | 6 ++-- .../operation/messages/message_edit.php | 12 ++++---- .../operation/messages/message_list.php | 28 +++++++++---------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pandora_console/godmode/reporting/visual_console_builder.data.php b/pandora_console/godmode/reporting/visual_console_builder.data.php index 5555618ac3..d9832ab514 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.data.php +++ b/pandora_console/godmode/reporting/visual_console_builder.data.php @@ -51,7 +51,7 @@ $pure = get_parameter('pure', 0); switch ($action) { case 'new': if (!defined('METACONSOLE')) { - echo "
"; + echo ""; html_print_input_hidden('action', 'save'); } else { @@ -63,7 +63,7 @@ switch ($action) { case 'update': case 'save': if (!defined('METACONSOLE')) { - echo ""; + echo ""; html_print_input_hidden('action', 'update'); } else { @@ -74,7 +74,7 @@ switch ($action) { break; case 'edit': if (!defined('METACONSOLE')) { - echo ""; + echo ""; html_print_input_hidden('action', 'update'); } else { diff --git a/pandora_console/operation/messages/message_edit.php b/pandora_console/operation/messages/message_edit.php index 1ee88715ef..ce1abf91a4 100644 --- a/pandora_console/operation/messages/message_edit.php +++ b/pandora_console/operation/messages/message_edit.php @@ -31,15 +31,15 @@ $reply = get_parameter('reply', 0); $show_sent = get_parameter('show_sent', 0); $buttons['message_list'] = array('active' => false, - 'text' => '' . + 'text' => '' . html_print_image("images/email_inbox.png", true, array ("title" => __('Received messages'))) .''); $buttons['sent_messages'] = array('active' => false, - 'text' => '' . + 'text' => '' . html_print_image("images/email_outbox.png", true, array ("title" => __('Sent messages'))) .''); $buttons['create_message'] = array('active' => true, - 'text' => '' . + 'text' => '' . html_print_image("images/new_message.png", true, array ("title" => __('Create message'))) .''); // Header @@ -103,14 +103,14 @@ if ($read_message) { //Start the message much like an e-mail reply $new_msg = "\n\n\nOn ".date ($config["date_format"], $message["timestamp"]).' '.$user_name.' '.__('wrote').":\n\n".$message["mensaje"]; - echo ''; + echo ''; html_print_table($table); echo "
"; html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"'); echo "
"; echo "
"; - echo '
'; + echo ''; html_print_input_hidden ("dst_user", $message["id_usuario_origen"]); html_print_input_hidden ("subject", $new_subj); html_print_input_hidden ("message", $new_msg); @@ -210,7 +210,7 @@ $table->data[2][1] = html_print_input_text ("subject", $subject, '', 50, 70, tru $table->data[3][0] = __('Message'); $table->data[3][1] = html_print_textarea ("message", 15, 255, $message, '', true); -echo ''; +echo ''; html_print_table($table); echo '
'; diff --git a/pandora_console/operation/messages/message_list.php b/pandora_console/operation/messages/message_list.php index a1e3a22c9c..19e1dab023 100644 --- a/pandora_console/operation/messages/message_list.php +++ b/pandora_console/operation/messages/message_list.php @@ -28,15 +28,15 @@ if ($show_sent) { } $buttons['message_list'] = array('active' => $active_list, - 'text' => '' . + 'text' => '' . html_print_image("images/email_inbox.png", true, array ("title" => __('Received messages'))) .''); $buttons['sent_messages'] = array('active' => $active_sent, - 'text' => '' . + 'text' => '' . html_print_image("images/email_outbox.png", true, array ("title" => __('Sent messages'))) .''); $buttons['create_message'] = array('active' => false, - 'text' => '' . + 'text' => '' . html_print_image("images/new_message.png", true, array ("title" => __('Create message'))) .''); if (!is_ajax ()) { @@ -132,24 +132,24 @@ else { $data[0] = ''; if ($message["status"] == 1) { if ($show_sent) { - $data[0] .= ''; + $data[0] .= ''; $data[0] .= html_print_image ("images/email_open.png", true, array ("border" => 0, "title" => __('Click to read'))); $data[0] .= ''; } else { - $data[0] .= ''; + $data[0] .= ''; $data[0] .= html_print_image ("images/email_open.png", true, array ("border" => 0, "title" => __('Mark as unread'))); $data[0] .= ''; } } else { if ($show_sent) { - $data[0] .= ''; + $data[0] .= ''; $data[0] .= html_print_image ("images/email.png", true, array ("border" => 0, "title" => __('Message unread - click to read'))); $data[0] .= ''; } else { - $data[0] .= ''; + $data[0] .= ''; $data[0] .= html_print_image ("images/email.png", true, array ("border" => 0, "title" => __('Message unread - click to read'))); $data[0] .= ''; } @@ -171,10 +171,10 @@ else { } if ($show_sent) { - $data[2] = ''; + $data[2] = ''; } else { - $data[2] = ''; + $data[2] = ''; } if ($message["subject"] == "") { $data[2] .= __('No Subject'); @@ -189,13 +189,13 @@ else { array ("prominent" => "timestamp")); if ($show_sent) { - $data[4] = '' . html_print_image ('images/cross.png', true, array("title" => __('Delete'))) . ''. html_print_checkbox_extended ('delete_multiple[]', $message_id, false, false, '', 'class="check_delete"', true); } else { - $data[4] = '' . html_print_image ('images/cross.png', true, array("title" => __('Delete'))) . ''. html_print_checkbox_extended ('delete_multiple[]', $message_id, false, false, '', 'class="check_delete"', true); @@ -207,10 +207,10 @@ else { if (!empty($messages)) { if ($show_sent) { - echo ''; + echo ''; } else { - echo ''; + echo ''; } html_print_input_hidden('multiple_delete', 1); html_print_table($table); @@ -222,7 +222,7 @@ if (!empty($messages)) { } echo "
"; - echo ''; + echo ''; html_print_submit_button (__('Create message'), 'create', false, 'class="sub next" style="margin-right:5px;"'); echo ""; echo "
"; From 1348256d1a6d34d5363f0aca2116960a4b4d7c34 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Mon, 17 Apr 2017 19:30:44 +0200 Subject: [PATCH 2/2] Change sec url string in message section - #684 /4 --- pandora_console/general/firts_task/map_builder.php | 2 +- .../godmode/reporting/visual_console_builder.elements.php | 6 +++--- .../godmode/reporting/visual_console_builder.wizard.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pandora_console/general/firts_task/map_builder.php b/pandora_console/general/firts_task/map_builder.php index 40eee2a215..26409ce803 100755 --- a/pandora_console/general/firts_task/map_builder.php +++ b/pandora_console/general/firts_task/map_builder.php @@ -38,7 +38,7 @@ if ($vconsoles_write || $vconsoles_manage) { Within the new visual console, we've been successful in imitating the sensation and touch of a drawing application like GIMP. We've also simplified the editor by dividing it into several subject-matter tabs named 'Data', 'Preview', 'Wizard', 'List of Elements' and 'Editor'. The elements the Pandora FMS Visual Map was designed to handle are 'static image', 'percentage bar', 'module graph' and 'simple value'. "); ?>

-
+
diff --git a/pandora_console/godmode/reporting/visual_console_builder.elements.php b/pandora_console/godmode/reporting/visual_console_builder.elements.php index c5df08c594..12b38df2b3 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.elements.php +++ b/pandora_console/godmode/reporting/visual_console_builder.elements.php @@ -291,7 +291,7 @@ foreach ($layoutDatas as $layoutData) { //Delete row button if (!defined('METACONSOLE')) { $url_delete = "index.php?" . - "sec=reporting&" . + "sec=network&" . "sec2=godmode/reporting/visual_console_builder&" . "tab=" . $activeTab . "&" . "action=delete&" . @@ -496,7 +496,7 @@ foreach ($layoutDatas as $layoutData) { $pure = get_parameter('pure', 0); if (!defined('METACONSOLE')) { - echo '
'; + echo ''; } else { echo ""; @@ -522,7 +522,7 @@ echo '
'; // Form for multiple delete if (!defined('METACONSOLE')) { $url_multiple_delete = "index.php?" . - "sec=reporting&" . + "sec=network&" . "sec2=godmode/reporting/visual_console_builder&" . "tab=" . $activeTab . "&" . "id_visual_console=" . $visualConsole["id"]; diff --git a/pandora_console/godmode/reporting/visual_console_builder.wizard.php b/pandora_console/godmode/reporting/visual_console_builder.wizard.php index 278a74d364..67273ed795 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.wizard.php +++ b/pandora_console/godmode/reporting/visual_console_builder.wizard.php @@ -345,7 +345,7 @@ if (is_metaconsole()) { } else { echo '
'; }