From 9cd99307dde681653158d44b557398e0f6498420 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Mon, 10 Apr 2017 13:58:42 +0200
Subject: [PATCH] Added selector in visual conf to select a csv divider

---
 .../godmode/setup/setup_visuals.php           | 41 +++++++++++++++++++
 pandora_console/include/functions_config.php  |  9 +++-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index cb4958306e..446193a735 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -755,6 +755,26 @@ $table_other->data[$row][1] .= html_print_input_hidden ('interval_values', $conf
 $table_other->data[$row][1] .= html_print_input_hidden ('interval_to_delete', '', true);
 //----------------------------------------------------------------------
 $row++;
+html_debug($config['csv_divider']);
+$common_dividers = array(
+	";" => ";",
+	"," => ",",
+	"|" => "|");
+$table_other->data[$row][0] = __('CSV divider');
+if ($config['csv_divider'] != ";" && $config['csv_divider'] != "," && $config['csv_divider'] != "|") {
+	$table_other->data[$row][1] = html_print_input_text ('csv_divider', $config['csv_divider'], "", 20, 255, true);
+	$table_other->data[$row][1] .= '<a id="csv_divider_custom" onclick="javascript: edit_csv_divider();">' .
+										html_print_image('images/default_list.png', true, array('id' => 'select')) . 
+									"</a>";
+}
+else {
+	$table_other->data[$row][1] = html_print_select ($common_dividers, 'csv_divider', $config['csv_divider'], "", '', '', true, false, false);
+	$table_other->data[$row][1] .= '<a id="csv_divider_custom" onclick="javascript: edit_csv_divider();">' .
+										html_print_image('images/pencil.png', true, array('id' => 'pencil')) . 
+									"</a>";
+}
+$row++;
+
 
 echo "<fieldset>";
 echo "<legend>" . __('Other configuration') . "</legend>";
@@ -792,6 +812,27 @@ ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/');
 ?>
 <script language="javascript" type="text/javascript">
 
+function edit_csv_divider () {
+	if ($("#csv_divider_custom img").attr("id") == "pencil") {
+		$("#csv_divider_custom img").attr("src", "images/default_list.png");
+		$("#csv_divider_custom img").attr("id", "select");
+		var value = $("#csv_divider").val();
+		$("#csv_divider").replaceWith("<input id='text-csv_divider' name='csv_divider' type='text'>");
+		$("#text-csv_divider").val(value);
+	}
+	else {
+		$("#csv_divider_custom img").attr("src", "images/pencil.png");
+		$("#csv_divider_custom img").attr("id", "pencil");
+		$("#text-csv_divider").replaceWith("<select id='csv_divider' name='csv_divider'>");
+		var o = new Option(";", ";");
+		var o1 = new Option(",", ",");
+		var o2 = new Option("|", "|");
+		$("#csv_divider").append(o);
+		$("#csv_divider").append(o1);
+		$("#csv_divider").append(o2);
+	}
+}
+
 // Juanma (07/05/2014) New feature: Custom front page for reports  
 function display_custom_report_front (show,table) {
 	
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 6fea6906b4..e400548637 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -655,7 +655,10 @@ function config_update_config () {
 					$error_update[] = __('Custom report front') . ' - ' . __('First page');				
 				
 				if (!config_update_value ('custom_report_front_footer', get_parameter('custom_report_front_footer')))
-					$error_update[] = __('Custom report front') . ' - ' . __('Footer');				
+					$error_update[] = __('Custom report front') . ' - ' . __('Footer');	
+
+					if (!config_update_value ('csv_divider', (string) get_parameter('csv_divider', ';')))
+						$error_update[] = __('CSV divider');
 				
 				break;
 			case 'net':
@@ -1620,6 +1623,10 @@ function config_process_config () {
 		config_update_value ('classic_menu', 0);
 	}
 
+	if (!isset($config["csv_divider"])) {
+		config_update_value ('csv_divider', ";");
+	}
+
 	if (!isset($config['command_snapshot'])) {
 		config_update_value ('command_snapshot', 1);
 	}