From df80304a80b4b9720d55daa7b1b6f0b9900902bb Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Thu, 20 Apr 2017 11:36:40 +0200 Subject: [PATCH] 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 @@ - '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'); }