diff options
author | Jakob Sack <kde@jakobsack.de> | 2011-07-27 19:25:49 +0200 |
---|---|---|
committer | Jakob Sack <kde@jakobsack.de> | 2011-07-27 19:25:49 +0200 |
commit | 2f807a3c7f6e5a3a8a8e8317a3b3b627d3d68952 (patch) | |
tree | f7a829d8bc67c364a8b77c02cb875fc0c33934a4 | |
parent | f5c0dbd947d45520550b68dae77a894f871a0758 (diff) | |
download | nextcloud-server-2f807a3c7f6e5a3a8a8e8317a3b3b627d3d68952.tar.gz nextcloud-server-2f807a3c7f6e5a3a8a8e8317a3b3b627d3d68952.zip |
Delete requires in applications where possible
-rw-r--r-- | admin/apps.php | 2 | ||||
-rw-r--r-- | admin/system.php | 1 | ||||
-rw-r--r-- | admin/users.php | 1 | ||||
-rw-r--r-- | apps/files_publiclink/admin.php | 1 | ||||
-rw-r--r-- | apps/files_publiclink/get.php | 1 | ||||
-rw-r--r-- | apps/media/index.php | 1 | ||||
-rw-r--r-- | apps/media/settings.php | 1 | ||||
-rw-r--r-- | apps/user_ldap/settings.php | 1 | ||||
-rw-r--r-- | apps/user_ldap/user_ldap.php | 2 | ||||
-rw-r--r-- | apps/user_openid/phpmyid.php | 3 | ||||
-rw-r--r-- | apps/user_openid/settings.php | 1 | ||||
-rw-r--r-- | apps/user_openid/user_openid.php | 1 | ||||
-rw-r--r-- | core/templates/404.php | 1 | ||||
-rw-r--r-- | docs/skeleton/admin.php | 3 | ||||
-rw-r--r-- | docs/skeleton/index.php | 1 | ||||
-rw-r--r-- | files/admin.php | 1 | ||||
-rw-r--r-- | files/ajax/list.php | 1 | ||||
-rw-r--r-- | files/download.php | 1 | ||||
-rw-r--r-- | files/index.php | 1 | ||||
-rw-r--r-- | files/settings.php | 1 | ||||
-rw-r--r-- | files/webdav.php | 5 | ||||
-rw-r--r-- | help/index.php | 1 | ||||
-rw-r--r-- | index.php | 4 | ||||
-rw-r--r-- | log/index.php | 1 | ||||
-rw-r--r-- | search/index.php | 1 | ||||
-rw-r--r-- | settings/index.php | 1 | ||||
-rw-r--r-- | tests/index.php | 2 |
27 files changed, 1 insertions, 40 deletions
diff --git a/admin/apps.php b/admin/apps.php index bc598a6991e..4bbf1c813b0 100644 --- a/admin/apps.php +++ b/admin/apps.php @@ -22,8 +22,6 @@ */ require_once('../lib/base.php'); -include_once('../lib/installer.php'); -require( 'template.php' ); if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){ header( "Location: ".OC_HELPER::linkTo( "", "index.php" )); exit(); diff --git a/admin/system.php b/admin/system.php index 284509144ee..9286ab9c2b3 100644 --- a/admin/system.php +++ b/admin/system.php @@ -22,7 +22,6 @@ */ require_once('../lib/base.php'); -require( 'template.php' ); if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){ header( "Location: ".OC_HELPER::linkTo( "index.php" )); exit(); diff --git a/admin/users.php b/admin/users.php index 8237d06da0b..4065cc471f1 100644 --- a/admin/users.php +++ b/admin/users.php @@ -22,7 +22,6 @@ */ require_once('../lib/base.php'); -require( 'template.php' ); if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){ header( "Location: ".OC_HELPER::linkTo( "index.php" )); exit(); diff --git a/apps/files_publiclink/admin.php b/apps/files_publiclink/admin.php index afb726da312..9a1a9ce03c2 100644 --- a/apps/files_publiclink/admin.php +++ b/apps/files_publiclink/admin.php @@ -25,7 +25,6 @@ // Init owncloud require_once('../../lib/base.php'); require_once( 'lib_public.php' ); -require( 'template.php' ); // Check if we are a user diff --git a/apps/files_publiclink/get.php b/apps/files_publiclink/get.php index d3e3022e761..3bc961bc37d 100644 --- a/apps/files_publiclink/get.php +++ b/apps/files_publiclink/get.php @@ -3,7 +3,6 @@ $RUNTIME_NOAPPS=true; //no need to load the apps $RUNTIME_NOSETUPFS=true; //don't setup the fs yet require_once '../../lib/base.php'; -require( 'template.php' ); require_once 'lib_public.php'; diff --git a/apps/media/index.php b/apps/media/index.php index 26e008acab5..fbf1c395d99 100644 --- a/apps/media/index.php +++ b/apps/media/index.php @@ -32,7 +32,6 @@ if( !OC_USER::isLoggedIn()){ require_once('lib_collection.php'); require_once('lib_scanner.php'); -require_once('template.php'); OC_UTIL::addScript('media','player'); OC_UTIL::addScript('media','music'); diff --git a/apps/media/settings.php b/apps/media/settings.php index 30276601a2d..4bd9acfd80b 100644 --- a/apps/media/settings.php +++ b/apps/media/settings.php @@ -29,7 +29,6 @@ if( !OC_USER::isLoggedIn()){ exit(); } -require( 'template.php' ); require( 'lib_collection.php' ); OC_UTIL::addStyle('media','style'); diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php index f7aff1b4614..8f9d282d2b1 100644 --- a/apps/user_ldap/settings.php +++ b/apps/user_ldap/settings.php @@ -22,7 +22,6 @@ */ require_once('../../lib/base.php'); -require( 'template.php' ); if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( OC_USER::getUser(), 'admin' )){ header( "Location: ".OC_HELPER::linkTo( "index.php" )); diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index a2fd48cdf06..a197c0a10e0 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -21,8 +21,6 @@ * */ -require_once('User/backend.php'); - class OC_USER_LDAP extends OC_USER_BACKEND { protected $ds; diff --git a/apps/user_openid/phpmyid.php b/apps/user_openid/phpmyid.php index 146eb380f73..f35e6811b84 100644 --- a/apps/user_openid/phpmyid.php +++ b/apps/user_openid/phpmyid.php @@ -12,9 +12,6 @@ * @version 0.9 */ -require( 'template.php' ); - - /** * Set a constant to indicate that phpMyID is running */ diff --git a/apps/user_openid/settings.php b/apps/user_openid/settings.php index 76316de100c..29c18eaa497 100644 --- a/apps/user_openid/settings.php +++ b/apps/user_openid/settings.php @@ -1,7 +1,6 @@ <?php require_once('../../lib/base.php'); -require( 'template.php' ); if( !OC_USER::isLoggedIn()){ header( "Location: ".OC_HELPER::linkTo( "index.php" )); exit(); diff --git a/apps/user_openid/user_openid.php b/apps/user_openid/user_openid.php index ddf5cc9bc23..c18edccf2db 100644 --- a/apps/user_openid/user_openid.php +++ b/apps/user_openid/user_openid.php @@ -21,7 +21,6 @@ * */ -require_once('User/backend.php'); require_once('class.openid.v3.php'); /** diff --git a/core/templates/404.php b/core/templates/404.php index b78828e6301..65cfaec3b7c 100644 --- a/core/templates/404.php +++ b/core/templates/404.php @@ -1,7 +1,6 @@ <?php if(!isset($_)){//also provide standalone error page require_once '../../lib/base.php'; - require( 'template.php' ); $tmpl = new OC_TEMPLATE( '', '404', 'guest' ); $tmpl->printPage(); diff --git a/docs/skeleton/admin.php b/docs/skeleton/admin.php index aaf6136692d..723c7f7612b 100644 --- a/docs/skeleton/admin.php +++ b/docs/skeleton/admin.php @@ -31,9 +31,6 @@ require_once('../lib/base.php'); // We need the file system although we said do not load it! Do it by hand now OC_UTIL::setupFS(); -// We load OC_TEMPLATE, too. This one is not loaded by base -require( 'template.php' ); - // The user should have admin rights. This is an admin page! if( !OC_USER::isLoggedIn() || !OC_USER::ingroup( $_SESSION['username'], 'admin' )){ // Bad boy! Go to the very first page of owncloud diff --git a/docs/skeleton/index.php b/docs/skeleton/index.php index 6d237ed6152..5402990e4c9 100644 --- a/docs/skeleton/index.php +++ b/docs/skeleton/index.php @@ -24,7 +24,6 @@ // Init owncloud require_once('../lib/base.php'); -require( 'template.php' ); // Check if we are a user if( !OC_USER::isLoggedIn()){ diff --git a/files/admin.php b/files/admin.php index 5c9923aff86..c0a41335f5e 100644 --- a/files/admin.php +++ b/files/admin.php @@ -24,7 +24,6 @@ // Init owncloud require_once('../lib/base.php'); -require( 'template.php' ); // Check if we are a user diff --git a/files/ajax/list.php b/files/ajax/list.php index ef43e72fcae..26462eb5ab9 100644 --- a/files/ajax/list.php +++ b/files/ajax/list.php @@ -2,7 +2,6 @@ // Init owncloud require_once('../../lib/base.php'); -require_once('../../lib/template.php'); // We send json data header( "Content-Type: application/jsonrequest" ); diff --git a/files/download.php b/files/download.php index f7fbcd0f857..ab3dee51348 100644 --- a/files/download.php +++ b/files/download.php @@ -23,7 +23,6 @@ // Init owncloud require_once('../lib/base.php'); -require( 'template.php' ); // Check if we are a user if( !OC_USER::isLoggedIn()){ diff --git a/files/index.php b/files/index.php index 550f23541a0..4f40e70393b 100644 --- a/files/index.php +++ b/files/index.php @@ -24,7 +24,6 @@ // Init owncloud require_once('../lib/base.php'); -require( 'template.php' ); // Check if we are a user if( !OC_USER::isLoggedIn()){ diff --git a/files/settings.php b/files/settings.php index 23aed4d1b86..447a38b1815 100644 --- a/files/settings.php +++ b/files/settings.php @@ -24,7 +24,6 @@ // Init owncloud require_once('../lib/base.php'); -require( 'template.php' ); // Check if we are a user if( !OC_USER::isLoggedIn()){ diff --git a/files/webdav.php b/files/webdav.php index 7dce0b48197..a59dee70c2e 100644 --- a/files/webdav.php +++ b/files/webdav.php @@ -28,11 +28,6 @@ $RUNTIME_NOSETUPFS = true; require_once('../lib/base.php'); require_once('Sabre/autoload.php'); -require_once('Connector/Sabre/auth.php'); -require_once('Connector/Sabre/node.php'); -require_once('Connector/Sabre/file.php'); -require_once('Connector/Sabre/directory.php'); -require_once('Connector/Sabre/locks.php'); // Create ownCloud Dir $publicDir = new OC_Connector_Sabre_Directory(''); diff --git a/help/index.php b/help/index.php index de461c29412..adcb47f08f6 100644 --- a/help/index.php +++ b/help/index.php @@ -1,7 +1,6 @@ <?php require_once('../lib/base.php'); -require( 'template.php' ); if( !OC_USER::isLoggedIn()){ header( "Location: ".OC_HELPER::linkTo( "index.php" )); exit(); diff --git a/index.php b/index.php index dfd75492709..6e580a508c8 100644 --- a/index.php +++ b/index.php @@ -23,9 +23,7 @@ $RUNTIME_NOAPPS = TRUE; //no apps, yet -require_once(dirname(__FILE__).'/lib/base.php'); -require_once('appconfig.php'); -require_once('template.php'); +require_once('lib/base.php'); OC_UTIL::addScript('setup'); diff --git a/log/index.php b/log/index.php index 4986526e007..096180347e5 100644 --- a/log/index.php +++ b/log/index.php @@ -23,7 +23,6 @@ //require_once('../../config/config.php'); require_once('../lib/base.php'); -require_once( 'template.php' ); if( !OC_USER::isLoggedIn()){ header( 'Location: '.OC_HELPER::linkTo( 'index.php' )); diff --git a/search/index.php b/search/index.php index b348b22387f..b9aca57cdec 100644 --- a/search/index.php +++ b/search/index.php @@ -24,7 +24,6 @@ // Init owncloud require_once('../lib/base.php'); -require( 'template.php' ); // Check if we are a user if( !OC_USER::isLoggedIn()){ diff --git a/settings/index.php b/settings/index.php index 07adba142d6..17c878b1a25 100644 --- a/settings/index.php +++ b/settings/index.php @@ -1,7 +1,6 @@ <?php require_once('../lib/base.php'); -require( 'template.php' ); if( !OC_USER::isLoggedIn()){ header( "Location: ".OC_HELPER::linkTo( "index.php" )); exit(); diff --git a/tests/index.php b/tests/index.php index 30ebde11235..3d410cd4330 100644 --- a/tests/index.php +++ b/tests/index.php @@ -26,8 +26,6 @@ */ $RUNTIME_NOSETUPFS=true; require_once('../lib/base.php'); -require_once('testcase.php'); -require_once('template.php'); $testCases=loadFiles(__DIR__,array('index.php','templates')); ob_end_clean(); |