tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1082-change-pass-db-register-dev' into 'develop' 

Added registration method to reset pass

See merge request !707
This commit is contained in:
vgilc 2017-08-03 17:05:24 +02:00
parent 5860d29e37 ea06ba213b
commit 6e25fc6ba9
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
View File

@ -1357,7 +1357,8 @@ INSERT INTO `tcontainer` SET `name` = 'Default graph container';
CREATE TABLE IF NOT EXISTS `treset_pass_history` (
`id` int(10) unsigned NOT NULL auto_increment,
`id_user` varchar(60) NOT NULL,
`reset_moment` date default NULL,
`reset_moment` datetime NOT NULL,
`success` tinyint(1) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

10
pandora_console/include/functions.php
View File

@ -2754,4 +2754,14 @@ function remove_right_zeros ($value) {
}
}
function register_pass_change_try ($id_user, $success) {
$values = array();
$values['id_user'] = $id_user;
$reset_pass_moment = new DateTime('now');
$reset_pass_moment = $reset_pass_moment->format("Y-m-d H:i:s");
$values['reset_moment'] = $reset_pass_moment;
$values['success'] = $success;
db_process_sql_insert('treset_pass_history', $values);
}
?>

15
pandora_console/index.php
View File

@ -585,18 +585,17 @@ if (! isset ($config['id_user'])) {
if ($res) {
$correct_reset_pass_process = __('Password changed successfully');
$values = array();
$values['id_user'] = $id_user;
$reset_pass_moment = new DateTime('now');
$reset_pass_moment = $reset_pass_moment->format("Y-m-d H:i:s");
$values['reset_moment'] = $reset_pass_moment;
db_process_sql_insert('treset_pass_history', $values);
register_pass_change_try($id_user, 1);
}
else {
register_pass_change_try($id_user, 0);
$process_error_message = __('Failed to change password');
}
}
else {
register_pass_change_try($id_user, 0);
$process_error_message = __('Passwords must be the same');
}
require_once ('general/login_page.php');
@ -612,6 +611,7 @@ if (! isset ($config['id_user'])) {
if ($db_reset_pass_entry) {
if (($db_reset_pass_entry + SECONDS_2HOUR) < time()) {
register_pass_change_try($id_user, 0);
$process_error_message = __('Too much time since password change request');
delete_reset_pass_entry($id_user);
require_once ('general/login_page.php');
@ -622,6 +622,7 @@ if (! isset ($config['id_user'])) {
}
}
else {
register_pass_change_try($id_user, 0);
$process_error_message = __('This user has not requested a password change');
require_once ('general/login_page.php');
}
@ -648,6 +649,7 @@ if (! isset ($config['id_user'])) {
if (!$check_user) {
$reset = false;
register_pass_change_try($user_reset_pass, 0);
$error = __('Error in reset password request');
$show_error = true;
}
@ -656,6 +658,7 @@ if (! isset ($config['id_user'])) {
if (!$check_mail) {
$reset = false;
register_pass_change_try($user_reset_pass, 0);
$error = __('This user doesn\'t have a valid email address');
$show_error = true;
}

3
pandora_console/pandoradb.sql
View File

@ -1149,7 +1149,8 @@ CREATE TABLE IF NOT EXISTS `tuser_double_auth` (
CREATE TABLE IF NOT EXISTS `treset_pass_history` (
`id` int(10) unsigned NOT NULL auto_increment,
`id_user` varchar(60) NOT NULL,
`reset_moment` datetime not null default 0,
`reset_moment` datetime NOT NULL,
`success` tinyint(1) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;