recovery tokens sql fix

db/StoredFunctions.sql

@@ -2199,17 +2199,18 @@ DROP FUNCTION IF EXISTS CreateRecoveryToken//
 CREATE FUNCTION `CreateRecoveryToken`
     (   `pAccountOrEMail` VARCHAR(255) CHARSET utf8,
         `pToken` VARCHAR(100) CHARSET utf8
-    )	RETURNS VARCHAR(255) charset utf8
+    )   RETURNS VARCHAR(255) charset utf8
     NO SQL
 BEGIN
     DECLARE vAccountID INT DEFAULT -1;
-    DECLARE vUserFullName TEXT;
-    DECLARE EXIT HANDLER FOR SQLEXCEPTION RETURN -1;
+    DECLARE vUserFullName TEXT charset utf8;
+    DECLARE EXIT HANDLER FOR SQLEXCEPTION RETURN -2;
 
     # get account ID
     SELECT accounts.ID INTO vAccountID
         FROM `accounts`
-        WHERE accounts.EMail = pAccountOrEMail
+        WHERE accounts.EMail = pAccountOrEMail OR
+              accounts.Login = pAccountOrEMail
         LIMIT 1;
     IF vAccountID <= 0 THEN
         RETURN '';
@@ -2223,12 +2224,13 @@ BEGIN
     # transform all unused recovery tokens into used
     UPDATE `recovery_tokens`
     SET recovery_tokens.isUsed = 1
-    WHERE recovery_tokens.isUsed = 0;
+    WHERE   recovery_tokens.isUsed = 0 AND
+            recovery_tokens.AccountID = vAccountID;
 
     # handle catch constraints violations
     INSERT INTO `recovery_tokens`
-        (AccountID, Token )
-    VALUES  (vAccountID, Token);
+        ( AccountID, Token )
+        VALUES  (vAccountID, pToken);
     RETURN vUserFullName;
 END//
 
@@ -2237,7 +2239,7 @@ CREATE FUNCTION `GetUserFullNameByAccountID`
     (   `pAccountID` INT(11))   RETURNS VARCHAR(255) charset utf8
 NO SQL
 BEGIN
-    DECLARE vUserFullName VARCHAR(255);
+    DECLARE vUserFullName VARCHAR(255) charset utf8;
     DECLARE vChecker INT DEFAULT -1;
 
     SELECT students.ID As ID, CONCAT(students.LastName,' ',students.FirstName,' ',students.SecondName) As UserName