From 6ee4f1ec093d892e16db2961e70c42a3cfb5e920 Mon Sep 17 00:00:00 2001 From: raulmateos Date: Wed, 13 Jun 2007 19:14:05 +0000 Subject: [PATCH] 2007-06-13 Raul Mateos * godmode/menu.php, operation/menu.php, include/pandora.css, include/op.css, include/god.css: Updated with styles to avoid top and bottom border. * godmode/groups/group_list.php, godmode/users/*.php, operation/users/*.php, godmode/servers/*.php, operation/snmpconsole/snmp_alert.php, godmode/reporting/map_builder.php, operation/messages/message.php: Removed old raya style and changed to new style. * include/languages/language_en.php: Changed some typing error. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@509 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 14 +- pandora_console/godmode/groups/group_list.php | 7 +- pandora_console/godmode/menu.php | 39 +++-- .../godmode/reporting/map_builder.php | 114 ++++++++------ .../godmode/servers/manage_recontask_form.php | 72 ++++----- .../godmode/servers/modificar_server.php | 11 +- .../godmode/users/configure_user.php | 2 +- .../include/languages/language_en.php | 2 +- pandora_console/include/styles/god.css | 20 ++- pandora_console/include/styles/op.css | 18 ++- pandora_console/include/styles/pandora.css | 18 ++- pandora_console/operation/menu.php | 12 +- .../operation/messages/message.php | 148 +++++++++++------- .../operation/snmpconsole/snmp_alert.php | 46 +++--- pandora_console/operation/users/user_edit.php | 56 ++++--- 15 files changed, 345 insertions(+), 234 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 2c245c6bb7..737abc3089 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,6 +1,18 @@ +2007-06-13 Raul Mateos + + * godmode/menu.php, operation/menu.php, include/pandora.css, include/op.css, + include/god.css: Updated with styles to avoid top and bottom border. + + * godmode/groups/group_list.php, godmode/users/*.php, operation/users/*.php, + godmode/servers/*.php, operation/snmpconsole/snmp_alert.php, + godmode/reporting/map_builder.php, operation/messages/message.php: + Removed old raya style and changed to new style. + + * include/languages/language_en.php: Changed some typing error. + 2007-06-12 Sancho Lerena - * operation/reporting/reporting_viewer.php: Solved problems with ACL. + * operation/reporting/reporting_viewer.php: Solved problems with ACL. * operation/reporting/graph_viewer.php: ACL to delete graph diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php index 6135f7a74e..4b7c083a0d 100644 --- a/pandora_console/godmode/groups/group_list.php +++ b/pandora_console/godmode/groups/group_list.php @@ -77,7 +77,7 @@ if (comprueba_login() == 0) ".$lang_label["help"]." "; - echo ""; + echo "
"; echo ""; echo ""; echo ""; @@ -120,8 +120,9 @@ if (comprueba_login() == 0) echo ""; } } - echo ""; - echo "
".$lang_label["icon"]."".$lang_label["group_name"]."".$lang_label["parent"]."
"; + echo "
"; + echo ""; + echo "
"; echo "
"; echo ""; diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index 7ea3c36aa5..d9aa0751ec 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -37,7 +37,7 @@ if (comprueba_login() == 0){ } else echo ''; + echo ''; if (isset($_GET["sec"]) && $_GET["sec"] == "gagente"){ if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/agentes/manage_config"){ @@ -202,40 +202,49 @@ if (comprueba_login() == 0){ if ((give_acl($id_user, 0, "DM")==1)){ if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/db/db_main"){ echo '
'; + } else + echo '
'; + echo '
'; if (isset($_GET["sec"]) && $_GET["sec"] == "gdbman"){ + + if (isset($_GET["sec2"]) && ($_GET["sec2"] == "godmode/db/db_info" || $_GET["sec2"] == "godmode/db/db_info_data")){ echo "
"; - } - else echo "
"; + } else + echo "
"; echo "
"; if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/db/db_purge"){ echo "
"; - } - else echo "
"; + } else + echo "
"; echo "
"; if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/db/db_refine"){ echo "
"; - } - else echo "
"; + } else + echo "
"; echo "
"; if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/db/db_audit"){ echo "
"; - } - else echo "
"; + } else + echo "
"; echo "
"; if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/db/db_event"){ - echo "
"; - } - else echo "
"; - echo "
"; + echo "
"; + } else + echo ""; } } ?> diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php index 2edbd1201a..30c98c4982 100644 --- a/pandora_console/godmode/reporting/map_builder.php +++ b/pandora_console/godmode/reporting/map_builder.php @@ -165,8 +165,9 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { $form_id_user = $id_user; $createmode = 1; } - - echo "

".$lang_label["custom_reporting_builder"]."

"; + + echo "

".$lang_label["reporting"]." > "; + echo $lang_label["custom_reporting_builder"]."

"; echo ""; echo ""; if ($createmode == 0){ @@ -181,7 +182,7 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { echo "
"; echo $lang_label["private"]; - echo ""; + echo ""; if ($form_report_private == 1) echo ""; else @@ -189,7 +190,7 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { echo "
"; echo $lang_label["description"]; - echo ""; + echo ""; echo ""; @@ -203,7 +204,7 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { echo ""; else echo ""; - echo "
"; + echo ""; echo ""; if ($createmode == 0){ @@ -220,8 +221,8 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { echo ""; echo ""; - echo "".$lang_label["source_agent"]; - echo ""; + echo "".$lang_label["source_agent"].""; + echo ""; echo "'; @@ -248,13 +249,13 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { echo "".$lang_label["modules"].""; echo ""; echo ""; @@ -264,15 +265,15 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { echo "".$lang_label["reporting_type"].""; echo ""; echo ""; // Custom graph @@ -284,7 +285,7 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { $sql1="SELECT * FROM tgraph"; $result = mysql_query($sql1); while ($row=mysql_fetch_array($result)){ - echo ""; } echo ""; @@ -294,42 +295,42 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { echo "".$lang_label["period"].""; echo ""; echo ""; // SLA Max echo ""; - echo "".$lang_label["sla_max"].""; + echo "".$lang_label["sla_max"].""; echo ""; echo ""; // SLA Min echo ""; - echo "".$lang_label["sla_min"].""; + echo "".$lang_label["sla_min"].""; echo ""; echo ""; // SLA limit echo ""; - echo "".$lang_label["sla_limit"].""; + echo "".$lang_label["sla_limit"].""; echo ""; echo ""; - echo ""; + echo ""; echo ""; echo "
"; echo ""; - echo "
"; + echo ""; echo ""; @@ -338,7 +339,12 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { echo "

".$lang_label["report_items"]."

"; echo ""; - echo " + + + + + "; $sql = "SELECT * FROM treport_content WHERE id_report = $id_report"; $res=mysql_query($sql); $color = 0; @@ -374,23 +380,29 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { $module_name = dame_nombre_modulo_agentemodulo ($id_am); } echo ""; - echo ""; + echo ""; + echo ""; + echo ""; echo "
".$lang_label["type"]."".$lang_label["agent_name"]."".$lang_label["module_name"]."".$lang_label["period"]."".$lang_label["delete"]; + echo "
".$lang_label["type"]."".$lang_label["agent_name"]."".$lang_label["module_name"]."".$lang_label["period"]."".$lang_label["delete"]."
".$type_desc; - echo "".$agent_name; - echo "".$module_name; - echo "".$period; + echo "".$type_desc."".$agent_name."".$module_name."".$period.""; if ($form_id_user == $id_user){ - echo ""; + echo ""; } } echo "
"; } } else { - // Map LIST Selecteion screen + // Map LIST Selection screen // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - echo "

".$lang_label["map_builder"]."

"; + echo "

".$lang_label["reporting"]." > "; + echo $lang_label["map_builder"]."

"; echo ""; - echo " + + + + + "; $color=1; $sql="SELECT * FROM tgraph"; $res=mysql_query($sql); @@ -406,18 +418,18 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { $color = 1; } echo ""; - echo ""; + echo ""; $id_graph = $row["id_graph"]; - echo "
".$lang_label["map_name"]."".$lang_label["description"]."".$lang_label["Manage"]."".$lang_label["delete"]; + echo "
".$lang_label["map_name"]."".$lang_label["description"]."".$lang_label["Manage"]."".$lang_label["delete"]."
".$row["name"]; - echo "".$row["description"]; + echo "".$row["name"]."".$row["description"].""; - echo ""; + echo ""; + echo ""; } } echo "
"; echo ""; echo ""; echo "
"; - echo ""; + echo ""; echo ""; echo "
"; } diff --git a/pandora_console/godmode/servers/manage_recontask_form.php b/pandora_console/godmode/servers/manage_recontask_form.php index 5520ced9f3..166d9c5e1a 100644 --- a/pandora_console/godmode/servers/manage_recontask_form.php +++ b/pandora_console/godmode/servers/manage_recontask_form.php @@ -57,17 +57,15 @@ if (isset($_GET["update"])){ // Edit mode } echo "

".$lang_label["view_servers"]." > "; echo $lang_label["manage_recontask"]."

"; -echo ''; +echo '
'; // Different Form url if it's a create or if it's a update form if ($id_rt != -1) echo ""; else echo ""; -echo ""; echo '"; -echo ''; echo ''; // Interval -echo ''; echo '"; -echo ""; echo ""; //-- Network server echo ""; -echo ""; echo ""; // TYPE echo ""; -echo ""; +echo ""; echo ""; echo '"; -echo ""; +echo ""; +echo "
"; //name -echo "
'.$lang_label["task_name"]; echo ""; //-- Recon server @@ -79,47 +77,47 @@ echo ""; } echo ""; // Network echo "
'.$lang_label["network"]; +echo ''.$lang_label["network"].''; -echo ''; +echo ''.$lang_label["interval"]; +echo ''.$lang_label["interval"].''; echo ""; // Network profile echo "
".$lang_label["network_profile"]; +echo "".$lang_label["network_profile"].""; echo ""; + echo ""; +echo "".$lang_label["network_server"]; echo ""; @@ -128,42 +126,43 @@ $sql1="SELECT id_server, name FROM tserver WHERE network_server = 1 ORDER BY nam $result=mysql_query($sql1); echo ""; } echo ""; // Group echo "
".$lang_label["group"]; +echo "".$lang_label["group"].""; echo ""; + echo ""; +echo "".$lang_label["type"]; echo ""; echo ""; // Incident echo "
".$lang_label["incident"]; +echo "".$lang_label["incident"].""; echo ""; +echo "
'.$lang_label["comments"]; @@ -171,10 +170,11 @@ echo ''; echo '"; -echo "
"; -echo ""; +echo ""; +echo " +
"; if ($id_rt != "-1") echo ''; else diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php index 1bd8e23a98..630fc96f8a 100644 --- a/pandora_console/godmode/servers/modificar_server.php +++ b/pandora_console/godmode/servers/modificar_server.php @@ -67,8 +67,8 @@ if (comprueba_login() == 0) { $checksum = $row["checksum"]; $description = $row["description"]; echo ''; - echo ""; - echo "
"; + echo ""; + echo ""; echo "'; - echo '
".$lang_label["name"].""; echo "
".$lang_label['ip_address'].""; echo "
".$lang_label['description'].""; @@ -76,9 +76,10 @@ if (comprueba_login() == 0) { else { echo "
".$lang_label["no_server"]."
"; } - echo '
'; - echo '
'; + echo '
'; + echo ''; + echo '
'; + echo '
'; } else { diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index 2d14a0beda..d7e259341b 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -156,7 +156,7 @@ if (comprueba_login() == 0) } ?> - +
'; diff --git a/pandora_console/include/languages/language_en.php b/pandora_console/include/languages/language_en.php index 7860d6f28d..b32381b6e7 100644 --- a/pandora_console/include/languages/language_en.php +++ b/pandora_console/include/languages/language_en.php @@ -580,7 +580,7 @@ $lang_label["send_mes"]="Send message"; $lang_label["m_from"]="From"; //from in messages $lang_label["m_to"]="To"; //to in messages $lang_label["sender"]="Sender"; -$lang_label["message_ok"]="Message successfully sended"; +$lang_label["message_ok"]="Message successfully sent"; $lang_label["message_no"]="There was a problem sending message"; $lang_label["no_messages"]="There are no messages"; $lang_label["new_message_bra"]="You have "; diff --git a/pandora_console/include/styles/god.css b/pandora_console/include/styles/god.css index 3f1c8e0766..d61f2cb11a 100644 --- a/pandora_console/include/styles/god.css +++ b/pandora_console/include/styles/god.css @@ -14,12 +14,12 @@ div.menug { border: 1px solid #dadbdc; width: 155px; margin-bottom: 5px; - } +} #god1 li, #god2 li, #god3 li, #god4 li, #god5 li, #god51 li, #god6 li, #god7 li, #god8 li, #god1s li, #god2s li, #god3s li, #god4s li, #god5s li, #god51s li, #god6s li, #god7s li, #god8s li, #god_module li, #god_module_sel li { padding: 0px 0px 0px 30px; } div#god1>ul, div#god2>ul, div#god3>ul, div#god4>ul, div#god5>ul, div#god51>ul, div#god6>ul, div#god7>ul, div#god8>ul, div#god1s>ul, div#god2s>ul, div#god3s>ul, div#god4s>ul, div#god5s>ul, div#god51s>ul, div#god6s>ul, div#god7s>ul, div#god8s>ul, div#god_module>ul, div#god_module_sel>ul { - width: 124px; + width: 126px; } #god1 li, #god1 li:hover, #god1s li { background: url(../../images/god1.gif) no-repeat 4px 2px; @@ -51,10 +51,10 @@ div#god1>ul, div#god2>ul, div#god3>ul, div#god4>ul, div#god5>ul, div#god51>ul, d #god_module li, #god_module li:hover, #god_module_sel li { background: url(../../images/brick.png) no-repeat 6px 4px; } -div.arrowg>ul, div.arrowgs>ul { - width: 74%; +div.arrowg>ul, div.arrowgs>ul, div#arrowgl>ul, div#arrowgls>ul { + width: 75%; } -.arrowg li, .arrowg li:hover, .arrowgs li { +.arrowg li, .arrowg li:hover, .arrowgs li, #arrowgl li, #arrowgl li:hover, #arrowgls li { background: url(../../images/arrow.gif) no-repeat 2px 4px; margin-left: 26px; padding: 0px 0px 0px 14px; @@ -63,8 +63,14 @@ div.arrowg>ul, div.arrowgs>ul { #god1 li:hover, #god1s li, #god2 li:hover, #god2s li, #god3 li:hover, #god3s li, #god4 li:hover, #god4s li, #god5 li:hover, #god5s li, #god6 li:hover, #god6s li, #god7 li:hover, #god7s li, #god8 li:hover, #god8s li, -#god_module li:hover, #god_module_sel li, #god51 li:hover, #god51s li, -.arrowg li:hover, .arrowgs li +#god_module li:hover, #god_module_sel li, #god51 li:hover, #god51s li, +.arrowg li:hover, .arrowgs li, #arrowgl li:hover, #arrowgls li { background-color: #efefbd; +} +#arrowgl li.bb0, #arrowgls li.bb0, #god8 li.bb0 { + border-bottom: 0px; +} +#god1 li.bt0, #god1s li.bt0 { + border-top: 0px; } \ No newline at end of file diff --git a/pandora_console/include/styles/op.css b/pandora_console/include/styles/op.css index 87fe1de103..88ab812dcb 100644 --- a/pandora_console/include/styles/op.css +++ b/pandora_console/include/styles/op.css @@ -14,7 +14,7 @@ div.menuop { border: 1px solid #dadbdb; width: 155px; margin-bottom: 5px; - } +} #op1 li, #op2 li, #op3 li, #op4 li, #op5 li, #op6 li, #op7 li, #op8 li, #op9 li, #op1s li, #op2s li, #op3s li, #op4s li, #op5s li, #op6s li, #op7s li, #op8s li, #op9s li { padding: 0px 0px 0px 28px; @@ -22,7 +22,7 @@ div.menuop { div#op1>ul, div#op2>ul, div#op3>ul, div#op4>ul, div#op5>ul, div#op6>ul, div#op7>ul, div#op8>ul, div#op9>ul, div#op1s>ul, div#op2s>ul, div#op3s>ul, div#op4s>ul, div#op5s>ul, div#op6s>ul, div#op7s>ul, div#op8s>ul, div#op9s>ul { - width: 126px; + width: 127px; } #op1 li , #op1 li:hover, #op1s li { background: url(../../images/bricks.png) no-repeat 4px 3px; @@ -53,10 +53,10 @@ div#op7s>ul, div#op8s>ul, div#op9s>ul { #op9 li, #op9 li:hover, #op9s li { background: url(../../images/op9.gif) no-repeat 4px 3px; } -div.arrow>ul, div.arrows>ul { - width: 74%; +div.arrow>ul, div.arrows>ul, div#arrowl>ul, div#arrowls>ul { + width: 75%; } -.arrow li, .arrow li:hover, .arrows li { +.arrow li, .arrow li:hover, .arrows li, #arrowl li, #arrowl li:hover, #arrowls li { background: url(../../images/arrow.gif) no-repeat 2px 4px; margin-left: 26px; padding: 0px 0px 0px 14px; @@ -66,7 +66,13 @@ div.arrow>ul, div.arrows>ul { #op1 li:hover, #op1s li , #op2 li:hover, #op2s li , #op3 li:hover, #op3s li , #op4 li:hover, #op4s li , #op5 li:hover, #op5s li , #op6 li:hover, #op6s li , #op7 li:hover, #op7s li , #op8 li:hover, #op8s li, #op9 li:hover, #op9s li, -.arrow li:hover, .arrows li +.arrow li:hover, .arrows li, #arrowl li:hover, #arrowls li { background-color: #d4ddc6; } +#arrowl li.bb0, #arrowls li.bb0, #op8 li.bb0 { + border-bottom: 0px; +} +#op1 li.bt0, #op1s li.bt0 { + border-top: 0px; +} \ No newline at end of file diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 608dcc55ca..77b450d4de 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -344,6 +344,11 @@ td.datos_jus, td.datos2_jus { color: #fff; text-align: center; } +.suc { + color: #5a8629; + background: url(../../images/suc.gif) no-repeat 1px; + padding: 4px 1px 6px 30px; +} .error { background: url(../../images/error.gif) no-repeat; padding: 4px 1px 6px 30px; @@ -356,11 +361,7 @@ td.datos_jus, td.datos2_jus { border-bottom: 1px solid #708090; width: 100%; } -.suc { - color: #5a8629; - background: url(../../images/suc.gif) no-repeat 1px; - padding: 4px 1px 6px 30px; -} + .green { color: #5a8629; } @@ -563,7 +564,6 @@ span.master, span.snmp, span.binary, span.recon { position: absolute; padding-top: 7px; padding-left: 210px; - } span#logo_text1 { font: bolder 3em Arial, Sans-serif; @@ -575,3 +575,9 @@ span#logo_text2 { letter-spacing: -2px; color: #aaa; } +.bb0 { + border-bottom: 0px; +} +.bt0 { + border-top: 0px; +} \ No newline at end of file diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index 4bd22b5442..21d72c510a 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -244,7 +244,15 @@ if (give_acl($_SESSION["id_usuario"], 0, "AR")==1) { } else { echo ''; + echo '
    '; + + if (isset($_GET["sec"]) && $_GET["sec"] == "reporting" && + isset($_GET["sec2"]) && $_GET["sec2"] != "operation/reporting/reporting"){ + echo '
  • '; + } else { + echo '
  • '; + } + echo ''. $lang_label["reporting"].'
'; // Custom reporting if (isset($_GET["sec"]) && $_GET["sec"] == "reporting"){ @@ -263,7 +271,7 @@ if (give_acl($_SESSION["id_usuario"], 0, "AR")==1) { } else { echo "
"; } - echo "
"; + echo ""; } } diff --git a/pandora_console/operation/messages/message.php b/pandora_console/operation/messages/message.php index 11d6293fe3..629f3841ac 100644 --- a/pandora_console/operation/messages/message.php +++ b/pandora_console/operation/messages/message.php @@ -57,7 +57,7 @@ $resultado2=mysql_query($sql2); $row2=mysql_fetch_array($resultado2); $sql3='SELECT * FROM tgrupo'; $resultado3=mysql_query($sql3); - + if (isset($_GET["nuevo_mensaje"])){ // Create message $usuario_destino = give_parameter_post ("u_destino"); @@ -78,23 +78,32 @@ if (isset($_GET["nuevo_mensaje_g"])){ while ($row=mysql_fetch_array($result)){ $error=create_message_g($iduser, $row["id_usuario"], $subject, $mensaje); } - if ($error==0) echo "

".$lang_label["message_ok"]."

"; - else echo "

".$lang_label["message_no"]."

"; + if ($error==0) + echo "

".$lang_label["message_ok"]."

"; + else + echo "

".$lang_label["message_no"]."

"; + } else { + echo "

".$lang_label["message_no"]."

"; } - else {echo "

".$lang_label["message_no"]."

";} } +echo "

".$lang_label["messages"]." > "; + if (isset($_GET["nuevo"]) || isset($_GET["nuevo_g"])){ if (isset($_GET["nuevo"])){ //create message - echo '

'.$lang_label["new_message"].'

'; + echo $lang_label["new_message"].''; echo '
- - + + + + + - + - + + -
'.$lang_label["m_from"].':'.$iduser.'
'.$lang_label["m_to"].':'; +
'.$lang_label["m_from"].':'.$iduser.'
'.$lang_label["m_to"].':'; if (isset($_POST["u_destino"])) { - echo ''.$_POST["u_destino"].''; - } - else{ + echo ''.$_POST["u_destino"].' + '; + } else { echo ''; - } + } echo '
'.$lang_label["subject"].':'; +
'.$lang_label["subject"].':'; if (isset($_POST["subject"])) echo ''; else echo ''; echo '
'.$lang_label["message"].':
'.$lang_label["message"].':
+ echo '
-
'; + '; } if (isset($_GET["nuevo_g"])){ - echo '

'.$lang_label["new_message_g"].' '.$lang_label["help"].'

'; + echo $lang_label["new_message_g"].' '.$lang_label["help"].''; echo '
- - -
'.$lang_label["m_from"].':'.$iduser.'
'.$lang_label["m_to"].':'; + + + + + + + + - - + + + +
'.$lang_label["m_from"].':'.$iduser.'
'.$lang_label["m_to"].':'; echo ''; echo '
'.$lang_label["subject"].':
'.$lang_label["message"].':
'.$lang_label["message"].':
- '; +
+ +
'; } -} -else { +} else { + echo $lang_label["read_mes"].""; // Get list of messages for this user if (isset($_GET["borrar"])){ $id_mensaje = $_GET["id_mensaje"]; $sql5='DELETE FROM tmensajes WHERE id_usuario_destino="'.$iduser.'" AND id_mensaje="'.$id_mensaje.'"'; $resultado5=mysql_query($sql5); - if ($resultado5) {echo "

".$lang_label["del_message_ok"]."

";} - else {echo "

".$lang_label["del_message_no"]."

";} - } - - echo "

".$lang_label["read_mes"]."

"; + if ($resultado5) { + echo "

".$lang_label["del_message_ok"]."

"; + } else { + echo "

".$lang_label["del_message_no"]."

"; + } + } if ($row2["COUNT(*)"]!=0){ echo "

"; echo $lang_label["new_message_bra"]." ".$row2["COUNT(*)"]." ".$lang_label["new_message_ket"]."

"; @@ -171,7 +192,13 @@ else { $resultado3=mysql_query($sql3); $color=1; if (mysql_num_rows($resultado3)) { - echo ""; + echo "
".$lang_label["read"]."".$lang_label["sender"]."".$lang_label["subject"]."".$lang_label["timestamp"]."".$lang_label["delete"]."
+ + + + + + "; while ($row3=mysql_fetch_array($resultado3)){ if ($color == 1){ $tdcolor = "datos"; @@ -182,26 +209,28 @@ else { $color = 1; } echo ""; - if ($row3["estado"]==1) - echo ""; + echo ""; - + echo ""; + echo ""; echo ""; + echo " + "; echo ""; } echo "
".$lang_label["read"]."".$lang_label["sender"]."".$lang_label["subject"]."".$lang_label["timestamp"]."".$lang_label["delete"]."
"; + if ($row3["estado"]==1) + echo ""; else - echo ""; - echo "".$row3["id_usuario_origen"].""; + echo "".$row3["id_usuario_origen"].""; if ($row3["subject"]) - echo "".$row3["subject"].""; + echo $row3["subject"]; else - echo "".$lang_label["no_subject"].""; + echo $lang_label["no_subject"]; - echo "".$row3["timestamp"]."".$row3["timestamp"]."
"; + } else { + echo "
".$lang_label["no_messages"]."
"; //no messages } - else - echo "

".$lang_label["no_messages"]."

"; //no messages // Read message if (isset($_GET["leer"])){ @@ -213,32 +242,41 @@ else { $resultado41=mysql_query($sql41); echo ''; echo ''; - echo ''; + echo ' + + + '; // Subject - echo ''; + echo ' + + + '; // text echo ' -
'.$lang_label["from"].':'.$row4["id_usuario_origen"].'
'.$lang_label["from"].':'.$row4["id_usuario_origen"].'
'.$lang_label["subject"].':'.$row4["subject"].'
'.$lang_label["subject"].':'.$row4["subject"].'
'.$lang_label["message"].':
'; - echo ' +
'; - echo ""; echo ''; - echo "
"; - echo ''; + echo "
"; + echo ''; echo ''; - echo "
"; - } - else { + echo ""; + } else { echo ''; echo ' - '; + if (mysql_num_rows($resultado3)) { + echo '
+
'; + } else { + echo ''; + } + echo '
'; - } + } echo "

"; echo ""; echo "
Message already opened"; diff --git a/pandora_console/operation/snmpconsole/snmp_alert.php b/pandora_console/operation/snmpconsole/snmp_alert.php index f7fc750b4d..c3a287edf2 100644 --- a/pandora_console/operation/snmpconsole/snmp_alert.php +++ b/pandora_console/operation/snmpconsole/snmp_alert.php @@ -129,8 +129,7 @@ if (give_acl($id_user, 0, "LW")==1) { } echo '
'; echo ''; // if known, if add will be undetermined (0). - echo ''; - echo '
'; + echo ''; // Alert echo ''; echo ''; echo ''; echo ''; echo ''; + echo ''; + echo ''; + echo ''; echo ''; // max & min alerts, time threshold - echo ''; + echo ' + '; + echo ''; + echo ' + '; + echo ''; + echo ' + '; + echo ''; + echo '
'.$lang_label["alert"].''; } // Description - echo '
'.$lang_label["description"]; + echo '
'.$lang_label["description"].''; // OID - echo '
'.$lang_label["OID"]; + echo '
'.$lang_label["OID"].''; // OID Custom - echo '
'.$lang_label["customvalue"]; + echo '
'.$lang_label["customvalue"].''; // SNMP Agent - echo '
'.$lang_label["SNMP_agent"]." IP"; + echo '
'.$lang_label["SNMP_agent"].' IP'; // Alert fields - echo '
'.$lang_label["field1"]; - echo ''; - echo '
'.$lang_label["field2"]; - echo ''; + echo '
'.$lang_label["field1"].'
'.$lang_label["field2"].'
'.$lang_label["field3"]; - echo ''; + echo '
'.$lang_label["min_alerts"]; - echo ''; - echo '
'.$lang_label["max_alerts"]; - echo ''; - echo '
'.$lang_label["time_threshold"]; - echo ''; - echo '
'.$lang_label["min_alerts"].'
'.$lang_label["max_alerts"].'
'.$lang_label["time_threshold"].'
'; + echo ' +
'; // Update or Add button if ($alert_update != 0) { - echo '
'; + echo ''; echo ""; echo ""; } else { - echo '
'; + echo ''; echo ""; echo ""; } // Endtable - echo "
"; + echo "
"; $view_alert =0; // Do not show alert list } diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php index 6eafa1106d..2767574ebc 100644 --- a/pandora_console/operation/users/user_edit.php +++ b/pandora_console/operation/users/user_edit.php @@ -99,62 +99,70 @@ if (comprueba_login() == 0) { $nombre_real=$rowdup["nombre_real"]; ?> - +
'; else echo ''; ?> - + + + + + + + + + + + +
- -
- -
- -
- -
E-Mail - -
+
+
+
+ + +
E-Mail + + +
-
+ "; + echo ""; } - echo '
'; - echo "

'; + echo '

'; echo '

'.$lang_label["listGroupUser"].' '.$lang_label["help"].'

'; - echo ""; + echo "
"; $sql1='SELECT * FROM tusuario_perfil WHERE id_usuario = "'.$nombre.'"'; $result=mysql_query($sql1); if (mysql_num_rows($result)){ - echo ''; $color=1; while ($row=mysql_fetch_array($result)){ if ($color == 1){ - $tdcolor = "datos"; + $tdcolor = "datos2"; $color = 0; } else { - $tdcolor = "datos2"; + $tdcolor = "datos"; $color = 1; } echo '"; } - echo ""; + } else { + echo '
'.$lang_label["no_profile"].'
'; } - else { echo '
'; + echo '
'; echo "".dame_perfil($row["id_perfil"])." / "; echo "".dame_grupo($row["id_grupo"])."
'.$lang_label["no_profile"]; } - - echo '
'; - + echo ''; } // fin pagina ?> \ No newline at end of file