Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan

Former-commit-id: b12bfcf0f580e011d1fa9ac9fab18d108b403b0a

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.730-190116
+Version: 7.0NG.730-190117
 Architecture: all
 Priority: optional
 Section: admin

pandora_agents/unix/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.730-190116"
+pandora_version="7.0NG.730-190117"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

pandora_agents/unix/pandora_agent

@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.730';
-use constant AGENT_BUILD => '190116';
+use constant AGENT_BUILD => '190117';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;

pandora_agents/unix/pandora_agent.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.730
-%define release     190116
+%define release     190117
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.730
-%define release     190116
+%define release     190117
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.730"
-PI_BUILD="190116"
+PI_BUILD="190117"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190116}
+{190117}
 
 ViewReadme
 {Yes}

pandora_agents/win32/pandora.cc

@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.730(Build 190116)")
+#define PANDORA_VERSION ("7.0NG.730(Build 190117)")
 
 string pandora_path;
 string pandora_dir;

pandora_agents/win32/versioninfo.rc

@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.730(Build 190116))"
+      VALUE "ProductVersion", "(7.0NG.730(Build 190117))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.730-190116
+Version: 7.0NG.730-190117
 Architecture: all
 Priority: optional
 Section: admin

pandora_console/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.730-190116"
+pandora_version="7.0NG.730-190117"
 
 package_pear=0
 package_pandora=1

pandora_console/include/config_process.php

@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC190116';
+$build_version = 'PC190117';
 $pandora_version = 'v7.0NG.730';
 
 // Do not overwrite default timezone set if defined.

pandora_console/include/graphs/pandora.d3.js

@@ -1332,7 +1332,7 @@ function print_phases_donut (recipient, phases) {
 	var svg = d3.select(recipient)
 		.append("svg")
 			.attr("width", 800)
-			.attr("height", 400)
+			.attr("height", 500)
 		.append("g");
 
 	svg.append("g")
@@ -1361,7 +1361,7 @@ function print_phases_donut (recipient, phases) {
 		.outerRadius(radius * 0.9);
 
 	width  = 800;
-	height = 400;
+	height = 500;
 	svg.attr("transform", "translate(" + width / 2 + "," + height / 2 + ")");
 
 	var key = function(d){ return d.data.label; };
@@ -1440,6 +1440,8 @@ function print_phases_donut (recipient, phases) {
 			return d.startAngle + (d.endAngle - d.startAngle)/2;
 		}
 
+		var ex = 1;
+		var sum = 0;
 		text.transition().duration(0)
 			.attrTween("transform", function(d) {
 				this._current = this._current || d;
@@ -1447,8 +1449,26 @@ function print_phases_donut (recipient, phases) {
 				this._current = interpolate(0);
 				return function(t) {
 					var d2 = interpolate(t);
-					var pos = outerArc.centroid(d2);
+
-					pos[0] = radius * (midAngle(d2) < Math.PI ? 1 : -1);
+					//fix for labels of a very small portion increase the
+					//height of the label so that they do not overlap
+					if( ( d2.endAngle - d2.startAngle ) < 0.1){
+						var pos = outerArc.centroid(d2);
+						if (ex%2==0){
+							pos[0] = 150;
+						}
+						else{
+							pos[0] = -150;
+							sum++;
+						}
+						pos[1] = pos[1] - (35*sum);
+						ex++;
+					}
+					else{
+						var pos = outerArc.centroid(d2);
+						pos[0] = radius * (midAngle(d2) < Math.PI ? 1 : -1);
+					}
+
 					return "translate("+ pos +")";
 				};
 			})
@@ -1458,6 +1478,17 @@ function print_phases_donut (recipient, phases) {
 				this._current = interpolate(0);
 				return function(t) {
 					var d2 = interpolate(t);
+
+					//fix for labels of a very small portion increase the
+					//height of the label so that they do not overlap
+					if( ( d2.endAngle - d2.startAngle ) < 0.1){
+						if (ex%2==0){
+							return "start";
+						}
+						else{
+							return "end";
+						}
+					}
 					return midAngle(d2) < Math.PI ? "start":"end";
 				};
 			});
@@ -1468,10 +1499,12 @@ function print_phases_donut (recipient, phases) {
 		/* ------- SLICE TO TEXT POLYLINES -------*/
 		var polyline = svg.select(".lines").selectAll("polyline")
 			.data(pie(data), key);
-		
+
 		polyline.enter()
 			.append("polyline");
 
+		var ex2 = 1;
+		var sum2 = 0;
 		polyline.transition().duration(0)
 			.attrTween("points", function(d){
 				this._current = this._current || d;
@@ -1479,16 +1512,33 @@ function print_phases_donut (recipient, phases) {
 				this._current = interpolate(0);
 				return function(t) {
 					var d2 = interpolate(t);
-					var pos = outerArc.centroid(d2);
+
-					pos[0] = radius * 0.95 * (midAngle(d2) < Math.PI ? 1 : -1);
+					//fix for labels of a very small portion increase the
+					//height of the label so that they do not overlap
+					if( ( d2.endAngle - d2.startAngle ) < 0.1){
+						var pos = outerArc.centroid(d2);
+						if (ex2%2==0){
+							pos[0] = 150 * 0.95;
+						}
+						else{
+							pos[0] = -150 * 0.95;
+							sum2++;
+						}
+						pos[1] = pos[1] - (30*sum2);
+						ex2++;
+					}
+					else{
+						var pos = outerArc.centroid(d2);
+						pos[0] = radius * 0.95 * (midAngle(d2) < Math.PI ? 1 : -1);
+					}
 					return [arc.centroid(d2), outerArc.centroid(d2), pos];
-				};			
+				};
 			})
 			.style("stroke", "black")
 			.style("opacity", ".3")
 			.style("stroke-width", "2px")
 			.style("fill", "none");
-		
+
 		polyline.exit()
 			.remove();
 	}
@@ -2331,4 +2381,4 @@ var digitPattern = [
   setTimeout(tick, 1000 - now % 1000);
 })();
 	
-}
+}

pandora_console/install.php

@@ -116,7 +116,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.730';
-$build = '190116';
+$build = '190117';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);

pandora_console/operation/users/user_edit.php

@@ -74,9 +74,9 @@ if (isset ($_GET["modified"]) && !$view_mode) {
 	$upd_info["lastname"] = get_parameter_post ("lastname", $user_info["lastname"]);
 	$password_new = get_parameter_post ("password_new", "");
 	$password_confirm = get_parameter_post ("password_conf", "");
-	$upd_info["email"] = get_parameter_post ("email", $user_info["email"]);
+	$upd_info["email"] = get_parameter_post ("email", "");
-	$upd_info["phone"] = get_parameter_post ("phone", $user_info["phone"]);
+	$upd_info["phone"] = get_parameter_post ("phone", "");
-	$upd_info["comments"] = get_parameter_post ("comments", $user_info["comments"]);
+	$upd_info["comments"] = get_parameter_post ("comments", "");
 	$upd_info["language"] = get_parameter_post ("language", $user_info["language"]);
 	$upd_info["timezone"] = get_parameter_post ("timezone", "");
 	$upd_info["id_skin"] = get_parameter ("skin", $user_info["id_skin"]);
@@ -164,25 +164,36 @@ if (isset ($_GET["modified"]) && !$view_mode) {
 			$success_msg = __('Password successfully updated');
 		}		
 
-		$return_update_user = update_user ($id, $upd_info);
+		// if info is valid then proceed with update
+		if ((filter_var($upd_info["email"], FILTER_VALIDATE_EMAIL) || $upd_info["email"]=="") && (preg_match('/^[0-9- ]+$/D', $upd_info["phone"]) || $upd_info["phone"]=="")) {
+			$return_update_user = update_user ($id, $upd_info);
 
-		if ($return_update_user === false) {
+			if ($return_update_user === false) {
-			$error_msg = __('Error updating user info');
+				$error_msg = __('Error updating user info');
-		}
+			}
-		elseif($return_update_user == true){
+			elseif($return_update_user == true){
-			$success_msg = __('User info successfully updated');
+				$success_msg = __('User info successfully updated');
-		}
+			}
-		else{
-			if(!empty($password_new) && !empty($password_confirm)){
-				$success_msg = __('Password successfully updated');
-			}	
 			else{
-				$return=false;
+				if(!empty($password_new) && !empty($password_confirm)){
-				$error_msg = __('No changes have been made'); 
+					$success_msg = __('Password successfully updated');
-			}	
+				}	
+				else{
+					$return=false;
+					$error_msg = __('No changes have been made'); 
+				}	
+			}
+
+			ui_print_result_message ($return, $success_msg, $error_msg,$user_auth_error);
+
 		}
+		else if (!filter_var($upd_info["email"], FILTER_VALIDATE_EMAIL))
+			ui_print_error_message (__('Please enter a valid email'));
+		else if (!preg_match('/^[0-9- ]+$/D', $upd_info["phone"]))
+			ui_print_error_message (__('Please enter a valid phone number'));
 
 		$user_info = $upd_info;
+
 	}
 	else{
 		if(!$error_msg){
@@ -190,9 +201,10 @@ if (isset ($_GET["modified"]) && !$view_mode) {
 		}
 
 		$user_auth_error= $config['auth_error'];
+
+		ui_print_result_message ($return, $success_msg, $error_msg,$user_auth_error);
 	}
 
-	ui_print_result_message ($return, $success_msg, $error_msg,$user_auth_error);
 }
 
 // Prints action status for current message 
@@ -221,7 +233,7 @@ $data = array();
 $data[0] = '<span style="width:50%;float:left;"><b>' . __('User ID') . '</b></span>';
 $data[0] .= $jump . '<span style="font-weight: normal;width:20%;float:left;">' . $id . '</span>';
 $data[1] = '<span style="width:40%;float:left;line-height:20px;"><b>' . __('Full (display) name') . '</b></span>';
-$data[1] .= $jump . '<span style="width:20%;float:left;line-height:20px;">' . html_print_input_text_extended ("fullname", $user_info["fullname"], '', '', 20, 100, $view_mode, '', 'class="input"', true).'</span>';
+$data[1] .= $jump . '<span style="width:20%;float:left;line-height:20px;">' . html_print_input_text_extended ("fullname", $user_info["fullname"], 'fullname', '', 20, 100, $view_mode, '', 'class="input"', true).'</span>';
 // Show "Picture" (in future versions, why not, allow users to upload it's own avatar here.
 
 if (is_user_admin ($id)) {
@@ -243,9 +255,9 @@ $table->data[] = $data;
 
 $data = array();
 $data[0] = '<span style="width:50%;float:left;">'.__('E-mail').'</span>';
-$data[0] .= $jump .'<span style="width:20%;float:left;line-height:20px;">'. html_print_input_text_extended ("email", $user_info["email"], '', '', '25', '100', $view_mode, '', 'class="input"', true).'</span>';
+$data[0] .= $jump .'<span style="width:20%;float:left;line-height:20px;">'. html_print_input_text_extended ("email", $user_info["email"], 'email', '', '25', '100', $view_mode, '', 'class="input"', true).'</span>';
 $data[1] = '<span style="width:40%;float:left;">'.__('Phone number').'</span>';
-$data[1] .= $jump . '<div style="width:20%;float:left;line-height:50px;">'.html_print_input_text_extended ("phone", $user_info["phone"], '', '', '20', '30', $view_mode, '', 'class="input"', true).'</div>';
+$data[1] .= $jump . '<div style="width:20%;float:left;line-height:50px;">'.html_print_input_text_extended ("phone", $user_info["phone"], 'phone', '', '20', '30', $view_mode, '', 'class="input"', true).'</div>';
 $table->rowclass[] = '';
 $table->rowstyle[] = 'font-weight: bold;';
 $table->data[] = $data;
@@ -254,9 +266,9 @@ if ($view_mode === false) {
 	if ($config["user_can_update_password"]) {
 		$data = array();
 		$data[0] = '<span style="width:50%;float:left;">'.__('New Password').'</span>';
-		$data[0] .=  $jump .'<span style="width:20%;float:left;line-height:20px;">'.html_print_input_text_extended ("password_new", "", '', '', '25', '45', $view_mode, '', 'class="input"', true, true).'</span>';
+		$data[0] .=  $jump .'<span style="width:20%;float:left;line-height:20px;">'.html_print_input_text_extended ("password_new", "", 'password_new', '', '25', '45', $view_mode, '', 'class="input"', true, true).'</span>';
 		$data[1] = '<span style="width:40%;float:left;">'.__('Password confirmation').'</span>';
-		$data[1] .= $jump . '<span style="width:20%;float:left;line-height:20px;">'.html_print_input_text_extended ("password_conf", "", '', '', '20', '45', $view_mode, '', 'class="input"', true, true).'</span>';
+		$data[1] .= $jump . '<span style="width:20%;float:left;line-height:20px;">'.html_print_input_text_extended ("password_conf", "", 'password_conf', '', '20', '45', $view_mode, '', 'class="input"', true, true).'</span>';
 		$table->rowclass[] = '';
 		$table->rowstyle[] = 'font-weight: bold;';
 		$table->data[] = $data;

pandora_console/pandora_console.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.730
-%define release     190116
+%define release     190117
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.730
-%define release     190116
+%define release     190117
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.730-190116
+Version: 7.0NG.730-190117
 Architecture: all
 Priority: optional
 Section: admin

pandora_server/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.730-190116"
+pandora_version="7.0NG.730-190117"
 
 package_cpan=0
 package_pandora=1

pandora_server/lib/PandoraFMS/Config.pm

@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.730";
-my $pandora_build = "190116";
+my $pandora_build = "190117";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash

pandora_server/lib/PandoraFMS/PluginTools.pm

@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.730";
-my $pandora_build = "190116";
+my $pandora_build = "190117";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );

pandora_server/pandora_server.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.730
-%define release     190116
+%define release     190117
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.730
-%define release     190116
+%define release     190117
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server_installer

@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.730"
-PI_BUILD="190116"
+PI_BUILD="190117"
 
 MODE=$1
 if [ $# -gt 1 ]; then

pandora_server/util/pandora_db.pl

@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.730 PS190116";
+my $version = "7.0NG.730 PS190117";
 
 # Pandora server configuration
 my %conf;

pandora_server/util/pandora_manage.pl

@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.730 PS190116";
+my $version = "7.0NG.730 PS190117";
 
 # save program name for logging
 my $progname = basename($0);