Merge branch '688-problema-acl-enterprise-workspace-2-7' into 'develop'

Change sec url string in message and vconsole section - #688 - 2

See merge request !378
This commit is contained in:
vgilc 2017-04-25 16:21:00 +02:00
commit 4b5da69e31
6 changed files with 28 additions and 28 deletions

View File

@ -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'. "); ?></p>
<form action="index.php?sec=reporting&amp;sec2=godmode/reporting/visual_console_builder" method="post">
<form action="index.php?sec=network&amp;sec2=godmode/reporting/visual_console_builder" method="post">
<?php html_print_input_hidden ('edit_layout', 1); ?>
<input type="submit" class="button_task" value="<?php echo __('Create Visual Console'); ?>" />
</form>

View File

@ -51,7 +51,7 @@ $pure = get_parameter('pure', 0);
switch ($action) {
case 'new':
if (!defined('METACONSOLE')) {
echo "<form id='back' method='post' action='index.php?sec=reporting&sec2=godmode/reporting/visual_console_builder&tab=" . $activeTab . "' enctype='multipart/form-data'>";
echo "<form id='back' method='post' action='index.php?sec=network&sec2=godmode/reporting/visual_console_builder&tab=" . $activeTab . "' enctype='multipart/form-data'>";
html_print_input_hidden('action', 'save');
}
else {
@ -63,7 +63,7 @@ switch ($action) {
case 'update':
case 'save':
if (!defined('METACONSOLE')) {
echo "<form id='back' method='post' action='index.php?sec=reporting&sec2=godmode/reporting/visual_console_builder&tab=" . $activeTab . "&id_visual_console=" . $idVisualConsole . "' enctype='multipart/form-data'>";
echo "<form id='back' method='post' action='index.php?sec=network&sec2=godmode/reporting/visual_console_builder&tab=" . $activeTab . "&id_visual_console=" . $idVisualConsole . "' enctype='multipart/form-data'>";
html_print_input_hidden('action', 'update');
}
else {
@ -74,7 +74,7 @@ switch ($action) {
break;
case 'edit':
if (!defined('METACONSOLE')) {
echo "<form id='back' method='post' action='index.php?sec=reporting&sec2=godmode/reporting/visual_console_builder&tab=" . $activeTab . "&id_visual_console=" . $idVisualConsole . "' enctype='multipart/form-data'>";
echo "<form id='back' method='post' action='index.php?sec=network&sec2=godmode/reporting/visual_console_builder&tab=" . $activeTab . "&id_visual_console=" . $idVisualConsole . "' enctype='multipart/form-data'>";
html_print_input_hidden('action', 'update');
}
else {

View File

@ -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 '<form method="post" action="index.php?sec=reporting&sec2=godmode/reporting/visual_console_builder&tab=' . $activeTab . '&id_visual_console=' . $visualConsole["id"] . '">';
echo '<form method="post" action="index.php?sec=network&sec2=godmode/reporting/visual_console_builder&tab=' . $activeTab . '&id_visual_console=' . $visualConsole["id"] . '">';
}
else {
echo "<form method='post' action='index.php?operation=edit_visualmap&sec=screen&sec2=screens/screens&action=visualmap&pure=0&tab=list_elements&id_visual_console=" . $idVisualConsole . "'>";
@ -522,7 +522,7 @@ echo '</form>';
// 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"];

View File

@ -345,7 +345,7 @@ if (is_metaconsole()) {
}
else {
echo '<form method="post"
action="index.php?sec=reporting&sec2=godmode/reporting/visual_console_builder&tab=' . $activeTab . '&id_visual_console=' . $visualConsole["id"] . '"
action="index.php?sec=network&sec2=godmode/reporting/visual_console_builder&tab=' . $activeTab . '&id_visual_console=' . $visualConsole["id"] . '"
onsubmit="if (! confirm(\''.__('Are you sure to add many elements\nin visual map?').'\')) return false; else return check_fields();">';
}

View File

@ -31,15 +31,15 @@ $reply = get_parameter('reply', 0);
$show_sent = get_parameter('show_sent', 0);
$buttons['message_list'] = array('active' => false,
'text' => '<a href="index.php?sec=workspace&sec2=operation/messages/message_list">' .
'text' => '<a href="index.php?sec=message_list&sec2=operation/messages/message_list">' .
html_print_image("images/email_inbox.png", true, array ("title" => __('Received messages'))) .'</a>');
$buttons['sent_messages'] = array('active' => false,
'text' => '<a href="index.php?sec=workspace&sec2=operation/messages/message_list&amp;show_sent=1">' .
'text' => '<a href="index.php?sec=message_list&sec2=operation/messages/message_list&amp;show_sent=1">' .
html_print_image("images/email_outbox.png", true, array ("title" => __('Sent messages'))) .'</a>');
$buttons['create_message'] = array('active' => true,
'text' => '<a href="index.php?sec=workspace&sec2=operation/messages/message_edit">' .
'text' => '<a href="index.php?sec=message_list&sec2=operation/messages/message_edit">' .
html_print_image("images/new_message.png", true, array ("title" => __('Create message'))) .'</a>');
// 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 '<form method="post" action="index.php?sec=workspace&amp;sec2=operation/messages/message_list&show_sent=1&amp;delete_message=1&amp;id='.$message_id.'">';
echo '<form method="post" action="index.php?sec=message_list&amp;sec2=operation/messages/message_list&show_sent=1&amp;delete_message=1&amp;id='.$message_id.'">';
html_print_table($table);
echo "<div style=' text-align: right; width:" . $table->width . "'>";
html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
echo "</div>";
echo "</form>";
echo '<form method="post" action="index.php?sec=workspace&sec2=operation/messages/message_edit&amp;new_msg=1&amp;reply=1">';
echo '<form method="post" action="index.php?sec=message_list&sec2=operation/messages/message_edit&amp;new_msg=1&amp;reply=1">';
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 '<form method="post" action="index.php?sec=workspace&amp;sec2=operation/messages/message_edit&amp;new_msg=1">';
echo '<form method="post" action="index.php?sec=message_list&amp;sec2=operation/messages/message_edit&amp;new_msg=1">';
html_print_table($table);
echo '<div class="action-buttons" style="width: '.$table->width.'">';

View File

@ -28,15 +28,15 @@ if ($show_sent) {
}
$buttons['message_list'] = array('active' => $active_list,
'text' => '<a href="index.php?sec=workspace&sec2=operation/messages/message_list">' .
'text' => '<a href="index.php?sec=message_list&sec2=operation/messages/message_list">' .
html_print_image("images/email_inbox.png", true, array ("title" => __('Received messages'))) .'</a>');
$buttons['sent_messages'] = array('active' => $active_sent,
'text' => '<a href="index.php?sec=workspace&sec2=operation/messages/message_list&amp;show_sent=1">' .
'text' => '<a href="index.php?sec=message_list&sec2=operation/messages/message_list&amp;show_sent=1">' .
html_print_image("images/email_outbox.png", true, array ("title" => __('Sent messages'))) .'</a>');
$buttons['create_message'] = array('active' => false,
'text' => '<a href="index.php?sec=workspace&sec2=operation/messages/message_edit">' .
'text' => '<a href="index.php?sec=message_list&sec2=operation/messages/message_edit">' .
html_print_image("images/new_message.png", true, array ("title" => __('Create message'))) .'</a>');
if (!is_ajax ()) {
@ -132,24 +132,24 @@ else {
$data[0] = '';
if ($message["status"] == 1) {
if ($show_sent) {
$data[0] .= '<a href="index.php?sec=workspace&amp;sec2=operation/messages/message_edit&read_message=1&amp;show_sent=1&amp;id_message='.$message_id.'">';
$data[0] .= '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_edit&read_message=1&amp;show_sent=1&amp;id_message='.$message_id.'">';
$data[0] .= html_print_image ("images/email_open.png", true, array ("border" => 0, "title" => __('Click to read')));
$data[0] .= '</a>';
}
else {
$data[0] .= '<a href="index.php?sec=workspace&amp;sec2=operation/messages/message_list&amp;mark_unread=1&amp;id_message='.$message_id.'">';
$data[0] .= '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_list&amp;mark_unread=1&amp;id_message='.$message_id.'">';
$data[0] .= html_print_image ("images/email_open.png", true, array ("border" => 0, "title" => __('Mark as unread')));
$data[0] .= '</a>';
}
}
else {
if ($show_sent) {
$data[0] .= '<a href="index.php?sec=workspace&amp;sec2=operation/messages/message_edit&amp;read_message=1&amp;show_sent=1&amp;id_message='.$message_id.'">';
$data[0] .= '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_edit&amp;read_message=1&amp;show_sent=1&amp;id_message='.$message_id.'">';
$data[0] .= html_print_image ("images/email.png", true, array ("border" => 0, "title" => __('Message unread - click to read')));
$data[0] .= '</a>';
}
else {
$data[0] .= '<a href="index.php?sec=workspace&amp;sec2=operation/messages/message_edit&amp;read_message=1&amp;id_message='.$message_id.'">';
$data[0] .= '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_edit&amp;read_message=1&amp;id_message='.$message_id.'">';
$data[0] .= html_print_image ("images/email.png", true, array ("border" => 0, "title" => __('Message unread - click to read')));
$data[0] .= '</a>';
}
@ -171,10 +171,10 @@ else {
}
if ($show_sent) {
$data[2] = '<a href="index.php?sec=workspace&amp;sec2=operation/messages/message_edit&amp;read_message=1&show_sent=1&amp;id_message='.$message_id.'">';
$data[2] = '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_edit&amp;read_message=1&show_sent=1&amp;id_message='.$message_id.'">';
}
else {
$data[2] = '<a href="index.php?sec=workspace&amp;sec2=operation/messages/message_edit&amp;read_message=1&amp;id_message='.$message_id.'">';
$data[2] = '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_edit&amp;read_message=1&amp;id_message='.$message_id.'">';
}
if ($message["subject"] == "") {
$data[2] .= __('No Subject');
@ -189,13 +189,13 @@ else {
array ("prominent" => "timestamp"));
if ($show_sent) {
$data[4] = '<a href="index.php?sec=workspace&amp;sec2=operation/messages/message_list&show_sent=1&delete_message=1&id='.$message_id.'"
$data[4] = '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_list&show_sent=1&delete_message=1&id='.$message_id.'"
onClick="javascript:if (!confirm(\''.__('Are you sure?').'\')) return false;">' .
html_print_image ('images/cross.png', true, array("title" => __('Delete'))) . '</a>'.
html_print_checkbox_extended ('delete_multiple[]', $message_id, false, false, '', 'class="check_delete"', true);
}
else {
$data[4] = '<a href="index.php?sec=workspace&amp;sec2=operation/messages/message_list&delete_message=1&id='.$message_id.'"
$data[4] = '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_list&delete_message=1&id='.$message_id.'"
onClick="javascript:if (!confirm(\''.__('Are you sure?').'\')) return false;">' .
html_print_image ('images/cross.png', true, array("title" => __('Delete'))) . '</a>'.
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 '<form method="post" action="index.php?sec=workspace&amp;sec2=operation/messages/message_list&show_sent=1">';
echo '<form method="post" action="index.php?sec=message_list&amp;sec2=operation/messages/message_list&show_sent=1">';
}
else {
echo '<form method="post" action="index.php?sec=workspace&amp;sec2=operation/messages/message_list">';
echo '<form method="post" action="index.php?sec=message_list&amp;sec2=operation/messages/message_list">';
}
html_print_input_hidden('multiple_delete', 1);
html_print_table($table);
@ -222,7 +222,7 @@ if (!empty($messages)) {
}
echo "<div style='float: right;'>";
echo '<form method="post" style="float:right;" action="index.php?sec=workspace&sec2=operation/messages/message_edit">';
echo '<form method="post" style="float:right;" action="index.php?sec=message_list&sec2=operation/messages/message_edit">';
html_print_submit_button (__('Create message'), 'create', false, 'class="sub next" style="margin-right:5px;"');
echo "</form>";
echo "</div>";