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

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
This commit is contained in:
Ramon Novoa 2014-06-02 16:00:44 +00:00
parent ab110f04ad
commit 3d35575e3a
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -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,

34
pandora_console/extensions/update_manager/settings.php
View File

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

1
pandora_console/godmode/menu.php
View File

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