port checkAppEnabled

diff --git a/apps/admin_migrate/settings.php b/apps/admin_migrate/settings.php
index da96e1a86840dbf6978d38ae4542f3ce73a68f61..7d3fd0417986c30bcf1a2ebaa0d82c8c272162f4 100755 (executable)
--- a/apps/admin_migrate/settings.php
+++ b/apps/admin_migrate/settings.php
@@ -23,7 +23,7 @@
  *
  */
 OCP\User::checkAdminUser();
-OC_Util::checkAppEnabled('admin_migrate');
+OCP\App::checkAppEnabled('admin_migrate');
 
 // Export?
 if (isset($_POST['admin_export'])) {

diff --git a/apps/bookmarks/addBm.php b/apps/bookmarks/addBm.php
index afe61875737c39f0588107ad18c02d88e4c631de..313489d22fbf822f03162625973945b60c2c7fb6 100755 (executable)
--- a/apps/bookmarks/addBm.php
+++ b/apps/bookmarks/addBm.php
@@ -25,7 +25,7 @@
 
 // Check if we are a user
 OCP\User::checkLoggedIn();
-OC_Util::checkAppEnabled('bookmarks');
+OCP\App::checkAppEnabled('bookmarks');
 
 require_once('bookmarksHelper.php');
 addBookmark($_GET['url'], '', 'Read-Later');

diff --git a/apps/bookmarks/index.php b/apps/bookmarks/index.php
index bfac1d29343012220c0ce648e6cb16ec4ed5f0c9..f545d79da61cea2355fdbeb332e65cbf0d880dd3 100755 (executable)
--- a/apps/bookmarks/index.php
+++ b/apps/bookmarks/index.php
@@ -25,7 +25,7 @@
 
 // Check if we are a user
 OCP\User::checkLoggedIn();
-OC_Util::checkAppEnabled('bookmarks');
+OCP\App::checkAppEnabled('bookmarks');
 
 OCP\App::setActiveNavigationEntry( 'bookmarks_index' );
 

diff --git a/apps/calendar/ajax/import/dialog.php b/apps/calendar/ajax/import/dialog.php
old mode 100644 (file)
new mode 100755 (executable)
index 0c1a8f9..9ee989c
--- a/apps/calendar/ajax/import/dialog.php
+++ b/apps/calendar/ajax/import/dialog.php
@@ -8,7 +8,7 @@
 
  
 OC_JSON::checkLoggedIn();
-OC_Util::checkAppEnabled('calendar');
+OCP\App::checkAppEnabled('calendar');
 $tmpl = new OC_Template('calendar', 'part.import');
 $tmpl->assign('path', $_POST['path']);
 $tmpl->assign('filename', $_POST['filename']);

diff --git a/apps/calendar/ajax/import/import.php b/apps/calendar/ajax/import/import.php
index eda34099abac388dd9a1e8796f1576f277412c30..43dfb5493fcd0f4605c3e021ae15c56c93bd47e1 100755 (executable)
--- a/apps/calendar/ajax/import/import.php
+++ b/apps/calendar/ajax/import/import.php
@@ -8,7 +8,7 @@
 //check for calendar rights or create new one
 ob_start();
 OC_JSON::checkLoggedIn();
-OC_Util::checkAppEnabled('calendar');
+OCP\App::checkAppEnabled('calendar');
 $nl="\r\n";
 $comps = array('VEVENT'=>true, 'VTODO'=>true, 'VJOURNAL'=>true);
 $progressfile = 'import_tmp/' . md5(session_id()) . '.txt';

diff --git a/apps/calendar/appinfo/remote.php b/apps/calendar/appinfo/remote.php
old mode 100644 (file)
new mode 100755 (executable)
index 2fbb973..32b454e
--- a/apps/calendar/appinfo/remote.php
+++ b/apps/calendar/appinfo/remote.php
@@ -9,7 +9,7 @@
 $RUNTIME_NOSETUPFS = true;
 require_once('../lib/base.php');
 
-OC_Util::checkAppEnabled('calendar');
+OCP\App::checkAppEnabled('calendar');
 
 // Backends
 $authBackend = new OC_Connector_Sabre_Auth();

diff --git a/apps/calendar/export.php b/apps/calendar/export.php
index 9b71bc6910fa52db8e6143fc46a57aaa495560c7..0756e1df20e3cda05b31ff760e28d8c124b1f329 100755 (executable)
--- a/apps/calendar/export.php
+++ b/apps/calendar/export.php
@@ -8,7 +8,7 @@
 
  
 OCP\User::checkLoggedIn();
-OC_Util::checkAppEnabled('calendar');
+OCP\App::checkAppEnabled('calendar');
 $cal = isset($_GET['calid']) ? $_GET['calid'] : NULL;
 $event = isset($_GET['eventid']) ? $_GET['eventid'] : NULL;
 $nl = "\r\n";

diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index dcc7e25e3ecdc3100b8d7b9b1d1ef01e9842cf3b..3a3915b96697cb6b6f20029db4d2b71fcf29f7c3 100755 (executable)
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -8,7 +8,7 @@
 
  
 OCP\User::checkLoggedIn();
-OC_Util::checkAppEnabled('calendar');
+OCP\App::checkAppEnabled('calendar');
 
 // Create default calendar ...
 $calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), 1);

diff --git a/apps/contacts/ajax/importaddressbook.php b/apps/contacts/ajax/importaddressbook.php
index e54d22b9cafb96db3c9033a4c5e64a9dff3d2798..dc251de201ad742527db09d085f96afe5ee1d6d7 100755 (executable)
--- a/apps/contacts/ajax/importaddressbook.php
+++ b/apps/contacts/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/apps/contacts/ajax/importdialog.php b/apps/contacts/ajax/importdialog.php
old mode 100644 (file)
new mode 100755 (executable)
index cde6bb2..bd19502
--- a/apps/contacts/ajax/importdialog.php
+++ b/apps/contacts/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/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php
old mode 100644 (file)
new mode 100755 (executable)
index 3ffdb64..804c560
--- a/apps/contacts/appinfo/remote.php
+++ b/apps/contacts/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/apps/contacts/export.php b/apps/contacts/export.php
index 84bf26042fbe85dac87db8ecd50a9ed34462bd3d..4e4ade2f2ba6c015cf38c5a3bb84dfdd6e89c2a8 100755 (executable)
--- a/apps/contacts/export.php
+++ b/apps/contacts/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/apps/contacts/import.php b/apps/contacts/import.php
index 9355f8b9f70da132f22a369356d5a5a9b432679a..2bcb40f7d42db71a237a4df8bbd02b31c35754d1 100755 (executable)
--- a/apps/contacts/import.php
+++ b/apps/contacts/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/apps/contacts/index.php b/apps/contacts/index.php
index 8e3c2faf012b74f3a69e134d5848b570aec8f4d9..814a8927f321a85496e35ad9d4e24b2dd947b01e 100755 (executable)
--- a/apps/contacts/index.php
+++ b/apps/contacts/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/apps/contacts/photo.php b/apps/contacts/photo.php
index a545afc434b2f47d7da271f4ac5b1159ea162056..60723b7f0b554a279d2ac1b5f7ae2c3bee712f19 100755 (executable)
--- a/apps/contacts/photo.php
+++ b/apps/contacts/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/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index 239ec7f4d47514ddebd9d07de92ae8e35760fc5d..cf54b4ffd4fa79f216d7818e351906b4b462ab47 100755 (executable)
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/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');

diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php
index eb1ed8a186f2fb4698a17ad6068eedf0142f0528..2fe6bc88e63f1622a1251d7023b552e7bbeed93c 100755 (executable)
--- a/apps/files_sharing/list.php
+++ b/apps/files_sharing/list.php
@@ -24,7 +24,7 @@
 require_once('lib_share.php');
 
 OCP\User::checkLoggedIn();
-OC_Util::checkAppEnabled('files_sharing');
+OCP\App::checkAppEnabled('files_sharing');
 
 OCP\App::setActiveNavigationEntry("files_sharing_list");
 

diff --git a/apps/gallery/index.php b/apps/gallery/index.php
index 4d49e3212e2c754e86bd4b9b693876014a980ec9..cf8bea142164d307c11123ee92e18f36dfbe5117 100755 (executable)
--- a/apps/gallery/index.php
+++ b/apps/gallery/index.php
@@ -24,7 +24,7 @@
 
 
 OCP\User::checkLoggedIn();
-OC_Util::checkAppEnabled('gallery');
+OCP\App::checkAppEnabled('gallery');
 OCP\App::setActiveNavigationEntry( 'gallery_index' );
 
 if (!file_exists(OCP\Config::getSystemValue("datadirectory").'/'. OCP\USER::getUser() .'/gallery')) {

diff --git a/apps/gallery/sharing.php b/apps/gallery/sharing.php
old mode 100644 (file)
new mode 100755 (executable)
index 2739f63..44fcd9c
--- a/apps/gallery/sharing.php
+++ b/apps/gallery/sharing.php
@@ -27,7 +27,7 @@ if (!isset($_GET['token']) || empty($_GET['token'])) {
 
 
 
-OC_Util::checkAppEnabled('gallery');
+OCP\App::checkAppEnabled('gallery');
 
 ?>
 <!doctype html>

diff --git a/apps/media/index.php b/apps/media/index.php
index df597c31085578c96bba95ead187d553b1331aae..e2911361ea2065110c9a61eb5b6321d9d3b09163 100755 (executable)
--- a/apps/media/index.php
+++ b/apps/media/index.php
@@ -26,7 +26,7 @@
 
 // Check if we are a user
 OCP\User::checkLoggedIn();
-OC_Util::checkAppEnabled('media');
+OCP\App::checkAppEnabled('media');
 
 require_once(OC::$APPSROOT . '/apps/media/lib_collection.php');
 require_once(OC::$APPSROOT . '/apps/media/lib_scanner.php');

diff --git a/apps/media/server/xml.server.php b/apps/media/server/xml.server.php
index bf277f3491cbd6fcc3547e63957cc89a413a370e..63f2a51dcb51dbc6562261fd460ac975d1f3b79a 100755 (executable)
--- a/apps/media/server/xml.server.php
+++ b/apps/media/server/xml.server.php
@@ -23,7 +23,7 @@
 
 require_once('../../inc.php');
 
-OC_Util::checkAppEnabled('media');
+OCP\App::checkAppEnabled('media');
  require_once(OC::$APPSROOT . '/apps/media/lib_collection.php');
  require_once(OC::$APPSROOT . '/apps/media/lib_ampache.php');
 

diff --git a/apps/remoteStorage/WebDAV.php b/apps/remoteStorage/WebDAV.php
old mode 100644 (file)
new mode 100755 (executable)
index 3522d1e..45f6cac
--- a/apps/remoteStorage/WebDAV.php
+++ b/apps/remoteStorage/WebDAV.php
@@ -30,7 +30,7 @@
 $RUNTIME_NOSETUPFS = true;
 
 
-OC_Util::checkAppEnabled('remoteStorage');
+OCP\App::checkAppEnabled('remoteStorage');
 require_once('Sabre/autoload.php');
 require_once('lib_remoteStorage.php');
 require_once('BearerAuth.php');

diff --git a/apps/remoteStorage/ajax/revokeToken.php b/apps/remoteStorage/ajax/revokeToken.php
old mode 100644 (file)
new mode 100755 (executable)
index 376fe29..235a021
--- a/apps/remoteStorage/ajax/revokeToken.php
+++ b/apps/remoteStorage/ajax/revokeToken.php
@@ -30,7 +30,7 @@
 $RUNTIME_NOSETUPFS = true;
 
  
-OC_Util::checkAppEnabled('remoteStorage');
+OCP\App::checkAppEnabled('remoteStorage');
 require_once('Sabre/autoload.php');
 require_once('../lib_remoteStorage.php');
 

diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php
index 682c1e97f6b8ac448a676668a845903fd2b5cfa5..a5cbd6aca02b6287f47b0a7ddc91e6eec35d0ab9 100755 (executable)
--- a/apps/remoteStorage/auth.php
+++ b/apps/remoteStorage/auth.php
@@ -30,7 +30,7 @@
 $RUNTIME_NOSETUPFS = true;
 
 
-OC_Util::checkAppEnabled('remoteStorage');
+OCP\App::checkAppEnabled('remoteStorage');
 require_once('Sabre/autoload.php');
 require_once('lib_remoteStorage.php');
 require_once('oauth_ro_auth.php');

diff --git a/apps/user_migrate/admin.php b/apps/user_migrate/admin.php
index 518e4f43f61e76bbc30d7a5c564a2fec98f4d1c8..93f9d59aa4df37da062c025834e2f6e6affc517a 100755 (executable)
--- a/apps/user_migrate/admin.php
+++ b/apps/user_migrate/admin.php
@@ -21,7 +21,7 @@
  *
  */
 OCP\User::checkAdminUser();
-OC_Util::checkAppEnabled('user_migrate');
+OCP\App::checkAppEnabled('user_migrate');
 
 // Import?
 if (isset($_POST['user_import'])) {

diff --git a/apps/user_migrate/ajax/export.php b/apps/user_migrate/ajax/export.php
index 874c04282851e8c88254363df1c8684b084547ec..ef8e331c68cd443b0a8b957e6665abe86c452c6a 100755 (executable)
--- a/apps/user_migrate/ajax/export.php
+++ b/apps/user_migrate/ajax/export.php
@@ -25,7 +25,7 @@
 
 // Check if we are a user
 OC_JSON::checkLoggedIn();
-OC_Util::checkAppEnabled('user_migrate');
+OCP\App::checkAppEnabled('user_migrate');
 // Which operation
 if( $_GET['operation']=='create' ){
        $uid = !empty( $_POST['uid'] ) ? $_POST['uid'] :  OCP\USER::getUser();

diff --git a/apps/user_migrate/settings.php b/apps/user_migrate/settings.php
old mode 100644 (file)
new mode 100755 (executable)
index 62f347b..2994d10
--- a/apps/user_migrate/settings.php
+++ b/apps/user_migrate/settings.php
@@ -22,7 +22,7 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-OC_Util::checkAppEnabled('user_migrate');
+OCP\App::checkAppEnabled('user_migrate');
 
 // fill template
 $tmpl = new OC_Template('user_migrate', 'settings');

diff --git a/apps/user_openid/user.php b/apps/user_openid/user.php
index 22b3a8ba73d2ffed8f6f5463567974d279b83b90..9f751da5edb01927326e2673eb05e62d7e915da7 100755 (executable)
--- a/apps/user_openid/user.php
+++ b/apps/user_openid/user.php
@@ -37,7 +37,7 @@ if($USERNAME=='' and isset($_SERVER['PHP_AUTH_USER'])){
 $RUNTIME_NOAPPS=true;
 $RUNTIME_NOAPPS=false;
 require_once '../../lib/base.php';
-OC_Util::checkAppEnabled('user_openid');
+OCP\App::checkAppEnabled('user_openid');
 
 if(!OCP\User::userExists($USERNAME)){
        OCP\Util::writeLog('user_openid',$USERNAME.' doesn\'t exist',OCP\Util::WARN);