From 3fb91a74112c00457d549c79d6908acdd32651c5 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 18 Apr 2012 17:49:50 +0200
Subject: [PATCH] restore require once command for non app files
---
core/ajax/appconfig.php | 2 +-
core/ajax/grouplist.php | 2 +-
core/ajax/translations.php | 2 +-
core/ajax/userlist.php | 2 +-
core/ajax/validateuser.php | 2 +-
core/ajax/vcategories/add.php | 2 +-
core/ajax/vcategories/delete.php | 2 +-
core/ajax/vcategories/edit.php | 2 +-
core/lostpassword/index.php | 2 +-
core/lostpassword/resetpassword.php | 2 +-
ocs/providers.php | 2 +-
ocs/v1.php | 2 +-
search/ajax/search.php | 2 +-
search/index.php | 2 +-
settings/admin.php | 2 +-
settings/ajax/changepassword.php | 2 +-
settings/ajax/creategroup.php | 2 +-
settings/ajax/createuser.php | 2 +-
settings/ajax/disableapp.php | 2 +-
settings/ajax/enableapp.php | 2 +-
settings/ajax/getlog.php | 2 +-
settings/ajax/lostpassword.php | 2 +-
settings/ajax/openid.php | 2 +-
settings/ajax/removegroup.php | 2 +-
settings/ajax/removeuser.php | 2 +-
settings/ajax/setlanguage.php | 2 +-
settings/ajax/setloglevel.php | 2 +-
settings/ajax/setquota.php | 2 +-
settings/ajax/togglegroups.php | 2 +-
settings/apps.php | 2 +-
settings/help.php | 2 +-
settings/log.php | 2 +-
settings/personal.php | 2 +-
settings/settings.php | 2 +-
settings/users.php | 2 +-
35 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/core/ajax/appconfig.php b/core/ajax/appconfig.php
index 41e421b2fe4..f815d710631 100644
--- a/core/ajax/appconfig.php
+++ b/core/ajax/appconfig.php
@@ -5,7 +5,7 @@
* See the COPYING-README file.
*/
-
+require_once ("../../lib/base.php");
OC_JSON::checkLoggedIn();
$action=isset($_POST['action'])?$_POST['action']:$_GET['action'];
$result=false;
diff --git a/core/ajax/grouplist.php b/core/ajax/grouplist.php
index ba079e2dae1..cc15102bbc3 100644
--- a/core/ajax/grouplist.php
+++ b/core/ajax/grouplist.php
@@ -22,7 +22,7 @@
*/
$RUNTIME_NOAPPS = TRUE; //no apps, yet
-
+require_once('../../lib/base.php');
if(!OC_User::isLoggedIn()){
if(!isset($_SERVER['PHP_AUTH_USER'])){
diff --git a/core/ajax/translations.php b/core/ajax/translations.php
index 3091926095f..a6433b1964a 100644
--- a/core/ajax/translations.php
+++ b/core/ajax/translations.php
@@ -22,7 +22,7 @@
*/
// Init owncloud
-
+require_once('../../lib/base.php');
$app = $_POST["app"];
diff --git a/core/ajax/userlist.php b/core/ajax/userlist.php
index d9910d5a98f..c8168eaf460 100644
--- a/core/ajax/userlist.php
+++ b/core/ajax/userlist.php
@@ -22,7 +22,7 @@
*/
$RUNTIME_NOAPPS = TRUE; //no apps, yet
-
+require_once('../../lib/base.php');
if(!OC_User::isLoggedIn()){
if(!isset($_SERVER['PHP_AUTH_USER'])){
diff --git a/core/ajax/validateuser.php b/core/ajax/validateuser.php
index a55c54a9a46..258bd50fcad 100644
--- a/core/ajax/validateuser.php
+++ b/core/ajax/validateuser.php
@@ -22,7 +22,7 @@
*/
$RUNTIME_NOAPPS = TRUE; //no apps, yet
-
+require_once('../../lib/base.php');
if(!isset($_SERVER['PHP_AUTH_USER'])){
header('WWW-Authenticate: Basic realm="ownCloud Server"');
diff --git a/core/ajax/vcategories/add.php b/core/ajax/vcategories/add.php
index b0183af7fc5..a58489228d8 100644
--- a/core/ajax/vcategories/add.php
+++ b/core/ajax/vcategories/add.php
@@ -14,7 +14,7 @@ function debug($msg) {
OC_Log::write('core','ajax/vcategories/add.php: '.$msg, OC_Log::DEBUG);
}
-
+require_once('../../../lib/base.php');
OC_JSON::checkLoggedIn();
$category = isset($_GET['category'])?strip_tags($_GET['category']):null;
$app = isset($_GET['app'])?$_GET['app']:null;
diff --git a/core/ajax/vcategories/delete.php b/core/ajax/vcategories/delete.php
index f96add3d8c3..75def433d30 100644
--- a/core/ajax/vcategories/delete.php
+++ b/core/ajax/vcategories/delete.php
@@ -15,7 +15,7 @@ function debug($msg) {
OC_Log::write('core','ajax/vcategories/delete.php: '.$msg, OC_Log::DEBUG);
}
-
+require_once('../../../lib/base.php');
OC_JSON::checkLoggedIn();
$app = isset($_POST['app'])?$_POST['app']:null;
$categories = isset($_POST['categories'])?$_POST['categories']:null;
diff --git a/core/ajax/vcategories/edit.php b/core/ajax/vcategories/edit.php
index 5b346bef28c..252b3d3454c 100644
--- a/core/ajax/vcategories/edit.php
+++ b/core/ajax/vcategories/edit.php
@@ -15,7 +15,7 @@ function debug($msg) {
OC_Log::write('core','ajax/vcategories/edit.php: '.$msg, OC_Log::DEBUG);
}
-
+require_once('../../../lib/base.php');
OC_JSON::checkLoggedIn();
$app = isset($_GET['app'])?$_GET['app']:null;
diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php
index 1400ec67cab..89bb6cfa794 100644
--- a/core/lostpassword/index.php
+++ b/core/lostpassword/index.php
@@ -7,7 +7,7 @@
*/
$RUNTIME_NOAPPS = TRUE; //no apps
-
+require_once('../../lib/base.php');
// Someone lost their password:
if (isset($_POST['user'])) {
diff --git a/core/lostpassword/resetpassword.php b/core/lostpassword/resetpassword.php
index 5f16e854f42..1c78d720947 100644
--- a/core/lostpassword/resetpassword.php
+++ b/core/lostpassword/resetpassword.php
@@ -7,7 +7,7 @@
*/
$RUNTIME_NOAPPS = TRUE; //no apps
-
+require_once('../../lib/base.php');
// Someone wants to reset their password:
if(isset($_GET['token']) && isset($_GET['user']) && OC_Preferences::getValue($_GET['user'], 'owncloud', 'lostpassword') === $_GET['token']) {
diff --git a/ocs/providers.php b/ocs/providers.php
index d4ccd4ef9f8..e1d6ef7ee1e 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 ed97db2d9b3..f5ff6cb6054 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/ajax/search.php b/search/ajax/search.php
index 8f89256b827..326724d60c4 100644
--- a/search/ajax/search.php
+++ b/search/ajax/search.php
@@ -23,7 +23,7 @@
// Init owncloud
-
+require_once('../../lib/base.php');
// Check if we are a user
OC_JSON::checkLoggedIn();
diff --git a/search/index.php b/search/index.php
index d1f94f74a2e..518695c56d2 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 399ddd907ee..a997bad4e3c 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/ajax/changepassword.php b/settings/ajax/changepassword.php
index 0ed3c4919f5..860ea987871 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -1,7 +1,7 @@
<?php
// Init owncloud
-
+require_once('../../lib/base.php');
$username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
$password = $_POST["password"];
diff --git a/settings/ajax/creategroup.php b/settings/ajax/creategroup.php
index faeccf48b58..57d82e7bd94 100644
--- a/settings/ajax/creategroup.php
+++ b/settings/ajax/creategroup.php
@@ -1,7 +1,7 @@
<?php
// Init owncloud
-
+require_once('../../lib/base.php');
// Check if we are a user
if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index e1eb1a78669..1ed53efcf06 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -1,7 +1,7 @@
<?php
// Init owncloud
-
+require_once('../../lib/base.php');
// Check if we are a user
if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
diff --git a/settings/ajax/disableapp.php b/settings/ajax/disableapp.php
index 859c293722b..53e9be379e1 100644
--- a/settings/ajax/disableapp.php
+++ b/settings/ajax/disableapp.php
@@ -1,6 +1,6 @@
<?php
// Init owncloud
-
+require_once('../../lib/base.php');
OC_JSON::checkAdminUser();
OC_JSON::setContentTypeHeader();
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index bebcbcc903f..cb116ebe4e8 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -1,7 +1,7 @@
<?php
// Init owncloud
-
+require_once('../../lib/base.php');
OC_JSON::checkAdminUser();
OC_JSON::setContentTypeHeader();
diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php
index bcb05fdd02b..ed48b2cae1a 100644
--- a/settings/ajax/getlog.php
+++ b/settings/ajax/getlog.php
@@ -6,7 +6,7 @@
*/
// Init owncloud
-
+require_once('../../lib/base.php');
OC_JSON::checkAdminUser();
diff --git a/settings/ajax/lostpassword.php b/settings/ajax/lostpassword.php
index 4368566992c..5874dec9647 100644
--- a/settings/ajax/lostpassword.php
+++ b/settings/ajax/lostpassword.php
@@ -1,7 +1,7 @@
<?php
// Init owncloud
-
+require_once('../../lib/base.php');
OC_JSON::checkLoggedIn();
diff --git a/settings/ajax/openid.php b/settings/ajax/openid.php
index 712f5b652fe..58d071255c2 100644
--- a/settings/ajax/openid.php
+++ b/settings/ajax/openid.php
@@ -1,7 +1,7 @@
<?php
// Init owncloud
-
+require_once('../../lib/base.php');
$l=OC_L10N::get('settings');
diff --git a/settings/ajax/removegroup.php b/settings/ajax/removegroup.php
index 73f86061e3f..4d364781894 100644
--- a/settings/ajax/removegroup.php
+++ b/settings/ajax/removegroup.php
@@ -1,7 +1,7 @@
<?php
// Init owncloud
-
+require_once('../../lib/base.php');
OC_JSON::checkAdminUser();
diff --git a/settings/ajax/removeuser.php b/settings/ajax/removeuser.php
index 325549ba3b5..2c288997a1f 100644
--- a/settings/ajax/removeuser.php
+++ b/settings/ajax/removeuser.php
@@ -1,7 +1,7 @@
<?php
// Init owncloud
-
+require_once('../../lib/base.php');
OC_JSON::checkAdminUser();
diff --git a/settings/ajax/setlanguage.php b/settings/ajax/setlanguage.php
index bcdc3bc1338..e3b00c3bc80 100644
--- a/settings/ajax/setlanguage.php
+++ b/settings/ajax/setlanguage.php
@@ -1,7 +1,7 @@
<?php
// Init owncloud
-
+require_once('../../lib/base.php');
$l=OC_L10N::get('settings');
diff --git a/settings/ajax/setloglevel.php b/settings/ajax/setloglevel.php
index 6383ce3c808..298cbd64738 100644
--- a/settings/ajax/setloglevel.php
+++ b/settings/ajax/setloglevel.php
@@ -5,7 +5,7 @@
* See the COPYING-README file.
*/
-
+require_once('../../lib/base.php');
OC_Util::checkAdminUser();
OC_Config::setValue( 'loglevel', $_POST['level'] );
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 0e2ca31f147..f59017600ac 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -6,7 +6,7 @@
*/
// Init owncloud
-
+require_once('../../lib/base.php');
OC_JSON::checkAdminUser();
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index 9449261af7c..3ee3239dd89 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -1,7 +1,7 @@
<?php
// Init owncloud
-
+require_once('../../lib/base.php');
OC_JSON::checkAdminUser();
diff --git a/settings/apps.php b/settings/apps.php
index aed198c77c6..0889b0c45ed 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 00e93720eec..48fcec32782 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 31e6f6ff371..ddbf72c4433 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 7717bb76667..41499657ac7 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 c73d6b706ea..a49de85520b 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 591d85ff675..96515a90ce4 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!
--
GitLab