From: Georg Ehrke Date: Wed, 18 Apr 2012 15:42:11 +0000 (+0200) Subject: remove require once lib base in some more files X-Git-Tag: v4.0.0beta~168^2~52 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b44bc9f4b289eda95ec94321c9698f3ce1a700be;p=nextcloud-server.git remove require once lib base in some more files --- diff --git a/apps/files/admin.php b/apps/files/admin.php index 4ae3ee51236..bdea70506fb 100644 --- a/apps/files/admin.php +++ b/apps/files/admin.php @@ -23,7 +23,7 @@ // Init owncloud -require_once('../lib/base.php'); + OC_Util::checkAdminUser(); diff --git a/apps/files/download.php b/apps/files/download.php index d1f5ba486d7..ec4a6e1fc9c 100644 --- a/apps/files/download.php +++ b/apps/files/download.php @@ -22,7 +22,7 @@ */ // Init owncloud -require_once('../lib/base.php'); + // Check if we are a user OC_Util::checkLoggedIn(); diff --git a/apps/files/index.php b/apps/files/index.php index aea91542db6..46b511d66eb 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -21,10 +21,6 @@ * */ - -// Init owncloud -require_once('../lib/base.php'); - // Check if we are a user OC_Util::checkLoggedIn(); diff --git a/apps/files/settings.php b/apps/files/settings.php index c47eb130095..41017c064ef 100644 --- a/apps/files/settings.php +++ b/apps/files/settings.php @@ -23,7 +23,7 @@ // Init owncloud -require_once('../lib/base.php'); + // Check if we are a user OC_Util::checkLoggedIn(); diff --git a/apps/files/webdav.php b/apps/files/webdav.php index 25e33024470..3418eba5a6c 100644 --- a/apps/files/webdav.php +++ b/apps/files/webdav.php @@ -29,7 +29,7 @@ $RUNTIME_NOSETUPFS = true; // only need filesystem apps $RUNTIME_APPTYPES=array('filesystem','authentication'); -require_once('../lib/base.php'); + // Backends $authBackend = new OC_Connector_Sabre_Auth(); diff --git a/ocs/providers.php b/ocs/providers.php index e1d6ef7ee1e..d4ccd4ef9f8 100644 --- a/ocs/providers.php +++ b/ocs/providers.php @@ -21,7 +21,7 @@ * */ -require_once('../lib/base.php'); + $url='http://'.substr($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'],0,-17).'ocs/v1.php/'; diff --git a/ocs/v1.php b/ocs/v1.php index f5ff6cb6054..ed97db2d9b3 100644 --- a/ocs/v1.php +++ b/ocs/v1.php @@ -21,7 +21,7 @@ * */ -require_once('../lib/base.php'); + @ob_clean(); OC_OCS::handle(); diff --git a/search/index.php b/search/index.php index 518695c56d2..d1f94f74a2e 100644 --- a/search/index.php +++ b/search/index.php @@ -23,7 +23,7 @@ // Init owncloud -require_once('../lib/base.php'); + // Check if we are a user OC_Util::checkLoggedIn(); diff --git a/settings/admin.php b/settings/admin.php index a997bad4e3c..399ddd907ee 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -5,7 +5,7 @@ * See the COPYING-README file. */ -require_once('../lib/base.php'); + OC_Util::checkAdminUser(); OC_Util::addStyle( "settings", "settings" ); diff --git a/settings/apps.php b/settings/apps.php index 0889b0c45ed..aed198c77c6 100644 --- a/settings/apps.php +++ b/settings/apps.php @@ -21,7 +21,7 @@ * */ -require_once('../lib/base.php'); + OC_Util::checkAdminUser(); // Load the files we need diff --git a/settings/help.php b/settings/help.php index 48fcec32782..00e93720eec 100644 --- a/settings/help.php +++ b/settings/help.php @@ -5,7 +5,7 @@ * See the COPYING-README file. */ -require_once('../lib/base.php'); + OC_Util::checkLoggedIn(); diff --git a/settings/log.php b/settings/log.php index ddbf72c4433..31e6f6ff371 100644 --- a/settings/log.php +++ b/settings/log.php @@ -20,7 +20,7 @@ * */ -require_once('../lib/base.php'); + OC_Util::checkAdminUser(); // Load the files we need diff --git a/settings/personal.php b/settings/personal.php index 41499657ac7..7717bb76667 100755 --- a/settings/personal.php +++ b/settings/personal.php @@ -5,7 +5,7 @@ * See the COPYING-README file. */ -require_once('../lib/base.php'); + OC_Util::checkLoggedIn(); // Highlight navigation entry diff --git a/settings/settings.php b/settings/settings.php index a49de85520b..c73d6b706ea 100644 --- a/settings/settings.php +++ b/settings/settings.php @@ -5,7 +5,7 @@ * See the COPYING-README file. */ -require_once('../lib/base.php'); + OC_Util::checkLoggedIn(); OC_Util::addStyle( 'settings', 'settings' ); diff --git a/settings/users.php b/settings/users.php index 96515a90ce4..591d85ff675 100644 --- a/settings/users.php +++ b/settings/users.php @@ -5,7 +5,7 @@ * See the COPYING-README file. */ -require_once('../lib/base.php'); + OC_Util::checkAdminUser(); // We have some javascript foo!