diff --git a/lib/json.php b/lib/json.php index b6acaae4c97b1c18b54f0efc84ba10f903f9c3dd..3e55f618430632c116e23f24390b7072e47f2035 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 db712627581ce143fcd0d456d25292bef5451f44..ba2a02922a535e787bf4a49505a4d592c9ebb2b8 100755 --- a/lib/util.php +++ b/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 */ diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php index 822a95c1bc2e01c4a94b3415280e6ed49c332784..12d3b67037ab92aa253e036cc568ee84f1c4ec0d 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; } }