From bdcf2a595b6a80a6f41fb09642b45d003889e686 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Thu, 24 May 2012 09:55:56 +0000 Subject: [PATCH] 2012-05-24 Miguel de Dios * extensions/update_manager/lib/functions.php: set the wget method by default. * extensions/update_manager/lib/functions.ajax.php, extensions/update_manager/update_pandora.php: cleaned source code style. MERGED FROM 4.0.2 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6341 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 12 ++++++++++++ .../extensions/update_manager/lib/functions.ajax.php | 2 +- .../extensions/update_manager/lib/functions.php | 6 +++--- pandora_console/extensions/update_manager/main.php | 2 +- .../extensions/update_manager/update_pandora.php | 4 ++-- 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 00b44ee261..2c9c99c2c9 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,15 @@ +2012-05-24 Miguel de Dios + + * extensions/update_manager/lib/functions.php: set the wget method + by default. + + * extensions/update_manager/lib/functions.ajax.php, + extensions/update_manager/update_pandora.php: cleaned source code + style. + + + MERGED FROM 4.0.2 + 2012-05-22 Sergio Martin * godmode/agentes/module_manager_editor_common.php: Fixed diff --git a/pandora_console/extensions/update_manager/lib/functions.ajax.php b/pandora_console/extensions/update_manager/lib/functions.ajax.php index 6db82933a2..603e2ff83b 100644 --- a/pandora_console/extensions/update_manager/lib/functions.ajax.php +++ b/pandora_console/extensions/update_manager/lib/functions.ajax.php @@ -35,7 +35,7 @@ function check_keygen_online() { db_clean_cache(); $settings = um_db_load_settings (); - return check_keygen ($settings); + return check_keygen ($settings); } function update_pandora_get_packages_online_ajax($ajax = true) { diff --git a/pandora_console/extensions/update_manager/lib/functions.php b/pandora_console/extensions/update_manager/lib/functions.php index 95d0e391bb..6ddf86e8a6 100644 --- a/pandora_console/extensions/update_manager/lib/functions.php +++ b/pandora_console/extensions/update_manager/lib/functions.php @@ -54,10 +54,10 @@ function update_pandora_installation() { if (empty($row)) { //The url of update manager. - $conf_update_pandora = array('url' => 'http://192.168.70.213/pandora.tar.gz', + $conf_update_pandora = array('url' => '', 'last_installed' => '', 'last_contact' => '', - 'download_mode' => 'curl'); + 'download_mode' => 'wget'); $values = array('token' => 'update_pandora_conf_url', 'value' => $conf_update_pandora['url']); @@ -78,7 +78,7 @@ function update_pandora_installation() { } } - $dir = $config['attachment_store'] . '/update_pandora/'; + $dir = $config['attachment_store'] . '/update_pandora/'; if (!is_dir($dir)) { $return = mkdir($dir); diff --git a/pandora_console/extensions/update_manager/main.php b/pandora_console/extensions/update_manager/main.php index ecb329156a..0e3e1e13da 100644 --- a/pandora_console/extensions/update_manager/main.php +++ b/pandora_console/extensions/update_manager/main.php @@ -116,7 +116,7 @@ function main_view_enterprise($settings, $user_key) { $table->colspan[0][0] = 3; $table->data = array(); $table->data[1][0] = '' . - __('Checking for a update') . ' ' . html_print_image('images/spinner.gif', true) . + __('Checking for an update') . ' ' . html_print_image('images/spinner.gif', true) . ''; $table->data[1][1] = html_print_button(__('Details'), 'details_online', true, 'show_details();', 'class="sub search"', true); diff --git a/pandora_console/extensions/update_manager/update_pandora.php b/pandora_console/extensions/update_manager/update_pandora.php index e895c9afdc..1aaf42b0ae 100644 --- a/pandora_console/extensions/update_manager/update_pandora.php +++ b/pandora_console/extensions/update_manager/update_pandora.php @@ -152,8 +152,8 @@ function update_pandora_administration($settings, $user_key) { ' . __('Downloaded Packages') . ''; + + echo '

' . __('Downloaded Packages') . '

'; $tableMain = null; $tableMain->width = '95%'; $tableMain->data = array();