Merge branch 'Task240805' into 'master'

#152722583::Amit::Reduce forgot password expire time link from 24hrs to 1 hr

See merge request !871

forgotPassword.php

@@ -42,7 +42,7 @@ if (isset($_REQUEST['username']) && isset($_REQUEST['emailId'])) {
 						You recently requested a password reset for your VtigerCRM Open source Account.<br> 
 						To create a new password, click on the link <a target="_blank" href='.$trackURL.'>here</a>. 
 						<br><br> 
-						This request was made on '.date("Y-m-d H:i:s").' and will expire in next 24 hours.<br><br> 
+						This request was made on '.date("Y-m-d H:i:s").' and will expire in next 1 hour.<br><br> 
 						Regards,<br> 
 						VtigerCRM Open source Support Team.<br>';
 

modules/Users/handlers/ForgotPassword.php

@@ -27,7 +27,7 @@ class Users_ForgotPassword_Handler {
 		$viewer->assign('USERNAME', $userName);
 		$changePasswordTrackUrl = $site_URL."/modules/Users/actions/ForgotPassword.php";
 
-		$expiryTime = (int)$request->get('time')+(24*60*60);
+		$expiryTime = (int)$request->get('time')+(60*60);
 		$currentTime = time();
 		if($expiryTime > $currentTime) {
 			$secretToken = uniqid();