diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index feec1508d4..fca57ba007 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,14 @@ +2009-05-12 Raul Mateos + + * include/config_process.php: Update build after last changes. + + * install.php: Added code to remove database if exists. This was removed + in a previous commit. + + * images/console/icons/*.png: Updated some icons and added others. + + * pandoradb_data.sql: Updated header. + 2009-05-11 Esteban Sánchez * operation/agentes/estado_agente.php: Sets a variable outside an if. diff --git a/pandora_console/images/console/icons/firewall.png b/pandora_console/images/console/icons/firewall.png index cd545ae0dc..23220c47ab 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 48e24a588f..3fe541ab9d 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 58df898380..4a9e6d144d 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 8106169d7e..38321fb1fb 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/home.png b/pandora_console/images/console/icons/home.png new file mode 100644 index 0000000000..8fc135866d Binary files /dev/null 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 new file mode 100644 index 0000000000..3df06dcc4b Binary files /dev/null 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 new file mode 100644 index 0000000000..ba2d81c009 Binary files /dev/null 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 new file mode 100644 index 0000000000..5634e1ca64 Binary files /dev/null and b/pandora_console/images/console/icons/home_warning.png differ diff --git a/pandora_console/images/console/icons/routerap.png b/pandora_console/images/console/icons/routerap.png index 9e8c1bdd68..cc61ccb458 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 2efa2e8c68..3cc4b52b8e 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 53cfe77a14..db0a09b386 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 96105383db..99ba87421b 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 9fabe97556..ee55aee167 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 0b469c3654..94468b69ca 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 21647658d8..b9a85bab3f 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 new file mode 100644 index 0000000000..383698d92d Binary files /dev/null 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 new file mode 100644 index 0000000000..e4081f456c Binary files /dev/null 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 new file mode 100644 index 0000000000..9cba36599b Binary files /dev/null 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 new file mode 100644 index 0000000000..cc29790c14 Binary files /dev/null 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 79cbad8c84..63f858979f 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/switch.png b/pandora_console/images/console/icons/switch.png index 382440d421..1e9c01bbba 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 920df6eade..9f3c7f12c5 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 4b2b89504f..0eec992b9e 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 c4df411c0d..8bbcabfd28 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 new file mode 100644 index 0000000000..ef48ee5302 Binary files /dev/null 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 4bc74e2616..3fbe122082 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -17,7 +17,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. //Pandora Version -$build_version = 'PC090504'; +$build_version = 'PC090512'; $pandora_version = 'v3.0-dev'; $config['start_time'] = microtime (true); diff --git a/pandora_console/install.php b/pandora_console/install.php index 267e3c1593..5209b57b1e 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -452,8 +452,7 @@ $config["homeurl"]="'.$url.'"; // Base URL if (mysql_error() != "") echo "
ERROR: ". mysql_error().".
"; - if ($step1 == 1) - mysql_query ("DROP DATABASE $dbname"); + mysql_query ("DROP DATABASE $dbname"); } echo " diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index b2e4e395dc..e6572fdb67 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -1,7 +1,7 @@ --- Pandora FMS - the Free Monitoring System --- ======================================== --- Copyright (c) 2008 Artica Soluciones Tecnológicas, http://www.artica.es --- Please see http://pandora.sourceforge.net for full contribution list +-- Pandora FMS - the Flexible Monitoring System +-- ============================================ +-- Copyright (c) 2009 Artica Soluciones Tecnologicas, http://www.artica.es +-- Please see http://www.pandorafms.org for full contribution list -- This program is free software; you can redistribute it and/or -- modify it under the terms of the GNU General Public License