Move isUserVerified to OC_Util

3 files changed, 14 insertions, 13 deletions

diff --git a/lib/json.php b/lib/json.php
index b6acaae4c97..3e55f618430 100644
--- a/lib/json.php
+++ b/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
 	*/
diff --git a/lib/util.php b/lib/util.php
index db712627581..ba2a02922a5 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -406,6 +406,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
 	*/
 	public static function redirectToDefaultPage() {
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index 822a95c1bc2..12d3b67037a 100644
--- a/settings/ajax/changepassword.php
+++ b/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;
 		}
 	}