From 9d7b02c9dc8c61050c8c57bdcc05f02763337326 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Wed, 2 May 2012 19:08:37 +0200 Subject: [PATCH] port checkAppEnabled --- ajax/importaddressbook.php | 2 +- ajax/importdialog.php | 2 +- appinfo/remote.php | 2 +- export.php | 2 +- import.php | 2 +- index.php | 2 +- photo.php | 2 +- thumbnail.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) mode change 100644 => 100755 ajax/importdialog.php mode change 100644 => 100755 appinfo/remote.php diff --git a/ajax/importaddressbook.php b/ajax/importaddressbook.php index e54d22b9..dc251de2 100755 --- a/ajax/importaddressbook.php +++ b/ajax/importaddressbook.php @@ -8,7 +8,7 @@ require_once('../../../lib/base.php'); OC_JSON::checkLoggedIn(); -OC_Util::checkAppEnabled('contacts'); +OCP\App::checkAppEnabled('contacts'); $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize')); $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size')); $maxUploadFilesize = min($upload_max_filesize, $post_max_size); diff --git a/ajax/importdialog.php b/ajax/importdialog.php old mode 100644 new mode 100755 index cde6bb2f..bd195023 --- a/ajax/importdialog.php +++ b/ajax/importdialog.php @@ -8,7 +8,7 @@ OC_JSON::checkLoggedIn(); -OC_Util::checkAppEnabled('contacts'); +OCP\App::checkAppEnabled('contacts'); $tmpl = new OC_Template('contacts', 'part.import'); $tmpl->assign('path', $_POST['path']); $tmpl->assign('filename', $_POST['filename']); diff --git a/appinfo/remote.php b/appinfo/remote.php old mode 100644 new mode 100755 index 3ffdb64b..804c560e --- a/appinfo/remote.php +++ b/appinfo/remote.php @@ -23,7 +23,7 @@ $RUNTIME_NOSETUPFS = true; require_once('../lib/base.php'); -OC_Util::checkAppEnabled('contacts'); +OCP\App::checkAppEnabled('contacts'); // Backends $authBackend = new OC_Connector_Sabre_Auth(); diff --git a/export.php b/export.php index 84bf2604..4e4ade2f 100755 --- a/export.php +++ b/export.php @@ -8,7 +8,7 @@ OCP\User::checkLoggedIn(); -OC_Util::checkAppEnabled('contacts'); +OCP\App::checkAppEnabled('contacts'); $bookid = isset($_GET['bookid']) ? $_GET['bookid'] : NULL; $contactid = isset($_GET['contactid']) ? $_GET['contactid'] : NULL; $nl = "\n"; diff --git a/import.php b/import.php index 9355f8b9..2bcb40f7 100755 --- a/import.php +++ b/import.php @@ -9,7 +9,7 @@ ob_start(); OC_JSON::checkLoggedIn(); -OC_Util::checkAppEnabled('contacts'); +OCP\App::checkAppEnabled('contacts'); $nl = "\n"; $progressfile = 'import_tmp/' . md5(session_id()) . '.txt'; if(is_writable('import_tmp/')){ diff --git a/index.php b/index.php index 8e3c2faf..814a8927 100755 --- a/index.php +++ b/index.php @@ -10,7 +10,7 @@ // Check if we are a user OCP\User::checkLoggedIn(); -OC_Util::checkAppEnabled('contacts'); +OCP\App::checkAppEnabled('contacts'); // Get active address books. This creates a default one if none exists. $ids = OC_Contacts_Addressbook::activeIds(OCP\USER::getUser()); diff --git a/photo.php b/photo.php index a545afc4..60723b7f 100755 --- a/photo.php +++ b/photo.php @@ -11,7 +11,7 @@ // Init owncloud OCP\User::checkLoggedIn(); -OC_Util::checkAppEnabled('contacts'); +OCP\App::checkAppEnabled('contacts'); function getStandardImage(){ OC_Response::setExpiresHeader('P10D'); diff --git a/thumbnail.php b/thumbnail.php index 239ec7f4..cf54b4ff 100755 --- a/thumbnail.php +++ b/thumbnail.php @@ -24,7 +24,7 @@ OC_JSON::checkLoggedIn(); //OCP\User::checkLoggedIn(); -OC_Util::checkAppEnabled('contacts'); +OCP\App::checkAppEnabled('contacts'); function getStandardImage(){ OC_Response::setExpiresHeader('P10D');