diff --git a/pandora_console/operation/agentes/estado_alertas.php b/pandora_console/operation/agentes/estado_alertas.php index b919629cea..e00954bdfd 100644 --- a/pandora_console/operation/agentes/estado_alertas.php +++ b/pandora_console/operation/agentes/estado_alertas.php @@ -226,9 +226,8 @@ if (isset($_GET["id_agente"])){ } //end while if (isset($string)) { echo ""; - echo " - ".$lang_label["fired"]; - echo "  "; - echo ""; + echo " - ".$lang_label["fired"].""; + echo ""; echo " - ".$lang_label["not_fired"]; echo ""; echo "
"; diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index d7fb599d96..3b75f0b463 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -42,7 +42,7 @@ if (comprueba_login() == 0) { } else { echo "
"; } - echo ""; + echo "
"; echo ""; echo ""; - echo " - "; - echo ""; + echo ""; echo ""; echo ""; @@ -81,7 +79,7 @@ if (comprueba_login() == 0) { if ( isset($ag_modulename)){ echo ""; } - echo ""; + echo ""; $sql='SELECT DISTINCT nombre FROM tagente_modulo WHERE (id_tipo_modulo = 2) @@ -112,7 +110,7 @@ if (comprueba_login() == 0) { $color =1; $result=mysql_query($sql); if (mysql_num_rows($result)){ - while ($row=mysql_fetch_array($result)){ //while there are agents + while ($row=mysql_fetch_array($result)){ //while there are agents if ($row["disabled"] == 0) { if ((isset($ag_modulename)) && ($ag_modulename != "ALL")) $query_gen='SELECT * FROM tagente_modulo @@ -190,7 +188,8 @@ if (comprueba_login() == 0) { } } if (isset($string)) { - echo "
".$lang_label["group"].""; echo " "; - echo " - ".$lang_label["green_light"]." "; + echo ""; + echo " - ".$lang_label["green_light"].""; echo " - ".$lang_label["red_light"]."
+ echo " +
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index 8ea019340f..e3a9cd1ed8 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -160,10 +160,27 @@ if (isset($_POST["event"])) $event = entrada_limpia($_POST["event"]); echo "

".$lang_label["events"]." > ".$lang_label["event_main_view"]." ".$lang_label["help"]."

"; -echo "
".$lang_label["agent"]."
"; - +echo "
"; +echo ""; +echo ""; +echo ""; +echo ""; echo ""; -echo ""; +echo ""; echo ""; -echo ""; + echo ""; echo "
"; +echo "

".$lang_label["filter"]."

"; +echo "		"; +echo "

".$lang_label["status"]."

"; +echo " - ".$lang_label["validated_event"]; +echo "
"; +echo " - ".$lang_label["not_validated_event"]; +echo "		"; +echo "

".$lang_label["action"]."

"; +echo " - ".$lang_label["validate_event"]; +echo "
"; +echo " - ".$lang_label["delete_event"]; +echo "
"; +echo " - ".$lang_label["create_incident"]; +echo "
".$lang_label["group"]."
".$lang_label["group"].""; echo ""; -echo ""; -echo " - ".$lang_label["validated_event"]; -echo "
"; -echo " - ".$lang_label["not_validated_event"]; -echo "		"; -echo " - ".$lang_label["validate_event"]; -echo "
"; -echo " - ".$lang_label["delete_event"]; -echo "
".$lang_label["events"].""; echo " +
- +"; echo '"; +echo " +"; // Pass search parameters for possible future filter searching by user if (isset($_GET["usuario"])) @@ -322,6 +330,11 @@ $row2_count = mysql_fetch_array($result2_count); if ($row2_count[0] <= 0 ) { echo '
'.$lang_label["no_incidents"].'

@@ -214,23 +214,24 @@ if (isset($_POST['operacion'])){ $estado = $_POST["estado"]; echo ""; break; + case 0: echo $lang_label["opened_inc"].""; break; + case 13: echo $lang_label["closed_inc"].""; break; + case 2: echo $lang_label["rej_inc"].""; break; + case 3: echo $lang_label["exp_inc"].""; break; } } - echo ""; + echo ""; + echo ""; + echo ""; + echo ""; ?> 		+ +

@@ -268,38 +269,45 @@ if ((isset($_GET["prioridad"])) OR (isset($_GET["prioridad"]))){ case 10: echo $lang_label["maintenance"]; break; } } -echo "		"; +echo ""; // al priorities (default) +echo '"; +echo '"; +echo '"; +echo '"; +echo '"; +echo '"; +echo " +"; echo "
+ +
'; + echo ""; + echo "
"; + echo ""; + echo ""; + echo "
"; } else { // TOTAL incidents $total_incidentes = $row2_count[0]; @@ -346,17 +359,17 @@ if ($row2_count[0] <= 0 ) { echo '
'; // Show headers - echo ""; + echo "
"; echo ""; - echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; $color = 1; while ($row2=mysql_fetch_array($result2)){ @@ -372,7 +385,8 @@ if ($row2_count[0] <= 0 ) { } $note_number = dame_numero_notas($row2["id_incidencia"]); echo ""; - echo "
ID"; - echo "".$lang_label["status"]; - echo "".$lang_label["incident"]; - echo "".$lang_label["priority"]; - echo "".$lang_label["group"]; - echo "".$lang_label["updated_at"]; - echo "".$lang_label["source"]; - echo "".$lang_label["in_openedby"]; - echo "".$lang_label["delete"]; + echo "ID".$lang_label["status"]."".$lang_label["incident"]."".$lang_label["priority"]."".$lang_label["group"]."".$lang_label["updated_at"]."".$lang_label["source"]."".$lang_label["in_openedby"]."".$lang_label["delete"]."
".$row2["id_incidencia"].""; + echo " + ".$row2["id_incidencia"].""; // Check for attachments in this incident $result3=mysql_query("SELECT * FROM tattachment WHERE id_incidencia = ".$row2["id_incidencia"]); @@ -434,14 +448,15 @@ if ($row2_count[0] <= 0 ) { } } } - echo "
" ; + echo "
"; + if (give_acl($_SESSION["id_usuario"], 0, "IW")==1) { + echo ""; + echo "
"; + echo "
"; + echo "
"; } + echo "
"; -if (give_acl($_SESSION["id_usuario"], 0, "IW")==1) { - echo "
"; - echo "
"; - echo "
"; } -echo "
"; ?> \ No newline at end of file diff --git a/pandora_console/operation/incidents/incident_detail.php b/pandora_console/operation/incidents/incident_detail.php index bc6266d946..061eff23c1 100644 --- a/pandora_console/operation/incidents/incident_detail.php +++ b/pandora_console/operation/incidents/incident_detail.php @@ -74,7 +74,8 @@ if (isset($_GET["id"])){ $nota = entrada_limpia($_POST["nota"]); $id_usuario=$_SESSION["id_usuario"]; - $sql1 = "INSERT INTO tnota (id_usuario,timestamp,nota) VALUES ('".$id_usuario."','".$timestamp."','".$nota."')"; + $sql1 = "INSERT INTO tnota (id_usuario,timestamp,nota) + VALUES ('".$id_usuario."','".$timestamp."','".$nota."')"; $res1=mysql_query($sql1); if ($res1) { echo "

".$lang_label["create_note_ok"]."

"; } @@ -202,9 +203,10 @@ if (isset($id_inc)) { } else { echo $lang_label["create_incident"]." ".$lang_label["help"].""; } -echo ''; +echo '
'; if ((give_acl($iduser_temp, $id_grupo, "IM")==1) OR ($usuario == $iduser_temp)) { - echo ' + '; // Only owner could change source or user with Incident management privileges if ((give_acl($iduser_temp, $id_grupo, "IM")==1) OR ($usuario == $iduser_temp)) { echo ' - - "; // Group combo if ((give_acl($iduser_temp, $id_grupo, "IM")==1) OR ($usuario == $iduser_temp)) { echo ' - - '; +echo ''; if ((give_acl($iduser_temp, $id_grupo, "IM")==1) OR ($usuario == $iduser_temp)) { echo '"; -echo ''; -echo "
'.$lang_label["incident"].''; + echo '
'.$lang_label["incident"].''; } else { echo '
'.$lang_label["incident"].''; } @@ -215,7 +217,7 @@ echo "".$actualizacion.""; echo '
'.$lang_label["in_openedby"].''; if ((give_acl($id_user, $id_grupo, "IM")==1) OR ($usuario == $id_user)) { echo "'.$lang_label["status"].' - + '.$lang_label["status"].' - + '; +echo '
'.$lang_label["source"].' +
'.$lang_label["source"].' + "; +echo "'.$lang_label["group"].' + '.$lang_label["group"].' +
'.$lang_label["priority"].' Creator ".$id_creator." ( ".dame_nombre_real($id_creator)." )"; @@ -334,8 +342,8 @@ if (isset($texto)) { } echo "
"; +echo '
'; +echo "
"; // Only if user is the used who opened incident or (s)he is admin $iduser_temp=$_SESSION['id_usuario']; @@ -366,8 +374,8 @@ if ($creacion_incidente == 0){ if (give_acl($iduser_temp, $id_grupo, "IW")==1){ echo '

'.$lang_label["attachfile"].'

- -
+ + - +
'.$lang_label["filename"].'
@@ -375,9 +383,11 @@ if ($creacion_incidente == 0){
'.$lang_label["description"].' -
- +
+ +
+

'; } // ************************************************************ @@ -389,7 +399,7 @@ if ($creacion_incidente == 0){ if (mysql_num_rows($att_fil)) { - echo ""; + echo "
"; echo "
"; echo "

".$lang_label["attached_files"]."

"; echo "
"; @@ -409,7 +419,7 @@ if ($creacion_incidente == 0){ } } - echo "

"; + echo "

"; } // ******************************************************************** // Notes @@ -419,10 +429,10 @@ if ($creacion_incidente == 0){ $res4=mysql_query($sql4); while ($row2=mysql_fetch_array($res4)){ if ($cabecera == 0) { // Show head only one time - echo ""; + echo "
"; echo "
"; echo "

".$lang_label["in_notas_t1"]."

"; - echo ""; + echo "
"; echo "
"; $cabecera = 1; } diff --git a/pandora_console/operation/incidents/incident_note.php b/pandora_console/operation/incidents/incident_note.php index acdc241edc..1d998f329b 100644 --- a/pandora_console/operation/incidents/incident_note.php +++ b/pandora_console/operation/incidents/incident_note.php @@ -24,20 +24,23 @@ require("include/config.php"); if (comprueba_login() == 0) { $id_inc = $_GET["id_inc"]; - $ahora=date("Y/m/d H:i:s"); + $now=date("Y/m/d H:i:s"); // Create Note - echo "

".$lang_label["incident_manag"]."

"; - echo "

".$lang_label["note_title"]." #".$id_inc." ".$lang_label["help"]."

"; - echo ""; - echo "
".$lang_label["date"].""; - echo "".$ahora; - echo ""; + echo "

".$lang_label["incident_manag"]." > "; + echo $lang_label["note_title"]." #".$id_inc." ".$lang_label["help"]."

"; + echo " + "; + echo ""; + echo ""; echo ""; - echo ''; - echo ''; + echo '
".$lang_label["date"].""; + echo "".$now."
'; - echo '
'; + echo '
'; + echo '
+ '; echo '
'; } // end page \ No newline at end of file diff --git a/pandora_console/operation/incidents/incident_search.php b/pandora_console/operation/incidents/incident_search.php index 05e0627dc8..8dbc09a881 100644 --- a/pandora_console/operation/incidents/incident_search.php +++ b/pandora_console/operation/incidents/incident_search.php @@ -29,9 +29,8 @@ echo "
"; echo "
"; ?>
- +
- - +
@@ -48,7 +47,8 @@ echo "
+
"; ?>