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

2014-06-16 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/update_manager/update_manager.setup.php,
	godmode/update_manager/update_manager.php,
	include/functions_update_manager.php, include/config_process.php:
	some changes in the update manager.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10201 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2014-06-16 13:04:58 +00:00
parent 7e7a748116
commit 8f21da56ad
5 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2014-06-16 Miguel de Dios <miguel.dedios@artica.es>
* godmode/update_manager/update_manager.setup.php,
godmode/update_manager/update_manager.php,
include/functions_update_manager.php, include/config_process.php:
some changes in the update manager.
2014-06-13 Miguel de Dios <miguel.dedios@artica.es> 2014-06-13 Miguel de Dios <miguel.dedios@artica.es>
* godmode/setup/license.php: fixed the erased the update extension. * godmode/setup/license.php: fixed the erased the update extension.

6
pandora_console/godmode/update_manager/update_manager.php
View File

@ -24,15 +24,15 @@ $tab = get_parameter('tab', 'online');
$buttons = array( $buttons = array(
'setup' => array( 'setup' => array(
'active' => ($tab == 'setup') ? true : false, 'active' => ($tab == 'setup') ? true : false,
'text' => '<a href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager_xxx&tab=setup">' . 'text' => '<a href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=setup">' .
html_print_image ("images/gm_setup.png", true, array ("title" => __('Options'))) .'</a>'), html_print_image ("images/gm_setup.png", true, array ("title" => __('Options'))) .'</a>'),
'offline' => array( 'offline' => array(
'active' => ($tab == 'offline') ? true : false, 'active' => ($tab == 'offline') ? true : false,
'text' => '<a href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager_xxx&tab=offline">' . 'text' => '<a href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=offline">' .
html_print_image ("images/box.disabled.png", true, array ("title" => __('Offline update manager'))) .'</a>'), html_print_image ("images/box.disabled.png", true, array ("title" => __('Offline update manager'))) .'</a>'),
'online' => array( 'online' => array(
'active' => ($tab == 'online') ? true : false, 'active' => ($tab == 'online') ? true : false,
'text' => '<a href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager_xxx&tab=online">' . 'text' => '<a href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=online">' .
html_print_image("images/op_gis.png", true, array ("title" => __('Online update manager'))) .'</a>') html_print_image("images/op_gis.png", true, array ("title" => __('Online update manager'))) .'</a>')
); );

2
pandora_console/godmode/update_manager/update_manager.setup.php
View File

@ -30,7 +30,7 @@ if ($action_update_url_update_manager) {
__('Unsuccesful Update the url config vars.')); __('Unsuccesful Update the url config vars.'));
} }
echo '<form method="post" action="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager_xxx&tab=setup">'; echo '<form method="post" action="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=setup">';
$table = null; $table = null;
$table->width = '98%'; $table->width = '98%';

2
pandora_console/include/config_process.php
View File

@ -178,7 +178,7 @@ if (!isset($config['inventory_changes_blacklist'])) {
//NEW UPDATE MANAGER URL //NEW UPDATE MANAGER URL
if (!isset($config['url_update_manager'])) { if (!isset($config['url_update_manager'])) {
config_update_value('url_update_manager', config_update_value('url_update_manager',
'https://artica.es/integriaupdate4/server.php'); 'https://artica.es/pandoraupdate51/server.php');
} }
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {

16
pandora_console/include/functions_update_manager.php
View File

@ -34,13 +34,6 @@ function update_manager_get_config_values() {
if (isset($config['current_package'])) if (isset($config['current_package']))
$current_update = $config['current_package']; $current_update = $config['current_package'];
//TO DO
$license = "TESTMIGUEL00B0WAW9BU1QM0RZ2QM0MZ3QN5M41R35S5S1DP";
//~ $current_update = 9;
//~ $limit_count = 2;
$build_version = "140514";
$pandora_version = "4.1";
//$license = "INTEGRIA-FREE";
return array( return array(
@ -238,6 +231,10 @@ function update_manager_check_online_free_packages_available() {
$http_status = curl_getinfo($curlObj, CURLINFO_HTTP_CODE); $http_status = curl_getinfo($curlObj, CURLINFO_HTTP_CODE);
curl_close($curlObj); curl_close($curlObj);
//~ html_debug_print("----------", true);
//~ html_debug_print($params, true);
//~ html_debug_print($http_status, true);
//~ html_debug_print($result, true);
if ($http_status >= 400 && $http_status < 500) { if ($http_status >= 400 && $http_status < 500) {
return false; return false;
@ -281,7 +278,10 @@ function update_manager_check_online_free_packages ($is_ajax=true) {
$http_status = curl_getinfo($curlObj, CURLINFO_HTTP_CODE); $http_status = curl_getinfo($curlObj, CURLINFO_HTTP_CODE);
curl_close($curlObj); curl_close($curlObj);
//~ html_debug_print("=============", true);
//~ html_debug_print($params, true);
//~ html_debug_print($http_status, true);
//~ html_debug_print($result, true);
if ($http_status >= 400 && $http_status < 500) { if ($http_status >= 400 && $http_status < 500) {