Index: trunk/kernel/frontaction.php
===================================================================
diff -u -r1031 -r1035
--- trunk/kernel/frontaction.php	(.../frontaction.php)	(revision 1031)
+++ trunk/kernel/frontaction.php	(.../frontaction.php)	(revision 1035)
@@ -73,6 +73,7 @@
 	      	$u->Set("PwRequestTime", 0);
 	      	if ($exp_time > mktime()) 
 	      	{
+	      		$m_var_list_update['codevalidationresult'] = 'lu_resetpw_confirm_text';
 		    	$newpw = makepassword();
 		      	$objSession->Set('password', $newpw); 
 		      	$u->Set("Password",$newpw);
@@ -85,19 +86,24 @@
 		        $u->Set("Password",md5($newpw));
 		        $u->Update();
 		     	$u->Clean();
+	      	} else {
+	      		$m_var_list_update['codevalidationresult'] = 'lu_code_expired';	
 	      	}
-	    }	    
+	    } else {
+	    	$m_var_list_update['codevalidationresult'] = 'lu_code_is_not_valid';	
+	    }    
 	    break;
      				
      case "m_forgotpw":
         $MissingCount = SetMissingDataErrors("forgotpw");
-        $pass_reset_add = $objConfig->Get("Users_AllowReset");
+//      $pass_reset_add = $objConfig->Get("Users_AllowReset");
         
         if($MissingCount==0)
         {        
           $username = $_POST["username"];
           $email = $_POST["email"];
           $found = false;
+          $allow_reset = true;
           if(strlen($username))
           {
             $u = $objUsers->GetItemByField("Login",$username);
@@ -145,15 +151,28 @@
               }
               else
               {              
-                  if(strlen($username))                           
-                      $FormError["forgotpw"]["username"] = language("lu_ferror_unknown_username");
-                  if(strlen($email))
-                      $FormError["forgotpw"]["email"] = language("lu_ferror_unknown_email");
-                  if (!$allow_reset) {
-                  		$FormError["forgotpw"]["username"] = language("lu_ferror_reset_denied");
-                  		//$FormError["forgotpw"] = language("lu_ferror_reset_denied");
-                  }
-                  $MissingCount++;
+	              	$error_phrases=Array();
+	
+	              	if($allow_reset)
+	              	{
+						$error_phrases['username']='lu_ferror_unknown_username';
+						$error_phrases['email']='lu_ferror_unknown_email';
+	              	}
+	              	else
+	              	{
+	              		$error_phrases['username']='lu_ferror_reset_denied';
+						$error_phrases['email']='lu_ferror_reset_denied';
+	              	}
+              	
+	              	foreach ($error_phrases as $field_name => $phrase_name) {
+	              		if(GetVar($field_name))
+	              		{
+	              			$FormError["forgotpw"][$field_name] = language($phrase_name);
+	              			break;
+	              		}
+	              	}
+                
+                   	$MissingCount++;
               }
               if(strlen($_GET["error"]))
                 $var_list["t"] = $_GET["error"];