summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorFrank Karlitschek <frank@owncloud.org>2012-05-01 18:46:15 +0200
committerFrank Karlitschek <frank@owncloud.org>2012-05-01 18:46:15 +0200
commit5bf69237b2471df9ee979200b19e0ce203df2a31 (patch)
tree3ad707ac9af71a1edb4d3101dd6b16dbde05b716 /apps
parentd0554bef069b29affa95ec3c2bf78af637703a90 (diff)
downloadnextcloud-server-5bf69237b2471df9ee979200b19e0ce203df2a31.tar.gz
nextcloud-server-5bf69237b2471df9ee979200b19e0ce203df2a31.zip
ported isLoggedIn
Diffstat (limited to 'apps')
-rw-r--r--apps/calendar/ajax/event/edit.form.php2
-rw-r--r--apps/calendar/ajax/event/new.form.php2
-rw-r--r--apps/files_encryption/appinfo/app.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/calendar/ajax/event/edit.form.php b/apps/calendar/ajax/event/edit.form.php
index e963da32958..e2b23d71f9b 100644
--- a/apps/calendar/ajax/event/edit.form.php
+++ b/apps/calendar/ajax/event/edit.form.php
@@ -8,7 +8,7 @@
-if(!OC_USER::isLoggedIn()) {
+if(!OCP\User::isLoggedIn()) {
die('<script type="text/javascript">document.location = oc_webroot;</script>');
}
OC_JSON::checkAppEnabled('calendar');
diff --git a/apps/calendar/ajax/event/new.form.php b/apps/calendar/ajax/event/new.form.php
index 62087e9a817..155e3dc371e 100644
--- a/apps/calendar/ajax/event/new.form.php
+++ b/apps/calendar/ajax/event/new.form.php
@@ -8,7 +8,7 @@
-if(!OC_USER::isLoggedIn()) {
+if(!OCP\User::isLoggedIn()) {
die('<script type="text/javascript">document.location = oc_webroot;</script>');
}
OC_JSON::checkAppEnabled('calendar');
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 68c445d5d77..fda2a55234b 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -10,7 +10,7 @@ OC_Hook::connect('OC_User','post_login','OC_Crypt','loginListener');
stream_wrapper_register('crypt','OC_CryptStream');
-if(!isset($_SESSION['enckey']) and OC_User::isLoggedIn()){//force the user to re-loggin if the encryption key isn't unlocked (happens when a user is logged in before the encryption app is enabled)
+if(!isset($_SESSION['enckey']) and OCP\User::isLoggedIn()){//force the user to re-loggin if the encryption key isn't unlocked (happens when a user is logged in before the encryption app is enabled)
OC_User::logout();
header("Location: ".OC::$WEBROOT.'/');
exit();