summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/json.php13
-rwxr-xr-xlib/util.php12
2 files changed, 13 insertions, 12 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() {