diff --git a/admin/apps.php b/admin/apps.php
index bc598a6991e7efca9b6857bf9e4732991bf5ec73..4bbf1c813b00a71d3c00bf3a1ab09b8131607256 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 284509144eee97d17069958d42688a5f187722d0..9286ab9c2b32822d86a2002d358e677bde07d5bc 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 8237d06da0b86e022379cef26838ea999f5879de..4065cc471f1e4b375b25f95a511bcd251a0774e6 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 afb726da3128f0dcd55eee9ba66457a78b5cfbc4..9a1a9ce03c286c56c3582ce5db8ee4d33109a8c4 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 d3e3022e76177c8c0d61435dc4c998752905d612..3bc961bc37d1e23b9419cf9e2c144d8d98a19cc2 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 26e008acab57aa41d9bd496cdad610ef2fa0aba4..fbf1c395d991db35b6e75c0925c5b9b280af607a 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 30276601a2dd8707e1d4397fcef3abcad2ec6dfe..4bd9acfd80b4d320e6c1749a35374df48895ea4f 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 f7aff1b46141df5016a0a194c932be5874c26d59..8f9d282d2b100393dab650d1d112ed0541927679 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 a2fd48cdf06ce7d1c75e14125687e47f85b54a10..a197c0a10e0995f62b3826a95d9a7f5ec748583d 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 146eb380f73566472102db6bd972e3be219a8984..f35e6811b84be7c9a8b1e758855af09a24d0b0df 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 76316de100cbc1f1bb7d7e6c1597264fd1b5b127..29c18eaa497bea5b83c9e6c25d4e3681cfb05da5 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 ddf5cc9bc23964992880ce4aa9b1550214c69ba6..c18edccf2dbae3952073c23525d23185c2223564 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 b78828e6301b04222b0fbc3baca4c0db1c1a6957..65cfaec3b7ca5f42bddb0ee9e479a25c9aa3f913 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 aaf6136692dd6d71cf48bf57f2e2b1cbf33ef08d..723c7f7612bc4aa9a438d76c047cba39dacbb93f 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 6d237ed615236ae56843f699f7fad2f7c42e56a2..5402990e4c92685b11a726e44e8357b814767958 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 5c9923aff865bd1ea6f90860d0efb950b0f0bfb2..c0a41335f5e0b0559b24cce4e00a69717ac20484 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 ef43e72fcae4b0d71f9f1c25ac00bd0d8c5844c9..26462eb5ab998418edc071dc89113ed3a8e1dafa 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 f7fbcd0f85724f561419912da1ff57b0f6281d39..ab3dee51348c2191ff817f1403789e4607c1a98a 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 550f23541a07f374753e1d5c196ac6dcca2a9e3f..4f40e70393b5312a4222b86d02030fbf248d7071 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 23aed4d1b866a0727b4530cc5e011b048b184486..447a38b1815c5971fc0c7bdcdbf34120351d8986 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 7dce0b48197ba99a7d7573ca5ecb737f3ed2b33b..a59dee70c2ed65f7cdcbb503ba71e6bc3992777f 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 de461c2941239f7d685acb8376f440e1182af156..adcb47f08f617e696b6c4db6003293dc6a0c4cde 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 dfd75492709323cceebf72593d67f80c95f35ae5..6e580a508c82a03e58820a76930988394d1c404b 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 4986526e0070648599bd8b43b9c08820afee7f8c..096180347e5cb94db67f99858c973843d75223dc 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 b348b22387f8a05104b20c013c6a8373d319c9e5..b9aca57cdece4f457dfedd0504a396f5e6f37f91 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 07adba142d6fb0713581334dc681f8702a30bdee..17c878b1a25e3fe65f95532d862972b9b9b72fab 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 30ebde112355ad7030321a27c0fe734c6477da9e..3d410cd433069d57b6d8856225ecc89adb174e94 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();