Mercurial > hg > ywww

comparison user/resetPassword.php @ 42:3f400072bf14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge, involved ediff3 wrt getAmazonInfo.php
author Charlie Root
date Sat, 05 Jan 2019 06:21:12 -0500
parents f024f2f08994
children a67bf725e87b
comparison
equal deleted inserted replaced
41:0578c6e438d3 42:3f400072bf14
3 3
4 include "../../private/db.php"; 4 include "../../private/db.php";
5 include "passGen.php"; 5 include "passGen.php";
6 6
7 // emailname and password sent from form 7 // emailname and password sent from form
8 $userID=$_GET['userID']; 8 $mypassword=$_GET['pwd'];
9 $email=$_GET['email']; 9 $email=$_GET['email'];
10 $mypassword=$_GET['pwd']; 10 if ($mypassword!='regen') {
11 $oldpass=$_GET['oldpwd']; 11 $oldpass=$_GET['oldpwd'];
12 $userID=$_GET['userID'];
12 13
13 // To protect MySQL injection 14 // To protect MySQL injection
14 $userID = stripslashes($userID); 15 $userID = stripslashes($userID);
15 $userID = mysqli_real_escape_string($link,$userID); 16 $userID = mysqli_real_escape_string($link,$userID);
16 //echo $userID; 17 //echo $userID;
18 }
17 $email = stripslashes($email); 19 $email = stripslashes($email);
18 $mypassword = stripslashes($mypassword); 20 $mypassword = stripslashes($mypassword);
19 $email = mysqli_real_escape_string($link,$email); 21 $email = mysqli_real_escape_string($link,$email);
20 $mypassword = mysqli_real_escape_string($link,$mypassword); 22 $mypassword = mysqli_real_escape_string($link,$mypassword);
21 23