Move isUserVerified to OC_Util

lib/json.php

@@ -90,18 +90,7 @@ class OC_JSON{
 			exit();
 		}
 	}
-	/**
-	* Check if the user verified the login with his password in the last 15 minutes
-	* @return bool
-	*/
-	public static function isUserVerified() {
-		// Check if the user verified his password in the last 15 minutes
-		if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) {
-			return false;
-		}
-		return true;
-	}
-
+	
 	/**
 	* Send json error msg
 	*/

lib/util.php

@@ -405,6 +405,18 @@ class OC_Util {
 		}
 	}
 
+	/**
+	* Check if the user verified the login with his password in the last 15 minutes
+	* @return bool
+	*/
+	public static function isUserVerified() {
+		// Check if the user verified his password in the last 15 minutes
+		if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) {
+			return false;
+		}
+		return true;
+	}
+	
 	/**
 	* Redirect to the user default page
 	*/

settings/ajax/changepassword.php

@@ -23,7 +23,7 @@ if(OC_User::getUser() === $username) {
 	{
 		$userstatus = 'user';
 	}  else {
-		if (!OC_JSON::isUserVerified()) {
+		if (!OC_Util::isUserVerified()) {
 			$userstatus = null;
 		}
 	}