diff --git a/wrenchboard/email/complete_losspass.mailfile b/wrenchboard/email/complete_losspass.mailfile index 9d2ed165..5b26e2e6 100644 --- a/wrenchboard/email/complete_losspass.mailfile +++ b/wrenchboard/email/complete_losspass.mailfile @@ -1,5 +1,5 @@ To: {{email}} -Subject: PayQuic - Password Reset for {{email}} with {{lost_added}} +Subject: WrenchBoard - Password Reset for {{email}} with {{lost_added}} @@ -7,29 +7,29 @@ Subject: PayQuic - Password Reset for {{email}} with {{lost_added}} 
 
 
-
-		
+
+							
+
-		
+							
-	
+
+
 
-		
+							
-	         
+
+
PayQuic
WrenchBoard

 
 Dear {{firstname}}
-
 

 
-As you requested, your password has been reset. 
+As you requested, your password has been reset.
 
-

 
-If it was not at your request, then please contact PayQuic support immediately.
+If it was not at your request, then please contact WrenchBoard support immediately.
 
-For further support go to our website at www.PayQuic.com or call 08188697770 between the hours of 10:00 AM and 5:00 PM.
-Thank you for choosing PayQuic.
-PayQuic Team.
+For further support go to our website at www.WrenchBoard.com or call 08188697770 between the hours of 10:00 AM and 5:00 PM.
+Thank you for choosing WrenchBoard.
+WrenchBoard Team.
 
-

 
 

 

@@ -38,6 +38,5 @@ PayQuic Team.
 
 
 
-
 		
 		
\ No newline at end of file
diff --git a/wrenchboard/src/shared_tool/wrenchboard_api_main.cc b/wrenchboard/src/shared_tool/wrenchboard_api_main.cc
index 4449dd37..66039665 100644
--- a/wrenchboard/src/shared_tool/wrenchboard_api_main.cc
+++ b/wrenchboard/src/shared_tool/wrenchboard_api_main.cc
@@ -411,6 +411,9 @@ long wrenchboard_api_main(CVars in, CVars &out) {
                                          " WHERE p.uid ='%s' AND p.reset_pin='%s' AND p.status IN (0,1) AND m.uid='%s'", in["reset_uid"].c_str(), in["reset_pin"].c_str(), in["m_uid"].c_str())) {
                                          in["reset_link"] = xx["pass_link"];  in["reset_link"] .set_valid( true );
 
+                   out["status"] = "Ready";
+                   out["status_msg"] = "ready_for_reset";
+
                   }
                   else{
                       out["status"] = "Invalid";
@@ -420,10 +423,9 @@ long wrenchboard_api_main(CVars in, CVars &out) {
             }
 
             REQ_STRING(in, "reset_link", 1, 100, "(.*)");
-            if (load_db_record(out, "SELECT p.id AS lostpass_id,p.member_id, p.uid AS pending_uid FROM password_reset p LEFT JOIN members m ON m.id = p.member_id WHERE p.pass_link ='%s' AND p.status IN (0,1)", in["reset_link"].c_str())) {
+            if (load_db_record(out, "SELECT p.id AS lostpass_id,p.member_id, p.uid AS pending_uid,m.uid AS m_uid FROM password_reset p LEFT JOIN members m ON m.id = p.member_id WHERE p.pass_link ='%s' AND p.status IN (0,1)", in["reset_link"].c_str())) {
                 if (out["lostpass_id"].Long() > 0){
-                        pgsql_exec("UPDATE password_reset SET status = 3 WHERE status IN (0, 1) AND member_id=%lu AND id = %lu ", out["member_id"].Long(), out["lostpass_id"].Long());
-                        CompletePassResetEmail(out);
+                        pgsql_exec("UPDATE password_reset SET status = 3,expired = now() + '5 minutes' WHERE status IN (0, 1) AND member_id=%lu AND id = %lu ", out["member_id"].Long(), out["lostpass_id"].Long());
                 }else{
                      out["status_message"] = "Invalid Request";
                 }