From 8f21da56ad767c07868313ba94b0894effd8b1b4 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Mon, 16 Jun 2014 13:04:58 +0000
Subject: [PATCH] 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
---
 pandora_console/ChangeLog                        |  7 +++++++
 .../godmode/update_manager/update_manager.php    |  6 +++---
 .../update_manager/update_manager.setup.php      |  2 +-
 pandora_console/include/config_process.php       |  2 +-
 .../include/functions_update_manager.php         | 16 ++++++++--------
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 65e7988cfb..5a61a2e9e4 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -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>
 	
 	* godmode/setup/license.php: fixed the erased the update extension.
diff --git a/pandora_console/godmode/update_manager/update_manager.php b/pandora_console/godmode/update_manager/update_manager.php
index 50ee62232b..45692f9c28 100644
--- a/pandora_console/godmode/update_manager/update_manager.php
+++ b/pandora_console/godmode/update_manager/update_manager.php
@@ -24,15 +24,15 @@ $tab = get_parameter('tab', 'online');
 $buttons = array(
 	'setup' => array(
 		'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>'),
 	'offline' => array(
 		'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>'),
 	'online' => array(
 		'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>')
 	);
 
diff --git a/pandora_console/godmode/update_manager/update_manager.setup.php b/pandora_console/godmode/update_manager/update_manager.setup.php
index e254314158..a71ff644d6 100644
--- a/pandora_console/godmode/update_manager/update_manager.setup.php
+++ b/pandora_console/godmode/update_manager/update_manager.setup.php
@@ -30,7 +30,7 @@ if ($action_update_url_update_manager) {
 		__('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->width = '98%';
 
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 8254b3864a..cb65a30915 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -178,7 +178,7 @@ if (!isset($config['inventory_changes_blacklist'])) {
 //NEW UPDATE MANAGER URL
 if (!isset($config['url_update_manager'])) {
 	config_update_value('url_update_manager',
-		'https://artica.es/integriaupdate4/server.php');
+		'https://artica.es/pandoraupdate51/server.php');
 }
 
 if (defined('METACONSOLE')) {
diff --git a/pandora_console/include/functions_update_manager.php b/pandora_console/include/functions_update_manager.php
index 4f9e39a022..46572aecba 100755
--- a/pandora_console/include/functions_update_manager.php
+++ b/pandora_console/include/functions_update_manager.php
@@ -34,13 +34,6 @@ function update_manager_get_config_values() {
 	if (isset($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(
@@ -238,6 +231,10 @@ function update_manager_check_online_free_packages_available() {
 	$http_status = curl_getinfo($curlObj, CURLINFO_HTTP_CODE);
 	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) {
 		return false;
@@ -281,7 +278,10 @@ function update_manager_check_online_free_packages ($is_ajax=true) {
 	$http_status = curl_getinfo($curlObj, CURLINFO_HTTP_CODE);
 	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) {