diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index b417bee697..2502d79f05 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,17 @@ +2010-11-03 Sancho Lerena + + * pandoradb_data.sql: Updated build + + * include/config_process.php: Updated build. + + * include/functions_db.php: Fixed the way takes agent status for visual maps, + was a wrong filter on remote_contact timestamp, that info is not used to + calculate agent unknown status !. + + * index.php: develop mode set to 0 + + * operation/snmpconsole/snmp_view.php: Removed a notice for a noninit var (again) + 2010-11-03 Ramon Novoa * include/functions_reporting.php: Order results before calculating diff --git a/pandora_console/images/console/icons/appliance.png b/pandora_console/images/console/icons/appliance.png index a242ce0324..1e08065267 100644 Binary files a/pandora_console/images/console/icons/appliance.png and b/pandora_console/images/console/icons/appliance.png differ diff --git a/pandora_console/images/console/icons/appliance_bad.png b/pandora_console/images/console/icons/appliance_bad.png index 5c7720cbfd..65a5d5ae8c 100644 Binary files a/pandora_console/images/console/icons/appliance_bad.png and b/pandora_console/images/console/icons/appliance_bad.png differ diff --git a/pandora_console/images/console/icons/appliance_ok.png b/pandora_console/images/console/icons/appliance_ok.png index cedac80022..be4816265a 100644 Binary files a/pandora_console/images/console/icons/appliance_ok.png and b/pandora_console/images/console/icons/appliance_ok.png differ diff --git a/pandora_console/images/console/icons/appliance_warning.png b/pandora_console/images/console/icons/appliance_warning.png index c47f820bad..126f973a84 100644 Binary files a/pandora_console/images/console/icons/appliance_warning.png and b/pandora_console/images/console/icons/appliance_warning.png differ diff --git a/pandora_console/images/console/icons/bridge.png b/pandora_console/images/console/icons/bridge.png index b7bd34664d..0d80cb066a 100644 Binary files a/pandora_console/images/console/icons/bridge.png and b/pandora_console/images/console/icons/bridge.png differ diff --git a/pandora_console/images/console/icons/bridge_bad.png b/pandora_console/images/console/icons/bridge_bad.png index 572ff46a47..4ec969e3b2 100644 Binary files a/pandora_console/images/console/icons/bridge_bad.png and b/pandora_console/images/console/icons/bridge_bad.png differ diff --git a/pandora_console/images/console/icons/bridge_ok.png b/pandora_console/images/console/icons/bridge_ok.png index 48ea15eb3c..be52f46540 100644 Binary files a/pandora_console/images/console/icons/bridge_ok.png and b/pandora_console/images/console/icons/bridge_ok.png differ diff --git a/pandora_console/images/console/icons/bridge_warning.png b/pandora_console/images/console/icons/bridge_warning.png index 654c4292c1..33e928ec5e 100644 Binary files a/pandora_console/images/console/icons/bridge_warning.png and b/pandora_console/images/console/icons/bridge_warning.png differ diff --git a/pandora_console/images/console/icons/computer.png b/pandora_console/images/console/icons/computer.png index e1708e5ea9..7dd0f30b6b 100644 Binary files a/pandora_console/images/console/icons/computer.png and b/pandora_console/images/console/icons/computer.png differ diff --git a/pandora_console/images/console/icons/computer_bad.png b/pandora_console/images/console/icons/computer_bad.png index 66952b3c41..908e592c97 100644 Binary files a/pandora_console/images/console/icons/computer_bad.png and b/pandora_console/images/console/icons/computer_bad.png differ diff --git a/pandora_console/images/console/icons/computer_ok.png b/pandora_console/images/console/icons/computer_ok.png index 82c4e432a2..32d1fe7fb6 100644 Binary files a/pandora_console/images/console/icons/computer_ok.png and b/pandora_console/images/console/icons/computer_ok.png differ diff --git a/pandora_console/images/console/icons/computer_warning.png b/pandora_console/images/console/icons/computer_warning.png index e691db5941..4784261fd8 100644 Binary files a/pandora_console/images/console/icons/computer_warning.png and b/pandora_console/images/console/icons/computer_warning.png differ diff --git a/pandora_console/images/console/icons/disk.png b/pandora_console/images/console/icons/disk.png index 9d749df746..bd9eb3ce2c 100644 Binary files a/pandora_console/images/console/icons/disk.png and b/pandora_console/images/console/icons/disk.png differ diff --git a/pandora_console/images/console/icons/disk_bad.png b/pandora_console/images/console/icons/disk_bad.png index 19798bbab8..0f0bbd9ed9 100644 Binary files a/pandora_console/images/console/icons/disk_bad.png and b/pandora_console/images/console/icons/disk_bad.png differ diff --git a/pandora_console/images/console/icons/disk_ok.png b/pandora_console/images/console/icons/disk_ok.png index 4b75780978..f5bb831a86 100644 Binary files a/pandora_console/images/console/icons/disk_ok.png and b/pandora_console/images/console/icons/disk_ok.png differ diff --git a/pandora_console/images/console/icons/disk_warning.png b/pandora_console/images/console/icons/disk_warning.png index a726c8919a..a30ebcbde3 100644 Binary files a/pandora_console/images/console/icons/disk_warning.png and b/pandora_console/images/console/icons/disk_warning.png differ diff --git a/pandora_console/images/console/icons/dot.png b/pandora_console/images/console/icons/dot.png index 07493411b7..74e9147ed3 100644 Binary files a/pandora_console/images/console/icons/dot.png and b/pandora_console/images/console/icons/dot.png differ diff --git a/pandora_console/images/console/icons/dot_bad.png b/pandora_console/images/console/icons/dot_bad.png index 063fc34b56..8d2511cf92 100644 Binary files a/pandora_console/images/console/icons/dot_bad.png and b/pandora_console/images/console/icons/dot_bad.png differ diff --git a/pandora_console/images/console/icons/dot_ok.png b/pandora_console/images/console/icons/dot_ok.png index cc54a9baa6..5c4ea8cabc 100644 Binary files a/pandora_console/images/console/icons/dot_ok.png and b/pandora_console/images/console/icons/dot_ok.png differ diff --git a/pandora_console/images/console/icons/dot_warning.png b/pandora_console/images/console/icons/dot_warning.png index 76a8035edc..bd33b7a3b1 100644 Binary files a/pandora_console/images/console/icons/dot_warning.png and b/pandora_console/images/console/icons/dot_warning.png differ diff --git a/pandora_console/images/console/icons/dotmin.png b/pandora_console/images/console/icons/dotmin.png index 592359f13d..a29b3a7101 100644 Binary files a/pandora_console/images/console/icons/dotmin.png and b/pandora_console/images/console/icons/dotmin.png differ diff --git a/pandora_console/images/console/icons/dotmin_bad.png b/pandora_console/images/console/icons/dotmin_bad.png index ccd33f8637..3b69ebcc8d 100644 Binary files a/pandora_console/images/console/icons/dotmin_bad.png and b/pandora_console/images/console/icons/dotmin_bad.png differ diff --git a/pandora_console/images/console/icons/dotmin_ok.png b/pandora_console/images/console/icons/dotmin_ok.png index 7be9efc561..819894d363 100644 Binary files a/pandora_console/images/console/icons/dotmin_ok.png and b/pandora_console/images/console/icons/dotmin_ok.png differ diff --git a/pandora_console/images/console/icons/dotmin_warning.png b/pandora_console/images/console/icons/dotmin_warning.png index c512f256bf..201f71be2d 100644 Binary files a/pandora_console/images/console/icons/dotmin_warning.png and b/pandora_console/images/console/icons/dotmin_warning.png differ diff --git a/pandora_console/images/console/icons/firewall.png b/pandora_console/images/console/icons/firewall.png index 23220c47ab..71abaf8e0d 100644 Binary files a/pandora_console/images/console/icons/firewall.png and b/pandora_console/images/console/icons/firewall.png differ diff --git a/pandora_console/images/console/icons/firewall_bad.png b/pandora_console/images/console/icons/firewall_bad.png index 3fe541ab9d..d86fc23455 100644 Binary files a/pandora_console/images/console/icons/firewall_bad.png and b/pandora_console/images/console/icons/firewall_bad.png differ diff --git a/pandora_console/images/console/icons/firewall_ok.png b/pandora_console/images/console/icons/firewall_ok.png index 4a9e6d144d..3e7a75aa6a 100644 Binary files a/pandora_console/images/console/icons/firewall_ok.png and b/pandora_console/images/console/icons/firewall_ok.png differ diff --git a/pandora_console/images/console/icons/firewall_warning.png b/pandora_console/images/console/icons/firewall_warning.png index 38321fb1fb..18840efc43 100644 Binary files a/pandora_console/images/console/icons/firewall_warning.png and b/pandora_console/images/console/icons/firewall_warning.png differ diff --git a/pandora_console/images/console/icons/gateway.png b/pandora_console/images/console/icons/gateway.png index fb9a06009b..739616df67 100644 Binary files a/pandora_console/images/console/icons/gateway.png and b/pandora_console/images/console/icons/gateway.png differ diff --git a/pandora_console/images/console/icons/gateway_bad.png b/pandora_console/images/console/icons/gateway_bad.png index 65bb6cae89..a9814e87db 100644 Binary files a/pandora_console/images/console/icons/gateway_bad.png and b/pandora_console/images/console/icons/gateway_bad.png differ diff --git a/pandora_console/images/console/icons/gateway_ok.png b/pandora_console/images/console/icons/gateway_ok.png index e6a33f6965..0fae5913f5 100644 Binary files a/pandora_console/images/console/icons/gateway_ok.png and b/pandora_console/images/console/icons/gateway_ok.png differ diff --git a/pandora_console/images/console/icons/gateway_warning.png b/pandora_console/images/console/icons/gateway_warning.png index d8c461329d..59513eb102 100644 Binary files a/pandora_console/images/console/icons/gateway_warning.png and b/pandora_console/images/console/icons/gateway_warning.png differ diff --git a/pandora_console/images/console/icons/home.png b/pandora_console/images/console/icons/home.png index 8fc135866d..1c02d2ea24 100644 Binary files a/pandora_console/images/console/icons/home.png and b/pandora_console/images/console/icons/home.png differ diff --git a/pandora_console/images/console/icons/home_bad.png b/pandora_console/images/console/icons/home_bad.png index 3df06dcc4b..58fdd77b7f 100644 Binary files a/pandora_console/images/console/icons/home_bad.png and b/pandora_console/images/console/icons/home_bad.png differ diff --git a/pandora_console/images/console/icons/home_ok.png b/pandora_console/images/console/icons/home_ok.png index ba2d81c009..78b7d2d5cd 100644 Binary files a/pandora_console/images/console/icons/home_ok.png and b/pandora_console/images/console/icons/home_ok.png differ diff --git a/pandora_console/images/console/icons/home_warning.png b/pandora_console/images/console/icons/home_warning.png index 5634e1ca64..243e6ce4a1 100644 Binary files a/pandora_console/images/console/icons/home_warning.png and b/pandora_console/images/console/icons/home_warning.png differ diff --git a/pandora_console/images/console/icons/hub.png b/pandora_console/images/console/icons/hub.png index e07e73937e..151e135870 100644 Binary files a/pandora_console/images/console/icons/hub.png and b/pandora_console/images/console/icons/hub.png differ diff --git a/pandora_console/images/console/icons/hub_bad.png b/pandora_console/images/console/icons/hub_bad.png index ecfcbf05e1..6f4b84b199 100644 Binary files a/pandora_console/images/console/icons/hub_bad.png and b/pandora_console/images/console/icons/hub_bad.png differ diff --git a/pandora_console/images/console/icons/hub_ok.png b/pandora_console/images/console/icons/hub_ok.png index d6a2ed3db3..5d5b28c8ba 100644 Binary files a/pandora_console/images/console/icons/hub_ok.png and b/pandora_console/images/console/icons/hub_ok.png differ diff --git a/pandora_console/images/console/icons/hub_warning.png b/pandora_console/images/console/icons/hub_warning.png index 32c87984bc..fd32b71806 100644 Binary files a/pandora_console/images/console/icons/hub_warning.png and b/pandora_console/images/console/icons/hub_warning.png differ diff --git a/pandora_console/images/console/icons/light.png b/pandora_console/images/console/icons/light.png index 0a67dafdf7..9d7007a4e1 100644 Binary files a/pandora_console/images/console/icons/light.png and b/pandora_console/images/console/icons/light.png differ diff --git a/pandora_console/images/console/icons/light_bad.png b/pandora_console/images/console/icons/light_bad.png index 944f514ad5..50e3d2bb55 100644 Binary files a/pandora_console/images/console/icons/light_bad.png and b/pandora_console/images/console/icons/light_bad.png differ diff --git a/pandora_console/images/console/icons/light_ok.png b/pandora_console/images/console/icons/light_ok.png index a785df52d5..5fd032f184 100644 Binary files a/pandora_console/images/console/icons/light_ok.png and b/pandora_console/images/console/icons/light_ok.png differ diff --git a/pandora_console/images/console/icons/light_warning.png b/pandora_console/images/console/icons/light_warning.png index fbe359319c..808904c695 100644 Binary files a/pandora_console/images/console/icons/light_warning.png and b/pandora_console/images/console/icons/light_warning.png differ diff --git a/pandora_console/images/console/icons/nat.png b/pandora_console/images/console/icons/nat.png index f42a0898a2..e71cd252a5 100644 Binary files a/pandora_console/images/console/icons/nat.png and b/pandora_console/images/console/icons/nat.png differ diff --git a/pandora_console/images/console/icons/nat_bad.png b/pandora_console/images/console/icons/nat_bad.png index 31be5f273a..4b0e6a3055 100644 Binary files a/pandora_console/images/console/icons/nat_bad.png and b/pandora_console/images/console/icons/nat_bad.png differ diff --git a/pandora_console/images/console/icons/nat_ok.png b/pandora_console/images/console/icons/nat_ok.png index 0c41b8806e..3d7b8235b1 100644 Binary files a/pandora_console/images/console/icons/nat_ok.png and b/pandora_console/images/console/icons/nat_ok.png differ diff --git a/pandora_console/images/console/icons/nat_warning.png b/pandora_console/images/console/icons/nat_warning.png index d5048fe608..769b85cc82 100644 Binary files a/pandora_console/images/console/icons/nat_warning.png and b/pandora_console/images/console/icons/nat_warning.png differ diff --git a/pandora_console/images/console/icons/network.png b/pandora_console/images/console/icons/network.png index 23b0c3267e..cb08206c0f 100644 Binary files a/pandora_console/images/console/icons/network.png and b/pandora_console/images/console/icons/network.png differ diff --git a/pandora_console/images/console/icons/network_bad.png b/pandora_console/images/console/icons/network_bad.png index f7d7ef0f92..2188772cea 100644 Binary files a/pandora_console/images/console/icons/network_bad.png and b/pandora_console/images/console/icons/network_bad.png differ diff --git a/pandora_console/images/console/icons/network_ok.png b/pandora_console/images/console/icons/network_ok.png index ab1ce7fcd5..2f98f3eb0d 100644 Binary files a/pandora_console/images/console/icons/network_ok.png and b/pandora_console/images/console/icons/network_ok.png differ diff --git a/pandora_console/images/console/icons/network_warning.png b/pandora_console/images/console/icons/network_warning.png index ff67a63f2b..ae4b4d5ef2 100644 Binary files a/pandora_console/images/console/icons/network_warning.png and b/pandora_console/images/console/icons/network_warning.png differ diff --git a/pandora_console/images/console/icons/nuclear.png b/pandora_console/images/console/icons/nuclear.png index ad2ba86193..3e7bc58b88 100644 Binary files a/pandora_console/images/console/icons/nuclear.png and b/pandora_console/images/console/icons/nuclear.png differ diff --git a/pandora_console/images/console/icons/nuclear_bad.png b/pandora_console/images/console/icons/nuclear_bad.png index d11a3668dd..5a104c6e1e 100644 Binary files a/pandora_console/images/console/icons/nuclear_bad.png and b/pandora_console/images/console/icons/nuclear_bad.png differ diff --git a/pandora_console/images/console/icons/nuclear_ok.png b/pandora_console/images/console/icons/nuclear_ok.png index f474a7abde..d26070216f 100644 Binary files a/pandora_console/images/console/icons/nuclear_ok.png and b/pandora_console/images/console/icons/nuclear_ok.png differ diff --git a/pandora_console/images/console/icons/nuclear_warning.png b/pandora_console/images/console/icons/nuclear_warning.png index 9496950779..e58614caa7 100644 Binary files a/pandora_console/images/console/icons/nuclear_warning.png and b/pandora_console/images/console/icons/nuclear_warning.png differ diff --git a/pandora_console/images/console/icons/old_icons/appliance.png b/pandora_console/images/console/icons/old_icons/appliance.png new file mode 100644 index 0000000000..a242ce0324 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/appliance.png differ diff --git a/pandora_console/images/console/icons/old_icons/appliance_bad.png b/pandora_console/images/console/icons/old_icons/appliance_bad.png new file mode 100644 index 0000000000..5c7720cbfd Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/appliance_bad.png differ diff --git a/pandora_console/images/console/icons/old_icons/appliance_ok.png b/pandora_console/images/console/icons/old_icons/appliance_ok.png new file mode 100644 index 0000000000..cedac80022 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/appliance_ok.png differ diff --git a/pandora_console/images/console/icons/old_icons/appliance_warning.png b/pandora_console/images/console/icons/old_icons/appliance_warning.png new file mode 100644 index 0000000000..c47f820bad Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/appliance_warning.png differ diff --git a/pandora_console/images/console/icons/old_icons/bridge.png b/pandora_console/images/console/icons/old_icons/bridge.png new file mode 100644 index 0000000000..b7bd34664d Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/bridge.png differ diff --git a/pandora_console/images/console/icons/old_icons/bridge_bad.png b/pandora_console/images/console/icons/old_icons/bridge_bad.png new file mode 100644 index 0000000000..572ff46a47 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/bridge_bad.png differ diff --git a/pandora_console/images/console/icons/old_icons/bridge_ok.png b/pandora_console/images/console/icons/old_icons/bridge_ok.png new file mode 100644 index 0000000000..48ea15eb3c Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/bridge_ok.png differ diff --git a/pandora_console/images/console/icons/old_icons/bridge_warning.png b/pandora_console/images/console/icons/old_icons/bridge_warning.png new file mode 100644 index 0000000000..654c4292c1 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/bridge_warning.png differ diff --git a/pandora_console/images/console/icons/old_icons/computer.png b/pandora_console/images/console/icons/old_icons/computer.png new file mode 100644 index 0000000000..e1708e5ea9 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/computer.png differ diff --git a/pandora_console/images/console/icons/old_icons/computer_bad.png b/pandora_console/images/console/icons/old_icons/computer_bad.png new file mode 100644 index 0000000000..66952b3c41 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/computer_bad.png differ diff --git a/pandora_console/images/console/icons/old_icons/computer_ok.png b/pandora_console/images/console/icons/old_icons/computer_ok.png new file mode 100644 index 0000000000..82c4e432a2 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/computer_ok.png differ diff --git a/pandora_console/images/console/icons/old_icons/computer_warning.png b/pandora_console/images/console/icons/old_icons/computer_warning.png new file mode 100644 index 0000000000..e691db5941 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/computer_warning.png differ diff --git a/pandora_console/images/console/icons/old_icons/disk.png b/pandora_console/images/console/icons/old_icons/disk.png new file mode 100644 index 0000000000..9d749df746 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/disk.png differ diff --git a/pandora_console/images/console/icons/old_icons/disk_bad.png b/pandora_console/images/console/icons/old_icons/disk_bad.png new file mode 100644 index 0000000000..19798bbab8 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/disk_bad.png differ diff --git a/pandora_console/images/console/icons/old_icons/disk_ok.png b/pandora_console/images/console/icons/old_icons/disk_ok.png new file mode 100644 index 0000000000..4b75780978 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/disk_ok.png differ diff --git a/pandora_console/images/console/icons/old_icons/disk_warning.png b/pandora_console/images/console/icons/old_icons/disk_warning.png new file mode 100644 index 0000000000..a726c8919a Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/disk_warning.png differ diff --git a/pandora_console/images/console/icons/old_icons/dot.png b/pandora_console/images/console/icons/old_icons/dot.png new file mode 100644 index 0000000000..07493411b7 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/dot.png differ diff --git a/pandora_console/images/console/icons/old_icons/dot_bad.png b/pandora_console/images/console/icons/old_icons/dot_bad.png new file mode 100644 index 0000000000..063fc34b56 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/dot_bad.png differ diff --git a/pandora_console/images/console/icons/old_icons/dot_ok.png b/pandora_console/images/console/icons/old_icons/dot_ok.png new file mode 100644 index 0000000000..cc54a9baa6 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/dot_ok.png differ diff --git a/pandora_console/images/console/icons/old_icons/dot_warning.png b/pandora_console/images/console/icons/old_icons/dot_warning.png new file mode 100644 index 0000000000..76a8035edc Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/dot_warning.png differ diff --git a/pandora_console/images/console/icons/old_icons/dotmin.png b/pandora_console/images/console/icons/old_icons/dotmin.png new file mode 100644 index 0000000000..592359f13d Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/dotmin.png differ diff --git a/pandora_console/images/console/icons/old_icons/dotmin_bad.png b/pandora_console/images/console/icons/old_icons/dotmin_bad.png new file mode 100644 index 0000000000..ccd33f8637 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/dotmin_bad.png differ diff --git a/pandora_console/images/console/icons/old_icons/dotmin_ok.png b/pandora_console/images/console/icons/old_icons/dotmin_ok.png new file mode 100644 index 0000000000..7be9efc561 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/dotmin_ok.png differ diff --git a/pandora_console/images/console/icons/old_icons/dotmin_warning.png b/pandora_console/images/console/icons/old_icons/dotmin_warning.png new file mode 100644 index 0000000000..c512f256bf Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/dotmin_warning.png differ diff --git a/pandora_console/images/console/icons/old_icons/firewall.png b/pandora_console/images/console/icons/old_icons/firewall.png new file mode 100644 index 0000000000..23220c47ab Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/firewall.png differ diff --git a/pandora_console/images/console/icons/old_icons/firewall_bad.png b/pandora_console/images/console/icons/old_icons/firewall_bad.png new file mode 100644 index 0000000000..3fe541ab9d Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/firewall_bad.png differ diff --git a/pandora_console/images/console/icons/old_icons/firewall_ok.png b/pandora_console/images/console/icons/old_icons/firewall_ok.png new file mode 100644 index 0000000000..4a9e6d144d Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/firewall_ok.png differ diff --git a/pandora_console/images/console/icons/old_icons/firewall_warning.png b/pandora_console/images/console/icons/old_icons/firewall_warning.png new file mode 100644 index 0000000000..38321fb1fb Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/firewall_warning.png differ diff --git a/pandora_console/images/console/icons/old_icons/gateway.png b/pandora_console/images/console/icons/old_icons/gateway.png new file mode 100644 index 0000000000..fb9a06009b Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/gateway.png differ diff --git a/pandora_console/images/console/icons/old_icons/gateway_bad.png b/pandora_console/images/console/icons/old_icons/gateway_bad.png new file mode 100644 index 0000000000..65bb6cae89 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/gateway_bad.png differ diff --git a/pandora_console/images/console/icons/old_icons/gateway_ok.png b/pandora_console/images/console/icons/old_icons/gateway_ok.png new file mode 100644 index 0000000000..e6a33f6965 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/gateway_ok.png differ diff --git a/pandora_console/images/console/icons/old_icons/gateway_warning.png b/pandora_console/images/console/icons/old_icons/gateway_warning.png new file mode 100644 index 0000000000..d8c461329d Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/gateway_warning.png differ diff --git a/pandora_console/images/console/icons/old_icons/home.png b/pandora_console/images/console/icons/old_icons/home.png new file mode 100644 index 0000000000..8fc135866d Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/home.png differ diff --git a/pandora_console/images/console/icons/old_icons/home_bad.png b/pandora_console/images/console/icons/old_icons/home_bad.png new file mode 100644 index 0000000000..3df06dcc4b Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/home_bad.png differ diff --git a/pandora_console/images/console/icons/old_icons/home_ok.png b/pandora_console/images/console/icons/old_icons/home_ok.png new file mode 100644 index 0000000000..ba2d81c009 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/home_ok.png differ diff --git a/pandora_console/images/console/icons/old_icons/home_warning.png b/pandora_console/images/console/icons/old_icons/home_warning.png new file mode 100644 index 0000000000..5634e1ca64 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/home_warning.png differ diff --git a/pandora_console/images/console/icons/old_icons/hub.png b/pandora_console/images/console/icons/old_icons/hub.png new file mode 100644 index 0000000000..e07e73937e Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/hub.png differ diff --git a/pandora_console/images/console/icons/old_icons/hub_bad.png b/pandora_console/images/console/icons/old_icons/hub_bad.png new file mode 100644 index 0000000000..ecfcbf05e1 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/hub_bad.png differ diff --git a/pandora_console/images/console/icons/old_icons/hub_ok.png b/pandora_console/images/console/icons/old_icons/hub_ok.png new file mode 100644 index 0000000000..d6a2ed3db3 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/hub_ok.png differ diff --git a/pandora_console/images/console/icons/old_icons/hub_warning.png b/pandora_console/images/console/icons/old_icons/hub_warning.png new file mode 100644 index 0000000000..32c87984bc Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/hub_warning.png differ diff --git a/pandora_console/images/console/icons/old_icons/light.png b/pandora_console/images/console/icons/old_icons/light.png new file mode 100644 index 0000000000..0a67dafdf7 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/light.png differ diff --git a/pandora_console/images/console/icons/old_icons/light_bad.png b/pandora_console/images/console/icons/old_icons/light_bad.png new file mode 100644 index 0000000000..944f514ad5 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/light_bad.png differ diff --git a/pandora_console/images/console/icons/old_icons/light_ok.png b/pandora_console/images/console/icons/old_icons/light_ok.png new file mode 100644 index 0000000000..a785df52d5 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/light_ok.png differ diff --git a/pandora_console/images/console/icons/old_icons/light_warning.png b/pandora_console/images/console/icons/old_icons/light_warning.png new file mode 100644 index 0000000000..fbe359319c Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/light_warning.png differ diff --git a/pandora_console/images/console/icons/old_icons/nat.png b/pandora_console/images/console/icons/old_icons/nat.png new file mode 100644 index 0000000000..f42a0898a2 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/nat.png differ diff --git a/pandora_console/images/console/icons/old_icons/nat_bad.png b/pandora_console/images/console/icons/old_icons/nat_bad.png new file mode 100644 index 0000000000..31be5f273a Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/nat_bad.png differ diff --git a/pandora_console/images/console/icons/old_icons/nat_ok.png b/pandora_console/images/console/icons/old_icons/nat_ok.png new file mode 100644 index 0000000000..0c41b8806e Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/nat_ok.png differ diff --git a/pandora_console/images/console/icons/old_icons/nat_warning.png b/pandora_console/images/console/icons/old_icons/nat_warning.png new file mode 100644 index 0000000000..d5048fe608 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/nat_warning.png differ diff --git a/pandora_console/images/console/icons/old_icons/network.png b/pandora_console/images/console/icons/old_icons/network.png new file mode 100644 index 0000000000..23b0c3267e Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/network.png differ diff --git a/pandora_console/images/console/icons/old_icons/network_bad.png b/pandora_console/images/console/icons/old_icons/network_bad.png new file mode 100644 index 0000000000..f7d7ef0f92 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/network_bad.png differ diff --git a/pandora_console/images/console/icons/old_icons/network_ok.png b/pandora_console/images/console/icons/old_icons/network_ok.png new file mode 100644 index 0000000000..ab1ce7fcd5 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/network_ok.png differ diff --git a/pandora_console/images/console/icons/old_icons/network_warning.png b/pandora_console/images/console/icons/old_icons/network_warning.png new file mode 100644 index 0000000000..ff67a63f2b Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/network_warning.png differ diff --git a/pandora_console/images/console/icons/old_icons/nuclear.png b/pandora_console/images/console/icons/old_icons/nuclear.png new file mode 100644 index 0000000000..ad2ba86193 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/nuclear.png differ diff --git a/pandora_console/images/console/icons/old_icons/nuclear_bad.png b/pandora_console/images/console/icons/old_icons/nuclear_bad.png new file mode 100644 index 0000000000..d11a3668dd Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/nuclear_bad.png differ diff --git a/pandora_console/images/console/icons/old_icons/nuclear_ok.png b/pandora_console/images/console/icons/old_icons/nuclear_ok.png new file mode 100644 index 0000000000..f474a7abde Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/nuclear_ok.png differ diff --git a/pandora_console/images/console/icons/old_icons/nuclear_warning.png b/pandora_console/images/console/icons/old_icons/nuclear_warning.png new file mode 100644 index 0000000000..9496950779 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/nuclear_warning.png differ diff --git a/pandora_console/images/console/icons/old_icons/pbx.png b/pandora_console/images/console/icons/old_icons/pbx.png new file mode 100644 index 0000000000..b916966ac3 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/pbx.png differ diff --git a/pandora_console/images/console/icons/old_icons/pbx_bad.png b/pandora_console/images/console/icons/old_icons/pbx_bad.png new file mode 100644 index 0000000000..bc7960188a Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/pbx_bad.png differ diff --git a/pandora_console/images/console/icons/old_icons/pbx_ok.png b/pandora_console/images/console/icons/old_icons/pbx_ok.png new file mode 100644 index 0000000000..76fe5a6d29 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/pbx_ok.png differ diff --git a/pandora_console/images/console/icons/old_icons/pbx_warning.png b/pandora_console/images/console/icons/old_icons/pbx_warning.png new file mode 100644 index 0000000000..cd60ba43d2 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/pbx_warning.png differ diff --git a/pandora_console/images/console/icons/old_icons/router.png b/pandora_console/images/console/icons/old_icons/router.png new file mode 100644 index 0000000000..15ec337ba2 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/router.png differ diff --git a/pandora_console/images/console/icons/old_icons/router_bad.png b/pandora_console/images/console/icons/old_icons/router_bad.png new file mode 100644 index 0000000000..0aaf78d982 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/router_bad.png differ diff --git a/pandora_console/images/console/icons/old_icons/router_ok.png b/pandora_console/images/console/icons/old_icons/router_ok.png new file mode 100644 index 0000000000..58dde93347 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/router_ok.png differ diff --git a/pandora_console/images/console/icons/old_icons/router_warning.png b/pandora_console/images/console/icons/old_icons/router_warning.png new file mode 100644 index 0000000000..05c1f0c9aa Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/router_warning.png differ diff --git a/pandora_console/images/console/icons/old_icons/routerap.png b/pandora_console/images/console/icons/old_icons/routerap.png new file mode 100644 index 0000000000..cc61ccb458 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/routerap.png differ diff --git a/pandora_console/images/console/icons/old_icons/routerap_bad.png b/pandora_console/images/console/icons/old_icons/routerap_bad.png new file mode 100644 index 0000000000..3cc4b52b8e Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/routerap_bad.png differ diff --git a/pandora_console/images/console/icons/old_icons/routerap_ok.png b/pandora_console/images/console/icons/old_icons/routerap_ok.png new file mode 100644 index 0000000000..db0a09b386 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/routerap_ok.png differ diff --git a/pandora_console/images/console/icons/old_icons/routerap_warning.png b/pandora_console/images/console/icons/old_icons/routerap_warning.png new file mode 100644 index 0000000000..99ba87421b Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/routerap_warning.png differ diff --git a/pandora_console/images/console/icons/old_icons/server.png b/pandora_console/images/console/icons/old_icons/server.png new file mode 100644 index 0000000000..ee55aee167 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/server.png differ diff --git a/pandora_console/images/console/icons/old_icons/server_bad.png b/pandora_console/images/console/icons/old_icons/server_bad.png new file mode 100644 index 0000000000..94468b69ca Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/server_bad.png differ diff --git a/pandora_console/images/console/icons/old_icons/server_ok.png b/pandora_console/images/console/icons/old_icons/server_ok.png new file mode 100644 index 0000000000..b9a85bab3f Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/server_ok.png differ diff --git a/pandora_console/images/console/icons/old_icons/server_rack.png b/pandora_console/images/console/icons/old_icons/server_rack.png new file mode 100644 index 0000000000..383698d92d Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/server_rack.png differ diff --git a/pandora_console/images/console/icons/old_icons/server_rack_bad.png b/pandora_console/images/console/icons/old_icons/server_rack_bad.png new file mode 100644 index 0000000000..e4081f456c Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/server_rack_bad.png differ diff --git a/pandora_console/images/console/icons/old_icons/server_rack_ok.png b/pandora_console/images/console/icons/old_icons/server_rack_ok.png new file mode 100644 index 0000000000..9cba36599b Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/server_rack_ok.png differ diff --git a/pandora_console/images/console/icons/old_icons/server_rack_warning.png b/pandora_console/images/console/icons/old_icons/server_rack_warning.png new file mode 100644 index 0000000000..cc29790c14 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/server_rack_warning.png differ diff --git a/pandora_console/images/console/icons/old_icons/server_warning.png b/pandora_console/images/console/icons/old_icons/server_warning.png new file mode 100644 index 0000000000..63f858979f Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/server_warning.png differ diff --git a/pandora_console/images/console/icons/old_icons/smalldot.png b/pandora_console/images/console/icons/old_icons/smalldot.png new file mode 100644 index 0000000000..5f6c000171 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/smalldot.png differ diff --git a/pandora_console/images/console/icons/old_icons/smalldot_bad.png b/pandora_console/images/console/icons/old_icons/smalldot_bad.png new file mode 100644 index 0000000000..9e2577ddde Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/smalldot_bad.png differ diff --git a/pandora_console/images/console/icons/old_icons/smalldot_ok.png b/pandora_console/images/console/icons/old_icons/smalldot_ok.png new file mode 100644 index 0000000000..ecabe45315 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/smalldot_ok.png differ diff --git a/pandora_console/images/console/icons/old_icons/smalldot_warning.png b/pandora_console/images/console/icons/old_icons/smalldot_warning.png new file mode 100644 index 0000000000..e0a6161f07 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/smalldot_warning.png differ diff --git a/pandora_console/images/console/icons/old_icons/switch.png b/pandora_console/images/console/icons/old_icons/switch.png new file mode 100644 index 0000000000..1e9c01bbba Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/switch.png differ diff --git a/pandora_console/images/console/icons/old_icons/switch_bad.png b/pandora_console/images/console/icons/old_icons/switch_bad.png new file mode 100644 index 0000000000..9f3c7f12c5 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/switch_bad.png differ diff --git a/pandora_console/images/console/icons/old_icons/switch_ok.png b/pandora_console/images/console/icons/old_icons/switch_ok.png new file mode 100644 index 0000000000..0eec992b9e Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/switch_ok.png differ diff --git a/pandora_console/images/console/icons/old_icons/switch_warning.png b/pandora_console/images/console/icons/old_icons/switch_warning.png new file mode 100644 index 0000000000..8bbcabfd28 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/switch_warning.png differ diff --git a/pandora_console/images/console/icons/old_icons/user.png b/pandora_console/images/console/icons/old_icons/user.png new file mode 100644 index 0000000000..ef48ee5302 Binary files /dev/null and b/pandora_console/images/console/icons/old_icons/user.png differ diff --git a/pandora_console/images/console/icons/pbx.png b/pandora_console/images/console/icons/pbx.png index b916966ac3..cf863f53d7 100644 Binary files a/pandora_console/images/console/icons/pbx.png and b/pandora_console/images/console/icons/pbx.png differ diff --git a/pandora_console/images/console/icons/pbx_bad.png b/pandora_console/images/console/icons/pbx_bad.png index bc7960188a..393c34a88b 100644 Binary files a/pandora_console/images/console/icons/pbx_bad.png and b/pandora_console/images/console/icons/pbx_bad.png differ diff --git a/pandora_console/images/console/icons/pbx_ok.png b/pandora_console/images/console/icons/pbx_ok.png index 76fe5a6d29..3c1ecf7ded 100644 Binary files a/pandora_console/images/console/icons/pbx_ok.png and b/pandora_console/images/console/icons/pbx_ok.png differ diff --git a/pandora_console/images/console/icons/pbx_warning.png b/pandora_console/images/console/icons/pbx_warning.png index cd60ba43d2..fd55bc466b 100644 Binary files a/pandora_console/images/console/icons/pbx_warning.png and b/pandora_console/images/console/icons/pbx_warning.png differ diff --git a/pandora_console/images/console/icons/router.png b/pandora_console/images/console/icons/router.png index 15ec337ba2..325104eee2 100644 Binary files a/pandora_console/images/console/icons/router.png and b/pandora_console/images/console/icons/router.png differ diff --git a/pandora_console/images/console/icons/router_bad.png b/pandora_console/images/console/icons/router_bad.png index 0aaf78d982..349cd06513 100644 Binary files a/pandora_console/images/console/icons/router_bad.png and b/pandora_console/images/console/icons/router_bad.png differ diff --git a/pandora_console/images/console/icons/router_ok.png b/pandora_console/images/console/icons/router_ok.png index 58dde93347..4fe881759c 100644 Binary files a/pandora_console/images/console/icons/router_ok.png and b/pandora_console/images/console/icons/router_ok.png differ diff --git a/pandora_console/images/console/icons/router_warning.png b/pandora_console/images/console/icons/router_warning.png index 05c1f0c9aa..395fae7ee0 100644 Binary files a/pandora_console/images/console/icons/router_warning.png and b/pandora_console/images/console/icons/router_warning.png differ diff --git a/pandora_console/images/console/icons/routerap.png b/pandora_console/images/console/icons/routerap.png index cc61ccb458..b5b44c2dc5 100644 Binary files a/pandora_console/images/console/icons/routerap.png and b/pandora_console/images/console/icons/routerap.png differ diff --git a/pandora_console/images/console/icons/routerap_bad.png b/pandora_console/images/console/icons/routerap_bad.png index 3cc4b52b8e..3cb5d086a9 100644 Binary files a/pandora_console/images/console/icons/routerap_bad.png and b/pandora_console/images/console/icons/routerap_bad.png differ diff --git a/pandora_console/images/console/icons/routerap_ok.png b/pandora_console/images/console/icons/routerap_ok.png index db0a09b386..5299bf0be7 100644 Binary files a/pandora_console/images/console/icons/routerap_ok.png and b/pandora_console/images/console/icons/routerap_ok.png differ diff --git a/pandora_console/images/console/icons/routerap_warning.png b/pandora_console/images/console/icons/routerap_warning.png index 99ba87421b..5b84107669 100644 Binary files a/pandora_console/images/console/icons/routerap_warning.png and b/pandora_console/images/console/icons/routerap_warning.png differ diff --git a/pandora_console/images/console/icons/server.png b/pandora_console/images/console/icons/server.png index ee55aee167..3c3fbbd53a 100644 Binary files a/pandora_console/images/console/icons/server.png and b/pandora_console/images/console/icons/server.png differ diff --git a/pandora_console/images/console/icons/server_bad.png b/pandora_console/images/console/icons/server_bad.png index 94468b69ca..582816cdbc 100644 Binary files a/pandora_console/images/console/icons/server_bad.png and b/pandora_console/images/console/icons/server_bad.png differ diff --git a/pandora_console/images/console/icons/server_ok.png b/pandora_console/images/console/icons/server_ok.png index b9a85bab3f..da37282b9f 100644 Binary files a/pandora_console/images/console/icons/server_ok.png and b/pandora_console/images/console/icons/server_ok.png differ diff --git a/pandora_console/images/console/icons/server_rack.png b/pandora_console/images/console/icons/server_rack.png index 383698d92d..6265c9dc39 100644 Binary files a/pandora_console/images/console/icons/server_rack.png and b/pandora_console/images/console/icons/server_rack.png differ diff --git a/pandora_console/images/console/icons/server_rack_bad.png b/pandora_console/images/console/icons/server_rack_bad.png index e4081f456c..03df3ccac4 100644 Binary files a/pandora_console/images/console/icons/server_rack_bad.png and b/pandora_console/images/console/icons/server_rack_bad.png differ diff --git a/pandora_console/images/console/icons/server_rack_ok.png b/pandora_console/images/console/icons/server_rack_ok.png index 9cba36599b..89a7a31c51 100644 Binary files a/pandora_console/images/console/icons/server_rack_ok.png and b/pandora_console/images/console/icons/server_rack_ok.png differ diff --git a/pandora_console/images/console/icons/server_rack_warning.png b/pandora_console/images/console/icons/server_rack_warning.png index cc29790c14..c769e01bbd 100644 Binary files a/pandora_console/images/console/icons/server_rack_warning.png and b/pandora_console/images/console/icons/server_rack_warning.png differ diff --git a/pandora_console/images/console/icons/server_warning.png b/pandora_console/images/console/icons/server_warning.png index 63f858979f..91082a2088 100644 Binary files a/pandora_console/images/console/icons/server_warning.png and b/pandora_console/images/console/icons/server_warning.png differ diff --git a/pandora_console/images/console/icons/smalldot.png b/pandora_console/images/console/icons/smalldot.png index 5f6c000171..4852fc2e44 100644 Binary files a/pandora_console/images/console/icons/smalldot.png and b/pandora_console/images/console/icons/smalldot.png differ diff --git a/pandora_console/images/console/icons/smalldot_bad.png b/pandora_console/images/console/icons/smalldot_bad.png index 9e2577ddde..4e14a70d09 100644 Binary files a/pandora_console/images/console/icons/smalldot_bad.png and b/pandora_console/images/console/icons/smalldot_bad.png differ diff --git a/pandora_console/images/console/icons/smalldot_ok.png b/pandora_console/images/console/icons/smalldot_ok.png index ecabe45315..7a6bf2b92b 100644 Binary files a/pandora_console/images/console/icons/smalldot_ok.png and b/pandora_console/images/console/icons/smalldot_ok.png differ diff --git a/pandora_console/images/console/icons/smalldot_warning.png b/pandora_console/images/console/icons/smalldot_warning.png index e0a6161f07..4d9e7c092e 100644 Binary files a/pandora_console/images/console/icons/smalldot_warning.png and b/pandora_console/images/console/icons/smalldot_warning.png differ diff --git a/pandora_console/images/console/icons/switch.png b/pandora_console/images/console/icons/switch.png index 1e9c01bbba..bbde4485bc 100644 Binary files a/pandora_console/images/console/icons/switch.png and b/pandora_console/images/console/icons/switch.png differ diff --git a/pandora_console/images/console/icons/switch_bad.png b/pandora_console/images/console/icons/switch_bad.png index 9f3c7f12c5..66229c8741 100644 Binary files a/pandora_console/images/console/icons/switch_bad.png and b/pandora_console/images/console/icons/switch_bad.png differ diff --git a/pandora_console/images/console/icons/switch_ok.png b/pandora_console/images/console/icons/switch_ok.png index 0eec992b9e..d9db0b494b 100644 Binary files a/pandora_console/images/console/icons/switch_ok.png and b/pandora_console/images/console/icons/switch_ok.png differ diff --git a/pandora_console/images/console/icons/switch_warning.png b/pandora_console/images/console/icons/switch_warning.png index 8bbcabfd28..65c2219f4f 100644 Binary files a/pandora_console/images/console/icons/switch_warning.png and b/pandora_console/images/console/icons/switch_warning.png differ diff --git a/pandora_console/images/console/icons/user.png b/pandora_console/images/console/icons/user.png index ef48ee5302..3a8eab21c2 100644 Binary files a/pandora_console/images/console/icons/user.png and b/pandora_console/images/console/icons/user.png differ diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 4273a4716c..2429ea54c2 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC101102'; +$build_version = 'PC101103'; $pandora_version = 'v3.2RC1'; /* Help to debug problems. Override global PHP configuration */ diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index 5e4434e517..9591112260 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -2752,8 +2752,7 @@ function get_agent_status ($id_agent = 0) { $status = get_db_value_filter ('COUNT(*)', 'tagente', array ('id_agente' => (int) $id_agent, - 'UNIX_TIMESTAMP(ultimo_contacto) + intervalo * 2 > '.$time, - 'UNIX_TIMESTAMP(ultimo_contacto_remoto) + intervalo * 2 > '.$time)); + 'UNIX_TIMESTAMP(ultimo_contacto) + intervalo * 2 > '.$time)); if (! $status) return -1; } diff --git a/pandora_console/index.php b/pandora_console/index.php index c8b5ee74e3..c8133c9c64 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -21,7 +21,7 @@ if (function_exists ('mb_internal_encoding')) { // Set to 1 to do not check for installer or config file (for development!). // Activate gives more error information, not useful for production sites -$develop_bypass = 1; +$develop_bypass = 0; if ($develop_bypass != 1) { // If no config file, automatically try to install diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php index f8ed4c868d..2d408bd0b2 100644 --- a/pandora_console/operation/snmpconsole/snmp_view.php +++ b/pandora_console/operation/snmpconsole/snmp_view.php @@ -295,7 +295,9 @@ $idx = 0; if ($traps !== false) { foreach ($traps as $trap) { $data = array (); - + if (empty($trap["description"])){ + $trap["description"]=""; + } $severity = enterprise_hook ('get_severity', array ($trap)); if ($severity === ENTERPRISE_NOT_HOOK) { $severity = $trap["alerted"] == 1 ? $trap["priority"] : 1; @@ -372,6 +374,7 @@ if ($traps !== false) { //Actions $data[8] = ""; + if (empty ($trap["status"]) && give_acl ($config["id_user"], 0, "IW")) { $data[8] .= ''; } diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index a577af46bf..038204aee5 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -46,8 +46,8 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_compact','15'), ('graph_res','5'), ('step_compact','1'), -('db_scheme_version','3.2dev'), -('db_scheme_build','PD101005'), +('db_scheme_version','3.2RC1'), +('db_scheme_build','PD101103'), ('show_unknown','0'), ('show_lastalerts','1'), ('style','pandora'),