From e33cebbd8e403100037113b2f8cff365bdc577fb Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Thu, 25 Oct 2012 16:46:52 +0000
Subject: [PATCH] 2012-10-25 Miguel de Dios <miguel.dedios@artica.es>

	* include/functions_extensions.php, extensions/pandora_logs.php,
	extensions/update_manager.php, extensions/resource_registration.php,
	extensions/resource_exportation.php, extensions/module_groups.php,
	extensions/plugin_registration.php, extensions/snmp_explorer.php,
	extensions/system_info.php, operation/menu.php: cleaned source code
	style.

	* include/functions_menu.php: fixed the hidden icons the extensions
	in  menu.

	Fixes: #3568966




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7096 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     | 14 +++++++++++
 pandora_console/extensions/module_groups.php  | 16 ++++++-------
 pandora_console/extensions/pandora_logs.php   | 14 +++++------
 .../extensions/plugin_registration.php        | 24 +++++++++----------
 .../extensions/resource_exportation.php       |  6 ++---
 .../extensions/resource_registration.php      | 18 +++++++-------
 pandora_console/extensions/snmp_explorer.php  |  9 +++----
 pandora_console/extensions/system_info.php    | 18 +++++++-------
 pandora_console/extensions/update_manager.php |  2 +-
 .../include/functions_extensions.php          | 14 +++++++----
 pandora_console/include/functions_menu.php    | 22 +++++++++--------
 pandora_console/operation/menu.php            |  2 +-
 12 files changed, 88 insertions(+), 71 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index a378d61632..8e907fa330 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,17 @@
+2012-10-25 Miguel de Dios <miguel.dedios@artica.es>
+	
+	* include/functions_extensions.php, extensions/pandora_logs.php,
+	extensions/update_manager.php, extensions/resource_registration.php,
+	extensions/resource_exportation.php, extensions/module_groups.php,
+	extensions/plugin_registration.php, extensions/snmp_explorer.php,
+	extensions/system_info.php, operation/menu.php: cleaned source code
+	style.
+	
+	* include/functions_menu.php: fixed the hidden icons the extensions
+	in  menu.
+	
+	Fixes: #3568966
+
 2012-10-25  Vanessa Gil <vanessa.gil@artica.es>
 
 	* include/functions_reporting.php
diff --git a/pandora_console/extensions/module_groups.php b/pandora_console/extensions/module_groups.php
index 5dc89b2439..1bc643745c 100644
--- a/pandora_console/extensions/module_groups.php
+++ b/pandora_console/extensions/module_groups.php
@@ -83,9 +83,9 @@ if (is_ajax ()) {
 /**
  * Translate the array texts using gettext
  */
- function translate(&$item, $key) {
- 	$item = __($item);
- }
+function translate(&$item, $key) {
+	$item = __($item);
+}
  
 /**
  * The main function of module groups and the enter point to
@@ -143,7 +143,7 @@ function mainModuleGroups() {
 	$agentGroups = users_get_groups ($config['id_user'], "AR", false);
 	$modelGroups = users_get_all_model_groups();
 	
-	if(!empty($agentGroups) && !empty($modelGroups)) {
+	if (!empty($agentGroups) && !empty($modelGroups)) {
 		array_walk($modelGroups, 'translate'); //Translate all head titles to language is set
 		
 		foreach ($modelGroups as $i => $n) {
@@ -217,17 +217,17 @@ function mainModuleGroups() {
 					if ($fired) {
 						$color = '#ffa300'; //Orange when the cell for this model group and agent has at least one alert fired.
 					}
-					else if (array_key_exists(1,$states)) {
+					else if (array_key_exists(1, $states)) {
 						$color = '#cc0000'; //Red when the cell for this model group and agent has at least one module in critical state and the rest in any state.
 						$font_color = '#ffffff';
 					}
-					elseif (array_key_exists(2,$states)) {
+					elseif (array_key_exists(2, $states)) {
 						$color = '#fce94f'; //Yellow when the cell for this model group and agent has at least one in warning state and the rest in green state.
 					}
-					elseif (array_key_exists(3,$states)) {
+					elseif (array_key_exists(3, $states)) {
 						$color = '#babdb6'; //Grey when the cell for this model group and agent has at least one module in unknown state and the rest in any state.
 					}
-					elseif (array_key_exists(0,$states)) {
+					elseif (array_key_exists(0, $states)) {
 						$color = '#8ae234'; //Green when the cell for this model group and agent has OK state all modules.
 					}
 					
diff --git a/pandora_console/extensions/pandora_logs.php b/pandora_console/extensions/pandora_logs.php
index e68e003ccf..6bec5f5a6c 100644
--- a/pandora_console/extensions/pandora_logs.php
+++ b/pandora_console/extensions/pandora_logs.php
@@ -16,7 +16,7 @@
 
 function view_logfile ($file_name) {
 	global $config;
-
+	
 	if (!file_exists($file_name)){
 		echo "<h2 class='error'>".__("Cannot find file"). "(".$file_name;
 		echo ")</h2>";
@@ -26,7 +26,7 @@ function view_logfile ($file_name) {
 		if ($file_size > 512000) {
 			$data = file_get_contents ($file_name, false, NULL, $file_size - 512000);
 			echo "<h2>$file_name (".__("File is too large (> 500KB)").")</h2>";
-
+			
 			echo "<textarea style='width: 98%; float:right; height: 200px; margin-bottom:20px;' name='$file_name'>";
 			echo "... ";
 			echo $data;
@@ -45,18 +45,18 @@ function view_logfile ($file_name) {
 
 function pandoralogs_extension_main () {
 	global $config;
-
+	
 	if (! check_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) {
 		db_pandora_audit("ACL Violation", "Trying to access Setup Management");
 		require ("general/noaccess.php");
 		return;
 	}
-
-
+	
+	
 	ui_print_page_header (__("System logfile viewer"), "images/extensions.png", false, "", true, "" );
-
+	
 	echo "<p>" . __('This tool is used just to view your Pandora FMS system logfiles directly from console') . "</p>";
-
+	
 	view_logfile ($config["homedir"]."/pandora_console.log");
 	view_logfile ("/var/log/pandora/pandora_server.log");
 	view_logfile ("/var/log/pandora/pandora_server.error");
diff --git a/pandora_console/extensions/plugin_registration.php b/pandora_console/extensions/plugin_registration.php
index 3f83e93747..21c0624d64 100644
--- a/pandora_console/extensions/plugin_registration.php
+++ b/pandora_console/extensions/plugin_registration.php
@@ -16,21 +16,21 @@
 
 function pluginreg_extension_main () {
 	global $config;
-
+	
 	if (! check_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) {
 		db_pandora_audit("ACL Violation", "Trying to access Setup Management");
 		require ("general/noaccess.php");
 		return;
 	}
-
+	
 	ui_print_page_header (__('Plugin registration'), "images/extensions.png", false, "", true, "" );
-
+	
 	echo "<div class=notify>";
 	printf(__("This extension makes registration of server plugins more easy. Here you can upload a server plugin in Pandora FMS 3.x zipped format (.pspz). Please refer to documentation on how to obtain and use Pandora FMS Server Plugins.<br><br>You can get more plugins in our <a href='%s'>Public Resource Library</a>") , "http://pandorafms.org/index.php?sec=community&sec2=repository&lng=en");
 	echo "</div>";
 	
 	echo "<br><br>";
-
+	
 	if (!isset ($_FILES['plugin_upload']['tmp_name'])){
 		// Upload form
 		echo "<form name='submit_plugin' method='post' enctype='multipart/form-data'>";
@@ -40,11 +40,11 @@ function pluginreg_extension_main () {
 		echo "</form></table>";
 		
 		return;
-	} 	
-
+	}
+	
 	$config["plugin_store"] = $config["attachment_store"] . "/plugin";
 	$zip = zip_open($_FILES['plugin_upload']['tmp_name']);
-
+	
 	if ($zip) {
 		while ($zip_entry = zip_read($zip)) {
 			if (zip_entry_open($zip, $zip_entry, "r")) {
@@ -65,7 +65,7 @@ function pluginreg_extension_main () {
 		}
 		zip_close($zip);
 	}
-
+	
 	// Parse with sections
 	if (! $ini_array = parse_ini_file($config["attachment_store"] . "/plugin_definition.ini", true)){
 		echo "<h2 class=error>".__("Cannot load INI file")."</h2>";
@@ -80,13 +80,13 @@ function pluginreg_extension_main () {
 	if(!isset($ini_array["plugin_definition"]["execution_postcommand"])) {
 		$ini_array["plugin_definition"]["execution_postcommand"] = '';
 	}
-
+	
 	// From Pandora 5.0 the pspz are in different format (version 2)
 	// If pspz is a version 1, we convert it to 2
 	if($version == 1) {
 		$ini_array["plugin_definition"] = pluginreg_convert_plugin_1_to_2($ini_array["plugin_definition"]);
 	}
-
+	
 	// Build plugin_exec
 	$exec_path = $config["plugin_store"] . "/" . $ini_array["plugin_definition"]["filename"];
 	
@@ -116,7 +116,7 @@ function pluginreg_extension_main () {
 	// Build macros
 	$macros = array();
 	$n = 1;
-	while(1) {
+	while (1) {
 		if(!isset($ini_array["plugin_definition"]["macro_desc_field".$n."_"])) {
 			break;
 		}
@@ -129,7 +129,7 @@ function pluginreg_extension_main () {
 		$n++;
 	}
 	
-	if(empty($macros)) {
+	if (empty($macros)) {
 		$macros = '';
 	}
 	else {
diff --git a/pandora_console/extensions/resource_exportation.php b/pandora_console/extensions/resource_exportation.php
index de974eb441..73d388d471 100644
--- a/pandora_console/extensions/resource_exportation.php
+++ b/pandora_console/extensions/resource_exportation.php
@@ -39,7 +39,7 @@ if (isset($_GET['get_ptr'])) {
 		else {
 			$config['id_user'] = $_SESSION["id_usuario"];
 		}
-				
+		
 		
 		if (! check_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) {
 			db_pandora_audit("ACL Violation", "Trying to access Setup Management");
@@ -84,9 +84,9 @@ function output_xml_resource($hook_enterprise) {
 
 function output_xml_report($id) {
 	global $config;
-
+	
 	require_once ($config['homedir'].'/include/functions_agents.php');
-
+	
 	$report = db_get_row('treport', 'id_report', $id);
 	
 	echo '<?xml version="1.0" encoding="UTF-8" ?>' . "\n"; 
diff --git a/pandora_console/extensions/resource_registration.php b/pandora_console/extensions/resource_registration.php
index 45e46d9bab..4ddf71f68e 100644
--- a/pandora_console/extensions/resource_registration.php
+++ b/pandora_console/extensions/resource_registration.php
@@ -35,7 +35,7 @@ function insert_item_report($report_id, $values) {
 	foreach ($report_id as $id => $name) {
 		$values['id_report'] = $id;
 		$result = (bool)db_process_sql_insert('treport_content', $values);
-
+		
 		ui_print_result_message($result,
 			sprintf(__("Success add '%s' item in report '%s'."), $values['type'], $name),
 			sprintf(__("Error create '%s' item in report '%s'."), $values['type'], $name));
@@ -91,7 +91,7 @@ function process_upload_xml_report($xml, $group_filter = 0) {
 		
 		if (isset($reportElement->description))
 			$values['description'] = $reportElement->description;
-			
+		
 		$id_report = db_process_sql_insert ('treport', $values);
 		
 		ui_print_result_message($id_report,
@@ -403,7 +403,7 @@ function process_upload_xml_visualmap($xml, $filter_group = 0) {
 				$posible_name = $values['name'] . " (" . (30 - $loops) . ")";
 			}
 		}
-			
+		
 		if ($exist) {
 			ui_print_error_message(
 				sprintf(
@@ -420,18 +420,18 @@ function process_upload_xml_visualmap($xml, $filter_group = 0) {
 		
 		$values['name'] = io_safe_input($posible_name);
 		$id_visual_map = db_process_sql_insert('tlayout', $values);
-			
+		
 		ui_print_result_message((bool)$id_visual_map,
 			sprintf(__("Success create '%s' visual map."), $posible_name),
 			sprintf(__("Error create '%s' visual map."), $posible_name));
-			
+		
 		if ($id_visual_map !== false) {
 			db_pandora_audit('CREATE VISUAL CONSOLE', $id_visual_map, $config['id_user']);
 		}
 		else {
 			break;
 		}
-	
+		
 		$relation_other_ids = array();
 		
 		foreach ($visual_map->item as $item) {
@@ -533,7 +533,7 @@ function process_upload_xml_visualmap($xml, $filter_group = 0) {
 				ui_print_result_message((bool)$id_item,
 					sprintf(__("Success create item type '%d' visual map."), $values['type']),
 					sprintf(__("Error create item type '%d' visual map."), $values['type']));
-					
+				
 				if ($id_item !== false) {
 					db_pandora_audit('CREATE ITEM VISUAL CONSOLE', $values['id_layout'] . " - " . $id_item, $config['id_user']);
 				}
@@ -552,7 +552,7 @@ function process_upload_xml_visualmap($xml, $filter_group = 0) {
 						ui_print_result_message((bool)$id_item,
 							sprintf(__("Success create item for agent '%s' visual map."), $agent['name']),
 							sprintf(__("Error create item for agent '%s' visual map."), $agent['name']));
-							
+						
 						if ($id_item !== false) {
 							db_pandora_audit('CREATE ITEM VISUAL CONSOLE', $values['id_layout'] . " - " . $id_item, $config['id_user']);
 						}
@@ -567,7 +567,7 @@ function process_upload_xml_visualmap($xml, $filter_group = 0) {
 							ui_print_result_message((bool)$id_item,
 								sprintf(__("Success create item for agent '%s' visual map."), $agent['name']),
 								sprintf(__("Error create item for agent '%s' visual map."), $agent['name']));
-								
+							
 							if ($id_item !== false) {
 								db_pandora_audit('CREATE ITEM VISUAL CONSOLE', $values['id_layout'] . " - " . $id_item, $config['id_user']);
 							}
diff --git a/pandora_console/extensions/snmp_explorer.php b/pandora_console/extensions/snmp_explorer.php
index b9a6da89cd..8af6de7719 100755
--- a/pandora_console/extensions/snmp_explorer.php
+++ b/pandora_console/extensions/snmp_explorer.php
@@ -52,13 +52,13 @@ function snmp_explorer() {
 	
 	$interfaces = array();
 	
-	if($snmpwalk) {	
+	if ($snmpwalk) {
 		
 		$snmpis = get_snmpwalk($ip_target, $snmp_version, $snmp_community, $snmp3_auth_user,
 			$snmp3_security_level, $snmp3_auth_method, $snmp3_auth_pass,
 			$snmp3_privacy_method, $snmp3_privacy_pass, 0, ".1.3.6.1.2.1", $tcp_port);
 		
-		if($snmpis === false) {
+		if ($snmpis === false) {
 			$snmpis = array();
 		}
 		
@@ -252,7 +252,7 @@ function snmp_explorer() {
 	
 	// Create the interface list for the interface
 	$interfaces_list = array();
-	foreach($interfaces as $interface){
+	foreach ($interfaces as $interface){
 		// Get the interface name, removing " " characters and avoid "blank" interfaces
 		if (isset($interface['ifName']) && $interface['ifName']['value'] != ""){
 				$ifname = $interface['ifName']['value'];
@@ -344,9 +344,6 @@ function snmp_explorer() {
 	
 	echo "</form>";
 	
-	//echo "</tr></table>";
-	//echo "</form>";
-	
 	if (!empty($interfaces_list)) {
 		echo '<span id="form_interfaces">';
 		echo '<span id ="none_text" style="display: none;">' . __('None') . '</span>';
diff --git a/pandora_console/extensions/system_info.php b/pandora_console/extensions/system_info.php
index f8dbb8d6bb..ae77188706 100644
--- a/pandora_console/extensions/system_info.php
+++ b/pandora_console/extensions/system_info.php
@@ -43,7 +43,7 @@ function getPandoraDiagnostic(&$systemInfo) {
 	$systemInfo['ttrap'] = db_get_sql("SELECT COUNT(*) FROM ttrap");
 	$systemInfo['tusuario'] = db_get_sql("SELECT COUNT(*) FROM tusuario");
 	$systemInfo['tsesion'] = db_get_sql("SELECT COUNT(*) FROM tsesion");
-
+	
 	switch ($config["dbtype"]) {
 		case "mysql":
 			$systemInfo['db_scheme_version'] = db_get_sql("SELECT `value` FROM tconfig WHERE `token` = 'db_scheme_version'");
@@ -146,8 +146,8 @@ function getLastLinesLog($file, $numLines = 2000) {
 
 function show_logfile($file_name, $numLines = 2000) {
 	global $config;
-
-	if (!file_exists($file_name)){
+	
+	if (!file_exists($file_name)) {
 		echo "<h2 class=error>" . __("Cannot find file") . "(" . $file_name .
 			")</h2>";
 	} 
@@ -167,7 +167,7 @@ function show_logfile($file_name, $numLines = 2000) {
 
 function logFilesLines($file_name, $numLines) {
 	global $config;
-
+	
 	if (!file_exists($file_name)){
 		return '';
 	} 
@@ -260,14 +260,15 @@ function mainSystemInfo() {
 	echo '</div>';
 	
 	echo "<p>" . __('This tool is used just to view your Pandora FMS system logfiles directly from console') . "</p>";
-
+	
 	echo "<form method='post' action='index.php?extension_in_menu=gsetup&sec=gextensions&sec2=extensions/system_info'>";
 	$table = null;
 	$table->width = '98%';
 	$table->align = array();
 	$table->align[1] = 'right';
 	if ($pandora_diag) {
-		$table->data[0][0] = '<a href="#diag_info">' . __('Pandora Diagnostic info') . "</a>";
+		$table->data[0][0] = '<a href="#diag_info">' .
+			__('Pandora Diagnostic info') . "</a>";
 	}
 	else {
 		$table->data[0][0] = __('Pandora Diagnostic info');
@@ -291,7 +292,6 @@ function mainSystemInfo() {
 	$table->data[3][1] = html_print_input_text('log_num_lines', $log_num_lines, __('Number lines of log'), 5, 10, true);
 	html_print_table($table);
 	echo "<div style='width: " . $table->width . "; text-align: right;'>";
-	//html_print_submit_button(__('Show'), 'show', false, 'class="sub next"');
 		html_print_submit_button(__('Generate file'), 'generate', false, 'class="sub next"');
 	echo "</div>";
 	echo "</form>";
@@ -558,7 +558,7 @@ function consoleMode() {
 				fwrite($file, $output);
 				fclose($file);
 			}
-
+			
 			$file = fopen($tempDir . 'my.cnf', 'w');
 			if ($file !== false) {
 				ob_start();
@@ -567,7 +567,7 @@ function consoleMode() {
 				fwrite($file, $output);
 				fclose($file);
 			}
-
+			
 			$file = fopen($tempDir . 'pandora_server.conf', 'w');
 			if ($file !== false) {
 				ob_start();
diff --git a/pandora_console/extensions/update_manager.php b/pandora_console/extensions/update_manager.php
index f1baef1f1d..a60b18b747 100644
--- a/pandora_console/extensions/update_manager.php
+++ b/pandora_console/extensions/update_manager.php
@@ -46,7 +46,7 @@ if (is_ajax ()) {
 		$is_enteprise = enterprise_hook('license_show_info');
 		
 		// If Open show info
-		if ($is_enteprise === ENTERPRISE_NOT_HOOK){		
+		if ($is_enteprise === ENTERPRISE_NOT_HOOK) {
 			$table->width = '98%';
 			$table->data = array ();
 			$table->style = array();
diff --git a/pandora_console/include/functions_extensions.php b/pandora_console/include/functions_extensions.php
index e6757efd39..cbc7e872e5 100644
--- a/pandora_console/include/functions_extensions.php
+++ b/pandora_console/include/functions_extensions.php
@@ -300,16 +300,20 @@ function extensions_add_operation_menu_option ($name, $fatherId = null, $icon =
 	global $config;
 	global $extension_file;
 	
-	/* $config['extension_file'] is set in extensions_load_extensions(), since that function must
-	   be called before any function the extension call, we are sure it will 
-	   be set. */
+	/*
+	$config['extension_file'] is set in extensions_load_extensions(),
+	since that function must be called before any function the extension
+	call, we are sure it will be set.
+	*/
 	$option_menu['name'] = $name;
-
+	
 	$extension = &$config['extensions'][$extension_file];
-	$option_menu['sec2'] = $extension['dir'].'/'.mb_substr ($extension_file, 0, -4);
+	
+	$option_menu['sec2'] = $extension['dir'] . '/' . mb_substr ($extension_file, 0, -4);
 	$option_menu['fatherId'] = $fatherId;
 	$option_menu['icon'] = $icon;
 	$option_menu['version'] = $version;
+	
 	$extension['operation_menu'] = $option_menu;
 }
 
diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index 415ee22fdb..47fff7a86c 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -27,20 +27,20 @@
 function menu_print_menu (&$menu) {
 	global $config;
 	static $idcounter = 0;
-
+	
 	echo '<div class="menu">';
 	
 	$sec = (string) get_parameter ('sec');
 	$sec2 = (string) get_parameter ('sec2');
 	
 	$allsec2 = explode('sec2=', $_SERVER['REQUEST_URI']);
-	if(isset($allsec2[1])) {
+	if (isset($allsec2[1])) {
 		$allsec2 = $allsec2[1];
 	}
 	else {
 		$allsec2 = $sec2;
 	}
-
+	
 	echo '<ul'.(isset ($menu['class']) ? ' class="'.$menu['class'].'"' : '').'>';
 	
 	foreach ($menu as $mainsec => $main) {
@@ -200,8 +200,10 @@ function menu_print_menu (&$menu) {
 				
 				//Ini Add icon extension
 				$secExtension = null;
-				if (array_key_exists('extension',$sub)) $secExtensionBool = $sub["extension"];
-				else $secExtensionBool = false;
+				if (array_key_exists('extension',$sub))
+					$secExtensionBool = $sub["extension"];
+				else
+					$secExtensionBool = false;
 				
 				if ($secExtensionBool) {
 					$imageIconDefault = 'images/extensions.png';
@@ -224,8 +226,8 @@ function menu_print_menu (&$menu) {
 					else {
 						$imageIcon = $imageIconDefault;
 					}
-					//Delete extension Icon before the was a style with background: url('.$imageIcon.') no-repeat; 
-					$submenu_output .= '<div style="width: 16px; height: 16px; float: left; margin: 5px 0px 0px 3px;">&nbsp;</div>';
+					
+					$submenu_output .= '<div style="background: url('.$imageIcon.') no-repeat; width: 16px; height: 16px; float: left; margin: 5px 0px 0px 3px;">&nbsp;</div>';
 				}
 				
 				
@@ -395,8 +397,8 @@ function menu_add_extras(&$menu) {
 				$menu_extra[$mm['sec']]['sub'][$kk]['text'] = $mm['text'];
 			}
 		}
-	}	
-
+	}
+	
 	$menu = array_merge_recursive($menu, $menu_extra);
 }
 
@@ -404,7 +406,7 @@ function menu_add_extras(&$menu) {
  * Get the sec list built in menu
  *
  * @param bool If true, the array returned will have the structure
- * 		to combo categories (optgroup)
+ * to combo categories (optgroup)
  * 
  * @return array Sections list
  */
diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php
index 011b1cabae..50282a4a3d 100644
--- a/pandora_console/operation/menu.php
+++ b/pandora_console/operation/menu.php
@@ -319,7 +319,7 @@ if (check_acl ($config['id_user'], 0, "IR") == 1) {
 }
 
 if (check_acl ($config['id_user'], 0, "AR")) {
-
+	
 	// Messages
 	$sub["operation/messages/message_list"]["text"] = __('Messages');
 	$sub["operation/messages/message_list"]["refr"] = 0;