2012-04-16 Juan Manuel Ramon <juanmanuel.ramon@artica.es>

* extensions/update_license_info.php: Added view to show UM license
	info.
	
	* extensions/update_manager.php
	 extensions/update_manager/settings.php: Added UM license dialog in 
	 this view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5981 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/ChangeLog

@@ -1,3 +1,12 @@
+2012-04-16 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* extensions/update_license_info.php: Added view to show UM license
+	info.
+	
+	* extensions/update_manager.php
+	 extensions/update_manager/settings.php: Added UM license dialog in 
+	 this view.
+
 2012-04-16  Vanessa Gil  <vanessa.gil@artica.es>
 
 	* extensions/tree.php: Added policy tab.
@@ -79,6 +88,13 @@
 	  extensions/tree/one_closed_.png
 	  extensions/tree/one_expanded_.png. Added files to new open tree view.
 
+2012-04-12 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* extensions/update_license_info.php
+	 extensions/update_manager.php
+	 extensions/update_manager/settings.php: Added modal window and view 
+	 of UM license information.
+
 2012-04-12 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 
 	* extensions/update_license_info.php

pandora_console/extensions/update_license_info.php

@@ -0,0 +1,44 @@
+<?php
+
+// Pandora FMS - http://pandorafms.com
+// ==================================================
+// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
+// Please see http://pandorafms.org for full contribution list
+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; version 2
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+
+
+if (! check_acl ($config['id_user'], 0, 'PM')) {
+	db_pandora_audit("ACL Violation", "Trying to use Open Update Manager extension");
+	include ("general/noaccess.php");
+	return;
+}
+
+function update_manage_license_info_main() {
+	update_manage_license_info();
+}
+
+function update_manage_license_info(){
+
+	ui_print_page_header (__('Update manager').' - '. __('License info'), "images/extensions.png", false, "", true, "" );
+
+	global $config;
+	include_once("include/functions_db.php");
+
+	$is_enterprise = enterprise_include_once('include/functions_license.php');
+
+	enterprise_hook('license_show_info');
+}
+
+if (defined('PANDORA_ENTERPRISE')) {
+	extensions_add_godmode_menu_option (__('Update manager license info'), 'PM');
+	extensions_add_godmode_function ('update_manage_license_info_main');
+}

pandora_console/extensions/update_manager.php

@@ -31,12 +31,22 @@ if (is_ajax ()) {
 	$checking_online_enterprise_package =
 		(bool)get_parameter('checking_online_enterprise_package', false);
 	
+	$get_license_info = get_parameter('get_license_info', 0);	
+	
 	if ($checking_online_enterprise_package) {
 		checking_online_enterprise_package();
 		
 		return;
 	}
 		
+	if ($get_license_info) {
+	
+		include_once("include/functions_db.php");
+		enterprise_include_once('include/functions_license.php');
+
+		enterprise_hook('license_show_info');
+	}
+	
 	return;
 }
 

pandora_console/extensions/update_manager/settings.php

@@ -67,9 +67,10 @@ $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][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>';
+if (defined('PANDORA_ENTERPRISE')) {
-$table->data[0][1] .= '<div id="dialog_show_license" style="display:none"></div>';
+	$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 host').'</strong>';
 $table->data[1][1] = html_print_input_text ('keys[update_server_host]', $settings->update_server_host, '', 20, 255, true);