2012-04-02 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_menu.php extensions/users_connected.php, operation/incidents/incident.php, operation/incidents/incident_detail.php, operation/incidents/incident_statistics.php, operation/menu.php, operation/integria_incidents/incident.incident.php, operation/integria_incidents/incident.files.php, operation/integria_incidents/incident.list.php, operation/messages/message_edit.php, operation/messages/message_list.php: Create new menu item called workspace. * godmode/reporting/map_builder.php operation/visual_console/render_view.php: Fixed some errors related to new menu structure. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5869 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
darode
parent
0af021c7b8
commit
e410f3c6cc
|
|
@ -1,3 +1,21 @@
|
|||
2012-04-02 Dario Rodriguez <dario.rodriguez@artica.es>
|
||||
|
||||
* include/functions_menu.php
|
||||
extensions/users_connected.php,
|
||||
operation/incidents/incident.php,
|
||||
operation/incidents/incident_detail.php,
|
||||
operation/incidents/incident_statistics.php,
|
||||
operation/menu.php,
|
||||
operation/integria_incidents/incident.incident.php,
|
||||
operation/integria_incidents/incident.files.php,
|
||||
operation/integria_incidents/incident.list.php,
|
||||
operation/messages/message_edit.php,
|
||||
operation/messages/message_list.php: Create new menu item called
|
||||
workspace.
|
||||
* godmode/reporting/map_builder.php
|
||||
operation/visual_console/render_view.php: Fixed some errors related to
|
||||
new menu structure.
|
||||
|
||||
2012-04-02 Sergio Martin <sergio.martin@artica.es>
|
||||
|
||||
* operation/reporting/reporting_xml.php: Added xml export
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ function users_extension_main_god ($god = true) {
|
|||
}
|
||||
|
||||
// Header
|
||||
ui_print_page_header (__("Users connected"), "images/extensions.png", false, "", $god);
|
||||
ui_print_page_header (__("Users connected"), "images/group.png", false, "", $god);
|
||||
|
||||
switch ($config["dbtype"]) {
|
||||
case "mysql":
|
||||
|
|
@ -92,7 +92,7 @@ extensions_add_godmode_menu_option (__('Users connected'), 'UM','gusuarios',"use
|
|||
|
||||
if (isset($config["id_user"])) {
|
||||
if (check_acl ($config["id_user"], 0, "UM")) {
|
||||
extensions_add_operation_menu_option(__('Users connected'), 'usuarios',"users/icon.png");
|
||||
extensions_add_operation_menu_option(__('Users connected'), 'workspace',"users/icon.png");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ ui_print_page_header (__('Reporting').' » '.__('Visual Console'), "images/
|
|||
$id_layout = (int) get_parameter ('id_layout');
|
||||
$copy_layout = (bool) get_parameter ('copy_layout');
|
||||
$delete_layout = (bool) get_parameter ('delete_layout');
|
||||
$refr = (int) get_parameter('refr');
|
||||
|
||||
if ($delete_layout) {
|
||||
db_process_sql_delete ('tlayout_data', array ('id_layout' => $id_layout));
|
||||
|
|
|
|||
|
|
@ -234,8 +234,8 @@ function menu_print_menu (&$menu) {
|
|||
$extensionInMenu = '';
|
||||
}
|
||||
|
||||
if (isset ($sub["title"]) || $selected) {
|
||||
$title = ' title="' . $sub["title"] . ' "';
|
||||
if (isset ($sub["text"]) || $selected) {
|
||||
$title = ' title="' . $sub["text"] . ' "';
|
||||
} else {
|
||||
$title = '';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -200,7 +200,7 @@ if (empty ($result)) {
|
|||
$count = 0;
|
||||
}
|
||||
|
||||
echo '<form name="visualizacion" method="post" action="index.php?sec=incidencias&sec2=operation/incidents/incident">';
|
||||
echo '<form name="visualizacion" method="post" action="index.php?sec=workspace&sec2=operation/incidents/incident">';
|
||||
|
||||
echo '<table class="databox" cellpadding="4" cellspacing="4" width="95%"><tr>
|
||||
<td valign="middle"><h3>'.__('Filter').'</h3>';
|
||||
|
|
@ -265,7 +265,7 @@ if ($count < 1) {
|
|||
echo '<div class="nf">'.__('No incidents match your search filter').'</div><br />';
|
||||
} else {
|
||||
// TOTAL incidents
|
||||
$url = "index.php?sec=incidencias&sec2=operation/incidents/incident";
|
||||
$url = "index.php?sec=workspace&sec2=operation/incidents/incident";
|
||||
|
||||
$estado = -1;
|
||||
|
||||
|
|
@ -325,14 +325,14 @@ if ($count < 1) {
|
|||
|
||||
$data = array();
|
||||
|
||||
$data[0] = '<a href="index.php?sec=incidencias&sec2=operation/incidents/incident_detail&id='.$row["id_incidencia"].'">'.$row["id_incidencia"].'</a>';
|
||||
$data[0] = '<a href="index.php?sec=workspace&sec2=operation/incidents/incident_detail&id='.$row["id_incidencia"].'">'.$row["id_incidencia"].'</a>';
|
||||
$attach = incidents_get_attach ($row["id_incidencia"]);
|
||||
|
||||
if (!empty ($attach))
|
||||
$data[0] .= ' '.html_print_image ("images/attachment.png", true, array ("style" => "align:middle;"));
|
||||
|
||||
$data[1] = incidents_print_status_img ($row["estado"], true);
|
||||
$data[2] = '<a href="index.php?sec=incidencias&sec2=operation/incidents/incident_detail&id='.$row["id_incidencia"].'">'.ui_print_truncate_text(io_safe_output($row["titulo"]),45).'</a>';
|
||||
$data[2] = '<a href="index.php?sec=workspace&sec2=operation/incidents/incident_detail&id='.$row["id_incidencia"].'">'.ui_print_truncate_text(io_safe_output($row["titulo"]),45).'</a>';
|
||||
$data[3] = incidents_print_priority_img ($row["prioridad"], true);
|
||||
$data[4] = ui_print_group_icon ($row["id_grupo"], true);
|
||||
$data[5] = ui_print_timestamp ($row["actualizacion"], true);
|
||||
|
|
@ -366,7 +366,7 @@ if ($count < 1) {
|
|||
echo '<br><br>';
|
||||
if (check_acl ($config["id_user"], 0, "IW")) {
|
||||
echo '<div style="text-align:right; float:right; padding-right: 2px;">';
|
||||
echo '<form method="post" action="index.php?sec=incidencias&sec2=operation/incidents/incident_detail&insert_form=1">';
|
||||
echo '<form method="post" action="index.php?sec=workspace&sec2=operation/incidents/incident_detail&insert_form=1">';
|
||||
html_print_submit_button (__('Create incident'), 'crt', false, 'class="sub next"');
|
||||
echo '</form>';
|
||||
echo '</div>';
|
||||
|
|
|
|||
|
|
@ -224,11 +224,11 @@ echo "<script type=\"text/javascript\">
|
|||
|
||||
if (isset ($id_inc)) { //If $id_inc is set (when $_GET["id"] is set, not $_GET["insert_form"]
|
||||
ui_print_page_header (__('Incident details'). ' #'.$id_inc, "images/book_edit.png", false, "", false, "");
|
||||
echo '<form name="accion_form" method="POST" action="index.php?sec=incidencias&sec2=operation/incidents/incident&action=update">';
|
||||
echo '<form name="accion_form" method="POST" action="index.php?sec=workspace&sec2=operation/incidents/incident&action=update">';
|
||||
echo '<input type="hidden" name="id_inc" value="'.$id_inc.'">';
|
||||
} else {
|
||||
ui_print_page_header (__('Create incident'), "images/book_edit.png", false, "", false, "");
|
||||
echo '<form name="accion_form" method="POST" action="index.php?sec=incidencias&sec2=operation/incidents/incident&action=insert">';
|
||||
echo '<form name="accion_form" method="POST" action="index.php?sec=workspace&sec2=operation/incidents/incident&action=insert">';
|
||||
}
|
||||
|
||||
echo '<table cellpadding="4" cellspacing="4" class="databox" width="98%">';
|
||||
|
|
@ -355,7 +355,7 @@ if (isset ($id_inc)) {
|
|||
echo __('Add note');
|
||||
echo '</a>';
|
||||
echo '</div><div>';
|
||||
echo '<form id="add_note" name="nota" method="POST" action="index.php?sec=incidencias&sec2=operation/incidents/incident_detail&insertar_nota=1&id='.$id_inc.'"><h4>'.__('Add note').'</h4>';
|
||||
echo '<form id="add_note" name="nota" method="POST" action="index.php?sec=workspace&sec2=operation/incidents/incident_detail&insertar_nota=1&id='.$id_inc.'"><h4>'.__('Add note').'</h4>';
|
||||
echo '<table cellpadding="4" cellspacing="4" class="databox" width="98%">
|
||||
<tr><td class="datos2"><textarea name="nota" rows="5" cols="70" style="height: 100px;"></textarea></td>
|
||||
<td valign="bottom"><input name="addnote" type="submit" class="sub wand" value="'.__('Add').'"></td></tr>
|
||||
|
|
@ -387,7 +387,7 @@ if (isset ($id_inc)) {
|
|||
|
||||
if (!empty ($table->data)) {
|
||||
echo "<h4>".__('Notes attached to incident').'</h4>';
|
||||
echo '<form method="POST" action="index.php?sec=incidencias&sec2=operation/incidents/incident_detail&id='.$id_inc.'">';
|
||||
echo '<form method="POST" action="index.php?sec=workspace&sec2=operation/incidents/incident_detail&id='.$id_inc.'">';
|
||||
html_print_table ($table);
|
||||
echo '</form>';
|
||||
}
|
||||
|
|
@ -436,7 +436,7 @@ if (isset ($id_inc)) {
|
|||
|
||||
if (!empty ($table->data)) {
|
||||
echo "<h4>".__('Attached files')."</h4>";
|
||||
echo '<form method="POST" action="index.php?sec=incidencias&sec2=operation/incidents/incident_detail&id='.$id_inc.'">';
|
||||
echo '<form method="POST" action="index.php?sec=workspace&sec2=operation/incidents/incident_detail&id='.$id_inc.'">';
|
||||
html_print_table ($table);
|
||||
echo '</form>';
|
||||
}
|
||||
|
|
@ -457,7 +457,7 @@ if (isset ($id_inc)) {
|
|||
echo '</a>';
|
||||
echo '</div>';
|
||||
|
||||
echo '<div><form method="post" id="file_control" action="index.php?sec=incidencias&sec2=operation/incidents/incident_detail&id='.$id_inc.'&upload_file=1" enctype="multipart/form-data"><h4>'.__('Add attachment').'</h4>';
|
||||
echo '<div><form method="post" id="file_control" action="index.php?sec=workspace&sec2=operation/incidents/incident_detail&id='.$id_inc.'&upload_file=1" enctype="multipart/form-data"><h4>'.__('Add attachment').'</h4>';
|
||||
echo '<table cellpadding="4" cellspacing="3" class="databox" width="98%">
|
||||
<tr><td class="datos">'.__('Filename').'</td><td class="datos"><input type="file" name="userfile" value="userfile" class="sub" size="40" /></td></tr>
|
||||
<tr><td class="datos2">'.__('Description').'</td><td class="datos2" colspan="3"><input type="text" name="file_description" size="47"></td></tr>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ if (! check_acl ($config['id_user'], 0, "IR") == 1) {
|
|||
exit;
|
||||
}
|
||||
|
||||
ui_print_page_header (__('Statistics'), "images/book_edit.png", false, "", false, "");
|
||||
ui_print_page_header (__('Incidents')." » ".__('Statistics'), "images/book_edit.png", false, "", false, "");
|
||||
|
||||
echo '<table width="90%">
|
||||
<tr><td valign="top"><h3>'.__('Incidents by status').'</h3>';
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ foreach($files as $value) {
|
|||
}
|
||||
$table->data[$row][2] = $value['description'];
|
||||
$table->data[$row][3] = $value['size'];
|
||||
$table->data[$row][4] = "<a href='index.php?sec=incidencias&sec2=operation/integria_incidents/incident&tab=files&id_incident=".$value['id_incidencia']."&delete_file=".$value['id_attachment']."'>".html_print_image("images/cross.png", true, array('title' => __('Delete file')))."</a>";
|
||||
$table->data[$row][4] = "<a href='index.php?sec=workspace&sec2=operation/integria_incidents/incident&tab=files&id_incident=".$value['id_incidencia']."&delete_file=".$value['id_attachment']."'>".html_print_image("images/cross.png", true, array('title' => __('Delete file')))."</a>";
|
||||
$row++;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ if(isset($result['id_incidencia'])) {
|
|||
echo "</form>";
|
||||
}
|
||||
else {
|
||||
echo "<form method='post' action='index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=incident'>";
|
||||
echo "<form method='post' action='index.php?login=1&sec=workspace&sec2=operation/integria_incidents/incident&tab=incident'>";
|
||||
html_print_table($table);
|
||||
html_print_submit_button(__('Create'), 'submit_button');
|
||||
html_print_input_hidden('tab', 'incident');
|
||||
|
|
|
|||
|
|
@ -124,9 +124,9 @@ foreach ($incidents as $row) {
|
|||
|
||||
$data = array();
|
||||
|
||||
$data[0] = '<a href="index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=incident&id_incident='.$row["id_incidencia"].'">'.$row["id_incidencia"].'</a>';
|
||||
$data[0] = '<a href="index.php?login=1&sec=workspace&sec2=operation/integria_incidents/incident&tab=incident&id_incident='.$row["id_incidencia"].'">'.$row["id_incidencia"].'</a>';
|
||||
//$data[1] = "";
|
||||
$data[2] = '<a href="index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=incident&id_incident='.$row["id_incidencia"].'">'.substr(io_safe_output($row["titulo"]),0,45).'</a>';
|
||||
$data[2] = '<a href="index.php?login=1&sec=workspace&sec2=operation/integria_incidents/incident&tab=incident&id_incident='.$row["id_incidencia"].'">'.substr(io_safe_output($row["titulo"]),0,45).'</a>';
|
||||
$data[3] = $groups[$row["id_grupo"]];
|
||||
$data[4] = $status[$row["estado"]]."<br/><i>".$resolutions[$row["resolution"]]."</i>";
|
||||
$data[5] = incidents_print_priority_img ($row["prioridad"], true);
|
||||
|
|
@ -134,7 +134,7 @@ foreach ($incidents as $row) {
|
|||
$data[7] = $row["workunits_hours"]." ".__('Hours')."<br/>".$row["workunits_count"]." ".__('Workunits');
|
||||
$data[8] = $row["id_creator"];
|
||||
$data[9] = $row["id_usuario"];
|
||||
$data[10] = "<a href='index.php?sec=incidencias&sec2=operation/integria_incidents/incident&delete_incident=".$row['id_incidencia']."'>".html_print_image("images/cross.png", true, array('title' => __('Delete incident')))."</a><a href='index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=incident&id_incident=".$row["id_incidencia"]."'>".html_print_image("images/config.png", true, array('title' => __('View incident details')))."</a>";
|
||||
$data[10] = "<a href='index.php?sec=workspace&sec2=operation/integria_incidents/incident&delete_incident=".$row['id_incidencia']."'>".html_print_image("images/cross.png", true, array('title' => __('Delete incident')))."</a><a href='index.php?login=1&sec=workspace&sec2=operation/integria_incidents/incident&tab=incident&id_incident=".$row["id_incidencia"]."'>".html_print_image("images/config.png", true, array('title' => __('View incident details')))."</a>";
|
||||
|
||||
array_push ($table->data, $data);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -83,6 +83,7 @@ if (check_acl ($config['id_user'], 0, "AR")) {
|
|||
$menu["reporting"]["text"] = __('Reporting');
|
||||
$menu["reporting"]["sec2"] = "godmode/reporting/map_builder";
|
||||
$menu["reporting"]["id"] = "oper-reporting";
|
||||
$menu["reporting"]["refr"] = 60;
|
||||
|
||||
$sub = array ();
|
||||
|
||||
|
|
@ -198,28 +199,6 @@ if (check_acl ($config['id_user'], 0, "AR")) {
|
|||
//END GIS Maps
|
||||
}
|
||||
|
||||
//Incidents
|
||||
if (check_acl ($config['id_user'], 0, "IR") == 1) {
|
||||
$temp_sec2 = $sec2;
|
||||
if($config['integria_enabled']) {
|
||||
$sec2 = "operation/integria_incidents/incident";
|
||||
}
|
||||
else {
|
||||
$sec2 = "operation/incidents/incident";
|
||||
}
|
||||
|
||||
$menu["incidencias"]["text"] = __('Manage incidents');
|
||||
$menu["incidencias"]["sec2"] = $sec2;
|
||||
$menu["incidencias"]["refr"] = 0;
|
||||
$menu["incidencias"]["id"] = "oper-incidents";
|
||||
|
||||
$sub = array ();
|
||||
$sub["operation/incidents/incident_statistics"]["text"] = __('Statistics');
|
||||
|
||||
$menu["incidencias"]["sub"] = $sub;
|
||||
$sec2 = $temp_sec2;
|
||||
}
|
||||
|
||||
// Rest of options, all with AR privilege (or should events be with incidents?)
|
||||
if (check_acl ($config['id_user'], 0, "AR")) {
|
||||
// Events
|
||||
|
|
@ -269,13 +248,52 @@ if (check_acl ($config['id_user'], 0, "AR")) {
|
|||
$menu["eventos"]["sub"] = $sub;
|
||||
}
|
||||
|
||||
//Workspace
|
||||
$menu["workspace"]["text"] = __('Workspace');
|
||||
$menu["workspace"]["sec2"] = "operation/users/user_edit";
|
||||
$menu["workspace"]["id"] = "oper-users";
|
||||
|
||||
// ANY user can view him/herself !
|
||||
// Users
|
||||
$menu["usuarios"]["text"] = __('Edit my user');
|
||||
$menu["usuarios"]["sec2"] = "operation/users/user_edit";
|
||||
$menu["usuarios"]["id"] = "oper-users";
|
||||
$sub = array();
|
||||
$sub["operation/users/user_edit"]["text"] = __('Edit my user');
|
||||
$sub["operation/users/user_edit"]["refr"] = 0;
|
||||
|
||||
//End of Users
|
||||
//Incidents
|
||||
if (check_acl ($config['id_user'], 0, "IR") == 1) {
|
||||
$temp_sec2 = $sec2;
|
||||
if($config['integria_enabled']) {
|
||||
$sec2 = "operation/integria_incidents/incident";
|
||||
}
|
||||
else {
|
||||
$sec2 = "operation/incidents/incident";
|
||||
}
|
||||
|
||||
$sub[$sec2]["text"] = __('Incidents');
|
||||
$sub[$sec2]["refr"] = 0;
|
||||
$sub[$sec2]["subsecs"] = array("operation/incidents/incident_detail",
|
||||
"operation/integria_incidents");
|
||||
|
||||
$sub2 = array ();
|
||||
$sub2["operation/incidents/incident_statistics"]["text"] = __('Statistics');
|
||||
|
||||
$sub[$sec2]["sub2"] = $sub2;
|
||||
$sec2 = $temp_sec2;
|
||||
}
|
||||
|
||||
if (check_acl ($config['id_user'], 0, "AR")) {
|
||||
|
||||
// Messages
|
||||
$sub["operation/messages/message_list"]["text"] = __('Messages');
|
||||
$sub["operation/messages/message"]["refr"] = 0;
|
||||
$sub["operation/messages/message"]["subsecs"] = array("operation/messages/message_edit",
|
||||
"operation/messages/message_list");
|
||||
|
||||
}
|
||||
|
||||
$menu["workspace"]["sub"] = $sub;
|
||||
|
||||
//End Workspace
|
||||
|
||||
if (check_acl ($config['id_user'], 0, "IR")) {
|
||||
if ($config['activate_netflow']) {
|
||||
|
|
@ -286,8 +304,7 @@ if (check_acl ($config['id_user'], 0, "IR")) {
|
|||
$sub["operation/netflow/nf_live_view"]["text"] = __('Live view');
|
||||
$menu["netf"]["sub"] = $sub;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
// Rest of options, all with AR privilege (or should events be with incidents?)
|
||||
if (check_acl ($config['id_user'], 0, "AR")) {
|
||||
|
||||
|
|
@ -296,18 +313,7 @@ if (check_acl ($config['id_user'], 0, "AR")) {
|
|||
$menu["snmpconsole"]["refr"] = 0;
|
||||
$menu["snmpconsole"]["sec2"] = "operation/snmpconsole/snmp_view";
|
||||
$menu["snmpconsole"]["id"] = "oper-snmpc";
|
||||
|
||||
// Messages
|
||||
$menu["messages"]["text"] = __('Messages');
|
||||
$menu["messages"]["refr"] = 0;
|
||||
$menu["messages"]["sec2"] = "operation/messages/message_list";
|
||||
$menu["messages"]["id"] = "oper-messages";
|
||||
|
||||
$sub = array ();
|
||||
$sub["operation/messages/message_edit&new_msg=1"]["text"] = __('New message');
|
||||
|
||||
$menu["messages"]["sub"] = $sub;
|
||||
|
||||
|
||||
// Extensions menu additions
|
||||
if (is_array ($config['extensions'])) {
|
||||
$menu["extensions"]["text"] = __('Extensions');
|
||||
|
|
|
|||
|
|
@ -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=message&sec2=operation/messages/message_list">' .
|
||||
'text' => '<a href="index.php?sec=workspace&sec2=operation/messages/message_list">' .
|
||||
html_print_image("images/email.png", true, array ("title" => __('Message list'))) .'</a>');
|
||||
|
||||
$buttons['sent_messages'] = array('active' => false,
|
||||
'text' => '<a href="index.php?sec=message&sec2=operation/messages/message_list&show_sent=1">' .
|
||||
'text' => '<a href="index.php?sec=workspace&sec2=operation/messages/message_list&show_sent=1">' .
|
||||
html_print_image("images/email_go.png", true, array ("title" => __('Sent messages'))) .'</a>');
|
||||
|
||||
$buttons['create_message'] = array('active' => true,
|
||||
'text' => '<a href="index.php?sec=message&sec2=operation/messages/message_edit">' .
|
||||
'text' => '<a href="index.php?sec=workspace&sec2=operation/messages/message_edit">' .
|
||||
html_print_image("images/email_edit.png", true, array ("title" => __('Create message'))) .'</a>');
|
||||
|
||||
// Header
|
||||
|
|
@ -94,14 +94,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=messages&sec2=operation/messages/message_list&show_sent=1&delete_message=1&id='.$message_id.'">';
|
||||
echo '<form method="post" action="index.php?sec=workspace&sec2=operation/messages/message_list&show_sent=1&delete_message=1&id='.$message_id.'">';
|
||||
html_print_table($table);
|
||||
echo "<div style='padding-bottom: 20px; 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=messages&sec2=operation/messages/message_edit&new_msg=1&reply=1">';
|
||||
echo '<form method="post" action="index.php?sec=workspace&sec2=operation/messages/message_edit&new_msg=1&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);
|
||||
|
|
@ -178,7 +178,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=messages&sec2=operation/messages/message_edit&new_msg=1">';
|
||||
echo '<form method="post" action="index.php?sec=workspace&sec2=operation/messages/message_edit&new_msg=1">';
|
||||
html_print_table($table);
|
||||
|
||||
echo '<div class="action-buttons" style="width: '.$table->width.'">';
|
||||
|
|
|
|||
|
|
@ -28,15 +28,15 @@ if ($show_sent) {
|
|||
}
|
||||
|
||||
$buttons['message_list'] = array('active' => $active_list,
|
||||
'text' => '<a href="index.php?sec=message&sec2=operation/messages/message_list">' .
|
||||
'text' => '<a href="index.php?sec=workspace&sec2=operation/messages/message_list">' .
|
||||
html_print_image("images/email.png", true, array ("title" => __('Message list'))) .'</a>');
|
||||
|
||||
$buttons['sent_messages'] = array('active' => $active_sent,
|
||||
'text' => '<a href="index.php?sec=message&sec2=operation/messages/message_list&show_sent=1">' .
|
||||
'text' => '<a href="index.php?sec=workspace&sec2=operation/messages/message_list&show_sent=1">' .
|
||||
html_print_image("images/email_go.png", true, array ("title" => __('Sent messages'))) .'</a>');
|
||||
|
||||
$buttons['create_message'] = array('active' => false,
|
||||
'text' => '<a href="index.php?sec=message&sec2=operation/messages/message_edit">' .
|
||||
'text' => '<a href="index.php?sec=workspace&sec2=operation/messages/message_edit">' .
|
||||
html_print_image("images/email_edit.png", true, array ("title" => __('Create message'))) .'</a>');
|
||||
|
||||
if (!is_ajax ()) {
|
||||
|
|
@ -132,21 +132,21 @@ if (empty ($messages)) {
|
|||
$data[0] = '';
|
||||
if ($message["status"] == 1) {
|
||||
if ($show_sent) {
|
||||
$data[0] .= '<a href="index.php?sec=messages&sec2=operation/messages/message_edit&read_message=1&show_sent=1&id_message='.$message_id.'">';
|
||||
$data[0] .= '<a href="index.php?sec=workspace&sec2=operation/messages/message_edit&read_message=1&show_sent=1&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=messages&sec2=operation/messages/message_list&mark_unread=1&id_message='.$message_id.'">';
|
||||
$data[0] .= '<a href="index.php?sec=workspace&sec2=operation/messages/message_list&mark_unread=1&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=messages&sec2=operation/messages/message_edit&read_message=1&show_sent=1&id_message='.$message_id.'">';
|
||||
$data[0] .= '<a href="index.php?sec=workspace&sec2=operation/messages/message_edit&read_message=1&show_sent=1&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=messages&sec2=operation/messages/message_edit&read_message=1&id_message='.$message_id.'">';
|
||||
$data[0] .= '<a href="index.php?sec=workspace&sec2=operation/messages/message_edit&read_message=1&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>';
|
||||
}
|
||||
|
|
@ -167,9 +167,9 @@ if (empty ($messages)) {
|
|||
}
|
||||
|
||||
if ($show_sent) {
|
||||
$data[2] = '<a href="index.php?sec=messages&sec2=operation/messages/message_edit&read_message=1&show_sent=1&id_message='.$message_id.'">';
|
||||
$data[2] = '<a href="index.php?sec=workspace&sec2=operation/messages/message_edit&read_message=1&show_sent=1&id_message='.$message_id.'">';
|
||||
} else {
|
||||
$data[2] = '<a href="index.php?sec=messages&sec2=operation/messages/message_edit&read_message=1&id_message='.$message_id.'">';
|
||||
$data[2] = '<a href="index.php?sec=workspace&sec2=operation/messages/message_edit&read_message=1&id_message='.$message_id.'">';
|
||||
}
|
||||
if ($message["subject"] == "") {
|
||||
$data[2] .= __('No Subject');
|
||||
|
|
@ -181,12 +181,12 @@ if (empty ($messages)) {
|
|||
$data[3] = ui_print_timestamp ($message["timestamp"], true, array ("prominent" => "timestamp"));
|
||||
|
||||
if ($show_sent) {
|
||||
$data[4] = '<a href="index.php?sec=messages&sec2=operation/messages/message_list&show_sent=1&delete_message=1&id='.$message_id.'"
|
||||
$data[4] = '<a href="index.php?sec=workspace&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=messages&sec2=operation/messages/message_list&delete_message=1&id='.$message_id.'"
|
||||
$data[4] = '<a href="index.php?sec=workspace&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);
|
||||
|
|
@ -194,9 +194,9 @@ if (empty ($messages)) {
|
|||
array_push ($table->data, $data);
|
||||
}
|
||||
if ($show_sent)
|
||||
echo '<form method="post" action="index.php?sec=messages&sec2=operation/messages/message_list&show_sent=1&multiple_delete=1">';
|
||||
echo '<form method="post" action="index.php?sec=workspace&sec2=operation/messages/message_list&show_sent=1&multiple_delete=1">';
|
||||
else
|
||||
echo '<form method="post" action="index.php?sec=messages&sec2=operation/messages/message_list&multiple_delete=1">';
|
||||
echo '<form method="post" action="index.php?sec=workspace&sec2=operation/messages/message_list&multiple_delete=1">';
|
||||
html_print_table($table);
|
||||
echo "<div style='padding-bottom: 20px; text-align: right; width:" . $table->width . "'>";
|
||||
html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
|
||||
|
|
@ -204,7 +204,7 @@ if (empty ($messages)) {
|
|||
echo "</form>";
|
||||
}
|
||||
|
||||
echo '<form method="post" action="index.php?sec=messages&sec2=operation/messages/message_edit">';
|
||||
echo '<form method="post" action="index.php?sec=workspace&sec2=operation/messages/message_edit">';
|
||||
echo '<div class="action-buttons" style="width: 98%;">';
|
||||
html_print_submit_button (__('Create message'), 'create', false, 'class="sub next"');
|
||||
echo "</div>";
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@ if (check_acl ($config["id_user"], $id_group, "AW")) {
|
|||
$options['public_link']['text'] = '<a href="'.$config["homeurl"].'/operation/visual_console/public_console.php?hash='.$hash.'&id_layout='.$id_layout.'&id_user='.$config["id_user"].'">'.
|
||||
|
||||
html_print_image ("images/camera.png", true, array ("title" => __('Show link to public Visual Console'))).'</a>';
|
||||
$options['public_link']['active'] = false;
|
||||
|
||||
$options['setup']['text'] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/visual_console_builder&tab=editor&action=edit&id_visual_console='.$id_layout.'">'.html_print_image ("images/setup.png", true, array ("title" => __('Setup'))).'</a>';
|
||||
$options['setup']['active'] = false;
|
||||
|
|
|
|||
Loading…
Reference in New Issue