diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 7350c9e49d..a55cc8d87b 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,15 @@ +2012-06-20 Sancho Lerena + + * extensions/update_manager/sql/update_manager.sql: 4.0.2 comes with a fixed + last package installed of 412 + + * extensions/update_manager/load_updatemanager.php: Fixed execution + of keygen: now uses dbtype as last parameter in execution. + + * include/functions_config.php: Avoid to check for new update on each + page render (BAD!) + + 2012-06-20 Vanessa Gil * operation/tree.php: Fixed bug: Missing text in tree view title. diff --git a/pandora_console/extensions/update_manager/load_updatemanager.php b/pandora_console/extensions/update_manager/load_updatemanager.php index fbdb645ecc..558242bb80 100644 --- a/pandora_console/extensions/update_manager/load_updatemanager.php +++ b/pandora_console/extensions/update_manager/load_updatemanager.php @@ -66,11 +66,17 @@ function get_user_key ($settings) { } global $config; - + + + /* html_debug_print ("DEBUG: Trying to execute escapeshellcmd ($settings->keygen_path". + ' '.$settings->customer_key.' '.$config['dbhost']. + ' '.$config['dbuser'].' '.$config['dbpass']. + ' '.$config['dbname'], true); */ + $user_key = exec (escapeshellcmd ($settings->keygen_path. ' '.$settings->customer_key.' '.$config['dbhost']. ' '.$config['dbuser'].' '.$config['dbpass']. - ' '.$config['dbname'])); + ' '.$config['dbname'].' '.$config["dbtype"])); return $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 b8805ddd0e..95088021e3 100644 --- a/pandora_console/extensions/update_manager/sql/update_manager.sql +++ b/pandora_console/extensions/update_manager/sql/update_manager.sql @@ -3,3 +3,5 @@ INSERT INTO `tupdate_settings` VALUES ('current_update', '0'), ('customer_key', CREATE TABLE `tupdate_package` ( id int(11) unsigned NOT NULL auto_increment, timestamp datetime NOT NULL, description varchar(255) 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; + +UPDATE tupdate_settings SET `value` = 412 WHERE `key`= 'current_update'; diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 1a4fe6adcd..eb0389f79f 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -779,7 +779,6 @@ function config_check (){ 'no_close' => true, 'force_style' => 'color: #000000 !important'), '', true); } - //pandora_update_manager_login(); if (isset($_SESSION['new_update'])) { if (!empty($_SESSION['return_installation_open'])) { if (!$_SESSION['return_installation_open']['return']) {