From 7011eee87174895ab386e46c35a58dba94e1e4d9 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 19 Apr 2017 13:26:20 +0200
Subject: [PATCH 01/14] Added a new page to reset password, for now without
 code, only visual page and error control

---
 pandora_console/general/login_page.php      |  49 ++++-
 pandora_console/general/reset_pass.php      | 202 ++++++++++++++++++++
 pandora_console/include/functions_users.php |  27 +++
 pandora_console/index.php                   |  55 +++++-
 4 files changed, 331 insertions(+), 2 deletions(-)
 create mode 100644 pandora_console/general/reset_pass.php

diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index 858ad945c0..e185b60550 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -210,7 +210,14 @@ echo '<div class="login_page">';
 			}
 			break;
 	}
-	
+
+	$reset_pass_link = 'reset_pass.php';
+	// Reset password link
+	echo '<div style="width:70%; height:40px; margin-right:auto; margin-left:auto; margin-top:20px; text-align:center;">';
+	echo '<a style="color: white !important;" href="index.php?reset=true&first=true">' . __('Forgotten your password?');
+	echo '</a>';
+	echo '</div>';
+
 	echo '</form></div>';
 	echo '<div class="login_data">';
 		echo '<div class ="text_banner_login">';
@@ -259,6 +266,25 @@ echo '</div>';
 echo '<div id="ver_num">'.$pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_version : '') . '</div>';
 echo '</div>';
 
+if ($mail != "") {
+	echo '<div id="reset_correct" title="' . __('Password reset') . '">';
+		echo '<div class="content_alert">';
+			echo '<div class="icon_message_alert">';
+				echo html_print_image('images/icono_logo_pandora.png', true, array("alt" => __('Password reset'), "border" => 0));
+			echo '</div>';
+			echo '<div class="content_message_alert">';
+				echo '<div class="text_message_alert">';
+					echo '<h1>' . __('INFO') . '</h1>';
+					echo '<p>'  . __('An email has been sent to the user\'s address') . '</p>';
+				echo '</div>';
+				echo '<div class="button_message_alert">';
+					html_print_submit_button("Ok", 'reset_correct_button', false);  
+				echo '</div>';
+			echo '</div>';
+		echo '</div>';
+	echo '</div>';
+}
+
 if (isset ($login_failed)) {
 	echo '<div id="login_failed" title="' . __('Login failed') . '">';
 		echo '<div class="content_alert">';
@@ -512,5 +538,26 @@ html_print_div(array('id' => 'forced_title_layer', 'class' => 'forced_title_laye
 	<?php 
 	}
 	?>
+
+	$(document).ready (function () {
+		$(function() {
+			$("#reset_correct").dialog({
+				resizable: true,
+				draggable: true,
+				modal: true,
+				height: 220,
+				width: 528,
+				clickOutside: true,
+				overlay: {
+					opacity: 0.5,
+					background: "black"
+				}
+			});
+		});
+
+		$("#submit-reset_correct_button").click (function () {
+			$("#reset_correct").dialog('close');
+		});		
+	});
 	/* ]]> */
 </script>
diff --git a/pandora_console/general/reset_pass.php b/pandora_console/general/reset_pass.php
new file mode 100644
index 0000000000..d3ef5d06df
--- /dev/null
+++ b/pandora_console/general/reset_pass.php
@@ -0,0 +1,202 @@
+<?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 (isset($config["homedir"])) {
+	$homedir = $config["homedir"] . '/';
+}
+else {
+	$homedir = '';
+}
+
+require_once($homedir . 'include/config.php');
+require_once($homedir . 'include/functions_config.php');
+include_once($homedir . 'include/functions_ui.php');
+include_once($homedir . 'include/functions_users.php');
+include_once($homedir . 'include/functions.php');
+include_once($homedir . 'include/functions_html.php');
+
+$login_body_style = '';
+// Overrides the default background with the defined by the user
+if (!empty($config['login_background'])) {
+    $background_url = "../../images/backgrounds/" . $config['login_background'];
+    $login_body_style = "style=\"background-image: url('$background_url');\"";
+}
+
+echo '<div id="login_body" ' . $login_body_style . '>';
+    echo '<div id="header_login">';
+        echo '<div id="icon_custom_pandora">';
+            if (defined ('PANDORA_ENTERPRISE')) {
+                if(isset ($config['custom_logo'])){
+                    echo '<img src="images/custom_logo/' . $config['custom_logo'] .'" alt="pandora_console">';
+                }
+                else{
+                    echo '<img src="images/custom_logo/logo_login_consola.png" alt="pandora_console">';
+                }
+            }
+            else{
+                echo '<img src="images/custom_logo/pandora_logo_head_3.png" alt="pandora_console">';	
+            }
+        echo '</div>';
+        echo '<div id="list_icon_docs_support"><ul>';
+            echo '<li><a href="http://wiki.pandorafms.com/" target="_blank"><img src="images/icono_docs.png" alt="docs pandora"></a></li>';
+            echo '<li>' . __('Docs') . '</li>';
+            echo '<li id="li_margin_left"><a href="https://pandorafms.com/monitoring-services/support/" target="_blank"><img src="images/icono_support.png" alt="support pandora"></a></li>';
+            echo '<li>' . __('Support') . '</li>';
+        echo '</ul></div>';	
+    echo '</div>';
+
+    echo '<div class="container_login">';
+    echo '<div class="login_page">';
+        echo '<form method="post" action="' . ui_get_full_url('index.php?reset=true') . '"><div class="login_logo_icon">';
+            echo '<a href="' . $logo_link . '">';
+                if (defined ('METACONSOLE')) {
+                    if (!isset ($config["custom_logo_login"])){
+                        html_print_image ("images/custom_logo_login/login_logo.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
+                    }
+                    else{
+                        html_print_image ("images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
+                    }
+                }
+                else if (defined ('PANDORA_ENTERPRISE')) {
+
+                    if (!isset ($config["custom_logo_login"])){
+                        html_print_image ("enterprise/images/custom_logo_login/login_logo_v7.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
+                    }
+                    else{
+                        html_print_image ("enterprise/images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
+                    }
+                }
+                else {
+                    if (!isset ($config["custom_logo_login"]) || $config["custom_logo_login"] == 0){
+                        html_print_image ("images/custom_logo_login/pandora_logo.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
+                    }
+                    else{
+                        html_print_image ("images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
+                    }
+                    echo "<br><span style='font-size:120%;color:white;top:10px;position:relative;'>Community edition</span>";
+                }
+            echo '</a></div>';
+                
+            echo '<div class="login_nick">';
+                echo '<div>';
+                    html_print_image ("/images/usuario_login.png", false);
+                echo '</div>';
+                html_print_input_text_extended ("user_reset_pass", '', "user_reset_pass", '', '', '' , false,
+                    '', 'autocomplete="off" placeholder="'.__('User to reset password').'"');
+            echo '</div>';
+            echo '<div class="login_button">';
+                html_print_submit_button(__("Reset password"), "login_button", false, 'class="sub next_login"');
+            echo '</div>';
+
+        echo '</form></div>';
+        echo '<div class="login_data">';
+            echo '<div class ="text_banner_login">';
+                echo '<div><span class="span1">';
+                    if(defined ('PANDORA_ENTERPRISE')){
+                        if($config['custom_title1_login']){
+                            echo strtoupper(io_safe_output($config['custom_title1_login']));
+                        }
+                        else{
+                            echo __('WELCOME TO PANDORA FMS');
+                        }
+                    }
+                    else{
+                        echo __('WELCOME TO PANDORA FMS');
+                    }
+                echo '</span></div>';
+                echo '<div><span class="span2">';
+                    if(defined ('PANDORA_ENTERPRISE')){
+                        if($config['custom_title2_login']){
+                            echo strtoupper(io_safe_output($config['custom_title2_login']));
+                        }
+                        else{
+                            echo __('NEXT GENERATION');
+                        }
+                    }
+                    else{
+                        echo __('NEXT GENERATION');
+                    }
+                echo '</span></div>';
+            echo '</div>';
+            echo '<div class ="img_banner_login">';
+                if (defined ('PANDORA_ENTERPRISE')) {
+                    if(isset($config['custom_splash_login'])){
+                        html_print_image ("enterprise/images/custom_splash_login/".$config['custom_splash_login'], false, array ( "alt" => "splash", "border" => 0, "title" => $splash_title), false, true);
+                    }
+                    else{
+                        html_print_image ("enterprise/images/custom_splash_login/splash_image_default.png", false, array ("alt" => "logo", "border" => 0, "title" => $splash_title), false, true);
+                    }
+                } 
+                else{
+                    html_print_image ("images/splash_image_default.png", false, array ("alt" => "logo", "border" => 0, "title" => $splash_title), false, true);
+                }
+            echo '</div>';
+        echo '</div>';
+    echo '</div>';
+
+    echo '</div>';
+    echo '<div id="ver_num">'.$pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_version : '') . '</div>';
+    echo '</div>';
+    
+if ($show_error) {
+    echo '<div id="reset_pass_error" title="' . __('Reset password failed') . '">';
+        echo '<div class="content_alert">';
+            echo '<div class="icon_message_alert">';
+                echo html_print_image('images/icono_stop.png', true, array("alt" => __('Reset password failed'), "border" => 0));
+            echo '</div>';
+            echo '<div class="content_message_alert">';
+                echo '<div class="text_message_alert">';
+                    echo '<h1>' . __('ERROR') . '</h1>';
+                    echo '<p>'  . $error . '</p>';
+                echo '</div>';
+                echo '<div class="button_message_alert">';
+                    html_print_submit_button("Ok", 'reset_pass_error', false);  
+                echo '</div>';
+            echo '</div>';
+        echo '</div>';
+    echo '</div>';
+}
+
+ui_require_css_file ('dialog');
+ui_require_css_file ('jquery-ui-1.10.0.custom');
+ui_require_jquery_file('jquery-ui-1.10.0.custom');
+
+?>
+
+<script type="text/javascript" language="javascript">
+
+$(document).ready (function () {
+    $(function() {
+        $( "#reset_pass_error" ).dialog({
+            resizable: true,
+            draggable: true,
+            modal: true,
+            height: 220,
+            width: 528,
+            overlay: {
+                opacity: 0.5,
+                background: "black"
+            }
+        });
+    });
+
+    $("#submit-reset_pass_error").click (function () {
+        $("#reset_pass_error" ).dialog('close');
+    });
+});
+
+</script>
\ No newline at end of file
diff --git a/pandora_console/include/functions_users.php b/pandora_console/include/functions_users.php
index e12cf6611f..6759c5aaec 100755
--- a/pandora_console/include/functions_users.php
+++ b/pandora_console/include/functions_users.php
@@ -891,4 +891,31 @@ function users_get_strict_mode_groups($id_user, $return_group_all) {
 	
 	return $return_user_groups;
 }
+
+function check_user_id ($id_user) {
+	global $config;
+	
+	$exists = db_get_value ('id_user', 'tusuario', 'id_user', $id_user);
+
+	if ($exists) {
+		return true;
+	}
+	else {
+		return false;
+	}
+}
+
+function check_user_have_mail ($id_user) {
+	global $config;
+	
+	$exists_mail = db_get_value ('email', 'tusuario', 'id_user', $id_user);
+
+	if ($exists_mail) {
+		return $exists_mail;
+	}
+	else {
+		return false;
+	}
+}
+
 ?>
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 78997fbe56..f4d3c6d0cb 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -547,7 +547,60 @@ if (! isset ($config['id_user'])) {
 	}
 	// There is no user connected
 	else {
-		require_once ('general/login_page.php');
+		$reset = (boolean)get_parameter('reset', 0);
+		$first = (boolean)get_parameter('first', 0);
+		if (!$reset) {
+			require_once ('general/login_page.php');
+		}
+		else {
+			$user_reset_pass = get_parameter('user_reset_pass', "");
+			$error = "";
+			$mail = "";
+			$show_error = false;
+
+			if (!$first) {
+				if ($reset) {
+					if ($user_reset_pass == '') {
+						$reset = false;
+						$error = __('Id user cannot be empty');
+						$show_error = true;
+					}
+					else {
+						$check_user = check_user_id($user_reset_pass);
+
+						if (!$check_user) {
+							$reset = false;
+							$error = __('User no exists in db');
+							$show_error = true;
+						}
+						else {
+							$check_mail = check_user_have_mail($user_reset_pass);
+
+							if (!$check_mail) {
+								$reset = false;
+								$error = __('User no have any email direction asociated');
+								$show_error = true;
+							}
+							else {
+								$mail = $check_mail;
+							}
+						}
+					}
+				}
+
+				if (!$reset) {
+				require_once ('general/reset_pass.php');
+				}
+				else {
+					// MANDAR CORREO ELECTRÓNICO AL USUARIO Y VOLVER A LA PÁGINA DE INICIO
+
+					require_once ('general/login_page.php');
+				}
+			}
+			else {
+				require_once ('general/reset_pass.php');
+			}
+		}
 		while (@ob_end_flush ());
 		exit ("</html>");
 	}

From bd30625532129432cd3a73edb08afdfdee96dc3a Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 19 Apr 2017 15:10:51 +0200
Subject: [PATCH 02/14] Added return to login button

---
 pandora_console/general/reset_pass.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pandora_console/general/reset_pass.php b/pandora_console/general/reset_pass.php
index d3ef5d06df..a3f83753d6 100644
--- a/pandora_console/general/reset_pass.php
+++ b/pandora_console/general/reset_pass.php
@@ -102,8 +102,15 @@ echo '<div id="login_body" ' . $login_body_style . '>';
                 html_print_submit_button(__("Reset password"), "login_button", false, 'class="sub next_login"');
             echo '</div>';
 
+        echo '</form>';
+
+        echo '<form method="post" action="' . ui_get_full_url('index.php') . '">';
+            echo '<div class="login_button">';
+                html_print_submit_button(__("Back to login"), "login_button", false, 'class="sub next_login"');
+            echo '</div>';
         echo '</form></div>';
-        echo '<div class="login_data">';
+
+        echo '<div style="float:right;" class="login_data">';
             echo '<div class ="text_banner_login">';
                 echo '<div><span class="span1">';
                     if(defined ('PANDORA_ENTERPRISE')){
@@ -151,7 +158,7 @@ echo '<div id="login_body" ' . $login_body_style . '>';
     echo '</div>';
     echo '<div id="ver_num">'.$pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_version : '') . '</div>';
     echo '</div>';
-    
+
 if ($show_error) {
     echo '<div id="reset_pass_error" title="' . __('Reset password failed') . '">';
         echo '<div class="content_alert">';

From 48f7fa50ddc7136f6ddc8bbe88f0180462c579a7 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 19 Apr 2017 16:04:24 +0200
Subject: [PATCH 03/14] Added error control and email handler

---
 pandora_console/general/login_page.php        | 44 ++++++++++++++-----
 pandora_console/include/email_config_user.php | 20 +++++++++
 pandora_console/include/functions.php         | 34 ++++++++++++++
 pandora_console/index.php                     | 19 +++++++-
 4 files changed, 104 insertions(+), 13 deletions(-)
 create mode 100644 pandora_console/include/email_config_user.php

diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index e185b60550..e6f42b4f73 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -267,22 +267,42 @@ echo '<div id="ver_num">'.$pandora_version.(($develop_bypass == 1) ? ' '.__('Bui
 echo '</div>';
 
 if ($mail != "") {
-	echo '<div id="reset_correct" title="' . __('Password reset') . '">';
-		echo '<div class="content_alert">';
-			echo '<div class="icon_message_alert">';
-				echo html_print_image('images/icono_logo_pandora.png', true, array("alt" => __('Password reset'), "border" => 0));
-			echo '</div>';
-			echo '<div class="content_message_alert">';
-				echo '<div class="text_message_alert">';
-					echo '<h1>' . __('INFO') . '</h1>';
-					echo '<p>'  . __('An email has been sent to the user\'s address') . '</p>';
+	if ($email_error_message == '') {
+		echo '<div id="reset_correct" title="' . __('Password reset') . '">';
+			echo '<div class="content_alert">';
+				echo '<div class="icon_message_alert">';
+					echo html_print_image('images/icono_logo_pandora.png', true, array("alt" => __('Password reset'), "border" => 0));
 				echo '</div>';
-				echo '<div class="button_message_alert">';
-					html_print_submit_button("Ok", 'reset_correct_button', false);  
+				echo '<div class="content_message_alert">';
+					echo '<div class="text_message_alert">';
+						echo '<h1>' . __('INFO') . '</h1>';
+						echo '<p>'  . __('An email has been sent to the user\'s address') . '</p>';
+					echo '</div>';
+					echo '<div class="button_message_alert">';
+						html_print_submit_button("Ok", 'reset_correct_button', false);  
+					echo '</div>';
 				echo '</div>';
 			echo '</div>';
 		echo '</div>';
-	echo '</div>';
+	}
+	else {
+		echo '<div id="reset_correct" title="' . __('Password reset') . '">';
+			echo '<div class="content_alert">';
+				echo '<div class="icon_message_alert">';
+					echo html_print_image('images/icono_stop.png', true, array("alt" => __('Password reset'), "border" => 0));
+				echo '</div>';
+				echo '<div class="content_message_alert">';
+					echo '<div class="text_message_alert">';
+						echo '<h1>' . __('ERROR') . '</h1>';
+						echo '<p>'  . $email_error_message . '</p>';
+					echo '</div>';
+					echo '<div class="button_message_alert">';
+						html_print_submit_button("Ok", 'reset_correct_button', false);  
+					echo '</div>';
+				echo '</div>';
+			echo '</div>';
+		echo '</div>';
+	}
 }
 
 if (isset ($login_failed)) {
diff --git a/pandora_console/include/email_config_user.php b/pandora_console/include/email_config_user.php
new file mode 100644
index 0000000000..eecce8d1a0
--- /dev/null
+++ b/pandora_console/include/email_config_user.php
@@ -0,0 +1,20 @@
+<?php
+// ______                 __                     _______ _______ _______
+//|   __ \.---.-.-----.--|  |.-----.----.---.-. |    ___|   |   |     __|
+//|    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+//|___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+//
+// ============================================================================
+// Copyright (c) 2007-2010 Artica Soluciones Tecnologicas, http://www.artica.es
+// This code is NOT free software. This code is NOT licenced under GPL2 licence
+// You cannnot redistribute it without written permission of copyright holder.
+// ============================================================================
+
+//Please setup your config to send emails
+
+$email_from = array('pandora@pandorafms.org' => 'Pandora FMS');
+$email_smtpServer = '127.0.0.1';
+$email_smtpPort = 25;
+$email_username = '';
+$email_password = '';
+?>
\ No newline at end of file
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 3ce4eed8da..c8067b11ca 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -2730,4 +2730,38 @@ function remove_right_zeros ($value) {
 		return $value;
 	}
 }
+
+function send_email_to_user ($to, $body, $subject) {
+	global $config;
+	
+	require_once($config['homedir'] . '/include/swiftmailer/swift_required.php');
+	require_once($config['homedir'] . '/include/email_config_user.php');
+	
+	$result = false;
+	try {
+		$transport = Swift_SmtpTransport::newInstance($email_smtpServer, $email_smtpPort);
+		$transport->setUsername($email_username);
+		$transport->setPassword($email_password);
+		
+		$mailer = Swift_Mailer::newInstance($transport);
+		
+		$message = Swift_Message::newInstance($subject);
+		$message->setFrom($email_from);
+		$to = trim($to);
+		$message->setTo(array($to => $to));
+		$message->setBody($body, 'text/html');
+		
+		ini_restore ('sendmail_from');
+		html_debug("AAAA", true);
+		$result = $mailer->send($message);
+	}
+	catch (Exception $e) {
+		error_log($e->getMessage());
+		db_pandora_audit("Pandora mail", $e->getMessage());
+		html_debug($e->getMessage(), true);
+	}
+	
+	return $result;
+}
+
 ?>
diff --git a/pandora_console/index.php b/pandora_console/index.php
index f4d3c6d0cb..78b67f80a9 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -592,7 +592,24 @@ if (! isset ($config['id_user'])) {
 				require_once ('general/reset_pass.php');
 				}
 				else {
-					// MANDAR CORREO ELECTRÓNICO AL USUARIO Y VOLVER A LA PÁGINA DE INICIO
+					$subject = '[Pandora] '.__('Reset password');
+					$body = __('This is the automatic message');
+					$body .= ' "<strong>' . $user_reset_pass . '"</strong>';
+					$body .= '<p />';
+					$body .= __('Please, click in the link below to reset your password');
+					$body .= '<p />';
+					$body .= '<a href="">' . __('Reset your password') . '</a>';
+					$body .= '<p />';
+					$body .= 'Pandora FMS';
+					$body .= '<p />';
+					$body .= '<em>'.__('Please do not answer or reply to this email').'</em>';
+					
+					$result = send_email_to_user($mail, $body, $subject);
+					
+					$email_error_message = "";
+					if (!$result) {
+						$email_error_message = __('Error at sending the email');
+					}
 
 					require_once ('general/login_page.php');
 				}

From 4a4f52c459eeb50c0b3864ba76712d2e6a66a3de Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Wed, 19 Apr 2017 17:29:22 +0200
Subject: [PATCH 04/14] Added send mail function

---
 pandora_console/include/email_config_user.php | 1 +
 pandora_console/include/functions.php         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/email_config_user.php b/pandora_console/include/email_config_user.php
index eecce8d1a0..f8258478ac 100644
--- a/pandora_console/include/email_config_user.php
+++ b/pandora_console/include/email_config_user.php
@@ -17,4 +17,5 @@ $email_smtpServer = '127.0.0.1';
 $email_smtpPort = 25;
 $email_username = '';
 $email_password = '';
+
 ?>
\ No newline at end of file
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index c8067b11ca..c6d8bc79e2 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -2752,7 +2752,7 @@ function send_email_to_user ($to, $body, $subject) {
 		$message->setBody($body, 'text/html');
 		
 		ini_restore ('sendmail_from');
-		html_debug("AAAA", true);
+		
 		$result = $mailer->send($message);
 	}
 	catch (Exception $e) {

From 727bd095f5bcd72db9df534969f911063485aee3 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 20 Apr 2017 10:59:32 +0200
Subject: [PATCH 05/14] Added function to reset password in node

---
 pandora_console/general/login_page.php        |  44 +++-
 .../general/process_reset_pass.php            | 196 ++++++++++++++++++
 pandora_console/include/functions.php         |  11 +-
 pandora_console/include/functions_html.php    |   3 +
 pandora_console/index.php                     | 166 ++++++++++-----
 5 files changed, 363 insertions(+), 57 deletions(-)
 create mode 100644 pandora_console/general/process_reset_pass.php

diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index e6f42b4f73..d25891d483 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -267,7 +267,7 @@ echo '<div id="ver_num">'.$pandora_version.(($develop_bypass == 1) ? ' '.__('Bui
 echo '</div>';
 
 if ($mail != "") {
-	if ($email_error_message == '') {
+	if ($process_error_message == '') {
 		echo '<div id="reset_correct" title="' . __('Password reset') . '">';
 			echo '<div class="content_alert">';
 				echo '<div class="icon_message_alert">';
@@ -294,7 +294,7 @@ if ($mail != "") {
 				echo '<div class="content_message_alert">';
 					echo '<div class="text_message_alert">';
 						echo '<h1>' . __('ERROR') . '</h1>';
-						echo '<p>'  . $email_error_message . '</p>';
+						echo '<p>'  . $process_error_message . '</p>';
 					echo '</div>';
 					echo '<div class="button_message_alert">';
 						html_print_submit_button("Ok", 'reset_correct_button', false);  
@@ -305,6 +305,25 @@ if ($mail != "") {
 	}
 }
 
+if ($correct_reset_pass_process != "") {
+	echo '<div id="final_process_correct" title="' . __('Password reset') . '">';
+		echo '<div class="content_alert">';
+			echo '<div class="icon_message_alert">';
+				echo html_print_image('images/icono_logo_pandora.png', true, array("alt" => __('Password reset'), "border" => 0));
+			echo '</div>';
+			echo '<div class="content_message_alert">';
+				echo '<div class="text_message_alert">';
+					echo '<h1>' . __('SUCCESS') . '</h1>';
+					echo '<p>'  . $correct_reset_pass_process . '</p>';
+				echo '</div>';
+				echo '<div class="button_message_alert">';
+					html_print_submit_button("Ok", 'final_process_correct_button', false);  
+				echo '</div>';
+			echo '</div>';
+		echo '</div>';
+	echo '</div>';
+}
+
 if (isset ($login_failed)) {
 	echo '<div id="login_failed" title="' . __('Login failed') . '">';
 		echo '<div class="content_alert">';
@@ -579,5 +598,26 @@ html_print_div(array('id' => 'forced_title_layer', 'class' => 'forced_title_laye
 			$("#reset_correct").dialog('close');
 		});		
 	});
+
+	$(document).ready (function () {
+		$(function() {
+			$("#final_process_correct").dialog({
+				resizable: true,
+				draggable: true,
+				modal: true,
+				height: 220,
+				width: 528,
+				clickOutside: true,
+				overlay: {
+					opacity: 0.5,
+					background: "black"
+				}
+			});
+		});
+
+		$("#submit-final_process_correct_button").click (function () {
+			$("#final_process_correct").dialog('close');
+		});		
+	});
 	/* ]]> */
 </script>
diff --git a/pandora_console/general/process_reset_pass.php b/pandora_console/general/process_reset_pass.php
new file mode 100644
index 0000000000..504551e74b
--- /dev/null
+++ b/pandora_console/general/process_reset_pass.php
@@ -0,0 +1,196 @@
+<?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 (isset($config["homedir"])) {
+	$homedir = $config["homedir"] . '/';
+}
+else {
+	$homedir = '';
+}
+
+require_once($homedir . 'include/config.php');
+require_once($homedir . 'include/functions_config.php');
+include_once($homedir . 'include/functions_ui.php');
+include_once($homedir . 'include/functions_users.php');
+include_once($homedir . 'include/functions.php');
+include_once($homedir . 'include/functions_html.php');
+
+$login_body_style = '';
+// Overrides the default background with the defined by the user
+if (!empty($config['login_background'])) {
+    $background_url = "../../images/backgrounds/" . $config['login_background'];
+    $login_body_style = "style=\"background-image: url('$background_url');\"";
+}
+
+echo '<div id="login_body" ' . $login_body_style . '>';
+    echo '<div id="header_login">';
+        echo '<div id="icon_custom_pandora">';
+            if (defined ('PANDORA_ENTERPRISE')) {
+                if(isset ($config['custom_logo'])){
+                    echo '<img src="images/custom_logo/' . $config['custom_logo'] .'" alt="pandora_console">';
+                }
+                else{
+                    echo '<img src="images/custom_logo/logo_login_consola.png" alt="pandora_console">';
+                }
+            }
+            else{
+                echo '<img src="images/custom_logo/pandora_logo_head_3.png" alt="pandora_console">';	
+            }
+        echo '</div>';
+        echo '<div id="list_icon_docs_support"><ul>';
+            echo '<li><a href="http://wiki.pandorafms.com/" target="_blank"><img src="images/icono_docs.png" alt="docs pandora"></a></li>';
+            echo '<li>' . __('Docs') . '</li>';
+            echo '<li id="li_margin_left"><a href="https://pandorafms.com/monitoring-services/support/" target="_blank"><img src="images/icono_support.png" alt="support pandora"></a></li>';
+            echo '<li>' . __('Support') . '</li>';
+        echo '</ul></div>';	
+    echo '</div>';
+
+    echo '<div class="container_login">';
+    echo '<div class="login_page">';
+        echo '<form method="post" action="' . ui_get_full_url('index.php?correct_pass_change=true') . '"><div class="login_logo_icon">';
+            echo '<a href="' . $logo_link . '">';
+                if (defined ('METACONSOLE')) {
+                    if (!isset ($config["custom_logo_login"])){
+                        html_print_image ("images/custom_logo_login/login_logo.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
+                    }
+                    else{
+                        html_print_image ("images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
+                    }
+                }
+                else if (defined ('PANDORA_ENTERPRISE')) {
+
+                    if (!isset ($config["custom_logo_login"])){
+                        html_print_image ("enterprise/images/custom_logo_login/login_logo_v7.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
+                    }
+                    else{
+                        html_print_image ("enterprise/images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
+                    }
+                }
+                else {
+                    if (!isset ($config["custom_logo_login"]) || $config["custom_logo_login"] == 0){
+                        html_print_image ("images/custom_logo_login/pandora_logo.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
+                    }
+                    else{
+                        html_print_image ("images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
+                    }
+                    echo "<br><span style='font-size:120%;color:white;top:10px;position:relative;'>Community edition</span>";
+                }
+            echo '</a></div>';
+                
+            echo '<div class="login_pass">';
+				echo '<div>';
+					html_print_image ("/images/candado_login.png", false);
+				echo '</div>';
+				html_print_input_text_extended ("pass1", '', "pass1", '', '', '' ,false,
+					'', 'autocomplete="off" placeholder="'.__('New Password').'"', false, true);
+            echo '</div>';
+            echo '<div class="login_pass">';
+				echo '<div>';
+					html_print_image ("/images/candado_login.png", false);
+				echo '</div>';
+				html_print_input_text_extended ("pass2", '', "pass2", '', '', '' ,false,
+					'', 'autocomplete="off" placeholder="'.__('Repeat password').'"', false, true);
+            echo '</div>';
+            echo '<div id="reset_pass_button" style="display:none;" class="login_button">';
+				html_print_submit_button(__("Change password"), "login_button", false, 'class="sub next_login"');
+            echo '</div>';
+            echo '<div id="error_pass_message" style="display:none; text-align:center;">';
+				html_print_label(__("Passwords must be the same"), "error_pass_label", false, array('style' => 'font-size:12pt; color:red;'));
+            echo '</div>';
+            html_print_input_hidden('id_user', $id_user);
+
+        echo '</form>';
+
+        echo '<form method="post" action="' . ui_get_full_url('index.php') . '">';
+            echo '<div class="login_button">';
+                html_print_submit_button(__("Back to login"), "login_button", false, 'class="sub next_login"');
+            echo '</div>';
+        echo '</form></div>';
+
+        echo '<div style="float:right;" class="login_data">';
+            echo '<div class ="text_banner_login">';
+                echo '<div><span class="span1">';
+                    if(defined ('PANDORA_ENTERPRISE')){
+                        if($config['custom_title1_login']){
+                            echo strtoupper(io_safe_output($config['custom_title1_login']));
+                        }
+                        else{
+                            echo __('WELCOME TO PANDORA FMS');
+                        }
+                    }
+                    else{
+                        echo __('WELCOME TO PANDORA FMS');
+                    }
+                echo '</span></div>';
+                echo '<div><span class="span2">';
+                    if(defined ('PANDORA_ENTERPRISE')){
+                        if($config['custom_title2_login']){
+                            echo strtoupper(io_safe_output($config['custom_title2_login']));
+                        }
+                        else{
+                            echo __('NEXT GENERATION');
+                        }
+                    }
+                    else{
+                        echo __('NEXT GENERATION');
+                    }
+                echo '</span></div>';
+            echo '</div>';
+            echo '<div class ="img_banner_login">';
+                if (defined ('PANDORA_ENTERPRISE')) {
+                    if(isset($config['custom_splash_login'])){
+                        html_print_image ("enterprise/images/custom_splash_login/".$config['custom_splash_login'], false, array ( "alt" => "splash", "border" => 0, "title" => $splash_title), false, true);
+                    }
+                    else{
+                        html_print_image ("enterprise/images/custom_splash_login/splash_image_default.png", false, array ("alt" => "logo", "border" => 0, "title" => $splash_title), false, true);
+                    }
+                } 
+                else{
+                    html_print_image ("images/splash_image_default.png", false, array ("alt" => "logo", "border" => 0, "title" => $splash_title), false, true);
+                }
+            echo '</div>';
+        echo '</div>';
+    echo '</div>';
+
+    echo '</div>';
+    echo '<div id="ver_num">'.$pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_version : '') . '</div>';
+    echo '</div>';
+
+ui_require_css_file ('dialog');
+ui_require_css_file ('jquery-ui-1.10.0.custom');
+ui_require_jquery_file('jquery-ui-1.10.0.custom');
+
+?>
+
+<script type="text/javascript" language="javascript">
+
+$(document).ready (function () {
+    $('#pass2').on('input', function(e) {
+        var pass1 = $('#pass1').val();
+        var pass2 = $('#pass2').val();
+        if (pass1 != pass2) {
+            $("#reset_pass_button").css('display', 'none');
+            $("#error_pass_message").css('display', '');
+        }
+        else {
+            $("#reset_pass_button").css('display', '');
+            $("#error_pass_message").css('display', 'none');
+        }
+    });
+});
+
+</script>
\ No newline at end of file
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index c6d8bc79e2..7fba3d1ac7 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -2758,10 +2758,19 @@ function send_email_to_user ($to, $body, $subject) {
 	catch (Exception $e) {
 		error_log($e->getMessage());
 		db_pandora_audit("Pandora mail", $e->getMessage());
-		html_debug($e->getMessage(), true);
 	}
 	
 	return $result;
 }
 
+function send_token_to_db ($id_user, $cod_hash) {
+	db_process_sql_delete('treset_pass', array('id_user' => $id_user));
+
+	$values = array();
+	$values['id_user'] = $id_user;
+	$values['cod_hash'] = $cod_hash;
+	$values['reset_time'] = time();
+	db_process_sql_insert('treset_pass', $values);
+}
+
 ?>
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 2af6eebf8e..5d56e14595 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -2040,6 +2040,9 @@ function html_print_label ($text, $id, $return = false, $options = false) {
 	if ($options) {
 		if (isset ($options['class']))
 			$output .= 'class="'.$options['class'].'" ';
+		
+		if (isset ($options['style']))
+			$output .= 'style="'.$options['style'].'" ';
 	}
 	
 	$output .= 'for="'.$id.'" >';
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 78b67f80a9..2455287848 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -547,77 +547,135 @@ if (! isset ($config['id_user'])) {
 	}
 	// There is no user connected
 	else {
+		$correct_pass_change = (boolean)get_parameter('correct_pass_change', 0);
 		$reset = (boolean)get_parameter('reset', 0);
 		$first = (boolean)get_parameter('first', 0);
-		if (!$reset) {
+		$reset_hash = get_parameter('reset_hash', "");
+
+		if ($correct_pass_change) {
+			$correct_reset_pass_process = "";
+			$process_error_message = "";
+			$pass1 = get_parameter('pass1');
+			$pass2 = get_parameter('pass2');
+			$id_user = get_parameter('id_user');
+
+			if ($pass1 == $pass2) {
+				$res = update_user_password ($id_user, $pass1);
+				if ($res) {
+					$correct_reset_pass_process = __('Password changed successfully');
+				}
+				else {
+					$process_error_message = __('Failed to change password');
+				}
+			}
+			else {
+				$process_error_message = __('Passwords must be the same');
+			}
 			require_once ('general/login_page.php');
 		}
 		else {
-			$user_reset_pass = get_parameter('user_reset_pass', "");
-			$error = "";
-			$mail = "";
-			$show_error = false;
+			if ($reset_hash != "") {
+				$hash_data = explode(":::", $reset_hash);
+				$id_user = $hash_data[0];
+				$codified_hash = $hash_data[1];
 
-			if (!$first) {
-				if ($reset) {
-					if ($user_reset_pass == '') {
-						$reset = false;
-						$error = __('Id user cannot be empty');
-						$show_error = true;
+				$db_reset_pass_entry = db_get_value_filter('reset_time', 'treset_pass', array('id_user' => $id_user, 'cod_hash' => $id_user . ":::" . $codified_hash));
+				$process_error_message = "";
+
+				if ($db_reset_pass_entry) {
+					if (($db_reset_pass_entry + SECONDS_15MINUTES) < time()) {
+						$process_error_message = __('This user has not requested a password change');
+						db_process_sql_delete('treset_pass', array('id_user' => $id_user));
+						require_once ('general/login_page.php');
 					}
 					else {
-						$check_user = check_user_id($user_reset_pass);
-
-						if (!$check_user) {
-							$reset = false;
-							$error = __('User no exists in db');
-							$show_error = true;
-						}
-						else {
-							$check_mail = check_user_have_mail($user_reset_pass);
-
-							if (!$check_mail) {
-								$reset = false;
-								$error = __('User no have any email direction asociated');
-								$show_error = true;
-							}
-							else {
-								$mail = $check_mail;
-							}
-						}
+						db_process_sql_delete('treset_pass', array('id_user' => $id_user));
+						require_once ('general/process_reset_pass.php');
 					}
 				}
-
-				if (!$reset) {
-				require_once ('general/reset_pass.php');
-				}
 				else {
-					$subject = '[Pandora] '.__('Reset password');
-					$body = __('This is the automatic message');
-					$body .= ' "<strong>' . $user_reset_pass . '"</strong>';
-					$body .= '<p />';
-					$body .= __('Please, click in the link below to reset your password');
-					$body .= '<p />';
-					$body .= '<a href="">' . __('Reset your password') . '</a>';
-					$body .= '<p />';
-					$body .= 'Pandora FMS';
-					$body .= '<p />';
-					$body .= '<em>'.__('Please do not answer or reply to this email').'</em>';
-					
-					$result = send_email_to_user($mail, $body, $subject);
-					
-					$email_error_message = "";
-					if (!$result) {
-						$email_error_message = __('Error at sending the email');
-					}
-
+					$process_error_message = __('Too much time since password change request');
 					require_once ('general/login_page.php');
 				}
 			}
 			else {
-				require_once ('general/reset_pass.php');
+				if (!$reset) {
+					require_once ('general/login_page.php');
+				}
+				else {
+					$user_reset_pass = get_parameter('user_reset_pass', "");
+					$error = "";
+					$mail = "";
+					$show_error = false;
+
+					if (!$first) {
+						if ($reset) {
+							if ($user_reset_pass == '') {
+								$reset = false;
+								$error = __('Id user cannot be empty');
+								$show_error = true;
+							}
+							else {
+								$check_user = check_user_id($user_reset_pass);
+
+								if (!$check_user) {
+									$reset = false;
+									$error = __('User no exists in db');
+									$show_error = true;
+								}
+								else {
+									$check_mail = check_user_have_mail($user_reset_pass);
+
+									if (!$check_mail) {
+										$reset = false;
+										$error = __('User no have any email direction asociated');
+										$show_error = true;
+									}
+									else {
+										$mail = $check_mail;
+									}
+								}
+							}
+						}
+
+						if (!$reset) {
+							require_once ('general/reset_pass.php');
+						}
+						else {
+							$cod_hash = $user_reset_pass . "::::" . base64_encode(rand(10, 1000000) . rand(10, 1000000) . rand(10, 1000000));
+
+							$subject = '[Pandora] '.__('Reset password');
+							$body = __('This is the automatic message');
+							$body .= ' "<strong>' . $user_reset_pass . '"</strong>';
+							$body .= '<p />';
+							$body .= __('Please, click in the link below to reset your password');
+							$body .= '<p />';
+							$body .= '<a href="' . $config['homeurl'] . 'index.php?reset_hash=' . $cod_hash . '">' . __('Reset your password') . '</a>';
+							$body .= '<p />';
+							$body .= 'Pandora FMS';
+							$body .= '<p />';
+							$body .= '<em>'.__('Please do not answer or reply to this email').'</em>';
+							
+							$result = send_email_to_user($mail, $body, $subject);
+							
+							$process_error_message = "";
+							if (!$result) {
+								$process_error_message = __('Error at sending the email');
+							}
+							else {
+								send_token_to_db($user_reset_pass, $cod_hash);
+							}
+
+							require_once ('general/login_page.php');
+						}
+					}
+					else {
+						require_once ('general/reset_pass.php');
+					}
+				}
 			}
 		}
+		
 		while (@ob_end_flush ());
 		exit ("</html>");
 	}

From e26dfcd46654046a2b2330c2e9ef7b1405a315aa Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 20 Apr 2017 11:18:43 +0200
Subject: [PATCH 06/14] Move code to enterprise section

---
 pandora_console/general/login_page.php        |  14 +-
 .../general/process_reset_pass.php            | 196 ----------------
 pandora_console/general/reset_pass.php        | 209 ------------------
 pandora_console/index.php                     |  10 +-
 4 files changed, 14 insertions(+), 415 deletions(-)
 delete mode 100644 pandora_console/general/process_reset_pass.php
 delete mode 100644 pandora_console/general/reset_pass.php

diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index d25891d483..59178efde1 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -211,12 +211,14 @@ echo '<div class="login_page">';
 			break;
 	}
 
-	$reset_pass_link = 'reset_pass.php';
-	// Reset password link
-	echo '<div style="width:70%; height:40px; margin-right:auto; margin-left:auto; margin-top:20px; text-align:center;">';
-	echo '<a style="color: white !important;" href="index.php?reset=true&first=true">' . __('Forgotten your password?');
-	echo '</a>';
-	echo '</div>';
+	if ($config['enterprise_installed']) {
+		$reset_pass_link = 'reset_pass.php';
+		// Reset password link
+		echo '<div style="width:70%; height:40px; margin-right:auto; margin-left:auto; margin-top:20px; text-align:center;">';
+		echo '<a style="color: white !important;" href="index.php?reset=true&first=true">' . __('Forgotten your password?');
+		echo '</a>';
+		echo '</div>';
+	}
 
 	echo '</form></div>';
 	echo '<div class="login_data">';
diff --git a/pandora_console/general/process_reset_pass.php b/pandora_console/general/process_reset_pass.php
deleted file mode 100644
index 504551e74b..0000000000
--- a/pandora_console/general/process_reset_pass.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?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 (isset($config["homedir"])) {
-	$homedir = $config["homedir"] . '/';
-}
-else {
-	$homedir = '';
-}
-
-require_once($homedir . 'include/config.php');
-require_once($homedir . 'include/functions_config.php');
-include_once($homedir . 'include/functions_ui.php');
-include_once($homedir . 'include/functions_users.php');
-include_once($homedir . 'include/functions.php');
-include_once($homedir . 'include/functions_html.php');
-
-$login_body_style = '';
-// Overrides the default background with the defined by the user
-if (!empty($config['login_background'])) {
-    $background_url = "../../images/backgrounds/" . $config['login_background'];
-    $login_body_style = "style=\"background-image: url('$background_url');\"";
-}
-
-echo '<div id="login_body" ' . $login_body_style . '>';
-    echo '<div id="header_login">';
-        echo '<div id="icon_custom_pandora">';
-            if (defined ('PANDORA_ENTERPRISE')) {
-                if(isset ($config['custom_logo'])){
-                    echo '<img src="images/custom_logo/' . $config['custom_logo'] .'" alt="pandora_console">';
-                }
-                else{
-                    echo '<img src="images/custom_logo/logo_login_consola.png" alt="pandora_console">';
-                }
-            }
-            else{
-                echo '<img src="images/custom_logo/pandora_logo_head_3.png" alt="pandora_console">';	
-            }
-        echo '</div>';
-        echo '<div id="list_icon_docs_support"><ul>';
-            echo '<li><a href="http://wiki.pandorafms.com/" target="_blank"><img src="images/icono_docs.png" alt="docs pandora"></a></li>';
-            echo '<li>' . __('Docs') . '</li>';
-            echo '<li id="li_margin_left"><a href="https://pandorafms.com/monitoring-services/support/" target="_blank"><img src="images/icono_support.png" alt="support pandora"></a></li>';
-            echo '<li>' . __('Support') . '</li>';
-        echo '</ul></div>';	
-    echo '</div>';
-
-    echo '<div class="container_login">';
-    echo '<div class="login_page">';
-        echo '<form method="post" action="' . ui_get_full_url('index.php?correct_pass_change=true') . '"><div class="login_logo_icon">';
-            echo '<a href="' . $logo_link . '">';
-                if (defined ('METACONSOLE')) {
-                    if (!isset ($config["custom_logo_login"])){
-                        html_print_image ("images/custom_logo_login/login_logo.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
-                    }
-                    else{
-                        html_print_image ("images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
-                    }
-                }
-                else if (defined ('PANDORA_ENTERPRISE')) {
-
-                    if (!isset ($config["custom_logo_login"])){
-                        html_print_image ("enterprise/images/custom_logo_login/login_logo_v7.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
-                    }
-                    else{
-                        html_print_image ("enterprise/images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
-                    }
-                }
-                else {
-                    if (!isset ($config["custom_logo_login"]) || $config["custom_logo_login"] == 0){
-                        html_print_image ("images/custom_logo_login/pandora_logo.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
-                    }
-                    else{
-                        html_print_image ("images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
-                    }
-                    echo "<br><span style='font-size:120%;color:white;top:10px;position:relative;'>Community edition</span>";
-                }
-            echo '</a></div>';
-                
-            echo '<div class="login_pass">';
-				echo '<div>';
-					html_print_image ("/images/candado_login.png", false);
-				echo '</div>';
-				html_print_input_text_extended ("pass1", '', "pass1", '', '', '' ,false,
-					'', 'autocomplete="off" placeholder="'.__('New Password').'"', false, true);
-            echo '</div>';
-            echo '<div class="login_pass">';
-				echo '<div>';
-					html_print_image ("/images/candado_login.png", false);
-				echo '</div>';
-				html_print_input_text_extended ("pass2", '', "pass2", '', '', '' ,false,
-					'', 'autocomplete="off" placeholder="'.__('Repeat password').'"', false, true);
-            echo '</div>';
-            echo '<div id="reset_pass_button" style="display:none;" class="login_button">';
-				html_print_submit_button(__("Change password"), "login_button", false, 'class="sub next_login"');
-            echo '</div>';
-            echo '<div id="error_pass_message" style="display:none; text-align:center;">';
-				html_print_label(__("Passwords must be the same"), "error_pass_label", false, array('style' => 'font-size:12pt; color:red;'));
-            echo '</div>';
-            html_print_input_hidden('id_user', $id_user);
-
-        echo '</form>';
-
-        echo '<form method="post" action="' . ui_get_full_url('index.php') . '">';
-            echo '<div class="login_button">';
-                html_print_submit_button(__("Back to login"), "login_button", false, 'class="sub next_login"');
-            echo '</div>';
-        echo '</form></div>';
-
-        echo '<div style="float:right;" class="login_data">';
-            echo '<div class ="text_banner_login">';
-                echo '<div><span class="span1">';
-                    if(defined ('PANDORA_ENTERPRISE')){
-                        if($config['custom_title1_login']){
-                            echo strtoupper(io_safe_output($config['custom_title1_login']));
-                        }
-                        else{
-                            echo __('WELCOME TO PANDORA FMS');
-                        }
-                    }
-                    else{
-                        echo __('WELCOME TO PANDORA FMS');
-                    }
-                echo '</span></div>';
-                echo '<div><span class="span2">';
-                    if(defined ('PANDORA_ENTERPRISE')){
-                        if($config['custom_title2_login']){
-                            echo strtoupper(io_safe_output($config['custom_title2_login']));
-                        }
-                        else{
-                            echo __('NEXT GENERATION');
-                        }
-                    }
-                    else{
-                        echo __('NEXT GENERATION');
-                    }
-                echo '</span></div>';
-            echo '</div>';
-            echo '<div class ="img_banner_login">';
-                if (defined ('PANDORA_ENTERPRISE')) {
-                    if(isset($config['custom_splash_login'])){
-                        html_print_image ("enterprise/images/custom_splash_login/".$config['custom_splash_login'], false, array ( "alt" => "splash", "border" => 0, "title" => $splash_title), false, true);
-                    }
-                    else{
-                        html_print_image ("enterprise/images/custom_splash_login/splash_image_default.png", false, array ("alt" => "logo", "border" => 0, "title" => $splash_title), false, true);
-                    }
-                } 
-                else{
-                    html_print_image ("images/splash_image_default.png", false, array ("alt" => "logo", "border" => 0, "title" => $splash_title), false, true);
-                }
-            echo '</div>';
-        echo '</div>';
-    echo '</div>';
-
-    echo '</div>';
-    echo '<div id="ver_num">'.$pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_version : '') . '</div>';
-    echo '</div>';
-
-ui_require_css_file ('dialog');
-ui_require_css_file ('jquery-ui-1.10.0.custom');
-ui_require_jquery_file('jquery-ui-1.10.0.custom');
-
-?>
-
-<script type="text/javascript" language="javascript">
-
-$(document).ready (function () {
-    $('#pass2').on('input', function(e) {
-        var pass1 = $('#pass1').val();
-        var pass2 = $('#pass2').val();
-        if (pass1 != pass2) {
-            $("#reset_pass_button").css('display', 'none');
-            $("#error_pass_message").css('display', '');
-        }
-        else {
-            $("#reset_pass_button").css('display', '');
-            $("#error_pass_message").css('display', 'none');
-        }
-    });
-});
-
-</script>
\ No newline at end of file
diff --git a/pandora_console/general/reset_pass.php b/pandora_console/general/reset_pass.php
deleted file mode 100644
index a3f83753d6..0000000000
--- a/pandora_console/general/reset_pass.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?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 (isset($config["homedir"])) {
-	$homedir = $config["homedir"] . '/';
-}
-else {
-	$homedir = '';
-}
-
-require_once($homedir . 'include/config.php');
-require_once($homedir . 'include/functions_config.php');
-include_once($homedir . 'include/functions_ui.php');
-include_once($homedir . 'include/functions_users.php');
-include_once($homedir . 'include/functions.php');
-include_once($homedir . 'include/functions_html.php');
-
-$login_body_style = '';
-// Overrides the default background with the defined by the user
-if (!empty($config['login_background'])) {
-    $background_url = "../../images/backgrounds/" . $config['login_background'];
-    $login_body_style = "style=\"background-image: url('$background_url');\"";
-}
-
-echo '<div id="login_body" ' . $login_body_style . '>';
-    echo '<div id="header_login">';
-        echo '<div id="icon_custom_pandora">';
-            if (defined ('PANDORA_ENTERPRISE')) {
-                if(isset ($config['custom_logo'])){
-                    echo '<img src="images/custom_logo/' . $config['custom_logo'] .'" alt="pandora_console">';
-                }
-                else{
-                    echo '<img src="images/custom_logo/logo_login_consola.png" alt="pandora_console">';
-                }
-            }
-            else{
-                echo '<img src="images/custom_logo/pandora_logo_head_3.png" alt="pandora_console">';	
-            }
-        echo '</div>';
-        echo '<div id="list_icon_docs_support"><ul>';
-            echo '<li><a href="http://wiki.pandorafms.com/" target="_blank"><img src="images/icono_docs.png" alt="docs pandora"></a></li>';
-            echo '<li>' . __('Docs') . '</li>';
-            echo '<li id="li_margin_left"><a href="https://pandorafms.com/monitoring-services/support/" target="_blank"><img src="images/icono_support.png" alt="support pandora"></a></li>';
-            echo '<li>' . __('Support') . '</li>';
-        echo '</ul></div>';	
-    echo '</div>';
-
-    echo '<div class="container_login">';
-    echo '<div class="login_page">';
-        echo '<form method="post" action="' . ui_get_full_url('index.php?reset=true') . '"><div class="login_logo_icon">';
-            echo '<a href="' . $logo_link . '">';
-                if (defined ('METACONSOLE')) {
-                    if (!isset ($config["custom_logo_login"])){
-                        html_print_image ("images/custom_logo_login/login_logo.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
-                    }
-                    else{
-                        html_print_image ("images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
-                    }
-                }
-                else if (defined ('PANDORA_ENTERPRISE')) {
-
-                    if (!isset ($config["custom_logo_login"])){
-                        html_print_image ("enterprise/images/custom_logo_login/login_logo_v7.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
-                    }
-                    else{
-                        html_print_image ("enterprise/images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
-                    }
-                }
-                else {
-                    if (!isset ($config["custom_logo_login"]) || $config["custom_logo_login"] == 0){
-                        html_print_image ("images/custom_logo_login/pandora_logo.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
-                    }
-                    else{
-                        html_print_image ("images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
-                    }
-                    echo "<br><span style='font-size:120%;color:white;top:10px;position:relative;'>Community edition</span>";
-                }
-            echo '</a></div>';
-                
-            echo '<div class="login_nick">';
-                echo '<div>';
-                    html_print_image ("/images/usuario_login.png", false);
-                echo '</div>';
-                html_print_input_text_extended ("user_reset_pass", '', "user_reset_pass", '', '', '' , false,
-                    '', 'autocomplete="off" placeholder="'.__('User to reset password').'"');
-            echo '</div>';
-            echo '<div class="login_button">';
-                html_print_submit_button(__("Reset password"), "login_button", false, 'class="sub next_login"');
-            echo '</div>';
-
-        echo '</form>';
-
-        echo '<form method="post" action="' . ui_get_full_url('index.php') . '">';
-            echo '<div class="login_button">';
-                html_print_submit_button(__("Back to login"), "login_button", false, 'class="sub next_login"');
-            echo '</div>';
-        echo '</form></div>';
-
-        echo '<div style="float:right;" class="login_data">';
-            echo '<div class ="text_banner_login">';
-                echo '<div><span class="span1">';
-                    if(defined ('PANDORA_ENTERPRISE')){
-                        if($config['custom_title1_login']){
-                            echo strtoupper(io_safe_output($config['custom_title1_login']));
-                        }
-                        else{
-                            echo __('WELCOME TO PANDORA FMS');
-                        }
-                    }
-                    else{
-                        echo __('WELCOME TO PANDORA FMS');
-                    }
-                echo '</span></div>';
-                echo '<div><span class="span2">';
-                    if(defined ('PANDORA_ENTERPRISE')){
-                        if($config['custom_title2_login']){
-                            echo strtoupper(io_safe_output($config['custom_title2_login']));
-                        }
-                        else{
-                            echo __('NEXT GENERATION');
-                        }
-                    }
-                    else{
-                        echo __('NEXT GENERATION');
-                    }
-                echo '</span></div>';
-            echo '</div>';
-            echo '<div class ="img_banner_login">';
-                if (defined ('PANDORA_ENTERPRISE')) {
-                    if(isset($config['custom_splash_login'])){
-                        html_print_image ("enterprise/images/custom_splash_login/".$config['custom_splash_login'], false, array ( "alt" => "splash", "border" => 0, "title" => $splash_title), false, true);
-                    }
-                    else{
-                        html_print_image ("enterprise/images/custom_splash_login/splash_image_default.png", false, array ("alt" => "logo", "border" => 0, "title" => $splash_title), false, true);
-                    }
-                } 
-                else{
-                    html_print_image ("images/splash_image_default.png", false, array ("alt" => "logo", "border" => 0, "title" => $splash_title), false, true);
-                }
-            echo '</div>';
-        echo '</div>';
-    echo '</div>';
-
-    echo '</div>';
-    echo '<div id="ver_num">'.$pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_version : '') . '</div>';
-    echo '</div>';
-
-if ($show_error) {
-    echo '<div id="reset_pass_error" title="' . __('Reset password failed') . '">';
-        echo '<div class="content_alert">';
-            echo '<div class="icon_message_alert">';
-                echo html_print_image('images/icono_stop.png', true, array("alt" => __('Reset password failed'), "border" => 0));
-            echo '</div>';
-            echo '<div class="content_message_alert">';
-                echo '<div class="text_message_alert">';
-                    echo '<h1>' . __('ERROR') . '</h1>';
-                    echo '<p>'  . $error . '</p>';
-                echo '</div>';
-                echo '<div class="button_message_alert">';
-                    html_print_submit_button("Ok", 'reset_pass_error', false);  
-                echo '</div>';
-            echo '</div>';
-        echo '</div>';
-    echo '</div>';
-}
-
-ui_require_css_file ('dialog');
-ui_require_css_file ('jquery-ui-1.10.0.custom');
-ui_require_jquery_file('jquery-ui-1.10.0.custom');
-
-?>
-
-<script type="text/javascript" language="javascript">
-
-$(document).ready (function () {
-    $(function() {
-        $( "#reset_pass_error" ).dialog({
-            resizable: true,
-            draggable: true,
-            modal: true,
-            height: 220,
-            width: 528,
-            overlay: {
-                opacity: 0.5,
-                background: "black"
-            }
-        });
-    });
-
-    $("#submit-reset_pass_error").click (function () {
-        $("#reset_pass_error" ).dialog('close');
-    });
-});
-
-</script>
\ No newline at end of file
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 2455287848..88ff08663b 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -583,14 +583,14 @@ if (! isset ($config['id_user'])) {
 				$process_error_message = "";
 
 				if ($db_reset_pass_entry) {
-					if (($db_reset_pass_entry + SECONDS_15MINUTES) < time()) {
+					if (($db_reset_pass_entry + SECONDS_2HOUR) < time()) {
 						$process_error_message = __('This user has not requested a password change');
 						db_process_sql_delete('treset_pass', array('id_user' => $id_user));
 						require_once ('general/login_page.php');
 					}
 					else {
 						db_process_sql_delete('treset_pass', array('id_user' => $id_user));
-						require_once ('general/process_reset_pass.php');
+						require_once ('enterprise/include/process_reset_pass.php');
 					}
 				}
 				else {
@@ -639,7 +639,9 @@ if (! isset ($config['id_user'])) {
 						}
 
 						if (!$reset) {
-							require_once ('general/reset_pass.php');
+							if ($config['enterprise_installed']) {
+								require_once ('enterprise/include/reset_pass.php');
+							}
 						}
 						else {
 							$cod_hash = $user_reset_pass . "::::" . base64_encode(rand(10, 1000000) . rand(10, 1000000) . rand(10, 1000000));
@@ -670,7 +672,7 @@ if (! isset ($config['id_user'])) {
 						}
 					}
 					else {
-						require_once ('general/reset_pass.php');
+						require_once ('enterprise/include/reset_pass.php');
 					}
 				}
 			}

From df80304a80b4b9720d55daa7b1b6f0b9900902bb Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 20 Apr 2017 11:36:40 +0200
Subject: [PATCH 07/14] Move code to enterprise section

---
 pandora_console/include/email_config_user.php | 21 ----------
 pandora_console/include/functions.php         | 42 -------------------
 pandora_console/include/functions_users.php   | 26 ------------
 pandora_console/index.php                     |  7 +++-
 4 files changed, 5 insertions(+), 91 deletions(-)
 delete mode 100644 pandora_console/include/email_config_user.php

diff --git a/pandora_console/include/email_config_user.php b/pandora_console/include/email_config_user.php
deleted file mode 100644
index f8258478ac..0000000000
--- a/pandora_console/include/email_config_user.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-// ______                 __                     _______ _______ _______
-//|   __ \.---.-.-----.--|  |.-----.----.---.-. |    ___|   |   |     __|
-//|    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
-//|___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
-//
-// ============================================================================
-// Copyright (c) 2007-2010 Artica Soluciones Tecnologicas, http://www.artica.es
-// This code is NOT free software. This code is NOT licenced under GPL2 licence
-// You cannnot redistribute it without written permission of copyright holder.
-// ============================================================================
-
-//Please setup your config to send emails
-
-$email_from = array('pandora@pandorafms.org' => 'Pandora FMS');
-$email_smtpServer = '127.0.0.1';
-$email_smtpPort = 25;
-$email_username = '';
-$email_password = '';
-
-?>
\ No newline at end of file
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 7fba3d1ac7..6c1216133c 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -2731,46 +2731,4 @@ function remove_right_zeros ($value) {
 	}
 }
 
-function send_email_to_user ($to, $body, $subject) {
-	global $config;
-	
-	require_once($config['homedir'] . '/include/swiftmailer/swift_required.php');
-	require_once($config['homedir'] . '/include/email_config_user.php');
-	
-	$result = false;
-	try {
-		$transport = Swift_SmtpTransport::newInstance($email_smtpServer, $email_smtpPort);
-		$transport->setUsername($email_username);
-		$transport->setPassword($email_password);
-		
-		$mailer = Swift_Mailer::newInstance($transport);
-		
-		$message = Swift_Message::newInstance($subject);
-		$message->setFrom($email_from);
-		$to = trim($to);
-		$message->setTo(array($to => $to));
-		$message->setBody($body, 'text/html');
-		
-		ini_restore ('sendmail_from');
-		
-		$result = $mailer->send($message);
-	}
-	catch (Exception $e) {
-		error_log($e->getMessage());
-		db_pandora_audit("Pandora mail", $e->getMessage());
-	}
-	
-	return $result;
-}
-
-function send_token_to_db ($id_user, $cod_hash) {
-	db_process_sql_delete('treset_pass', array('id_user' => $id_user));
-
-	$values = array();
-	$values['id_user'] = $id_user;
-	$values['cod_hash'] = $cod_hash;
-	$values['reset_time'] = time();
-	db_process_sql_insert('treset_pass', $values);
-}
-
 ?>
diff --git a/pandora_console/include/functions_users.php b/pandora_console/include/functions_users.php
index 6759c5aaec..13116c6eb8 100755
--- a/pandora_console/include/functions_users.php
+++ b/pandora_console/include/functions_users.php
@@ -892,30 +892,4 @@ function users_get_strict_mode_groups($id_user, $return_group_all) {
 	return $return_user_groups;
 }
 
-function check_user_id ($id_user) {
-	global $config;
-	
-	$exists = db_get_value ('id_user', 'tusuario', 'id_user', $id_user);
-
-	if ($exists) {
-		return true;
-	}
-	else {
-		return false;
-	}
-}
-
-function check_user_have_mail ($id_user) {
-	global $config;
-	
-	$exists_mail = db_get_value ('email', 'tusuario', 'id_user', $id_user);
-
-	if ($exists_mail) {
-		return $exists_mail;
-	}
-	else {
-		return false;
-	}
-}
-
 ?>
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 88ff08663b..83108a60a5 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -585,11 +585,11 @@ if (! isset ($config['id_user'])) {
 				if ($db_reset_pass_entry) {
 					if (($db_reset_pass_entry + SECONDS_2HOUR) < time()) {
 						$process_error_message = __('This user has not requested a password change');
-						db_process_sql_delete('treset_pass', array('id_user' => $id_user));
+						delete_reset_pass_entry($id_user);
 						require_once ('general/login_page.php');
 					}
 					else {
-						db_process_sql_delete('treset_pass', array('id_user' => $id_user));
+						delete_reset_pass_entry($id_user);
 						require_once ('enterprise/include/process_reset_pass.php');
 					}
 				}
@@ -599,6 +599,9 @@ if (! isset ($config['id_user'])) {
 				}
 			}
 			else {
+				if ($config['enterprise_installed']) {
+					enterprise_include_once ('include/functions_reset_pass.php');
+				}
 				if (!$reset) {
 					require_once ('general/login_page.php');
 				}

From a1f23af142dea33eff4efbc6919fa5887b0ea5c8 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 20 Apr 2017 12:15:45 +0200
Subject: [PATCH 08/14] Added new setup menu to mail

---
 pandora_console/godmode/menu.php              |  1 +
 pandora_console/include/functions_config.php  | 40 ++++++++++++++++++-
 .../help/clippy/extension_cron_send_email.php |  3 +-
 pandora_console/index.php                     |  7 ++--
 4 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 1bd5773822..0a0652655d 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -249,6 +249,7 @@ if (check_acl ($config['id_user'], 0, "PM")) {
 	enterprise_hook ('enterprise_submenu');
 	enterprise_hook ('historydb_submenu');
 	enterprise_hook ('log_collector_submenu');
+	enterprise_hook ('mail_submenu');
 	
 	$sub2["godmode/setup/setup&amp;section=auth"]["text"] =  __('Authentication');
 	$sub2["godmode/setup/setup&amp;section=auth"]["refr"] = 0;
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 6fea6906b4..576cf5e3ac 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -708,6 +708,20 @@ function config_update_config () {
 				if (!config_update_value ('history_db_delay', get_parameter ('history_db_delay')))
 					$error_update[] = __('Delay');
 				break;
+			case 'mail':
+				if (!config_update_value ('email_from_dir', get_parameter('email_from_dir')))
+					$error_update[] = __('From dir');
+				if (!config_update_value ('email_from_name', get_parameter('email_from_name')))
+					$error_update[] = __('From name');
+				if (!config_update_value ('email_smtpServer', get_parameter('email_smtpServer')))
+					$error_update[] = __('Server SMTP');
+				if (!config_update_value ('email_smtpPort', (int)get_parameter('email_smtpPort')))
+					$error_update[] = __('Port SMTP');
+				if (!config_update_value ('email_username', get_parameter('email_username')))
+					$error_update[] = __('Email user');
+				if (!config_update_value ('email_password', get_parameter('email_password')))
+					$error_update[] = __('Email password');
+				break;
 			case 'ehorus':
 				if (!config_update_value('ehorus_enabled', (int) get_parameter('ehorus_enabled', $config['ehorus_enabled'])))
 					$error_update[] = __('Enable eHorus');
@@ -1187,7 +1201,31 @@ function config_process_config () {
 	if (!isset ($config['history_db_delay'])) {
 		config_update_value ( 'history_db_delay', 0);
 	}
-	
+
+	if (!isset ($config['email_from_dir'])) {
+		config_update_value ( 'email_from_dir', "pandora@pandorafms.org");
+	}
+
+	if (!isset ($config['email_from_name'])) {
+		config_update_value ( 'email_from_name', "Pandora FMS");
+	}
+
+	if (!isset ($config['email_smtpServer'])) {
+		config_update_value ( 'email_smtpServer', "127.0.0.1");
+	}
+
+	if (!isset ($config['email_smtpPort'])) {
+		config_update_value ( 'email_smtpPort', 25);
+	}
+
+	if (!isset ($config['email_username'])) {
+		config_update_value ( 'email_username', "");
+	}
+
+	if (!isset ($config['email_password'])) {
+		config_update_value ( 'email_password', "");
+	}
+
 	if (!isset ($config['activate_gis'])) {
 		config_update_value ( 'activate_gis', 0);
 	}
diff --git a/pandora_console/include/help/clippy/extension_cron_send_email.php b/pandora_console/include/help/clippy/extension_cron_send_email.php
index cd6cf216d4..6a4eb64b43 100755
--- a/pandora_console/include/help/clippy/extension_cron_send_email.php
+++ b/pandora_console/include/help/clippy/extension_cron_send_email.php
@@ -36,8 +36,7 @@ function clippy_extension_cron_send_email() {
 		'intro' => '<table>' .
 			'<tr>' .
 			'<td class="context_help_body">' .
-			__('The configuration of email for the task email is in the file:') . '<br />' .
-			'&lt;www&gt;/pandora_console/enterprise/extensions/cron/email_config.php <br />' .
+			__('The configuration of email for the task email is in the mail setup:') . '<br />' .
 			__('Please check if the email configuration is correct.') .
 			'</td>' .
 			'</tr>' .
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 83108a60a5..dda5f86077 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -547,6 +547,10 @@ if (! isset ($config['id_user'])) {
 	}
 	// There is no user connected
 	else {
+		if ($config['enterprise_installed']) {
+			enterprise_include_once ('include/functions_reset_pass.php');
+		}
+		
 		$correct_pass_change = (boolean)get_parameter('correct_pass_change', 0);
 		$reset = (boolean)get_parameter('reset', 0);
 		$first = (boolean)get_parameter('first', 0);
@@ -599,9 +603,6 @@ if (! isset ($config['id_user'])) {
 				}
 			}
 			else {
-				if ($config['enterprise_installed']) {
-					enterprise_include_once ('include/functions_reset_pass.php');
-				}
 				if (!$reset) {
 					require_once ('general/login_page.php');
 				}

From bfa3b43ee7630147388edfbf4b3ef00006a2aa85 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 20 Apr 2017 12:36:33 +0200
Subject: [PATCH 09/14] Added changes to reset password system

---
 pandora_console/general/login_page.php | 65 +++++++++++++-------------
 pandora_console/index.php              |  6 +--
 pandora_console/pandoradb.sql          |  8 ++++
 3 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index 59178efde1..928b1d39a7 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -268,44 +268,43 @@ echo '</div>';
 echo '<div id="ver_num">'.$pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_version : '') . '</div>';
 echo '</div>';
 
-if ($mail != "") {
-	if ($process_error_message == '') {
-		echo '<div id="reset_correct" title="' . __('Password reset') . '">';
-			echo '<div class="content_alert">';
-				echo '<div class="icon_message_alert">';
-					echo html_print_image('images/icono_logo_pandora.png', true, array("alt" => __('Password reset'), "border" => 0));
+if ($process_error_message == '') {
+	echo '<div id="reset_correct" title="' . __('Password reset') . '">';
+		echo '<div class="content_alert">';
+			echo '<div class="icon_message_alert">';
+				echo html_print_image('images/icono_logo_pandora.png', true, array("alt" => __('Password reset'), "border" => 0));
+			echo '</div>';
+			echo '<div class="content_message_alert">';
+				echo '<div class="text_message_alert">';
+					echo '<h1>' . __('INFO') . '</h1>';
+					echo '<p>'  . __('An email has been sent to the user\'s address') . '</p>';
 				echo '</div>';
-				echo '<div class="content_message_alert">';
-					echo '<div class="text_message_alert">';
-						echo '<h1>' . __('INFO') . '</h1>';
-						echo '<p>'  . __('An email has been sent to the user\'s address') . '</p>';
-					echo '</div>';
-					echo '<div class="button_message_alert">';
-						html_print_submit_button("Ok", 'reset_correct_button', false);  
-					echo '</div>';
+				echo '<div class="button_message_alert">';
+					html_print_submit_button("Ok", 'reset_correct_button', false);  
 				echo '</div>';
 			echo '</div>';
 		echo '</div>';
-	}
-	else {
-		echo '<div id="reset_correct" title="' . __('Password reset') . '">';
-			echo '<div class="content_alert">';
-				echo '<div class="icon_message_alert">';
-					echo html_print_image('images/icono_stop.png', true, array("alt" => __('Password reset'), "border" => 0));
-				echo '</div>';
-				echo '<div class="content_message_alert">';
-					echo '<div class="text_message_alert">';
-						echo '<h1>' . __('ERROR') . '</h1>';
-						echo '<p>'  . $process_error_message . '</p>';
-					echo '</div>';
-					echo '<div class="button_message_alert">';
-						html_print_submit_button("Ok", 'reset_correct_button', false);  
-					echo '</div>';
-				echo '</div>';
-			echo '</div>';
-		echo '</div>';
-	}
+	echo '</div>';
 }
+else {
+	echo '<div id="reset_correct" title="' . __('Password reset') . '">';
+		echo '<div class="content_alert">';
+			echo '<div class="icon_message_alert">';
+				echo html_print_image('images/icono_stop.png', true, array("alt" => __('Password reset'), "border" => 0));
+			echo '</div>';
+			echo '<div class="content_message_alert">';
+				echo '<div class="text_message_alert">';
+					echo '<h1>' . __('ERROR') . '</h1>';
+					echo '<p>'  . $process_error_message . '</p>';
+				echo '</div>';
+				echo '<div class="button_message_alert">';
+					html_print_submit_button("Ok", 'reset_correct_button', false);  
+				echo '</div>';
+			echo '</div>';
+		echo '</div>';
+	echo '</div>';
+}
+
 
 if ($correct_reset_pass_process != "") {
 	echo '<div id="final_process_correct" title="' . __('Password reset') . '">';
diff --git a/pandora_console/index.php b/pandora_console/index.php
index dda5f86077..8fa41224a4 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -550,7 +550,7 @@ if (! isset ($config['id_user'])) {
 		if ($config['enterprise_installed']) {
 			enterprise_include_once ('include/functions_reset_pass.php');
 		}
-		
+
 		$correct_pass_change = (boolean)get_parameter('correct_pass_change', 0);
 		$reset = (boolean)get_parameter('reset', 0);
 		$first = (boolean)get_parameter('first', 0);
@@ -588,7 +588,7 @@ if (! isset ($config['id_user'])) {
 
 				if ($db_reset_pass_entry) {
 					if (($db_reset_pass_entry + SECONDS_2HOUR) < time()) {
-						$process_error_message = __('This user has not requested a password change');
+						$process_error_message = __('Too much time since password change request');
 						delete_reset_pass_entry($id_user);
 						require_once ('general/login_page.php');
 					}
@@ -598,7 +598,7 @@ if (! isset ($config['id_user'])) {
 					}
 				}
 				else {
-					$process_error_message = __('Too much time since password change request');
+					$process_error_message = __('This user has not requested a password change');
 					require_once ('general/login_page.php');
 				}
 			}
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 2a1bded331..20197a9c4c 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -2926,3 +2926,11 @@ create table IF NOT EXISTS `tphase`(
     `timeout` int unsigned default null,
     PRIMARY KEY (`phase_id`,`transaction_id`)
 ) engine=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `treset_pass` (
+	`id` bigint(10) unsigned NOT NULL auto_increment,
+	`id_user` varchar(100) NOT NULL default '',
+	`cod_hash` varchar(100) NOT NULL default '',
+	`reset_time` int(10) unsigned NOT NULL default 0,
+	PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;

From 63254ac7e4b4ae1f218692c159b9539755328bf2 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 20 Apr 2017 12:54:15 +0200
Subject: [PATCH 10/14] Move mail setup section to enterprise setup

---
 pandora_console/general/login_page.php       |  4 +--
 pandora_console/godmode/menu.php             |  1 -
 pandora_console/include/functions_config.php | 27 ++++++++++----------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index 928b1d39a7..9702d73d78 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -268,7 +268,7 @@ echo '</div>';
 echo '<div id="ver_num">'.$pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_version : '') . '</div>';
 echo '</div>';
 
-if ($process_error_message == '') {
+if ($process_error_message == '' && $mail != "") {
 	echo '<div id="reset_correct" title="' . __('Password reset') . '">';
 		echo '<div class="content_alert">';
 			echo '<div class="icon_message_alert">';
@@ -286,7 +286,7 @@ if ($process_error_message == '') {
 		echo '</div>';
 	echo '</div>';
 }
-else {
+else if ($process_error_message != '') {
 	echo '<div id="reset_correct" title="' . __('Password reset') . '">';
 		echo '<div class="content_alert">';
 			echo '<div class="icon_message_alert">';
diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 0a0652655d..1bd5773822 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -249,7 +249,6 @@ if (check_acl ($config['id_user'], 0, "PM")) {
 	enterprise_hook ('enterprise_submenu');
 	enterprise_hook ('historydb_submenu');
 	enterprise_hook ('log_collector_submenu');
-	enterprise_hook ('mail_submenu');
 	
 	$sub2["godmode/setup/setup&amp;section=auth"]["text"] =  __('Authentication');
 	$sub2["godmode/setup/setup&amp;section=auth"]["refr"] = 0;
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 576cf5e3ac..612667f1a8 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -249,6 +249,19 @@ function config_update_config () {
 						$inventory_changes_blacklist = get_parameter('inventory_changes_blacklist', array());
 						if (!config_update_value ('inventory_changes_blacklist', implode(',',$inventory_changes_blacklist)))
 							$error_update[] = __('Inventory changes blacklist');
+
+						if (!config_update_value ('email_from_dir', get_parameter('email_from_dir')))
+							$error_update[] = __('From dir');
+						if (!config_update_value ('email_from_name', get_parameter('email_from_name')))
+							$error_update[] = __('From name');
+						if (!config_update_value ('email_smtpServer', get_parameter('email_smtpServer')))
+							$error_update[] = __('Server SMTP');
+						if (!config_update_value ('email_smtpPort', (int)get_parameter('email_smtpPort')))
+							$error_update[] = __('Port SMTP');
+						if (!config_update_value ('email_username', get_parameter('email_username')))
+							$error_update[] = __('Email user');
+						if (!config_update_value ('email_password', get_parameter('email_password')))
+							$error_update[] = __('Email password');
 						
 					}
 					break;
@@ -708,20 +721,6 @@ function config_update_config () {
 				if (!config_update_value ('history_db_delay', get_parameter ('history_db_delay')))
 					$error_update[] = __('Delay');
 				break;
-			case 'mail':
-				if (!config_update_value ('email_from_dir', get_parameter('email_from_dir')))
-					$error_update[] = __('From dir');
-				if (!config_update_value ('email_from_name', get_parameter('email_from_name')))
-					$error_update[] = __('From name');
-				if (!config_update_value ('email_smtpServer', get_parameter('email_smtpServer')))
-					$error_update[] = __('Server SMTP');
-				if (!config_update_value ('email_smtpPort', (int)get_parameter('email_smtpPort')))
-					$error_update[] = __('Port SMTP');
-				if (!config_update_value ('email_username', get_parameter('email_username')))
-					$error_update[] = __('Email user');
-				if (!config_update_value ('email_password', get_parameter('email_password')))
-					$error_update[] = __('Email password');
-				break;
 			case 'ehorus':
 				if (!config_update_value('ehorus_enabled', (int) get_parameter('ehorus_enabled', $config['ehorus_enabled'])))
 					$error_update[] = __('Enable eHorus');

From ad065e2464c7fdd522dd31c63e85bc292660d297 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 20 Apr 2017 12:56:22 +0200
Subject: [PATCH 11/14] Changed cron help message

---
 .../include/help/clippy/extension_cron_send_email.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/help/clippy/extension_cron_send_email.php b/pandora_console/include/help/clippy/extension_cron_send_email.php
index 6a4eb64b43..52480f4b5a 100755
--- a/pandora_console/include/help/clippy/extension_cron_send_email.php
+++ b/pandora_console/include/help/clippy/extension_cron_send_email.php
@@ -36,7 +36,7 @@ function clippy_extension_cron_send_email() {
 		'intro' => '<table>' .
 			'<tr>' .
 			'<td class="context_help_body">' .
-			__('The configuration of email for the task email is in the mail setup:') . '<br />' .
+			__('The configuration of email for the task email is in the enterprise setup:') . '<br />' .
 			__('Please check if the email configuration is correct.') .
 			'</td>' .
 			'</tr>' .

From 14a3a79eb3bdb7d6a9cac68a61a98cf49ec2f9fb Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 20 Apr 2017 15:00:24 +0200
Subject: [PATCH 12/14] Changed cod type

---
 pandora_console/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/index.php b/pandora_console/index.php
index 8fa41224a4..065dcd2682 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -648,7 +648,7 @@ if (! isset ($config['id_user'])) {
 							}
 						}
 						else {
-							$cod_hash = $user_reset_pass . "::::" . base64_encode(rand(10, 1000000) . rand(10, 1000000) . rand(10, 1000000));
+							$cod_hash = $user_reset_pass . "::::" . md5(rand(10, 1000000) . rand(10, 1000000) . rand(10, 1000000));
 
 							$subject = '[Pandora] '.__('Reset password');
 							$body = __('This is the automatic message');

From d93fa1bb3f6a7e9252ae5b5b4807142fbe55f75a Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 20 Apr 2017 15:31:39 +0200
Subject: [PATCH 13/14] Added new option to enable and disable reset pass

---
 pandora_console/general/login_page.php       | 14 ++++++++------
 pandora_console/include/functions_config.php |  6 ++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index 9702d73d78..09fadd0c9d 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -212,12 +212,14 @@ echo '<div class="login_page">';
 	}
 
 	if ($config['enterprise_installed']) {
-		$reset_pass_link = 'reset_pass.php';
-		// Reset password link
-		echo '<div style="width:70%; height:40px; margin-right:auto; margin-left:auto; margin-top:20px; text-align:center;">';
-		echo '<a style="color: white !important;" href="index.php?reset=true&first=true">' . __('Forgotten your password?');
-		echo '</a>';
-		echo '</div>';
+		if ($config["reset_pass_option"]) {
+			$reset_pass_link = 'reset_pass.php';
+			// Reset password link
+			echo '<div style="width:70%; height:40px; margin-right:auto; margin-left:auto; margin-top:20px; text-align:center;">';
+			echo '<a style="color: white !important;" href="index.php?reset=true&first=true">' . __('Forgotten your password?');
+			echo '</a>';
+			echo '</div>';
+		}
 	}
 
 	echo '</form></div>';
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 612667f1a8..83e85e5e61 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -245,6 +245,8 @@ function config_update_config () {
 							$error_update[] = __('Metaconsole agent cache');
 						if (!config_update_value ('log_collector', (bool)get_parameter('log_collector')))
 							$error_update[] = __('Activate Log Collector');
+						if (!config_update_value ('reset_pass_option', (bool)get_parameter('reset_pass_option')))
+							$error_update[] = __('Activate reset password');
 						
 						$inventory_changes_blacklist = get_parameter('inventory_changes_blacklist', array());
 						if (!config_update_value ('inventory_changes_blacklist', implode(',',$inventory_changes_blacklist)))
@@ -1001,6 +1003,10 @@ function config_process_config () {
 		config_update_value ('log_collector', 0);
 	}
 
+	if (!isset ($config["reset_pass_option"])) {
+		config_update_value ('reset_pass_option', 0);
+	}
+
 	if (!isset ($config["include_agents"])) {
 		config_update_value ('include_agents', 0);
 	}

From 5b015dbcb989fd22e3964480e9da9491d0f16189 Mon Sep 17 00:00:00 2001
From: Arturo Gonzalez <arturo.gonzalez@artica.es>
Date: Thu, 20 Apr 2017 16:11:45 +0200
Subject: [PATCH 14/14] Added new icon to meta mail setup and change mail
 message

---
 pandora_console/images/icono_mail.png | Bin 0 -> 483 bytes
 pandora_console/index.php             |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 pandora_console/images/icono_mail.png

diff --git a/pandora_console/images/icono_mail.png b/pandora_console/images/icono_mail.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb9a8e953e5a49b91774c50a7896e6ddb30750a8
GIT binary patch
literal 483
zcmV<90UZ8`P)<h;3K|Lk000e1NJLTq000*N000*V1^@s7mo4Nr0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzg-Jv~RCwBAV890K?d|8I2mk~ShI9jz
z-p>T2`C$?O0fZAVqG|O9;tN2mfKvxR0Fi+}&H>`{=)Pcq@)e+x9}XTo=m^(=&0{zL
zKmd`97?G@T0OA8U)Pdzd?qY(8068Gd3xQYwBms4_01!Wb%7FnBlH<=qH5vlh0U!)w
zqemzsl0X6h=Pv*nkVvwp0Rm`{Aecx0LlfHvTwxCiPFNy20F4Ympx_6zwDBJnf#{L+
z9w;dQRU`mXh%15&pw0kk0Hyu+=x%{I17zBHm?@z2gT#jU2gP0Za>ajSlL=~|EdU6x
zp^K2qFi;Aqr-GS<z-YaI5<5_X9iVKGq$7G##1qxXnYtgO7bOM4(l|6RO@yYz^RVQL
z%TQR7f$BSeEybb$puz<}O(56rhgt&n3Dh!>xB+@$h7OppxJCe4(CvpBi0qU9&^$E}
z=2DOtuG$PaLiZzuc_PU5Bvd-cVSWHsx1a~h1CYT;sfSpw5Q_V8g?S(}94ShMC?yIl
Z0RYJ|rNXcPe69ch002ovPDHLkV1g$Zy`KO8

literal 0
HcmV?d00001

diff --git a/pandora_console/index.php b/pandora_console/index.php
index 065dcd2682..3a10eb43d2 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -651,7 +651,7 @@ if (! isset ($config['id_user'])) {
 							$cod_hash = $user_reset_pass . "::::" . md5(rand(10, 1000000) . rand(10, 1000000) . rand(10, 1000000));
 
 							$subject = '[Pandora] '.__('Reset password');
-							$body = __('This is the automatic message');
+							$body = __('This is the automatic message to the user');
 							$body .= ' "<strong>' . $user_reset_pass . '"</strong>';
 							$body .= '<p />';
 							$body .= __('Please, click in the link below to reset your password');