From 0e8a649e7c0e305b31b76e168206d18597409abf Mon Sep 17 00:00:00 2001 From: Esteban Sanchez Date: Mon, 1 Sep 2008 13:00:14 +0000 Subject: [PATCH] 2008-09-01 Esteban Sanchez * extensions/update_manager.php, extensions/update_manager/sql/update_manager.sql: Fixed update server path typo error. * extensions/update_manager/load_updatemanager.php: Force values to be integer. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1062 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 +++++++++ pandora_console/extensions/update_manager.php | 2 +- .../extensions/update_manager/load_updatemanager.php | 8 ++++---- .../extensions/update_manager/sql/update_manager.sql | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 031f1d691a..abcf61b816 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2008-09-01 Esteban Sanchez + + * extensions/update_manager.php, + extensions/update_manager/sql/update_manager.sql: Fixed update server + path typo error. + + * extensions/update_manager/load_updatemanager.php: Force values to be + integer. + 2008-09-01 Raul Mateos * operation/snmp/snmp_console/snmp_view.php: Added style to buttons. diff --git a/pandora_console/extensions/update_manager.php b/pandora_console/extensions/update_manager.php index 5aff58dc97..41be15c1bd 100644 --- a/pandora_console/extensions/update_manager.php +++ b/pandora_console/extensions/update_manager.php @@ -88,7 +88,7 @@ function pandora_update_manager_login () { $settings = um_db_load_settings (); um_db_update_setting ('update_server_host', 'www.artica.es'); - um_db_update_setting ('update_server_path', 'pandoraupdate/server.php'); + um_db_update_setting ('update_server_path', '/pandoraupdate/server.php'); $user_key = get_user_key (); diff --git a/pandora_console/extensions/update_manager/load_updatemanager.php b/pandora_console/extensions/update_manager/load_updatemanager.php index 1bcd32af17..050a5b2a73 100644 --- a/pandora_console/extensions/update_manager/load_updatemanager.php +++ b/pandora_console/extensions/update_manager/load_updatemanager.php @@ -17,10 +17,10 @@ function get_user_key () { /* We only want to know this for statistics records. Feel free to disable if you want. We don't want to hide anything. */ - $n = get_db_value ('COUNT(`id_agente`)', 'tagente', 'disabled', 0); - $m = get_db_value ('COUNT(`id_agente_modulo`)', 'tagente_modulo', - 'disabled', 0); - $user_key = array ('A' => $n, 'M' => $m); + $n = (int) get_db_value ('COUNT(`id_agente`)', 'tagente', 'disabled', 0); + $m = (int) get_db_value ('COUNT(`id_agente_modulo`)', 'tagente_modulo', + 'disabled', 0); + $user_key = array ('A' => )$n, 'M' => $m); return json_encode ($user_key); } diff --git a/pandora_console/extensions/update_manager/sql/update_manager.sql b/pandora_console/extensions/update_manager/sql/update_manager.sql index 0c5e233346..0ddaa7ff16 100644 --- a/pandora_console/extensions/update_manager/sql/update_manager.sql +++ b/pandora_console/extensions/update_manager/sql/update_manager.sql @@ -1,5 +1,5 @@ CREATE TABLE `tupdate_settings` ( `key` varchar(255) default '', `value` varchar(255) default '', PRIMARY KEY (`key`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -INSERT INTO `tupdate_settings` VALUES ('current_update', '0'), ('customer_key', 'PANDORA-FREE'), ('keygen_path', ''), ('update_server_host', 'www.artica.es'), ('update_server_port', '80'), ('update_server_path', 'pandoraupdate/server.php'), ('updating_binary_path', 'Path where the updated binary files will be stored'), ('updating_code_path', 'Path where the updated code is stored'), ('dbname', ''), ('dbhost', ''), ('dbpass', ''), ('dbuser', ''); +INSERT INTO `tupdate_settings` VALUES ('current_update', '0'), ('customer_key', 'PANDORA-FREE'), ('keygen_path', ''), ('update_server_host', 'www.artica.es'), ('update_server_port', '80'), ('update_server_path', '/pandoraupdate/server.php'), ('updating_binary_path', 'Path where the updated binary files will be stored'), ('updating_code_path', 'Path where the updated code is stored'), ('dbname', ''), ('dbhost', ''), ('dbpass', ''), ('dbuser', ''); CREATE TABLE `tupdate_package` ( id int(11) unsigned NOT NULL auto_increment, timestamp datetime NOT NULL, description mediumtext NOT NULL default '', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tupdate` ( id int(11) unsigned NOT NULL auto_increment, type enum('code', 'db_data', 'db_schema', 'binary'), id_update_package int(11) unsigned NOT NULL default 0, filename varchar(250) default '', checksum varchar(250) default '', previous_checksum varchar(250) default '', svn_version int(4) unsigned NOT NULL default 0, data LONGTEXT default '', data_rollback LONGTEXT default '', description TEXT default '', db_table_name varchar(140) default '', db_field_name varchar(140) default '', db_field_value varchar(1024) default '', PRIMARY KEY (`id`), FOREIGN KEY (`id_update_package`) REFERENCES tupdate_package(`id`) ON UPDATE CASCADE ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tupdate_journal` ( id int(11) unsigned NOT NULL auto_increment, id_update int(11) unsigned NOT NULL default 0, PRIMARY KEY (`id`), FOREIGN KEY (`id_update`) REFERENCES tupdate(`id`) ON UPDATE CASCADE ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8;