tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-05-24 Miguel de Dios <miguel.dedios@artica.es> 

* 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
This commit is contained in:
mdtrooper 2012-05-24 09:55:56 +00:00
parent 954488bd1a
commit 88bea5da55
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/ChangeLog
View File

@ -1,3 +1,15 @@
2012-05-24 Miguel de Dios <miguel.dedios@artica.es>
* 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 <sergio.martin@artica.es>
* godmode/agentes/module_manager_editor_common.php: Fixed

2
pandora_console/extensions/update_manager/lib/functions.ajax.php
View File

@ -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) {

6
pandora_console/extensions/update_manager/lib/functions.php
View File

@ -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);

2
pandora_console/extensions/update_manager/main.php
View File

@ -116,7 +116,7 @@ function main_view_enterprise($settings, $user_key) {
$table->colspan[0][0] = 3;
$table->data = array();
$table->data[1][0] = '<span id="box_ajax_checking_online">' .
__('Checking for a update') . '&nbsp;' . html_print_image('images/spinner.gif', true) .
__('Checking for an update') . '&nbsp;' . html_print_image('images/spinner.gif', true) .
'</span>';
$table->data[1][1] = html_print_button(__('Details'),
'details_online', true, 'show_details();', 'class="sub search"', true);

4
pandora_console/extensions/update_manager/update_pandora.php
View File

@ -152,8 +152,8 @@ function update_pandora_administration($settings, $user_key) {
</div>
</div>
<?php
echo '<h4>' . __('Downloaded Packages') . '</h4>';
echo '<h4>' . __('Downloaded Packages') . '</h4>';
$tableMain = null;
$tableMain->width = '95%';
$tableMain->data = array();