diff user/resetPassword.php @ 42:3f400072bf14

merge, involved ediff3 wrt getAmazonInfo.php
author Charlie Root
date Sat, 05 Jan 2019 06:21:12 -0500
parents f024f2f08994
children a67bf725e87b
line wrap: on
line diff
--- a/user/resetPassword.php	Sun Jul 30 05:36:48 2017 -0400
+++ b/user/resetPassword.php	Sat Jan 05 06:21:12 2019 -0500
@@ -5,15 +5,17 @@
 include "passGen.php";
 
 // emailname and password sent from form
-$userID=$_GET['userID'];
+$mypassword=$_GET['pwd'];
 $email=$_GET['email'];
-$mypassword=$_GET['pwd'];
-$oldpass=$_GET['oldpwd'];
+if ($mypassword!='regen') {
+  $oldpass=$_GET['oldpwd'];
+  $userID=$_GET['userID'];
 
-// To protect MySQL injection 
-$userID = stripslashes($userID);
-$userID = mysqli_real_escape_string($link,$userID);
-//echo $userID;
+  // To protect MySQL injection 
+  $userID = stripslashes($userID);
+  $userID = mysqli_real_escape_string($link,$userID);
+  //echo $userID;
+ }
 $email = stripslashes($email);
 $mypassword = stripslashes($mypassword);
 $email = mysqli_real_escape_string($link,$email);