2012-06-20 Miguel de Dios <miguel.dedios@artica.es>

* include/functions_html.php, include/functions.php: cleaned source
	code style.
	
	* extensions/extension_uploader.php: fixed the upload enterprise
	extension.
	
	Fixes: #3532208
	
	MERGED FROM 4.0.2




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

pandora_console/ChangeLog

@@ -1,3 +1,15 @@
+2012-06-20 Miguel de Dios <miguel.dedios@artica.es>
+	
+	* include/functions_html.php, include/functions.php: cleaned source
+	code style.
+	
+	* extensions/extension_uploader.php: fixed the upload enterprise
+	extension.
+	
+	Fixes: #3532208
+	
+	MERGED FROM 4.0.2
+
 2012-06-20  Hirofumi Kosaka  <kosaka@rworks.jp>
 
 	* extensions/net_tools.php: Fixed bug: 'whereis' could find a
@@ -47,6 +59,18 @@
 	of the xml2array function to set it equal to recent
 	fix in 4.0.2
 
+2012-06-19 Miguel de Dios <miguel.dedios@artica.es>
+	
+	* include/javascript/webchat.js, extensions/pandora_logs.php,
+	extensions/update_manager/lib/functions.php, operation/tree.php,
+	operation/agentes/stat_win.php,
+	godmode/massive/massive_delete_modules.php,
+	godmode/reporting/reporting_builder.list_items.php,
+	godmode/reporting/reporting_builder.php: a lot of changes in the
+	javascript for the crap browser ( = Micro$oft IE9) compatibility.
+	
+	MERGED FROM 4.0.2
+
 2012-06-19 Miguel de Dios <miguel.dedios@artica.es>
 	
 	* godmode/reporting/reporting_builder.list_items.php: some fixes.

pandora_console/extensions/extension_uploader.php

@@ -25,9 +25,11 @@ function extension_uploader_extensions() {
 		return;
 	}
 	
-	ui_print_page_header (__("Uploader extension"), "images/extensions.png", false, "", true, "");
+	ui_print_page_header (__("Uploader extension"),
+		"images/extensions.png", false, "", true, "");
 	
 	$upload = (bool)get_parameter('upload', 0);
+	$upload_enteprise = (bool)get_parameter('upload_enterprise', 0);
 	
 	if ($upload) {
 		$error = $_FILES['extension']['error'];
@@ -37,7 +39,12 @@ function extension_uploader_extensions() {
 			
 			$tmpName = $_FILES['extension']['tmp_name'];
 			
+			if ($upload_enteprise) {
+				$pathname = $config['homedir'] . '/' . ENTERPRISE_DIR . '/' . EXTENSIONS_DIR . '/';
+			}
+			else {
 				$pathname = $config['homedir'] . '/' . EXTENSIONS_DIR . '/';
+			}
 			
 			if ($zip->open($tmpName) === true) {
 				$result = $zip->extractTo($pathname);
@@ -65,6 +72,10 @@ function extension_uploader_extensions() {
 	$table->data[0][0] = __('Upload extension');
 	$table->data[0][1] = html_print_input_file('extension', true) .
 		ui_print_help_tip (__("Upload the extension as a zip file."), true);
+	if (enterprise_installed()) {
+		$table->data[0][2] = __('Upload enterprise extension') . " " .
+			html_print_checkbox('upload_enterprise', 1, false, true);
+	}
 	
 	echo "<form method='post' enctype='multipart/form-data'>";
 	html_print_table($table);

pandora_console/godmode/massive/massive_delete_modules.php

@@ -395,14 +395,12 @@ $(document).ready (function () {
 				}
 				else {
 					$(".select_agents_row_2").css('display', '');
-
 				}
 			}
 		}
 	);
 	
 	$("#form_modules input[name=selection_mode]").change (function () {
-		console.log(this.value);
 		selector = this.value;
 		clean_lists();
 		

pandora_console/godmode/reporting/reporting_builder.list_items.php

@@ -298,6 +298,7 @@ foreach ($items as $item) {
 		}
 		else {
 			$module_name_db = db_get_value_filter('nombre', 'tagente_modulo', array('id_agente_modulo' => $item['id_agent_module']));
+			
 			$row[3] =
 				ui_print_truncate_text(io_safe_output($module_name_db), 'module_small');
 		}
@@ -392,8 +393,6 @@ function added_ids_sorted_items_to_hidden_input() {
 	
 	$("input[name='ids_items_to_sort']").val(ids);
 	
-	console.log(ids);
-	
 	if (ids == '') {
 		alert("<?php echo __("Please select any item to order");?>");
 		
@@ -414,6 +413,5 @@ function only_numbers(name) {
 	}
 	
 	$("input[name='" + name + "']").val(value);
-	
 }
 </script>

pandora_console/godmode/reporting/reporting_builder.php

@@ -46,7 +46,6 @@ switch ($action) {
 	case 'sort_items':
 		switch ($activeTab) {
 			case 'list_items':
-			
 				$resultOperationDB = null;
 				$position_to_sort = (int)get_parameter('position_to_sort', 1);
 				$ids_serialize = (string)get_parameter('ids_items_to_sort', '');
@@ -231,11 +230,10 @@ switch ($action) {
 				$data = array ();
 				
 				if (check_acl ($config["id_user"], $report["id_group"], "AW")) {
-			
 					$data[0] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&action=edit&id_report='.
 							$report['id_report'].'">'.$report['name'].'</a>';
-						
-				} else {
+				}
+				else {
 					$data[0] = $report['name'];
 				}
 				
@@ -283,7 +281,8 @@ switch ($action) {
 				
 			}
 			html_print_table ($table);
-		} else {
+		}
+		else {
 			echo "<div class='nf'>".__('There are no defined reportings')."</div>";
 		}
 		

pandora_console/include/javascript/webchat.js

@@ -41,7 +41,6 @@ function get_last_global_counter() {
 		async: false,
 		success: function(data) {
 			if (data['correct'] == 1) {
-				console.log(global_counter_chat+" < "+data['global_counter']);
 				global_counter_chat = data['global_counter'];
 			}
 		}

pandora_console/operation/agentes/stat_win.php

@@ -91,7 +91,6 @@ window.onload = function() {
 	period_select_init(periodSelectId);
 	
 	$("#graph_menu_arrow").click(function(){
-		console.log($("#graph_menu_arrow").attr("src").indexOf("hide"));
 		if ($("#graph_menu_arrow").attr("src").indexOf("hide") == -1){
 			$("#graph_menu_arrow").attr("src", <?php echo '"' . $config['homeurl'] . '"'; ?> + "/images/graphmenu_arrow_hide.png");	
 		}

pandora_console/operation/tree.php

@@ -1020,8 +1020,8 @@ printTree_($activeTab);
 
 <script language="javascript" type="text/javascript">
 	
-	status = $('#status').val();
-	search_free = $('#text-search_free').val();
+	var status = $('#status').val();
+	var search_free = $('#text-search_free').val();
 		/**
 		 * loadSubTree asincronous load ajax the agents or modules (pass type, id to search and binary structure of branch),
 		 * change the [+] or [-] image (with same more or less div id) of tree and anime (for show or hide)