summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorFrank Karlitschek <frank@owncloud.org>2012-05-02 19:08:37 +0200
committerFrank Karlitschek <frank@owncloud.org>2012-05-02 19:08:37 +0200
commit4fe90f62f4041d31402cbe198fd0e3edce77ce13 (patch)
tree2320a5fabe2e5347c04472af1cc95a6eb056369f /apps
parenteec7c3833c9c1f1e83549474d6ba4b34ce307761 (diff)
downloadnextcloud-server-4fe90f62f4041d31402cbe198fd0e3edce77ce13.tar.gz
nextcloud-server-4fe90f62f4041d31402cbe198fd0e3edce77ce13.zip
port checkAppEnabled
Diffstat (limited to 'apps')
-rwxr-xr-xapps/admin_migrate/settings.php2
-rwxr-xr-xapps/bookmarks/addBm.php2
-rwxr-xr-xapps/bookmarks/index.php2
-rwxr-xr-x[-rw-r--r--]apps/calendar/ajax/import/dialog.php2
-rwxr-xr-xapps/calendar/ajax/import/import.php2
-rwxr-xr-x[-rw-r--r--]apps/calendar/appinfo/remote.php2
-rwxr-xr-xapps/calendar/export.php2
-rwxr-xr-xapps/calendar/index.php2
-rwxr-xr-xapps/contacts/ajax/importaddressbook.php2
-rwxr-xr-x[-rw-r--r--]apps/contacts/ajax/importdialog.php2
-rwxr-xr-x[-rw-r--r--]apps/contacts/appinfo/remote.php2
-rwxr-xr-xapps/contacts/export.php2
-rwxr-xr-xapps/contacts/import.php2
-rwxr-xr-xapps/contacts/index.php2
-rwxr-xr-xapps/contacts/photo.php2
-rwxr-xr-xapps/contacts/thumbnail.php2
-rwxr-xr-xapps/files_sharing/list.php2
-rwxr-xr-xapps/gallery/index.php2
-rwxr-xr-x[-rw-r--r--]apps/gallery/sharing.php2
-rwxr-xr-xapps/media/index.php2
-rwxr-xr-xapps/media/server/xml.server.php2
-rwxr-xr-x[-rw-r--r--]apps/remoteStorage/WebDAV.php2
-rwxr-xr-x[-rw-r--r--]apps/remoteStorage/ajax/revokeToken.php2
-rwxr-xr-xapps/remoteStorage/auth.php2
-rwxr-xr-xapps/user_migrate/admin.php2
-rwxr-xr-xapps/user_migrate/ajax/export.php2
-rwxr-xr-x[-rw-r--r--]apps/user_migrate/settings.php2
-rwxr-xr-xapps/user_openid/user.php2
28 files changed, 28 insertions, 28 deletions
diff --git a/apps/admin_migrate/settings.php b/apps/admin_migrate/settings.php
index da96e1a8684..7d3fd041798 100755
--- 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 afe61875737..313489d22fb 100755
--- 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 bfac1d29343..f545d79da61 100755
--- 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
index 0c1a8f94943..9ee989c0dee 100644..100755
--- 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 eda34099aba..43dfb5493fc 100755
--- 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
index 2fbb973d5cb..32b454ee90c 100644..100755
--- 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 9b71bc6910f..0756e1df20e 100755
--- 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 dcc7e25e3ec..3a3915b9669 100755
--- 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 e54d22b9caf..dc251de201a 100755
--- 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
index cde6bb2f5c4..bd195023dd2 100644..100755
--- 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
index 3ffdb64b52b..804c560e3d0 100644..100755
--- 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 84bf26042fb..4e4ade2f2ba 100755
--- 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 9355f8b9f70..2bcb40f7d42 100755
--- 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 8e3c2faf012..814a8927f32 100755
--- 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 a545afc434b..60723b7f0b5 100755
--- 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 239ec7f4d47..cf54b4ffd4f 100755
--- 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 eb1ed8a186f..2fe6bc88e63 100755
--- 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 4d49e3212e2..cf8bea14216 100755
--- 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
index 2739f63d4e0..44fcd9c864b 100644..100755
--- 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 df597c31085..e2911361ea2 100755
--- 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 bf277f3491c..63f2a51dcb5 100755
--- 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
index 3522d1ed683..45f6cac3166 100644..100755
--- 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
index 376fe29b3e7..235a02107e6 100644..100755
--- 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 682c1e97f6b..a5cbd6aca02 100755
--- 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 518e4f43f61..93f9d59aa4d 100755
--- 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 874c0428285..ef8e331c68c 100755
--- 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
index 62f347b3557..2994d10a1eb 100644..100755
--- 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 22b3a8ba73d..9f751da5edb 100755
--- 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);