From 8c76fb5b671710edf7bcf3a71ac31fea67fd4d07 Mon Sep 17 00:00:00 2001
From: ramonn <noreply@pandorafms.org>
Date: Mon, 2 Jun 2014 16:00:44 +0000
Subject: [PATCH] 2014-06-02  Ramon Novoa  <rnovoa@artica.es>

	* extensions/update_manager/settings.php
	  godmode/menu.php: Moved license configuration from update manager settings
	  to its own screen.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10077 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     |  6 ++++
 .../extensions/update_manager/settings.php    | 34 ++++++++-----------
 pandora_console/godmode/menu.php              |  1 +
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 88489a752a..0ffa3fe3ad 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-02  Ramon Novoa  <rnovoa@artica.es>
+
+	* extensions/update_manager/settings.php
+	  godmode/menu.php: Moved license configuration from update manager settings
+	  to its own screen.
+
 2014-06-02  Miguel de Dios <miguel.dedios@artica.es>
 	
 	* godmode/alerts/configure_alert_template.php,
diff --git a/pandora_console/extensions/update_manager/settings.php b/pandora_console/extensions/update_manager/settings.php
index d3e6a274af..8339b33273 100644
--- a/pandora_console/extensions/update_manager/settings.php
+++ b/pandora_console/extensions/update_manager/settings.php
@@ -66,32 +66,26 @@ echo '<form method="post">';
 $table->width = '95%';
 $table->data = array ();
 
-$table->data[0][0] = '<strong>'.__('Customer key').'</strong>';
-$table->data[0][1] = html_print_input_text ('keys[customer_key]', $settings->customer_key, '', 40, 255, true);
+$table->data[0][0] = '<strong>'.__('Update server host').'</strong>';
+$table->data[0][1] = html_print_input_text ('keys[update_server_host]', $settings->update_server_host, '', 20, 255, true);
 
-$table->data[0][1] .= '&nbsp;<a id="dialog_license_info" title="'.__("License Info").'" href="#">'.html_print_image('images/lock.png', true, array('class' => 'bot', 'title' => __('License info'))).'</a>';
-$table->data[0][1] .= '<div id="dialog_show_license" style="display:none"></div>';
+$table->data[1][0] = '<strong>'.__('Update server path').'</strong>';
+$table->data[1][1] = html_print_input_text ('keys[update_server_path]', $settings->update_server_path, '', 40, 255, true);
 
-$table->data[1][0] = '<strong>'.__('Update server host').'</strong>';
-$table->data[1][1] = html_print_input_text ('keys[update_server_host]', $settings->update_server_host, '', 20, 255, true);
+$table->data[2][0] = '<strong>'.__('Update server port').'</strong>';
+$table->data[2][1] = html_print_input_text ('keys[update_server_port]', $settings->update_server_port, '', 5, 5, true);
 
-$table->data[2][0] = '<strong>'.__('Update server path').'</strong>';
-$table->data[2][1] = html_print_input_text ('keys[update_server_path]', $settings->update_server_path, '', 40, 255, true);
+$table->data[3][0] = '<strong>'.__('Proxy server').'</strong>';
+$table->data[3][1] = html_print_input_text ('keys[proxy]', $settings->proxy, '', 40, 255, true);
 
-$table->data[3][0] = '<strong>'.__('Update server port').'</strong>';
-$table->data[3][1] = html_print_input_text ('keys[update_server_port]', $settings->update_server_port, '', 5, 5, true);
+$table->data[4][0] = '<strong>'.__('Proxy port').'</strong>';
+$table->data[4][1] = html_print_input_text ('keys[proxy_port]', $settings->proxy_port, '', 40, 255, true);
 
-$table->data[6][0] = '<strong>'.__('Proxy server').'</strong>';
-$table->data[6][1] = html_print_input_text ('keys[proxy]', $settings->proxy, '', 40, 255, true);
+$table->data[5][0] = '<strong>'.__('Proxy user').'</strong>';
+$table->data[5][1] = html_print_input_text ('keys[proxy_user]', $settings->proxy_user, '', 40, 255, true);
 
-$table->data[7][0] = '<strong>'.__('Proxy port').'</strong>';
-$table->data[7][1] = html_print_input_text ('keys[proxy_port]', $settings->proxy_port, '', 40, 255, true);
-
-$table->data[8][0] = '<strong>'.__('Proxy user').'</strong>';
-$table->data[8][1] = html_print_input_text ('keys[proxy_user]', $settings->proxy_user, '', 40, 255, true);
-
-$table->data[9][0] = '<strong>'.__('Proxy password').'</strong>';
-$table->data[9][1] = html_print_input_password ('keys[proxy_pass]', $settings->proxy_pass, '', 40, 255, true);
+$table->data[6][0] = '<strong>'.__('Proxy password').'</strong>';
+$table->data[6][1] = html_print_input_password ('keys[proxy_pass]', $settings->proxy_pass, '', 40, 255, true);
 
 if (!enterprise_installed()) {
 	global $conf_update_pandora;
diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 63ce72d36f..7251af307e 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -216,6 +216,7 @@ if (check_acl ($config['id_user'], 0, "PM")) {
 	$sub["godmode/setup/links"]["text"] = __('Links');
 	$sub["godmode/setup/news"]["text"] = __('Site news');
 	$sub["godmode/setup/os"]["text"] = __('Edit OS');
+	$sub["godmode/setup/license"]["text"] = __('License');
 	
 	enterprise_hook ('enterprise_acl_submenu');
 	enterprise_hook ('skins_submenu');