diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 06e9d0828a..e87cc7fff0 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,19 @@ +2007-06-27 Raul Mateos + + * include/sytles/*.css: Updated "gif" references to the "png" refs. + + * include/language/language_en.php: Updated text. + + * images/*: Removed near all .gif files and created .png + + * operation/*.php, godmode/*.php, *.sql: + Updated gif references to .png + + * install.php: Added feature request 1744237 + + * index.php, operation/agentes/exportdata.php: Moved calendar jscript + from index to exportdata + 2007-06-25 Sancho Lerena First commit for Beta2 :-) diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php index 1fe1a391a6..c45473bacf 100644 --- a/pandora_console/general/logon_ok.php +++ b/pandora_console/general/logon_ok.php @@ -89,7 +89,7 @@ } else $global_health = 100; - echo "

".$lang_label["tactical_indicator"]."

"; + echo "

".$lang_label["tactical_indicator"]."

"; echo ""; echo "
"; diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index 77afa76d8f..805af7f9d1 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -69,7 +69,7 @@ if (isset($_GET["creacion"])){ echo " - "; + "; } echo ''; diff --git a/pandora_console/godmode/agentes/agent_template.php b/pandora_console/godmode/agentes/agent_template.php index 75156b14ae..b80c557376 100644 --- a/pandora_console/godmode/agentes/agent_template.php +++ b/pandora_console/godmode/agentes/agent_template.php @@ -159,7 +159,7 @@ if ($row=mysql_num_rows($result)){ id_agente=".$id_agente."& tab=module& update_module=".$row["id_agente_modulo"]."#modules'> - ".$lang_label["update"].""; + ".$lang_label["update"].""; } echo ""; echo ""; diff --git a/pandora_console/godmode/agentes/alert_manager.php b/pandora_console/godmode/agentes/alert_manager.php index a861c7c939..40f0a535cf 100644 --- a/pandora_console/godmode/agentes/alert_manager.php +++ b/pandora_console/godmode/agentes/alert_manager.php @@ -90,10 +90,10 @@ $result=mysql_query($sql1); // We have alert text ? if ($row3["alert_text"] != "") - $string = $string."".$lang_label["text"]; + $string = $string."".$lang_label["text"].""; else { - $string = $string."".$mymin; - $string = $string."".$mymax; + $string = $string."".$mymin.""; + $string = $string."".$mymax.""; } $mytimefrom =$row3["time_from"]; $mytimeto =$row3["time_to"]; @@ -103,8 +103,8 @@ $result=mysql_query($sql1); else $string .= render_time($mytimefrom)." - ".render_time($mytimeto); - $string = $string."".salida_limpia($row3["descripcion"]); - $string = $string.""; + $string = $string."".salida_limpia($row3["descripcion"]); + $string = $string.""; $id_grupo = dame_id_grupo($id_agente); if (give_acl($id_user, $id_grupo, "LW")==1){ $string = $string." - ".$lang_label["update"].""; + ".$lang_label["update"].""; } $string = $string.""; } diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index 263e242a41..e15f77eb7a 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -157,7 +157,7 @@ echo ""; -echo "  NC Templates"; +echo "  NC Templates"; echo ""; echo ""; diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index ddbb2a33a5..b4f9985416 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -228,7 +228,7 @@ if ($row=mysql_num_rows($result)){ echo "".$lang_label["delete"].""; echo " "; echo ""; - echo "".$lang_label["update"].""; + echo "".$lang_label["update"].""; } // Value arithmetical media fix if (($id_tipo != 3) AND ($id_tipo != 10) AND ($id_tipo != 17)){ diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php index baa66b48f1..67bb97d45e 100644 --- a/pandora_console/godmode/servers/modificar_server.php +++ b/pandora_console/godmode/servers/modificar_server.php @@ -127,28 +127,28 @@ if (comprueba_login() == 0) { echo "$name"; echo ""; if ($status ==0){ - echo ""; + echo ""; } else { - echo ""; + echo ""; } echo ""; echo "$address"; echo "".substr($description,0,25); echo ""; if ($network_server == 1){ - echo "  "; + echo "  "; } if ($data_server == 1){ - echo "  "; + echo "  "; } if ($snmp_server == 1){ - echo "  "; + echo "  "; } if ($master == 1){ - echo "  "; + echo "  "; } if ($checksum == 1){ - echo "  "; + echo "  "; } echo "".substr($keepalive,0,25).""; echo "".substr($laststart,0,25).""; diff --git a/pandora_console/help/en/chap3.php b/pandora_console/help/en/chap3.php index 603f734512..14a35a1bac 100644 --- a/pandora_console/help/en/chap3.php +++ b/pandora_console/help/en/chap3.php @@ -146,7 +146,7 @@ user views.

In this screen the modules can be:

However, the type of data of the module can't be modified.

@@ -250,7 +250,7 @@ deletion is performed, the data associated to them will also be deleted.

If you pass the mouse over any group image, you'll see the number of agents of that group as well the number of monitors, organized by status.

-

By pressing the icon at the right of any group image, you will update the info of that group.

+

By pressing the icon at the right of any group image, you will update the info of that group.

3.3. Agent monitoring

@@ -283,23 +283,23 @@ modules, the number of monitors and the number of monitors with "incorrect" stat all in black save the last one.

Status: Shows the "general" status of the agent through the following icons:

-

All the monitors OK. It's the ideal status.

-

No defined monitors. Sometimes nothing is monitored +

All the monitors OK. It's the ideal status.

+

No defined monitors. Sometimes nothing is monitored that could be right or wrong, and only numeric or text data is reported.

-

At least one of the monitors is failing. Usually we +

At least one of the monitors is failing. Usually we want to avoid this, and keep our systems in a healthy green colour.

-

The agent doesn't have any data. New agents with an empty data +

The agent doesn't have any data. New agents with an empty data package can have this status.

-

Colour shifting from green to red. This icon indicates +

Colour shifting from green to red. This icon indicates that the agent has just changed its status, from 'All OK' to 'we have a problem'.

- When an agent is down or there is no news from it for 2 times the Interval value in seconds. Usually it is due to a communication issue or a crashed remote system.

+ When an agent is down or there is no news from it for 2 times the Interval value in seconds. Usually it is due to a communication issue or a crashed remote system.

Alerts: Shows if any alerts have been sent through the following icons:

-

No alerts have been sent.

-

When at least one alert has been sent within the time threshold of the alert.

+

No alerts have been sent.

+

When at least one alert has been sent within the time threshold of the alert.

-

Last contact: Shows the time and date of the last data package sent by the agent, using a progress bar, according to value of the interval. If you see the image , the agent has not send data during the interval. Passing the mouse over the image will show you the last contact in time and date format.

+

Last contact: Shows the time and date of the last data package sent by the agent, using a progress bar, according to value of the interval. If you see the image , the agent has not send data during the interval. Passing the mouse over the image will show you the last contact in time and date format.

Note: The icon is only visible if you're and administrator and it's a link to the "Manage Agents" > "Update Agent" option in the Administration menu.

@@ -331,23 +331,23 @@ the data sent by the agent against time.

On the left hand side of the graph the newst data is represent, and on the right had side the oldest.

The generated graphs are: -

- Hourly graph () covers a 60 minute interval

+

- Hourly graph () covers a 60 minute interval

-

- Daily graph () covers a 24 hour interval

+

- Daily graph () covers a 24 hour interval

-

- Weekly graph () covers a 7 day interval

+

- Weekly graph () covers a 7 day interval

-

- Mothly graph () covers a 30 day interval

+

- Mothly graph () covers a 30 day interval

Raw Data: This is the raw data sent by the agent

-

- Last month

-

- Last week

-

- Last day

+

- Last month

+

- Last week

+

- Last day

3.3.2.3. Complete list of monitors

@@ -363,8 +363,8 @@ the data sent by the agent against time.

Description: Description given to the module in the agent's config file.

Status: The table shows the agent status through the following icons:

-

The monitor is OK

-

The monitor is failing

+

The monitor is OK

+

The monitor is failing

Last contact: Shows the time and date of the last data packaged received from the agent

@@ -383,8 +383,8 @@ the data sent by the agent against time.

Times Fired: Number of times the alert was launched.

Status: Shows if the alert has been sent through the following icon:

-

No alerts have been sent

-

At least one alert has been sent

+

No alerts have been sent

+

At least one alert has been sent

3.3.3. Group details

@@ -401,10 +401,10 @@ The groups are displayed ordered by the following columns:

Monitors: Number of monitors configured in the group.

Status: The status is described through the following icons:

-

All monitors are OK.

-

At least one monitor has failed.

-

At least one monitor is down and there is no contact with it.

-

This Agent doesn't have any monitor defined.

+

All monitors are OK.

+

At least one monitor has failed.

+

At least one monitor is down and there is no contact with it.

+

This Agent doesn't have any monitor defined.

OK: Number of monitors that are OK.

Failed: Number of failing monitors.

diff --git a/pandora_console/help/en/chap4.php b/pandora_console/help/en/chap4.php index 9618fdaaa8..477d456eb0 100644 --- a/pandora_console/help/en/chap4.php +++ b/pandora_console/help/en/chap4.php @@ -78,21 +78,21 @@ incidents the user is interested on.

ID: ID of the incident.

Status: The incident status is represented by the following icons:

-

Active incident

-

Active incident with comments

-

Rejected incident

-

Closed incident

-

Expired incident

+

Active incident

+

Active incident with comments

+

Rejected incident

+

Closed incident

+

Expired incident

Incident name: Name given to the incident

Priority: The incident assigned priority is represented by the following icons:

-

Very high priority

-

High priority

-

Medium priority

-

Low priority

-

Informative priority

-

Maintenance priority

+

Very high priority

+

High priority

+

Medium priority

+

Low priority

+

Informative priority

+

Maintenance priority

Group: The name of the group the incident has been assigned to. One incident can only belong to a single group.

Updated at: This is the date/time the incident was updated for the last time.

diff --git a/pandora_console/help/en/chap5.php b/pandora_console/help/en/chap5.php index c9d974a81f..5616d33531 100644 --- a/pandora_console/help/en/chap5.php +++ b/pandora_console/help/en/chap5.php @@ -53,8 +53,8 @@ if the problem can be ignored or it's been already solved.

The event information list shows the data in the following columns:

Status: The event status is represented by the icon bellow:

-

The event has been validated

-

The event hasn't been validated

+

The event has been validated

+

The event hasn't been validated

Event name: Name assigned to the event by Pandora.

Agent name: Agent where the event happend.

Group name: Group of the agent where the event has happened.

diff --git a/pandora_console/help/en/chap7.php b/pandora_console/help/en/chap7.php index ecb9b33954..b52e238c95 100644 --- a/pandora_console/help/en/chap7.php +++ b/pandora_console/help/en/chap7.php @@ -93,7 +93,7 @@ in the Operation menu.

It is possible to change the server properties using the icon - +

In a Server it is possible to modify: Name, IP Address and Description. diff --git a/pandora_console/help/es/chap3.php b/pandora_console/help/es/chap3.php index e269ea8fed..c1613a3ce5 100644 --- a/pandora_console/help/es/chap3.php +++ b/pandora_console/help/es/chap3.php @@ -165,7 +165,7 @@ Cualquier valor por debajo del mínimo definido se interpretará com

Desde aquí se puede:

No será posible modificar el tipo de dato del módulo.

@@ -282,7 +282,7 @@ todos los datos asociados a estos.

Si pasamos el ratón sobre cualquier imagen de grupo, veremos el número de agentes que tiene el grupo además del número de monitores, organizado por estado.

-

Si pulsamos el icono que aparece a la derecha de cada grupo, se refrescará la información del grupo seleccionado.

+

Si pulsamos el icono que aparece a la derecha de cada grupo, se refrescará la información del grupo seleccionado.

3.3. Monitorización de agentes

@@ -315,21 +315,21 @@ estado incorrecto, aparecen tres valores: el número de módulos, el monitores y el número de monitores con estado incorrecto, éste último en color rojo, el resto de color negro.

Estado: Muestra el estado «general» del agente mediante los siguientes iconos:

-

Cuando todos los monitores están OK. El estado ideal.

-

Cuando no hay monitores definidos. A veces no monitorizamos nada que pueda estar «bien» o «mal», y simplemente reporta datos +

Cuando todos los monitores están OK. El estado ideal.

+

Cuando no hay monitores definidos. A veces no monitorizamos nada que pueda estar «bien» o «mal», y simplemente reporta datos numéricos o de tipo texto.

-

Cuando al menos un monitor falla. Generalmente queremos evitar esto y que todos nuestros sistemas tengan un saludable color verde.

-

Cuando el agente no tiene datos. Los agentes nuevos con un paquete vacío pueden tener este estado.

-

Cuando hay un cambio entre verde y rojo. Esto indica que un agente acaba de cambiar de estado, de «todo bien» a «tenemos un problema».

- Cuando el agente está caído o no se ha recibido información de él en el doble del Intervalo en segundos. Generalmente se debe a un +

Cuando al menos un monitor falla. Generalmente queremos evitar esto y que todos nuestros sistemas tengan un saludable color verde.

+

Cuando el agente no tiene datos. Los agentes nuevos con un paquete vacío pueden tener este estado.

+

Cuando hay un cambio entre verde y rojo. Esto indica que un agente acaba de cambiar de estado, de «todo bien» a «tenemos un problema».

+ Cuando el agente está caído o no se ha recibido información de él en el doble del Intervalo en segundos. Generalmente se debe a un problema de comunicación o a un «cuelgue» del sistema remoto.

Alertas: Muestra si se han enviado alertas mediante los siguientes iconos:

-

Cuando no se ha enviado ninguna alerta.

-

Cuando se ha enviado al menos una alerta en el período definido como «time threshold» o «umbral de tiempo» en la alerta.

+

Cuando no se ha enviado ninguna alerta.

+

Cuando se ha enviado al menos una alerta en el período definido como «time threshold» o «umbral de tiempo» en la alerta.

-

Último contacto: Muestra la fecha y hora en que se recibieron los últimos datos del agente, utilizando una barra de progreso, de acuerdo con el valor del intervalo. Si se muestra la imagen , el agente no ha enviado datos al finalizar el intervalo. Si pasamos el ratón encima de la imagen, se mostrará el último contacto en formato de fecha y hora.

+

Último contacto: Muestra la fecha y hora en que se recibieron los últimos datos del agente, utilizando una barra de progreso, de acuerdo con el valor del intervalo. Si se muestra la imagen , el agente no ha enviado datos al finalizar el intervalo. Si pasamos el ratón encima de la imagen, se mostrará el último contacto en formato de fecha y hora.

Nota: El icono sólo es visible si es usuario es administrador y es un enlace a la opción «Gestionar agentes» > «Actualizar agente» del menú de administración.

@@ -364,23 +364,23 @@ y horarias (M, W, D y H, respectivamente).

los datos más antiguos.

Las gráficas que se generan son:

-

- Gráfico horario () con un rango total de 60 minutos

+

- Gráfico horario () con un rango total de 60 minutos

-

- Gráfico diario () con un rango total de 24 horas

+

- Gráfico diario () con un rango total de 24 horas

-

- Gráfico semanal () con un rango total de 7 días

+

- Gráfico semanal () con un rango total de 7 días

-

- Gráfico mensual () con un rango total de 30 días

+

- Gráfico mensual () con un rango total de 30 días

Datos: Son, en bruto, los datos enviados por el agente:

-

- El último mes

-

- La última semana

-

- El último día

+

- El último mes

+

- La última semana

+

- El último día

3.3.2.3. Lista completa de monitores

@@ -396,8 +396,8 @@ los datos más antiguos.

Descripción: Descripción del módulo configurado en el archivo de configuración del agente.

Estado: Aparece el estado del agente mediante los siguientes iconos:

-

Cuando el monitor está correcto

-

Cuando el monitor falla

+

Cuando el monitor está correcto

+

Cuando el monitor falla

Último contacto: Aparece la fecha y hora en que se recibieron los últimos datos del agente.

@@ -416,8 +416,8 @@ los datos más antiguos.

Número de veces lanzada: Número de veces que se ha lanzado la alerta.

Estado: Muestra si se han enviado alertas mediante los siguientes iconos:

-

Cuando no se ha enviado ninguna alerta

-

Cuando se ha enviado al menos una alerta

+

Cuando no se ha enviado ninguna alerta

+

Cuando se ha enviado al menos una alerta

3.3.3. Detalle de grupos

@@ -434,10 +434,10 @@ simplemente con una rápida mirada, gracias a un sistema de bombillas de d

Monitores: Número de monitores configurados en el grupo.

Estado: Estado del agente, mediante los siguientes iconos:

-

Aparece cuando todos los monitores están correctos.

-

Aparece cuando al menos un monitor tiene algún fallo.

-

Aparece cuando al menos un monitor está caído o no hay contacto.

-

Aparece cuando el agente no tiene ningún monitor definido.

+

Aparece cuando todos los monitores están correctos.

+

Aparece cuando al menos un monitor tiene algún fallo.

+

Aparece cuando al menos un monitor está caído o no hay contacto.

+

Aparece cuando el agente no tiene ningún monitor definido.

Ok: Número de monitores que están correctos.

Fallo: Número de monitores que tienen algún fallo

diff --git a/pandora_console/help/es/chap4.php b/pandora_console/help/es/chap4.php index 9520c4ffb3..05dcff7b28 100644 --- a/pandora_console/help/es/chap4.php +++ b/pandora_console/help/es/chap4.php @@ -83,21 +83,21 @@ orden de actualización. Mediante los filtros se puede acceder sólo

ID: Identificador del incidente.

Estado: Estado en el que se encuentra el incidente mediante los siguientes iconos:

-

Cuando el incidente está activo

-

Cuando el incidente está activo y tiene comentarios

-

Cuando el incidente ha sido rechazado

-

Cuando el incidente está cerrado

-

Cuando el incidente ha expirado

+

Cuando el incidente está activo

+

Cuando el incidente está activo y tiene comentarios

+

Cuando el incidente ha sido rechazado

+

Cuando el incidente está cerrado

+

Cuando el incidente ha expirado

Nombre del Incidente: Nombre que se le ha asignado al incidente

Prioridad: Aparece la prioridad que tiene asignada el incidente mediante los siguientes iconos:

-

Prioridad muy alta

-

Prioridad alta

-

Prioridad media

-

Prioridad baja

-

Prioridad de tarea informativa

-

Prioridad de tarea de Mantenimiento

+

Prioridad muy alta

+

Prioridad alta

+

Prioridad media

+

Prioridad baja

+

Prioridad de tarea informativa

+

Prioridad de tarea de Mantenimiento

Grupo: Define el grupo al que se ha asociado el incidente. Un incidente sólo puede pertenecer a un único grupo.

diff --git a/pandora_console/help/es/chap5.php b/pandora_console/help/es/chap5.php index 6c7a2d9465..3eb75837b2 100644 --- a/pandora_console/help/es/chap5.php +++ b/pandora_console/help/es/chap5.php @@ -52,8 +52,8 @@ solucionado.

En la lista de eventos, cada uno de ellos aparece con información distribuida en las siguientes columnas:

Estado: Estado en el que se encuentra el incidente mediante los siguientes iconos:

-

Cuando el evento ha sido validado

-

Cuando el evento no ha sido validado

+

Cuando el evento ha sido validado

+

Cuando el evento no ha sido validado

Nombre del evento: Nombre asociado por Pandora al evento.

Nombre del agente: Agente en el que ha ocurrido el evento.

Nombre del grupo: Grupo al que pertenece el agente en el que ha ocurrido el evento.

diff --git a/pandora_console/help/es/chap7.php b/pandora_console/help/es/chap7.php index ffc903d560..cca5c84e8e 100644 --- a/pandora_console/help/es/chap7.php +++ b/pandora_console/help/es/chap7.php @@ -92,7 +92,7 @@ acceder a la lista de los Servidores Pandora.

Para modificar un servidor utilizamos el icono - +

Si estamos modificando un servidor podemos cambiar las siguientes diff --git a/pandora_console/images/arrow.gif b/pandora_console/images/arrow.gif deleted file mode 100644 index 9347fdf5f4..0000000000 Binary files a/pandora_console/images/arrow.gif and /dev/null differ diff --git a/pandora_console/images/b_blue.gif b/pandora_console/images/b_blue.gif deleted file mode 100644 index aef45ab000..0000000000 Binary files a/pandora_console/images/b_blue.gif and /dev/null differ diff --git a/pandora_console/images/b_down.gif b/pandora_console/images/b_down.gif deleted file mode 100644 index fa8736b7b8..0000000000 Binary files a/pandora_console/images/b_down.gif and /dev/null differ diff --git a/pandora_console/images/b_green.gif b/pandora_console/images/b_green.gif deleted file mode 100644 index 847d492a35..0000000000 Binary files a/pandora_console/images/b_green.gif and /dev/null differ diff --git a/pandora_console/images/b_red.gif b/pandora_console/images/b_red.gif deleted file mode 100644 index 6d957afe32..0000000000 Binary files a/pandora_console/images/b_red.gif and /dev/null differ diff --git a/pandora_console/images/b_white.gif b/pandora_console/images/b_white.gif deleted file mode 100644 index 60a06374ce..0000000000 Binary files a/pandora_console/images/b_white.gif and /dev/null differ diff --git a/pandora_console/images/b_yellow.gif b/pandora_console/images/b_yellow.gif deleted file mode 100644 index ff3e755776..0000000000 Binary files a/pandora_console/images/b_yellow.gif and /dev/null differ diff --git a/pandora_console/images/backgrounds/background10.jpg b/pandora_console/images/backgrounds/background10.jpg index b6806ec4a7..632610b25c 100644 Binary files a/pandora_console/images/backgrounds/background10.jpg and b/pandora_console/images/backgrounds/background10.jpg differ diff --git a/pandora_console/images/backgrounds/background2.jpg b/pandora_console/images/backgrounds/background2.jpg index 632610b25c..b6806ec4a7 100644 Binary files a/pandora_console/images/backgrounds/background2.jpg and b/pandora_console/images/backgrounds/background2.jpg differ diff --git a/pandora_console/images/binary.gif b/pandora_console/images/binary.gif deleted file mode 100644 index 52b4eafa49..0000000000 Binary files a/pandora_console/images/binary.gif and /dev/null differ diff --git a/pandora_console/images/binary.png b/pandora_console/images/binary.png new file mode 100644 index 0000000000..945e351558 Binary files /dev/null and b/pandora_console/images/binary.png differ diff --git a/pandora_console/images/bottom-left-corner.gif b/pandora_console/images/bottom-left-corner.gif deleted file mode 100644 index cd2877ce20..0000000000 Binary files a/pandora_console/images/bottom-left-corner.gif and /dev/null differ diff --git a/pandora_console/images/bottom-right-corner.gif b/pandora_console/images/bottom-right-corner.gif deleted file mode 100644 index 203a1606f8..0000000000 Binary files a/pandora_console/images/bottom-right-corner.gif and /dev/null differ diff --git a/pandora_console/images/config.gif b/pandora_console/images/config.gif deleted file mode 100644 index ad0598a3a3..0000000000 Binary files a/pandora_console/images/config.gif and /dev/null differ diff --git a/pandora_console/images/config.png b/pandora_console/images/config.png new file mode 100644 index 0000000000..3570ec7d46 Binary files /dev/null and b/pandora_console/images/config.png differ diff --git a/pandora_console/images/console/icons/network.gif b/pandora_console/images/console/icons/network.gif deleted file mode 100644 index be64889482..0000000000 Binary files a/pandora_console/images/console/icons/network.gif and /dev/null differ diff --git a/pandora_console/images/data.gif b/pandora_console/images/data.gif deleted file mode 100644 index 3c550d44d8..0000000000 Binary files a/pandora_console/images/data.gif and /dev/null differ diff --git a/pandora_console/images/data.png b/pandora_console/images/data.png new file mode 100644 index 0000000000..43ed514317 Binary files /dev/null and b/pandora_console/images/data.png differ diff --git a/pandora_console/images/data_d.gif b/pandora_console/images/data_d.gif deleted file mode 100644 index 1378102f61..0000000000 Binary files a/pandora_console/images/data_d.gif and /dev/null differ diff --git a/pandora_console/images/data_m.gif b/pandora_console/images/data_m.gif deleted file mode 100644 index a93c07a0e8..0000000000 Binary files a/pandora_console/images/data_m.gif and /dev/null differ diff --git a/pandora_console/images/data_w.gif b/pandora_console/images/data_w.gif deleted file mode 100644 index 5e41097732..0000000000 Binary files a/pandora_console/images/data_w.gif and /dev/null differ diff --git a/pandora_console/images/dot_blue.gif b/pandora_console/images/dot_blue.gif deleted file mode 100644 index bd04ea3045..0000000000 Binary files a/pandora_console/images/dot_blue.gif and /dev/null differ diff --git a/pandora_console/images/dot_down.gif b/pandora_console/images/dot_down.gif deleted file mode 100644 index 1ac77f133c..0000000000 Binary files a/pandora_console/images/dot_down.gif and /dev/null differ diff --git a/pandora_console/images/dot_green.gif b/pandora_console/images/dot_green.gif deleted file mode 100644 index e3b94776e5..0000000000 Binary files a/pandora_console/images/dot_green.gif and /dev/null differ diff --git a/pandora_console/images/dot_red.gif b/pandora_console/images/dot_red.gif deleted file mode 100644 index 72dda6743a..0000000000 Binary files a/pandora_console/images/dot_red.gif and /dev/null differ diff --git a/pandora_console/images/dot_white.gif b/pandora_console/images/dot_white.gif deleted file mode 100644 index 2632d652c9..0000000000 Binary files a/pandora_console/images/dot_white.gif and /dev/null differ diff --git a/pandora_console/images/dot_yellow.gif b/pandora_console/images/dot_yellow.gif deleted file mode 100644 index 5a9913641f..0000000000 Binary files a/pandora_console/images/dot_yellow.gif and /dev/null differ diff --git a/pandora_console/images/email_error.png b/pandora_console/images/email_error.png deleted file mode 100644 index 8bdd3304de..0000000000 Binary files a/pandora_console/images/email_error.png and /dev/null differ diff --git a/pandora_console/images/email_go.png b/pandora_console/images/email_go.png deleted file mode 100644 index 4a6c5d396a..0000000000 Binary files a/pandora_console/images/email_go.png and /dev/null differ diff --git a/pandora_console/images/file.gif b/pandora_console/images/file.gif deleted file mode 100644 index 4f85348582..0000000000 Binary files a/pandora_console/images/file.gif and /dev/null differ diff --git a/pandora_console/images/file.png b/pandora_console/images/file.png new file mode 100644 index 0000000000..aebbf0fa7e Binary files /dev/null and b/pandora_console/images/file.png differ diff --git a/pandora_console/images/g_apps.gif b/pandora_console/images/g_apps.gif deleted file mode 100644 index 935da7b0c5..0000000000 Binary files a/pandora_console/images/g_apps.gif and /dev/null differ diff --git a/pandora_console/images/g_comms.gif b/pandora_console/images/g_comms.gif deleted file mode 100644 index d32d107c97..0000000000 Binary files a/pandora_console/images/g_comms.gif and /dev/null differ diff --git a/pandora_console/images/g_db.gif b/pandora_console/images/g_db.gif deleted file mode 100644 index 8715a6c870..0000000000 Binary files a/pandora_console/images/g_db.gif and /dev/null differ diff --git a/pandora_console/images/g_firewall.gif b/pandora_console/images/g_firewall.gif deleted file mode 100644 index 4ffbf20def..0000000000 Binary files a/pandora_console/images/g_firewall.gif and /dev/null differ diff --git a/pandora_console/images/g_ids.gif b/pandora_console/images/g_ids.gif deleted file mode 100644 index 87d9d5cf52..0000000000 Binary files a/pandora_console/images/g_ids.gif and /dev/null differ diff --git a/pandora_console/images/g_others.gif b/pandora_console/images/g_others.gif deleted file mode 100644 index 2f2850dd5a..0000000000 Binary files a/pandora_console/images/g_others.gif and /dev/null differ diff --git a/pandora_console/images/g_servers.gif b/pandora_console/images/g_servers.gif deleted file mode 100644 index aba9cffc35..0000000000 Binary files a/pandora_console/images/g_servers.gif and /dev/null differ diff --git a/pandora_console/images/g_workstation.gif b/pandora_console/images/g_workstation.gif deleted file mode 100644 index 77515d66d0..0000000000 Binary files a/pandora_console/images/g_workstation.gif and /dev/null differ diff --git a/pandora_console/images/grafica_d.gif b/pandora_console/images/grafica_d.gif deleted file mode 100644 index 1f6b0f51fb..0000000000 Binary files a/pandora_console/images/grafica_d.gif and /dev/null differ diff --git a/pandora_console/images/grafica_h.gif b/pandora_console/images/grafica_h.gif deleted file mode 100644 index 26e0c6dc9f..0000000000 Binary files a/pandora_console/images/grafica_h.gif and /dev/null differ diff --git a/pandora_console/images/grafica_m.gif b/pandora_console/images/grafica_m.gif deleted file mode 100644 index 183e0fd157..0000000000 Binary files a/pandora_console/images/grafica_m.gif and /dev/null differ diff --git a/pandora_console/images/grafica_w.gif b/pandora_console/images/grafica_w.gif deleted file mode 100644 index 0db3c339cd..0000000000 Binary files a/pandora_console/images/grafica_w.gif and /dev/null differ diff --git a/pandora_console/images/groups_small/binary.gif b/pandora_console/images/groups_small/binary.gif deleted file mode 100644 index 52b4eafa49..0000000000 Binary files a/pandora_console/images/groups_small/binary.gif and /dev/null differ diff --git a/pandora_console/images/groups_small/g_apps.png b/pandora_console/images/groups_small/g_apps.png new file mode 100644 index 0000000000..4f9be5a260 Binary files /dev/null and b/pandora_console/images/groups_small/g_apps.png differ diff --git a/pandora_console/images/groups_small/g_comms.png b/pandora_console/images/groups_small/g_comms.png new file mode 100644 index 0000000000..8cdfe024b1 Binary files /dev/null and b/pandora_console/images/groups_small/g_comms.png differ diff --git a/pandora_console/images/groups_small/g_db.png b/pandora_console/images/groups_small/g_db.png new file mode 100644 index 0000000000..9392a79fff Binary files /dev/null and b/pandora_console/images/groups_small/g_db.png differ diff --git a/pandora_console/images/groups_small/g_firewall.png b/pandora_console/images/groups_small/g_firewall.png new file mode 100644 index 0000000000..d7f788ba80 Binary files /dev/null and b/pandora_console/images/groups_small/g_firewall.png differ diff --git a/pandora_console/images/groups_small/g_ids.png b/pandora_console/images/groups_small/g_ids.png new file mode 100644 index 0000000000..e2f2147b5f Binary files /dev/null and b/pandora_console/images/groups_small/g_ids.png differ diff --git a/pandora_console/images/groups_small/g_others.png b/pandora_console/images/groups_small/g_others.png new file mode 100644 index 0000000000..6e21161a65 Binary files /dev/null and b/pandora_console/images/groups_small/g_others.png differ diff --git a/pandora_console/images/groups_small/g_servers.png b/pandora_console/images/groups_small/g_servers.png new file mode 100644 index 0000000000..3e2ede8d29 Binary files /dev/null and b/pandora_console/images/groups_small/g_servers.png differ diff --git a/pandora_console/images/groups_small/g_workstation.png b/pandora_console/images/groups_small/g_workstation.png new file mode 100644 index 0000000000..c4432bc360 Binary files /dev/null and b/pandora_console/images/groups_small/g_workstation.png differ diff --git a/pandora_console/images/groups_small/star.png b/pandora_console/images/groups_small/star.png deleted file mode 100644 index b88c857895..0000000000 Binary files a/pandora_console/images/groups_small/star.png and /dev/null differ diff --git a/pandora_console/images/help.gif b/pandora_console/images/help.gif deleted file mode 100644 index e85f642bf6..0000000000 Binary files a/pandora_console/images/help.gif and /dev/null differ diff --git a/pandora_console/images/help2.png b/pandora_console/images/help2.png new file mode 100644 index 0000000000..c6a2750e90 Binary files /dev/null and b/pandora_console/images/help2.png differ diff --git a/pandora_console/images/link.gif b/pandora_console/images/link.gif deleted file mode 100644 index 7120c85797..0000000000 Binary files a/pandora_console/images/link.gif and /dev/null differ diff --git a/pandora_console/images/link.png b/pandora_console/images/link.png new file mode 100644 index 0000000000..543cbd1c8f Binary files /dev/null and b/pandora_console/images/link.png differ diff --git a/pandora_console/images/lupa.gif b/pandora_console/images/lupa.gif deleted file mode 100644 index 8f8c8659de..0000000000 Binary files a/pandora_console/images/lupa.gif and /dev/null differ diff --git a/pandora_console/images/lupa.png b/pandora_console/images/lupa.png new file mode 100644 index 0000000000..c0665fe30e Binary files /dev/null and b/pandora_console/images/lupa.png differ diff --git a/pandora_console/images/mail.gif b/pandora_console/images/mail.gif deleted file mode 100644 index 8c609326f0..0000000000 Binary files a/pandora_console/images/mail.gif and /dev/null differ diff --git a/pandora_console/images/maintab.gif b/pandora_console/images/maintab.gif deleted file mode 100644 index 4e6688e126..0000000000 Binary files a/pandora_console/images/maintab.gif and /dev/null differ diff --git a/pandora_console/images/master.gif b/pandora_console/images/master.gif deleted file mode 100644 index 6556997026..0000000000 Binary files a/pandora_console/images/master.gif and /dev/null differ diff --git a/pandora_console/images/master.png b/pandora_console/images/master.png new file mode 100644 index 0000000000..f6218dec1b Binary files /dev/null and b/pandora_console/images/master.png differ diff --git a/pandora_console/images/mod_data.gif b/pandora_console/images/mod_data.gif deleted file mode 100644 index b13df20514..0000000000 Binary files a/pandora_console/images/mod_data.gif and /dev/null differ diff --git a/pandora_console/images/mod_data_inc.gif b/pandora_console/images/mod_data_inc.gif deleted file mode 100644 index 580845a7c6..0000000000 Binary files a/pandora_console/images/mod_data_inc.gif and /dev/null differ diff --git a/pandora_console/images/mod_icmp_data.gif b/pandora_console/images/mod_icmp_data.gif deleted file mode 100644 index 277cb704ab..0000000000 Binary files a/pandora_console/images/mod_icmp_data.gif and /dev/null differ diff --git a/pandora_console/images/mod_icmp_proc.gif b/pandora_console/images/mod_icmp_proc.gif deleted file mode 100644 index c1b536f569..0000000000 Binary files a/pandora_console/images/mod_icmp_proc.gif and /dev/null differ diff --git a/pandora_console/images/mod_proc.gif b/pandora_console/images/mod_proc.gif deleted file mode 100644 index a3f5e20eeb..0000000000 Binary files a/pandora_console/images/mod_proc.gif and /dev/null differ diff --git a/pandora_console/images/mod_snmp_data.gif b/pandora_console/images/mod_snmp_data.gif deleted file mode 100644 index 69d37d71f7..0000000000 Binary files a/pandora_console/images/mod_snmp_data.gif and /dev/null differ diff --git a/pandora_console/images/mod_snmp_inc.gif b/pandora_console/images/mod_snmp_inc.gif deleted file mode 100644 index 89d784e5bc..0000000000 Binary files a/pandora_console/images/mod_snmp_inc.gif and /dev/null differ diff --git a/pandora_console/images/mod_snmp_proc.gif b/pandora_console/images/mod_snmp_proc.gif deleted file mode 100644 index 1f52a0d7d1..0000000000 Binary files a/pandora_console/images/mod_snmp_proc.gif and /dev/null differ diff --git a/pandora_console/images/mod_snmp_string.gif b/pandora_console/images/mod_snmp_string.gif deleted file mode 100644 index a9b63a6b4e..0000000000 Binary files a/pandora_console/images/mod_snmp_string.gif and /dev/null differ diff --git a/pandora_console/images/mod_string.gif b/pandora_console/images/mod_string.gif deleted file mode 100644 index ab8cb19428..0000000000 Binary files a/pandora_console/images/mod_string.gif and /dev/null differ diff --git a/pandora_console/images/mod_tcp_data.gif b/pandora_console/images/mod_tcp_data.gif deleted file mode 100644 index b0b36d6f34..0000000000 Binary files a/pandora_console/images/mod_tcp_data.gif and /dev/null differ diff --git a/pandora_console/images/mod_tcp_inc.gif b/pandora_console/images/mod_tcp_inc.gif deleted file mode 100644 index cc9b3f5ef4..0000000000 Binary files a/pandora_console/images/mod_tcp_inc.gif and /dev/null differ diff --git a/pandora_console/images/mod_tcp_proc.gif b/pandora_console/images/mod_tcp_proc.gif deleted file mode 100644 index a813ce44df..0000000000 Binary files a/pandora_console/images/mod_tcp_proc.gif and /dev/null differ diff --git a/pandora_console/images/mod_tcp_string.gif b/pandora_console/images/mod_tcp_string.gif deleted file mode 100644 index 87be4d7dcd..0000000000 Binary files a/pandora_console/images/mod_tcp_string.gif and /dev/null differ diff --git a/pandora_console/images/mod_udp_proc.gif b/pandora_console/images/mod_udp_proc.gif deleted file mode 100644 index b5d7381200..0000000000 Binary files a/pandora_console/images/mod_udp_proc.gif and /dev/null differ diff --git a/pandora_console/images/network.gif b/pandora_console/images/network.gif deleted file mode 100644 index b2f5313107..0000000000 Binary files a/pandora_console/images/network.gif and /dev/null differ diff --git a/pandora_console/images/network.png b/pandora_console/images/network.png new file mode 100644 index 0000000000..73394fff7d Binary files /dev/null and b/pandora_console/images/network.png differ diff --git a/pandora_console/images/nota.gif b/pandora_console/images/nota.gif deleted file mode 100644 index 5e39a65647..0000000000 Binary files a/pandora_console/images/nota.gif and /dev/null differ diff --git a/pandora_console/images/outlimits.png b/pandora_console/images/outlimits.png deleted file mode 100644 index 5083a4af36..0000000000 Binary files a/pandora_console/images/outlimits.png and /dev/null differ diff --git a/pandora_console/images/outof.gif b/pandora_console/images/outof.gif deleted file mode 100644 index fcbd16237b..0000000000 Binary files a/pandora_console/images/outof.gif and /dev/null differ diff --git a/pandora_console/images/play.gif b/pandora_console/images/play.gif deleted file mode 100644 index 805cb99298..0000000000 Binary files a/pandora_console/images/play.gif and /dev/null differ diff --git a/pandora_console/images/pulpo_cilindro.gif b/pandora_console/images/pulpo_cilindro.gif deleted file mode 100644 index 08a0da9d04..0000000000 Binary files a/pandora_console/images/pulpo_cilindro.gif and /dev/null differ diff --git a/pandora_console/images/refresh.gif b/pandora_console/images/refresh.gif deleted file mode 100644 index c7e5f68432..0000000000 Binary files a/pandora_console/images/refresh.gif and /dev/null differ diff --git a/pandora_console/images/refresh.png b/pandora_console/images/refresh.png new file mode 100644 index 0000000000..39ca33079c Binary files /dev/null and b/pandora_console/images/refresh.png differ diff --git a/pandora_console/images/scroll.gif b/pandora_console/images/scroll.gif deleted file mode 100644 index f0e3671ce2..0000000000 Binary files a/pandora_console/images/scroll.gif and /dev/null differ diff --git a/pandora_console/images/snmp.gif b/pandora_console/images/snmp.gif deleted file mode 100644 index 0d75a5ff7b..0000000000 Binary files a/pandora_console/images/snmp.gif and /dev/null differ diff --git a/pandora_console/images/snmp.png b/pandora_console/images/snmp.png new file mode 100644 index 0000000000..649eb3e6e2 Binary files /dev/null and b/pandora_console/images/snmp.png differ diff --git a/pandora_console/images/so_aix.gif b/pandora_console/images/so_aix.gif deleted file mode 100644 index e2cea98cb9..0000000000 Binary files a/pandora_console/images/so_aix.gif and /dev/null differ diff --git a/pandora_console/images/so_beos.gif b/pandora_console/images/so_beos.gif deleted file mode 100644 index e5a04e1f5f..0000000000 Binary files a/pandora_console/images/so_beos.gif and /dev/null differ diff --git a/pandora_console/images/so_bsd.gif b/pandora_console/images/so_bsd.gif deleted file mode 100644 index 7ab44d3ecd..0000000000 Binary files a/pandora_console/images/so_bsd.gif and /dev/null differ diff --git a/pandora_console/images/so_cisco.gif b/pandora_console/images/so_cisco.gif deleted file mode 100644 index 060684586f..0000000000 Binary files a/pandora_console/images/so_cisco.gif and /dev/null differ diff --git a/pandora_console/images/so_hpux.gif b/pandora_console/images/so_hpux.gif deleted file mode 100644 index 55e3374092..0000000000 Binary files a/pandora_console/images/so_hpux.gif and /dev/null differ diff --git a/pandora_console/images/so_linux.gif b/pandora_console/images/so_linux.gif deleted file mode 100644 index 1edb15bc61..0000000000 Binary files a/pandora_console/images/so_linux.gif and /dev/null differ diff --git a/pandora_console/images/so_mac.gif b/pandora_console/images/so_mac.gif deleted file mode 100644 index 0458707161..0000000000 Binary files a/pandora_console/images/so_mac.gif and /dev/null differ diff --git a/pandora_console/images/so_other.gif b/pandora_console/images/so_other.gif deleted file mode 100644 index f90a545a49..0000000000 Binary files a/pandora_console/images/so_other.gif and /dev/null differ diff --git a/pandora_console/images/so_solaris.gif b/pandora_console/images/so_solaris.gif deleted file mode 100644 index 9840cfdffd..0000000000 Binary files a/pandora_console/images/so_solaris.gif and /dev/null differ diff --git a/pandora_console/images/so_win.gif b/pandora_console/images/so_win.gif deleted file mode 100644 index ce817dc68b..0000000000 Binary files a/pandora_console/images/so_win.gif and /dev/null differ diff --git a/pandora_console/images/target.gif b/pandora_console/images/target.gif deleted file mode 100644 index b2d3c2bce0..0000000000 Binary files a/pandora_console/images/target.gif and /dev/null differ diff --git a/pandora_console/images/target.png b/pandora_console/images/target.png new file mode 100644 index 0000000000..2151dc8e2b Binary files /dev/null and b/pandora_console/images/target.png differ diff --git a/pandora_console/images/time.gif b/pandora_console/images/time.gif deleted file mode 100644 index 83993c011a..0000000000 Binary files a/pandora_console/images/time.gif and /dev/null differ diff --git a/pandora_console/images/tip.gif b/pandora_console/images/tip.gif deleted file mode 100644 index 49fd13ca9d..0000000000 Binary files a/pandora_console/images/tip.gif and /dev/null differ diff --git a/pandora_console/images/tip.png b/pandora_console/images/tip.png new file mode 100644 index 0000000000..06509d8e88 Binary files /dev/null and b/pandora_console/images/tip.png differ diff --git a/pandora_console/images/unread.gif b/pandora_console/images/unread.gif deleted file mode 100644 index 7138a9a9fd..0000000000 Binary files a/pandora_console/images/unread.gif and /dev/null differ diff --git a/pandora_console/images/upper-left-corner.gif b/pandora_console/images/upper-left-corner.gif deleted file mode 100644 index 5f0e13d1e7..0000000000 Binary files a/pandora_console/images/upper-left-corner.gif and /dev/null differ diff --git a/pandora_console/images/upper-right-corner.gif b/pandora_console/images/upper-right-corner.gif deleted file mode 100644 index 0812195a2b..0000000000 Binary files a/pandora_console/images/upper-right-corner.gif and /dev/null differ diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 98d63058ab..2ae9adb7f5 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -175,9 +175,9 @@ function event_reporting ($id_agent, $period){ } echo ""; if ($row2["estado"] == 0) - echo ""; + echo ""; else - echo ""; + echo ""; echo "".$row2["evento"]; echo ""; if ($row2["estado"] <> 0) @@ -216,9 +216,9 @@ function alert_reporting ($id_agent_module){ } echo ""; if ($data["times_fired"] <> 0) - echo ""; + echo ""; else - echo ""; + echo ""; echo "".$data["descripcion"].""; echo "".human_time_description($data["time_threshold"]); if ($data["last_fired"] == "0000-00-00 00:00:00") { diff --git a/pandora_console/include/languages/language_en.php b/pandora_console/include/languages/language_en.php index 3c50c722bd..09c5f99384 100644 --- a/pandora_console/include/languages/language_en.php +++ b/pandora_console/include/languages/language_en.php @@ -890,6 +890,10 @@ $lang_label["no_reporting_def"] = "There are no defined reportings"; $lang_label["no_map_def"] = "There are no defined maps"; $lang_label["no_repitem_def"] = "There are no defined report items"; +$lang_label["message_read"]= "Message already read"; +$lang_label["message_not_read"]= "Message not read"; + + global $lang_label; global $help_label; ?> diff --git a/pandora_console/include/styles/god.css b/pandora_console/include/styles/god.css index 615ab22833..89b61a7f38 100644 --- a/pandora_console/include/styles/god.css +++ b/pandora_console/include/styles/god.css @@ -55,7 +55,7 @@ div.arrowg>ul, div.arrowgs>ul, div#arrowgl>ul, div#arrowgls>ul { width: 75%; } .arrowg li, .arrowg li:hover, .arrowgs li, #arrowgl li, #arrowgl li:hover, #arrowgls li { - background: url(../../images/arrow.gif) no-repeat 2px 4px; + background: url(../../images/arrow.png) no-repeat 2px 4px; margin-left: 26px; padding: 0px 0px 0px 14px; } diff --git a/pandora_console/include/styles/install.css b/pandora_console/include/styles/install.css index fe0cb54d3e..38242989c7 100644 --- a/pandora_console/include/styles/install.css +++ b/pandora_console/include/styles/install.css @@ -79,4 +79,11 @@ div.warn { color: #ac4444; margin-top: 7px; padding: 2px 1px 6px 25px; +} +span.arr{ + background: url(../../images/arrow.png) no-repeat; + margin-top: 2px; + margin-left: 5px; + padding: 2px 1px 6px 15px; + display: block; } \ No newline at end of file diff --git a/pandora_console/include/styles/link.css b/pandora_console/include/styles/link.css index bf0efc6148..9b17e6a7da 100644 --- a/pandora_console/include/styles/link.css +++ b/pandora_console/include/styles/link.css @@ -38,8 +38,11 @@ div.linkli>ul { width: 100%; } .linkli li, .linkli li:hover { - background: url(../../images/link.gif) no-repeat 3px 8px; + background: url(../../images/link.png) no-repeat 3px 8px; } #link a:hover, .linkli li:hover { background-color: #cde0ad; } +#link li.bb0 { + border-bottom: 0px; +} \ No newline at end of file diff --git a/pandora_console/include/styles/op.css b/pandora_console/include/styles/op.css index 1812bddddd..248728dc5f 100644 --- a/pandora_console/include/styles/op.css +++ b/pandora_console/include/styles/op.css @@ -57,11 +57,10 @@ div.arrow>ul, div.arrows>ul, div#arrowl>ul, div#arrowls>ul { width: 75%; } .arrow li, .arrow li:hover, .arrows li, #arrowl li, #arrowl li:hover, #arrowls li { - background: url(../../images/arrow.gif) no-repeat 2px 4px; + background: url(../../images/arrow.png) no-repeat 2px 4px; margin-left: 26px; padding: 0px 0px 0px 14px; } - #op a:hover , #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 , diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 0a649c83a1..8b0eac91a6 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -89,7 +89,6 @@ h4 { font-size: 13px; color: #000; } - a { color: #486787; text-decoration: none; @@ -456,7 +455,7 @@ div.title_line { background: #cde0ad; } #menu_tab li:hover a { - background: #b2b08a url("../images/arrow.gif") no-repeat right 3px; + background: #b2b08a url("../images/arrow.png") no-repeat right 3px; } #menu_tab li:hover ul a, #menu_tab .mn ul { background: #db6351; @@ -497,7 +496,7 @@ span.agents { background: url(../../images/bricks.png) no-repeat; } span.data { - background: url(../../images/data.gif) no-repeat; + background: url(../../images/data.png) no-repeat; } span.alerts { background: url(../../images/bell.png) no-repeat; @@ -506,20 +505,26 @@ span.time { background: url(../../images/hourglass.png) no-repeat; } span.net { - background: url(../../images/network.gif) no-repeat; + background: url(../../images/network.png) no-repeat; } span.master { - background: url(../../images/master.gif) no-repeat; + background: url(../../images/master.png) no-repeat; } span.snmp { - background: url(../../images/snmp.gif) no-repeat; + background: url(../../images/snmp.png) no-repeat; } span.binary { - background: url(../../images/binary.gif) no-repeat; + background: url(../../images/binary.png) no-repeat; } span.recon { background: url(../../images/recon.png) no-repeat; } +span.rmess { + background: url(../../images/email_open.png) no-repeat; +} +span.nrmess { + background: url(../../images/email.png) no-repeat; +} span.users, span.agents, span.data, span.alerts, span.time, span.net, span.master, span.snmp, span.binary, span.recon { margin-left: 4px; @@ -527,6 +532,11 @@ span.master, span.snmp, span.binary, span.recon { padding: 4px 8px 12px 30px; display: block; } +span.rmess, span.nrmess { + margin-left: 14px; + padding: 1px 0px 10px 30px; + display: block; +} /* New styles for data box */ .databox, .databox_color, .databox_frame { margin-bottom: 15px; diff --git a/pandora_console/include/styles/pandora_red.css b/pandora_console/include/styles/pandora_red.css index d4f1d571af..4d74aae9e7 100644 --- a/pandora_console/include/styles/pandora_red.css +++ b/pandora_console/include/styles/pandora_red.css @@ -333,7 +333,7 @@ td.datos_jus, td.datos2_jus { text-align: center; } .error { - background: url(../../images/error.gif) no-repeat; + background: url(../../images/error.png) no-repeat; padding: 4px 1px 6px 30px; } .red , .redb, .redi, .error { @@ -346,7 +346,7 @@ td.datos_jus, td.datos2_jus { } .suc { color: #5a8629; - background: url(../../images/suc.gif) no-repeat 1px; + background: url(../../images/suc.png) no-repeat 1px; padding: 4px 1px 6px 30px; } .green { @@ -452,7 +452,7 @@ div.title_line { background: #cde0ad; } #menu_tab li:hover a { - background: #b2b08a url("../images/arrow.gif") no-repeat right 3px; + background: #b2b08a url("../images/arrow.png") no-repeat right 3px; } #menu_tab li:hover ul a, #menu_tab .mn ul { background: #db6351; @@ -493,7 +493,7 @@ span.agents { background: url(../../images/bricks.png) no-repeat; } span.data { - background: url(../../images/data.gif) no-repeat; + background: url(../../images/data.png) no-repeat; } span.alerts { background: url(../../images/bell.png) no-repeat; @@ -502,20 +502,26 @@ span.time { background: url(../../images/hourglass.png) no-repeat; } span.net { - background: url(../../images/network.gif) no-repeat; + background: url(../../images/network.png) no-repeat; } span.master { - background: url(../../images/master.gif) no-repeat; + background: url(../../images/master.png) no-repeat; } span.snmp { - background: url(../../images/snmp.gif) no-repeat; + background: url(../../images/snmp.png) no-repeat; } span.binary { - background: url(../../images/binary.gif) no-repeat; + background: url(../../images/binary.png) no-repeat; } span.recon { background: url(../../images/recon.png) no-repeat; } +span.rmess { + background: url(../../images/email_open.png) no-repeat; +} +span.nrmess { + background: url(../../images/email.png) no-repeat; +} span.users, span.agents, span.data, span.alerts, span.time, span.net, span.master, span.snmp, span.binary, span.recon { margin-left: 4px; @@ -523,6 +529,11 @@ span.master, span.snmp, span.binary, span.recon { padding: 4px 8px 12px 30px; display: block; } +span.rmess, span.nrmess { + margin-left: 14px; + padding: 1px 0px 10px 30px; + display: block; +} /* New styles for data box */ .databox, .databox_color, .databox_frame { margin-bottom: 15px; diff --git a/pandora_console/include/styles/tip.css b/pandora_console/include/styles/tip.css index 99ba0e4900..4255d7f188 100644 --- a/pandora_console/include/styles/tip.css +++ b/pandora_console/include/styles/tip.css @@ -1,6 +1,6 @@ a.tip, a.tip2, a.tipp { cursor: help; - background: url(../../images/tip.gif) no-repeat; + background: url(../../images/tip.png) no-repeat; } a.tip , a.tip2 { padding: 5px 2px 5px 12px; @@ -10,7 +10,7 @@ a.tipp { } a.help { cursor: help; - background: url(../../images/help.gif) no-repeat; + background: url(../../images/help2.png) no-repeat; padding: 2px 2px 2px 12px; left: 5px; text-transform: capitalize; diff --git a/pandora_console/index.php b/pandora_console/index.php index 9de8057751..cd121de794 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -25,7 +25,7 @@ // Pandora FMS 1.x uses Pear Image::Graph code //Pandora Version, if not defined here it would take from config.php -$build_version="PC070623"; +$build_version="PC070627"; $pandora_version="v1.3 Beta 2"; global $build_version; global $pandora_version; @@ -102,7 +102,7 @@ if ( (isset ($_GET["refr"])) || (isset($_POST["refr"])) ){ // Pandora FMS 1.3 custom style selection echo ''; ?> - + diff --git a/pandora_console/install.php b/pandora_console/install.php index d586a25afc..6b5ff94304 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -44,13 +44,13 @@ error_reporting(0); function check_extension ( $ext, $label ){ echo ""; - echo " $label"; + echo " $label "; echo ""; if (!extension_loaded($ext)){ - echo ""; + echo ""; return 1; } else { - echo ""; + echo ""; return 0; } echo ""; @@ -58,13 +58,13 @@ function check_extension ( $ext, $label ){ function check_include ( $ext, $label ){ echo ""; - echo " $label"; + echo " $label "; echo ""; if (!include($ext)){ - echo ""; + echo ""; return 1; } else { - echo ""; + echo ""; return 0; } echo ""; @@ -72,13 +72,13 @@ function check_include ( $ext, $label ){ function check_exists ( $file, $label ){ echo ""; - echo " $label"; + echo " $label "; echo ""; if (!file_exists ($file)){ - echo " "; + echo " "; return 1; } else { - echo " "; + echo " "; return 0; } echo ""; @@ -86,13 +86,13 @@ function check_exists ( $file, $label ){ function check_generic ( $ok, $label ){ echo ""; - echo " $label"; + echo " $label "; echo ""; if ($ok == 0 ){ - echo " "; + echo " "; return 1; } else { - echo " "; + echo " "; return 0; } echo ""; @@ -100,21 +100,21 @@ function check_generic ( $ok, $label ){ function check_variable ( $var, $value, $label, $mode ){ echo ""; - echo " $label"; + echo " $label "; echo ""; if ($mode == 1){ if ($var >= $value){ - echo " "; + echo " "; return 0; } else { - echo " "; + echo " "; return 1; } } elseif ($var == $value){ - echo " "; + echo " "; return 0; } else { - echo " "; + echo " "; return 1; } echo ""; @@ -249,7 +249,7 @@ function install_step3() {

DB Password for this user
- +
DB Hostname of MySQL
@@ -313,7 +313,7 @@ function install_step4() { echo "

Pandora FMS Console installation wizard. Step #4 of 4

-
+

Creating database and default configuration file

"; @@ -376,7 +376,7 @@ $BASE_URL="'.$url.'"; // Base URL
"; if ($everything_ok == 1) { - echo ""; + echo "

"; } else { echo "
There was some problems. Installation is not completed.

Please correct failures before trying again. diff --git a/pandora_console/operation/agentes/bulbs.php b/pandora_console/operation/agentes/bulbs.php index 7635ec9ded..544cd462ab 100644 --- a/pandora_console/operation/agentes/bulbs.php +++ b/pandora_console/operation/agentes/bulbs.php @@ -22,21 +22,22 @@ echo "

+ - ".$lang_label["green_light"]." + - ".$lang_label["red_light"]." + - ".$lang_label["yellow_light"]." + - ".$lang_label["fired"]." + - ".$lang_label["no_light"]." + - ".$lang_label["blue_light"]." + - ".$lang_label["broken_light"]." + - ".$lang_label["not_fired"]." +
- - ".$lang_label["green_light"]." - - ".$lang_label["red_light"]." - - ".$lang_label["yellow_light"]." - - ".$lang_label["fired"]."
- - ".$lang_label["no_light"]." - - ".$lang_label["blue_light"]." - - ".$lang_label["broken_light"]." - - ".$lang_label["not_fired"]."
"; ?> \ No newline at end of file diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php index a1f634eb94..745ed5bed8 100644 --- a/pandora_console/operation/agentes/estado_agente.php +++ b/pandora_console/operation/agentes/estado_agente.php @@ -243,21 +243,21 @@ if (comprueba_login() == 0) { if ($numero_monitor <> 0){ if ($estado_general <> 0){ if ($estado_cambio == 0){ - echo ""; + echo ""; } else { - echo ""; + echo ""; } } elseif ($monitor_ok > 0) { - echo ""; + echo ""; } elseif ($numero_datamodules > 0) { - echo ""; + echo ""; } elseif ($monitor_down > 0) { - echo ""; + echo ""; } } else - echo ""; + echo ""; // checks if an alert was fired recently echo ""; @@ -265,9 +265,9 @@ if (comprueba_login() == 0) { echo " ".$lang_label["disabled"].""; else { if (check_alert_fired($id_agente) == 1) - echo ""; + echo ""; else - echo ""; + echo ""; } echo ""; echo ""; diff --git a/pandora_console/operation/agentes/estado_alertas.php b/pandora_console/operation/agentes/estado_alertas.php index d2728c8f05..f6fc9935f8 100644 --- a/pandora_console/operation/agentes/estado_alertas.php +++ b/pandora_console/operation/agentes/estado_alertas.php @@ -110,9 +110,9 @@ if (isset($_GET["id_agente"])){ } echo "".$data["times_fired"].""; if ($data["times_fired"] <> 0) - echo ""; + echo ""; else - echo ""; + echo ""; } echo ''; @@ -202,11 +202,11 @@ if (isset($_GET["id_agente"])){ if ($data["times_fired"] <> 0) $string=$string." - "; + "; else $string=$string." - "; + "; $string = $string."" .dame_nombre_alerta($data["id_alerta"]).""; @@ -233,9 +233,9 @@ if (isset($_GET["id_agente"])){ } //end while if (isset($string)) { echo ""; - echo " - ".$lang_label["fired"].""; + echo " - ".$lang_label["fired"].""; echo ""; - echo " - ".$lang_label["not_fired"]; + echo " - ".$lang_label["not_fired"]; echo ""; echo "
"; echo ""; diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index 7706245815..d1deca70d1 100644 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -67,7 +67,7 @@ if (comprueba_login() == 0) { '; @@ -104,7 +104,7 @@ if (comprueba_login() == 0) { } elseif ($agent_type == 1) { echo ' - '; echo ''; diff --git a/pandora_console/operation/agentes/estado_grupo.php b/pandora_console/operation/agentes/estado_grupo.php index 2cbda3df0c..304e02fda3 100644 --- a/pandora_console/operation/agentes/estado_grupo.php +++ b/pandora_console/operation/agentes/estado_grupo.php @@ -136,22 +136,22 @@ $icono_type = ""; if ($grupo[$real_count]["bad"] > 0) { $icono_type = $icono_type." - "; + "; } if ($grupo[$real_count]["ok"] > 0) { $icono_type = $icono_type." - "; + "; } // Show yellow light if there are recent alerts fired for this group if ($grupo[$real_count]["alerts"] > 0 ){ $icono_type=$icono_type." - "; + "; } // Show grey light if there are agent down for this group if ($grupo[$real_count]["down"] > 0 ){ $icono_type=$icono_type." - "; + "; } // Show red flag is group has disabled alert system @@ -207,7 +207,7 @@ @@ -230,7 +230,7 @@ if ($config_show_lastalerts == 1) $celda .= " @@ -244,7 +244,7 @@ sec=estado& sec2=operation/agentes/estado_grupo& update_netgroup=".$grupo[$real_count]["id_grupo"]."'> - "; + "; } $celda .= "

". $icono_type."

diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php index 544e3f9e07..3900cafccf 100644 --- a/pandora_console/operation/agentes/estado_monitores.php +++ b/pandora_console/operation/agentes/estado_monitores.php @@ -76,18 +76,18 @@ if (comprueba_login() == 0) { // echo ""; + "; else if ($est_estado == 1) if ($est_cambio ==1) echo ""; + "; else echo ""; + "; else echo ""; + "; echo ""; diff --git a/pandora_console/operation/agentes/estado_ultimopaquete.php b/pandora_console/operation/agentes/estado_ultimopaquete.php index b9c042dd14..4917e43938 100644 --- a/pandora_console/operation/agentes/estado_ultimopaquete.php +++ b/pandora_console/operation/agentes/estado_ultimopaquete.php @@ -112,15 +112,14 @@ if (comprueba_login() == 0) { flag=1& tab=data& refr=60'> - "; + "; } else { echo " - "; + tab=data&refr=60'> + "; } } } @@ -176,16 +175,16 @@ if (comprueba_login() == 0) { echo ""; + echo " - ".$lang_label["green_light"].""; echo ""; + echo " - ".$lang_label["red_light"].""; echo ""; echo ""; echo ""; @@ -146,13 +146,13 @@ if (comprueba_login() == 0) { if (!isset($string)) {$string='';} $string=$string. ""; - $string=$string.""; @@ -179,9 +179,9 @@ if (comprueba_login() == 0) { $data2=mysql_fetch_array($result_gen2); $string=$string.""; break; diff --git a/pandora_console/operation/servers/view_server.php b/pandora_console/operation/servers/view_server.php index 03d781bb30..b3dc24c5d7 100644 --- a/pandora_console/operation/servers/view_server.php +++ b/pandora_console/operation/servers/view_server.php @@ -111,9 +111,9 @@ if (comprueba_login() == 0) { echo "$name"; echo ""; echo ""; // Name echo ""; echo "
'.$lang_label["agent_name"].' '.strtoupper(salida_limpia($nombre_agente)); - echo "".$lang_label["refresh_data"].""."  "; + echo "".$lang_label["refresh_data"].""."  "; // Data base access graph echo '
'.$lang_label["agent_type"].''; + '; }*/ echo '
- + ".$lang_label["ok"].": ".$grupo[$real_count]["ok"]." @@ -215,14 +215,14 @@
- + ".$lang_label["fail"].": ". $grupo[$real_count]["bad"]."
- + ".$lang_label["down"].": ". $grupo[$real_count]["down"]."
- + ".$lang_label["alerts"].": ". $grupo[$real_count]["alerts"]."".$row3["datos"]; if ($agent_down == 1) echo " - - - - "; if ($temp_interval != $intervalo) echo $temp_interval.""; $graph_label = output_clean_strict ($row3["nombre"]); - echo " "; + echo " "; $link ="winopeng('reporting/stat_win.php?period=604800&id=".$row3["id_agente_modulo"]."&label=".$graph_label."&refresh=6000','week_".$win_handle."')"; - echo ' '; + echo ' '; $link ="winopeng('reporting/stat_win.php?period=86400&id=".$row3["id_agente_modulo"]."&label=".$graph_label."&refresh=600','day_".$win_handle."')"; - echo ' '; + echo ' '; $link ="winopeng('reporting/stat_win.php?period=3600&id=".$row3["id_agente_modulo"]."&label=".$graph_label."&refresh=60','hour_".$win_handle."')"; - echo ''; + echo ''; } // STRING DATA else { # Writing string data in different way :) @@ -194,9 +193,9 @@ if (comprueba_login() == 0) { } echo ""; - echo "  "; - echo "  "; - echo ""; + echo "  "; + echo "  "; + echo ""; echo ""; if ($row3["timestamp"] == "0000-00-00 00:00:00"){ echo $lang_label["never"]; diff --git a/pandora_console/operation/agentes/exportdata.php b/pandora_console/operation/agentes/exportdata.php index b125ba85a0..67dafbcb28 100644 --- a/pandora_console/operation/agentes/exportdata.php +++ b/pandora_console/operation/agentes/exportdata.php @@ -247,7 +247,7 @@ if ((isset($_POST["export"])) AND (! isset($_POST["update_agent"]))){ else $date_to = $ahora; - + echo ""; echo "

".$lang_label["ag_title"]." > "; echo $lang_label["export_data"]." ".$lang_label["help"]."

"; diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index dbc6bd9d8e..2289090163 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -67,9 +67,9 @@ if (comprueba_login() == 0) { } echo "		"; - echo " - ".$lang_label["green_light"].""; - echo " - ".$lang_label["red_light"]."
"; $string=$string. ""; - $string=$string.""; - $string=$string. ""; - $string=$string.""; + $string=$string. ""; + $string=$string."". - strtoupper(substr(dame_nombre_agente($data["id_agente"]),0,21)).""; + strtoupper(substr(dame_nombre_agente($data["id_agente"]),0,21)).""; + $string=$string.""; $string=$string." "; if ($data2["datos"] > 0){ - $string=$string.""; + $string=$string.""; } else { - $string=$string.""; + $string=$string.""; } $string=$string.""; diff --git a/pandora_console/operation/agentes/tactical.php b/pandora_console/operation/agentes/tactical.php index 0c00351519..7cde7a02af 100644 --- a/pandora_console/operation/agentes/tactical.php +++ b/pandora_console/operation/agentes/tactical.php @@ -205,9 +205,9 @@ echo "$name"; echo ""; if ($status ==0){ - echo ""; + echo ""; } else { - echo ""; + echo ""; } echo ""; if (($network_server == 1) OR ($data_server == 1)){ diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index eccc4368e7..85129dbf1d 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -280,9 +280,9 @@ if ($total_events > 0){ } echo "
"; if ($row2["estado"] == 0) - echo ""; + echo ""; else - echo ""; + echo ""; echo "".$row2["evento"]; if ($row2["id_agente"] > 0){ echo "".dame_nombre_agente($row2["id_agente"]).""; @@ -291,7 +291,7 @@ if ($total_events > 0){ echo ""; } else { // for SNMP generated alerts echo "".$lang_label["alert"]." / SNMP"; - echo ""; + echo ""; echo ""; } if ($row2["estado"] <> 0) @@ -325,9 +325,9 @@ echo ""; echo ""; echo ""; echo " + -
+ -
+ -
+ -
+ - "; echo "
"; echo "

".$lang_label["status"]."

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

".$lang_label["action"]."

"; diff --git a/pandora_console/operation/incidents/incident.php b/pandora_console/operation/incidents/incident.php index be19cc4416..ae03773208 100644 --- a/pandora_console/operation/incidents/incident.php +++ b/pandora_console/operation/incidents/incident.php @@ -235,20 +235,20 @@ if (isset($_POST['operacion'])){

- -
- -
- -
- -
- -

- -
- -
- -
- -
- -
- -
+ -
+ -
+ -
+ -
+ -
+ -
"; + echo ""; switch ($row2["estado"]) { - case 0: echo ""; + case 0: echo ""; break; - case 1: echo ""; + case 1: echo ""; break; - case 2: echo ""; + case 2: echo ""; break; - case 3: echo ""; + case 3: echo ""; break; - case 13: echo ""; + case 13: echo ""; break; } - echo "".substr(salida_limpia($row2["titulo"]),0,45); + echo "".substr(salida_limpia($row2["titulo"]),0,45); echo ""; switch ( $row2["prioridad"] ){ - case 0: echo ""."".""; break; - case 1: echo ""."".""; break; - case 2: echo ""."".""; break; - case 3: echo ""."".""; break; - case 4: echo ""."".""; break; - case 10: echo ""."".""; break; + case 0: echo ""."".""; break; + case 1: echo ""."".""; break; + case 2: echo ""."".""; break; + case 3: echo ""."".""; break; + case 4: echo ""."".""; break; + case 10: echo ""."".""; break; } /* case 0: echo $lang_label["informative"]; break; diff --git a/pandora_console/operation/messages/message.php b/pandora_console/operation/messages/message.php index 629f3841ac..c22df669eb 100644 --- a/pandora_console/operation/messages/message.php +++ b/pandora_console/operation/messages/message.php @@ -186,7 +186,7 @@ if (isset($_GET["nuevo"]) || isset($_GET["nuevo_g"])){ } if ($row2["COUNT(*)"]!=0){ echo "

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

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

"; } $sql3='SELECT * FROM tmensajes WHERE id_usuario_destino="'.$iduser.'" ORDER BY timestamp desc'; $resultado3=mysql_query($sql3); @@ -213,7 +213,7 @@ if (isset($_GET["nuevo"]) || isset($_GET["nuevo_g"])){ if ($row3["estado"]==1) echo ""; else - echo ""; + echo ""; echo "		"; echo "".$row3["id_usuario_origen"].""; @@ -277,11 +277,11 @@ if (isset($_GET["nuevo"]) || isset($_GET["nuevo_g"])){
'; } - echo "

"; - echo ""; - echo "
Message already opened"; - echo "
Message unreaded"; - echo "
"; + if (mysql_num_rows($resultado3)) { + echo ""; + echo "".$lang_label["message_read"].""; + echo "".$lang_label["message_not_read"].""; + } } ?> \ No newline at end of file diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php index c142ef410c..9e067d3dd5 100644 --- a/pandora_console/operation/reporting/reporting_viewer.php +++ b/pandora_console/operation/reporting/reporting_viewer.php @@ -208,11 +208,11 @@ if (($report_user == $id_user) OR (dame_admin($id_user)==1) OR ($report_private echo "		"; echo ""; echo "

"; - echo $monitor_value." %".""; + echo $monitor_value." %".""; echo "

"; $monitor_value2 = 100 - $monitor_value ; echo "

"; - echo $monitor_value2." %".""; + echo $monitor_value2." %".""; echo "

"; echo "
"; if ($status ==0){ - echo ""; + echo ""; } else { - echo ""; + echo ""; } echo ""; if (($network_server == 1) OR ($data_server == 1)){ @@ -210,22 +210,22 @@ if (comprueba_login() == 0) { echo "".substr($description,0,25).""; if ($network_server == 1){ - echo " "; + echo " "; } if ($data_server == 1){ - echo "  "; + echo "  "; } if ($snmp_server == 1){ - echo "  "; + echo "  "; } if ($recon_server == 1){ echo "  "; } if ($master == 1){ - echo "  "; + echo "  "; } if ($checksum == 1){ - echo "  "; + echo "  "; } echo ""; echo $version; diff --git a/pandora_console/operation/servers/view_server_detail.php b/pandora_console/operation/servers/view_server_detail.php index d3efc0cf8f..af65bfe52e 100644 --- a/pandora_console/operation/servers/view_server_detail.php +++ b/pandora_console/operation/servers/view_server_detail.php @@ -73,7 +73,7 @@ if ((comprueba_login() == 0) AND (give_acl($id_user, 0, "AR")==1) ) { echo "
"; - echo ""; + echo ""; echo ""; echo "$name"; @@ -120,14 +120,14 @@ if ((comprueba_login() == 0) AND (give_acl($id_user, 0, "AR")==1) ) { echo ''; // Last execution - echo ""; + echo ""; $keepalive = strftime ( "%m/%d/%y %H:%M:%S" , $utimestamp ); echo substr($keepalive,0,25).""; if (give_acl($id_user, 0, "PM")==1){ echo ""; - echo ""; + echo ""; } } echo "
"; diff --git a/pandora_console/operation/snmpconsole/snmp_alert.php b/pandora_console/operation/snmpconsole/snmp_alert.php index 00ccb1db4d..4e6c8f095c 100644 --- a/pandora_console/operation/snmpconsole/snmp_alert.php +++ b/pandora_console/operation/snmpconsole/snmp_alert.php @@ -299,7 +299,7 @@ if (give_acl($id_user, 0, "LW")==1) { echo " ".$lang_label["delete"]."   "; echo " - ".$lang_label["update"].""; + ".$lang_label["update"].""; } echo ""; echo ""; diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php index cffb9fa7ed..5c34678c36 100644 --- a/pandora_console/operation/snmpconsole/snmp_view.php +++ b/pandora_console/operation/snmpconsole/snmp_view.php @@ -134,11 +134,11 @@ if (comprueba_login() == 0) { echo "
"; echo ""; echo ""; echo ""; echo "
"; - echo " - ".$lang_label["validated_event"]; + echo " - ".$lang_label["validated_event"]; echo "
"; - echo " - ".$lang_label["not_validated_event"]; + echo " - ".$lang_label["not_validated_event"]; echo "
"; - echo " - ".$lang_label["alert"]; + echo " - ".$lang_label["alert"]; echo "		"; echo " - ".$lang_label["validate_event"]; @@ -219,10 +219,10 @@ if (comprueba_login() == 0) { echo "
"; if ($row["status"] == 0){ - echo ""; + echo ""; } else { - echo ""; + echo ""; } echo "".$row["oid"]; $sql="SELECT * FROM tagente WHERE direccion = '".$row["source"]."'"; @@ -243,7 +243,7 @@ if (comprueba_login() == 0) { echo "".$row["timestamp"].""; if ($row["alerted"] != 0 ) - echo ""; + echo ""; echo ""; if (($row["status"] == 0) and (give_acl($id_usuario,"0","IW") ==1)) diff --git a/pandora_console/pandoradb_1.1_to_1.2.sql b/pandora_console/pandoradb_1.1_to_1.2.sql index ca748f2a14..8f8db01b9a 100644 --- a/pandora_console/pandoradb_1.1_to_1.2.sql +++ b/pandora_console/pandoradb_1.1_to_1.2.sql @@ -145,21 +145,21 @@ INSERT INTO `tmodule_group` VALUES (3,'Application'); INSERT INTO `tmodule_group` VALUES (4,'System'); INSERT INTO `tmodule_group` VALUES (5,'Miscellaneous'); -UPDATE ttipo_modulo set icon = "mod_data.gif" where nombre = "generic_data"; -UPDATE ttipo_modulo set icon = "mod_proc.gif" where nombre = "generic_proc"; -UPDATE ttipo_modulo set icon = "mod_string.gif" where nombre = "generic_data_string"; -UPDATE ttipo_modulo set icon = "mod_data_inc.gif" where nombre = "generic_data_inc"; -INSERT INTO `ttipo_modulo` VALUES (6,'remote_icmp_proc',3,'Remote ICMP network agent, boolean data','mod_icmp_proc.gif'); -INSERT INTO `ttipo_modulo` VALUES (7,'remote_icmp',2,'Remote ICMP network agent (latency)','mod_icmp_data.gif'); -INSERT INTO `ttipo_modulo` VALUES (8,'remote_tcp',2,'Remote TCP network agent, numeric data','mod_tcp_data.gif'); -INSERT INTO `ttipo_modulo` VALUES (9,'remote_tcp_proc',3,'Remote TCP network agent, boolean data','mod_tcp_proc.gif'); -INSERT INTO `ttipo_modulo` VALUES (10,'remote_tcp_string',2,'Remote TCP network agent, alphanumeric data','mod_tcp_string.gif'); -INSERT INTO `ttipo_modulo` VALUES (11,'remote_tcp_inc',2,'Remote TCP network agent, incremental data','mod_tcp_inc.gif'); -INSERT INTO `ttipo_modulo` VALUES (12,'remote_udp_proc',3,'Remote UDP network agent, boolean data','mod_udp_proc.gif'); -INSERT INTO `ttipo_modulo` VALUES (15,'remote_snmp',2,'Remote SNMP network agent, numeric data','mod_snmp_data.gif'); -INSERT INTO `ttipo_modulo` VALUES (16,'remote_snmp_inc',2,'Remote SNMP network agent, incremental data','mod_snmp_inc.gif'); -INSERT INTO `ttipo_modulo` VALUES (17,'remote_snmp_string',2,'Remote SNMP network agent, alphanumeric data','mod_snmp_string.gif'); -INSERT INTO `ttipo_modulo` VALUES (18,'remote_snmp_proc',1,'Remote SNMP network agent, boolean data','mod_snmp_proc.gif'); +UPDATE ttipo_modulo set icon = "mod_data.png" where nombre = "generic_data"; +UPDATE ttipo_modulo set icon = "mod_proc.png" where nombre = "generic_proc"; +UPDATE ttipo_modulo set icon = "mod_string.png" where nombre = "generic_data_string"; +UPDATE ttipo_modulo set icon = "mod_data_inc.png" where nombre = "generic_data_inc"; +INSERT INTO `ttipo_modulo` VALUES (6,'remote_icmp_proc',3,'Remote ICMP network agent, boolean data','mod_icmp_proc.png'); +INSERT INTO `ttipo_modulo` VALUES (7,'remote_icmp',2,'Remote ICMP network agent (latency)','mod_icmp_data.png'); +INSERT INTO `ttipo_modulo` VALUES (8,'remote_tcp',2,'Remote TCP network agent, numeric data','mod_tcp_data.png'); +INSERT INTO `ttipo_modulo` VALUES (9,'remote_tcp_proc',3,'Remote TCP network agent, boolean data','mod_tcp_proc.png'); +INSERT INTO `ttipo_modulo` VALUES (10,'remote_tcp_string',2,'Remote TCP network agent, alphanumeric data','mod_tcp_string.png'); +INSERT INTO `ttipo_modulo` VALUES (11,'remote_tcp_inc',2,'Remote TCP network agent, incremental data','mod_tcp_inc.png'); +INSERT INTO `ttipo_modulo` VALUES (12,'remote_udp_proc',3,'Remote UDP network agent, boolean data','mod_udp_proc.png'); +INSERT INTO `ttipo_modulo` VALUES (15,'remote_snmp',2,'Remote SNMP network agent, numeric data','mod_snmp_data.png'); +INSERT INTO `ttipo_modulo` VALUES (16,'remote_snmp_inc',2,'Remote SNMP network agent, incremental data','mod_snmp_inc.png'); +INSERT INTO `ttipo_modulo` VALUES (17,'remote_snmp_string',2,'Remote SNMP network agent, alphanumeric data','mod_snmp_string.png'); +INSERT INTO `ttipo_modulo` VALUES (18,'remote_snmp_proc',1,'Remote SNMP network agent, boolean data','mod_snmp_proc.png'); UPDATE tgrupo set icon = "others"; UPDATE tgrupo set icon = "servers" where nombre = "Servers"; @@ -170,7 +170,7 @@ UPDATE tgrupo set icon = "comms" where nombre = "Comms"; UPDATE tgrupo set icon = "others" where nombre like "Other%"; UPDATE tgrupo set icon = "workstation" where nombre = "Workstations"; UPDATE tgrupo set icon = "apps" where nombre = "Applications"; -INSERT INTO `tconfig_os` VALUES ('Network','Pandora Network Agent','network.gif'); +INSERT INTO `tconfig_os` VALUES ('Network','Pandora Network Agent','network.png'); DROP TABLE tagente_datos; CREATE TABLE `tagente_datos` ( diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index e1a15dd163..ffd917ae4c 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -27,7 +27,7 @@ UNLOCK TABLES; /*!40000 ALTER TABLE `tconfig_os` DISABLE KEYS */; LOCK TABLES `tconfig_os` WRITE; -INSERT INTO `tconfig_os` VALUES (1,'GNU/Linux','Linux: All versions','so_linux.gif'),(2,'Solaris','Sun Solaris','so_solaris.gif'),(3,'AIX','IBM AIX','so_aix.gif'),(4,'BSD','OpenBSD, FreeBSD and Others','so_bsd.gif'),(5,'HP-UX','HP-UX Unix OS','so_hpux.gif'),(6,'BeOS','BeOS','so_beos.gif'),(7,'Cisco','CISCO IOS','so_cisco.gif'),(8,'MacOS','MAC OS','so_mac.gif'),(9,'Windows','Microsoft Windows OS','so_win.gif'),(10,'Other','Other SO','so_other.gif'),(11,'Network','Pandora Network Agent','network.gif'); +INSERT INTO `tconfig_os` VALUES (1,'GNU/Linux','Linux: All versions','so_linux.png'),(2,'Solaris','Sun Solaris','so_solaris.png'),(3,'AIX','IBM AIX','so_aix.png'),(4,'BSD','OpenBSD, FreeBSD and Others','so_bsd.png'),(5,'HP-UX','HP-UX Unix OS','so_hpux.png'),(6,'BeOS','BeOS','so_beos.png'),(7,'Cisco','CISCO IOS','so_cisco.png'),(8,'MacOS','MAC OS','so_mac.png'),(9,'Windows','Microsoft Windows OS','so_win.png'),(10,'Other','Other SO','so_other.png'),(11,'Network','Pandora Network Agent','network.png'); UNLOCK TABLES; /*!40000 ALTER TABLE `tconfig_os` ENABLE KEYS */; @@ -104,7 +104,7 @@ INSERT INTO `torigen` VALUES ('Operating System event'),('IDS events'),('Firewal -- Dumping data for table `ttipo_modulo` -- -INSERT INTO `ttipo_modulo` VALUES (1,'generic_data',0,'Generic module to adquire numeric data','mod_data.gif'),(2,'generic_proc',1,'Generic module to adquire boolean data','mod_proc.gif'),(3,'generic_data_string',0,'Generic module to adquire alphanumeric data','mod_string.gif'),(4,'generic_data_inc',0,'Generic module to adquire numeric incremental data','mod_data_inc.gif'),(6,'remote_icmp_proc',3,'Remote ICMP network agent, boolean data','mod_icmp_proc.gif'),(7,'remote_icmp',2,'Remote ICMP network agent (latency)','mod_icmp_data.gif'),(8,'remote_tcp',2,'Remote TCP network agent, numeric data','mod_tcp_data.gif'),(9,'remote_tcp_proc',3,'Remote TCP network agent, boolean data','mod_tcp_proc.gif'),(10,'remote_tcp_string',2,'Remote TCP network agent, alphanumeric data','mod_tcp_string.gif'),(11,'remote_tcp_inc',2,'Remote TCP network agent, incremental data','mod_tcp_inc.gif'),(15,'remote_snmp',2,'Remote SNMP network agent, numeric data','mod_snmp_data.gif'),(16,'remote_snmp_inc',2,'Remote SNMP network agent, incremental data','mod_snmp_inc.gif'),(17,'remote_snmp_string',2,'Remote SNMP network agent, alphanumeric data','mod_snmp_string.gif'),(18,'remote_snmp_proc',1,'Remote SNMP network agent, boolean data','mod_snmp_proc.gif'); +INSERT INTO `ttipo_modulo` VALUES (1,'generic_data',0,'Generic module to adquire numeric data','mod_data.png'),(2,'generic_proc',1,'Generic module to adquire boolean data','mod_proc.png'),(3,'generic_data_string',0,'Generic module to adquire alphanumeric data','mod_string.png'),(4,'generic_data_inc',0,'Generic module to adquire numeric incremental data','mod_data_inc.png'),(6,'remote_icmp_proc',3,'Remote ICMP network agent, boolean data','mod_icmp_proc.png'),(7,'remote_icmp',2,'Remote ICMP network agent (latency)','mod_icmp_data.png'),(8,'remote_tcp',2,'Remote TCP network agent, numeric data','mod_tcp_data.png'),(9,'remote_tcp_proc',3,'Remote TCP network agent, boolean data','mod_tcp_proc.png'),(10,'remote_tcp_string',2,'Remote TCP network agent, alphanumeric data','mod_tcp_string.png'),(11,'remote_tcp_inc',2,'Remote TCP network agent, incremental data','mod_tcp_inc.png'),(15,'remote_snmp',2,'Remote SNMP network agent, numeric data','mod_snmp_data.png'),(16,'remote_snmp_inc',2,'Remote SNMP network agent, incremental data','mod_snmp_inc.png'),(17,'remote_snmp_string',2,'Remote SNMP network agent, alphanumeric data','mod_snmp_string.png'),(18,'remote_snmp_proc',1,'Remote SNMP network agent, boolean data','mod_snmp_proc.png'); -- -- Dumping data for table `tusuario`