diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index ab2dd3dccc..50dc3ebd26 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2008-07-10 Evi Vanoost + + * pandora_console/operation/agentes/estado_grupo.php: Fixed some extra spaces that made the URL look ugly + + * pandora_console/operation/agentes/status_monitor.php: Made a nested SQL query out of the flagging operation, much faster now. + There is still a bug here that I was trying to fix. Everything is 0-ed on this page. I will find out why tomorrow + + * pandora_console/images/console/background: Added some backgrounds + 2008-07-10 Sancho Lerena * include/styles/pandora_red.css: Updated. diff --git a/pandora_console/images/console/background/Cisco_Catalyst_2960-24TC-Stack.jpg b/pandora_console/images/console/background/Cisco_Catalyst_2960-24TC-Stack.jpg new file mode 100644 index 0000000000..45ef383cdc Binary files /dev/null and b/pandora_console/images/console/background/Cisco_Catalyst_2960-24TC-Stack.jpg differ diff --git a/pandora_console/images/console/background/Cisco_Catalyst_2960-24TC.jpg b/pandora_console/images/console/background/Cisco_Catalyst_2960-24TC.jpg new file mode 100644 index 0000000000..555a95f023 Binary files /dev/null and b/pandora_console/images/console/background/Cisco_Catalyst_2960-24TC.jpg differ diff --git a/pandora_console/images/console/background/Cisco_Catalyst_2960-48TT-Stack.jpg b/pandora_console/images/console/background/Cisco_Catalyst_2960-48TT-Stack.jpg new file mode 100644 index 0000000000..a74183a5a0 Binary files /dev/null and b/pandora_console/images/console/background/Cisco_Catalyst_2960-48TT-Stack.jpg differ diff --git a/pandora_console/images/console/background/Cisco_Catalyst_2960-48TT.jpg b/pandora_console/images/console/background/Cisco_Catalyst_2960-48TT.jpg new file mode 100644 index 0000000000..ddf51f2d93 Binary files /dev/null and b/pandora_console/images/console/background/Cisco_Catalyst_2960-48TT.jpg differ diff --git a/pandora_console/images/console/background/Nortel-3510-24T-800x477.jpg b/pandora_console/images/console/background/Nortel-3510-24T-800x477.jpg new file mode 100644 index 0000000000..9127cf9efc Binary files /dev/null and b/pandora_console/images/console/background/Nortel-3510-24T-800x477.jpg differ diff --git a/pandora_console/images/console/background/XRAID-666x216.jpg b/pandora_console/images/console/background/XRAID-666x216.jpg new file mode 100644 index 0000000000..f367d92364 Binary files /dev/null and b/pandora_console/images/console/background/XRAID-666x216.jpg differ diff --git a/pandora_console/images/console/background/XServe-449x480.jpg b/pandora_console/images/console/background/XServe-449x480.jpg new file mode 100644 index 0000000000..448c64685e Binary files /dev/null and b/pandora_console/images/console/background/XServe-449x480.jpg differ diff --git a/pandora_console/operation/agentes/estado_grupo.php b/pandora_console/operation/agentes/estado_grupo.php index 407fd4d7f2..cfbfd316fd 100644 --- a/pandora_console/operation/agentes/estado_grupo.php +++ b/pandora_console/operation/agentes/estado_grupo.php @@ -31,17 +31,11 @@ echo "

".$lang_label["ag_title"]." > ".$lang_label["group_view"]."

"; // Update network modules for this group // Check for Network FLAG change request +// Made it a subquery, much faster on both the database and server side if (isset ($_GET["update_netgroup"])) { if (give_acl ($id_user, $_GET["update_netgroup"], "AW") == 1) { - $sql = "SELECT * FROM tagente WHERE id_grupo = ". - $_GET["update_netgroup"]; - $result = mysql_query ($sql); - while ($row = mysql_fetch_array ($result)) { - $id_agente = $row["id_agente"]; - $query2 ="UPDATE tagente_modulo SET flag=1 - WHERE id_agente = ".$id_agente; - $res = mysql_query ($query2); - } + $sql = sprintf ("UPDATE tagente_modulo SET `flag` = '1' WHERE `id_agente` = ANY(SELECT id_agente FROM tagente WHERE `id_grupo` = '%d')",$_GET["update_netgroup"]); + mysql_query ($sql); } } diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index d599d8a9fc..59e2d60154 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -220,10 +220,7 @@ if ($counter > 0){ echo ""; echo ""; echo ""; - echo "". - strtoupper(substr($data[1],0,21)).""; + echo "".strtoupper(substr($data[1],0,21)).""; echo ""; echo ""; echo "". substr($data[2],0,21). ""; diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index ca2abcd2b4..55ac7df906 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,7 @@ +2008-07-10 Evi Vanoost + + * pandora_server_installer: Some typos + 2008-07-08 Sancho Lerena * pandora_server: An event is generated if a BAD XML is detected. diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index c27d967d5c..594abb0321 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -49,7 +49,7 @@ else chown -R pandora /home/pandora fi mkdir /var/log/pandora - chown pandora:wheel /var/spool/pandora/data_in + chown pandora:wheel /var/spool/pandora/data_in > /dev/null 2>&1 || chown pandora:root /var/spool/pandora/data_in chmod 770 /var/spool/pandora/data_in mkdir /etc/pandora if [ -e /etc/pandora/pandora_server.conf ]; then @@ -93,7 +93,6 @@ else mkdir /usr/share/pandora cp -R util /usr/share/pandora - cp -R plugin /usr/share/pandora if [ -d /etc/cron.daily ] then echo "perl /usr/share/pandora/util/pandora_db /etc/pandora/pandora_server.conf" > /etc/cron.daily/pandora_purge_db