diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-17 19:31:29 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-17 19:31:29 +0200 |
| commit | 69ee0efc0b355c33ec566cffb36c4b0dc429c338 (patch) | |
| tree | 50f96da78b34007f47d6de10bdf47f35704d96a8 | |
| parent | 12818093007d5bdce5519b5015e2a0748c98e24d (diff) | |
| download | nextcloud-server-69ee0efc0b355c33ec566cffb36c4b0dc429c338.tar.gz nextcloud-server-69ee0efc0b355c33ec566cffb36c4b0dc429c338.zip | |
remove the require_once lib base from all (or nearly all) files
147 files changed, 147 insertions, 147 deletions
diff --git a/apps/bookmarks/addBm.php b/apps/bookmarks/addBm.php index 861b677222d..27e01bb3baf 100644 --- a/apps/bookmarks/addBm.php +++ b/apps/bookmarks/addBm.php @@ -21,7 +21,7 @@ * */ -require_once('../../lib/base.php'); + // Check if we are a user OC_Util::checkLoggedIn(); diff --git a/apps/bookmarks/ajax/addBookmark.php b/apps/bookmarks/ajax/addBookmark.php index 8cda7f0f060..4daed58af3b 100644 --- a/apps/bookmarks/ajax/addBookmark.php +++ b/apps/bookmarks/ajax/addBookmark.php @@ -24,7 +24,7 @@ //no apps or filesystem $RUNTIME_NOSETUPFS=true; -require_once('../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); diff --git a/apps/bookmarks/ajax/delBookmark.php b/apps/bookmarks/ajax/delBookmark.php index 4aef86e771b..655d9f825d9 100644 --- a/apps/bookmarks/ajax/delBookmark.php +++ b/apps/bookmarks/ajax/delBookmark.php @@ -24,7 +24,7 @@ //no apps or filesystem $RUNTIME_NOSETUPFS=true; -require_once('../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); diff --git a/apps/bookmarks/ajax/editBookmark.php b/apps/bookmarks/ajax/editBookmark.php index 35f30ebcb7a..a834cd216e6 100644 --- a/apps/bookmarks/ajax/editBookmark.php +++ b/apps/bookmarks/ajax/editBookmark.php @@ -24,7 +24,7 @@ //no apps or filesystem $RUNTIME_NOSETUPFS=true; -require_once('../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); diff --git a/apps/bookmarks/ajax/recordClick.php b/apps/bookmarks/ajax/recordClick.php index e6fdfe043e1..a542f636d8c 100644 --- a/apps/bookmarks/ajax/recordClick.php +++ b/apps/bookmarks/ajax/recordClick.php @@ -24,7 +24,7 @@ //no apps or filesystem $RUNTIME_NOSETUPFS=true; -require_once('../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); diff --git a/apps/bookmarks/ajax/updateList.php b/apps/bookmarks/ajax/updateList.php index 487e0d290e3..6aa951bbb65 100644 --- a/apps/bookmarks/ajax/updateList.php +++ b/apps/bookmarks/ajax/updateList.php @@ -25,7 +25,7 @@ //no apps or filesystem $RUNTIME_NOSETUPFS=true; -require_once('../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); diff --git a/apps/bookmarks/index.php b/apps/bookmarks/index.php index 50fea3fddbd..4d604a4fd55 100644 --- a/apps/bookmarks/index.php +++ b/apps/bookmarks/index.php @@ -21,7 +21,7 @@ * */ -require_once('../../lib/base.php'); + // Check if we are a user OC_Util::checkLoggedIn(); diff --git a/apps/calendar/ajax/calendar/activation.php b/apps/calendar/ajax/calendar/activation.php index 7677d85aff3..c93a0495717 100644 --- a/apps/calendar/ajax/calendar/activation.php +++ b/apps/calendar/ajax/calendar/activation.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('calendar'); $calendarid = $_POST['calendarid']; diff --git a/apps/calendar/ajax/calendar/delete.php b/apps/calendar/ajax/calendar/delete.php index a2f5311731c..4bef912333c 100644 --- a/apps/calendar/ajax/calendar/delete.php +++ b/apps/calendar/ajax/calendar/delete.php @@ -5,7 +5,7 @@ * later. * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('calendar'); diff --git a/apps/calendar/ajax/calendar/edit.form.php b/apps/calendar/ajax/calendar/edit.form.php index 8922b3eba4e..d3f9629f1ae 100644 --- a/apps/calendar/ajax/calendar/edit.form.php +++ b/apps/calendar/ajax/calendar/edit.form.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('calendar'); diff --git a/apps/calendar/ajax/calendar/edit.php b/apps/calendar/ajax/calendar/edit.php index 8922b3eba4e..d3f9629f1ae 100644 --- a/apps/calendar/ajax/calendar/edit.php +++ b/apps/calendar/ajax/calendar/edit.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('calendar'); diff --git a/apps/calendar/ajax/calendar/new.form.php b/apps/calendar/ajax/calendar/new.form.php index fa014351f77..3de56460c2d 100644 --- a/apps/calendar/ajax/calendar/new.form.php +++ b/apps/calendar/ajax/calendar/new.form.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('calendar'); $calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions(); diff --git a/apps/calendar/ajax/calendar/new.php b/apps/calendar/ajax/calendar/new.php index 228e6247724..ada28a9fc07 100644 --- a/apps/calendar/ajax/calendar/new.php +++ b/apps/calendar/ajax/calendar/new.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); diff --git a/apps/calendar/ajax/calendar/overview.php b/apps/calendar/ajax/calendar/overview.php index dd55f3e018f..f66d1eae8f8 100644 --- a/apps/calendar/ajax/calendar/overview.php +++ b/apps/calendar/ajax/calendar/overview.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + $l10n = OC_L10N::get('calendar'); OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('calendar'); diff --git a/apps/calendar/ajax/calendar/update.php b/apps/calendar/ajax/calendar/update.php index f400c8c14b4..9bb1307a845 100644 --- a/apps/calendar/ajax/calendar/update.php +++ b/apps/calendar/ajax/calendar/update.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); diff --git a/apps/calendar/ajax/categories/rescan.php b/apps/calendar/ajax/categories/rescan.php index 0fd878ed8f9..9273986cad4 100644 --- a/apps/calendar/ajax/categories/rescan.php +++ b/apps/calendar/ajax/categories/rescan.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('calendar'); diff --git a/apps/calendar/ajax/changeview.php b/apps/calendar/ajax/changeview.php index ae48b229b16..707c8c59ebf 100644 --- a/apps/calendar/ajax/changeview.php +++ b/apps/calendar/ajax/changeview.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once ("../../../lib/base.php"); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('calendar'); $view = $_GET['v']; diff --git a/apps/calendar/ajax/event/delete.php b/apps/calendar/ajax/event/delete.php index 5fc12900ef3..49b740656de 100644 --- a/apps/calendar/ajax/event/delete.php +++ b/apps/calendar/ajax/event/delete.php @@ -5,7 +5,7 @@ * later. * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('calendar'); diff --git a/apps/calendar/ajax/event/edit.form.php b/apps/calendar/ajax/event/edit.form.php index 98c22eb0206..1634e7ea416 100644 --- a/apps/calendar/ajax/event/edit.form.php +++ b/apps/calendar/ajax/event/edit.form.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + if(!OC_USER::isLoggedIn()) { die('<script type="text/javascript">document.location = oc_webroot;</script>'); diff --git a/apps/calendar/ajax/event/edit.php b/apps/calendar/ajax/event/edit.php index 64daffddef0..53912cb4c93 100644 --- a/apps/calendar/ajax/event/edit.php +++ b/apps/calendar/ajax/event/edit.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('calendar'); diff --git a/apps/calendar/ajax/event/move.php b/apps/calendar/ajax/event/move.php index 8150fdbaa32..bfebefb8fe0 100644 --- a/apps/calendar/ajax/event/move.php +++ b/apps/calendar/ajax/event/move.php @@ -5,7 +5,7 @@ * later. * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); $id = $_POST['id']; diff --git a/apps/calendar/ajax/event/new.form.php b/apps/calendar/ajax/event/new.form.php index 838002a3a09..2e03c02af27 100644 --- a/apps/calendar/ajax/event/new.form.php +++ b/apps/calendar/ajax/event/new.form.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + if(!OC_USER::isLoggedIn()) { die('<script type="text/javascript">document.location = oc_webroot;</script>'); diff --git a/apps/calendar/ajax/event/new.php b/apps/calendar/ajax/event/new.php index 7070bbf05d7..5e8c305e97a 100644 --- a/apps/calendar/ajax/event/new.php +++ b/apps/calendar/ajax/event/new.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('calendar'); diff --git a/apps/calendar/ajax/event/resize.php b/apps/calendar/ajax/event/resize.php index aa2d420e77d..9a9d37ff3d4 100644 --- a/apps/calendar/ajax/event/resize.php +++ b/apps/calendar/ajax/event/resize.php @@ -5,7 +5,7 @@ * later. * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); $id = $_POST['id']; diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php index d053df2e4c1..0cfee0dbdc1 100755 --- a/apps/calendar/ajax/events.php +++ b/apps/calendar/ajax/events.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once ('../../../lib/base.php'); + require_once('when/When.php'); $l = OC_L10N::get('calendar'); $unnamed = $l->t('unnamed'); diff --git a/apps/calendar/ajax/import/dialog.php b/apps/calendar/ajax/import/dialog.php index 16ec54d14a2..0c1a8f94943 100644 --- a/apps/calendar/ajax/import/dialog.php +++ b/apps/calendar/ajax/import/dialog.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_Util::checkAppEnabled('calendar'); $tmpl = new OC_Template('calendar', 'part.import'); diff --git a/apps/calendar/ajax/import/import.php b/apps/calendar/ajax/import/import.php index d0bdab4f0d5..95294948f75 100644 --- a/apps/calendar/ajax/import/import.php +++ b/apps/calendar/ajax/import/import.php @@ -7,7 +7,7 @@ */ //check for calendar rights or create new one ob_start(); -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_Util::checkAppEnabled('calendar'); $nl = "\n\r"; diff --git a/apps/calendar/ajax/settings/getfirstday.php b/apps/calendar/ajax/settings/getfirstday.php index cab5870509a..63218dcd028 100644 --- a/apps/calendar/ajax/settings/getfirstday.php +++ b/apps/calendar/ajax/settings/getfirstday.php @@ -5,7 +5,7 @@ * later. * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); $firstday = OC_Preferences::getValue( OC_User::getUser(), 'calendar', 'firstday', 'mo'); OC_JSON::encodedPrint(array('firstday' => $firstday)); diff --git a/apps/calendar/ajax/settings/gettimezonedetection.php b/apps/calendar/ajax/settings/gettimezonedetection.php index 11255fe8ef3..b9555900a0e 100644 --- a/apps/calendar/ajax/settings/gettimezonedetection.php +++ b/apps/calendar/ajax/settings/gettimezonedetection.php @@ -5,7 +5,7 @@ * later. * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('calendar'); OC_JSON::success(array('detection' => OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezonedetection')));
\ No newline at end of file diff --git a/apps/calendar/ajax/settings/guesstimezone.php b/apps/calendar/ajax/settings/guesstimezone.php index c02b8d10b8d..c0b4ef65263 100755 --- a/apps/calendar/ajax/settings/guesstimezone.php +++ b/apps/calendar/ajax/settings/guesstimezone.php @@ -5,7 +5,7 @@ * later. * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('calendar'); diff --git a/apps/calendar/ajax/settings/setfirstday.php b/apps/calendar/ajax/settings/setfirstday.php index 3b652212205..3b1b5481db4 100644 --- a/apps/calendar/ajax/settings/setfirstday.php +++ b/apps/calendar/ajax/settings/setfirstday.php @@ -5,7 +5,7 @@ * later. * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); if(isset($_POST["firstday"])){ OC_Preferences::setValue(OC_User::getUser(), 'calendar', 'firstday', $_POST["firstday"]); diff --git a/apps/calendar/ajax/settings/settimeformat.php b/apps/calendar/ajax/settings/settimeformat.php index 8f65447065c..374825a5d40 100644 --- a/apps/calendar/ajax/settings/settimeformat.php +++ b/apps/calendar/ajax/settings/settimeformat.php @@ -5,7 +5,7 @@ * later. * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); if(isset($_POST["timeformat"])){ OC_Preferences::setValue(OC_User::getUser(), 'calendar', 'timeformat', $_POST["timeformat"]); diff --git a/apps/calendar/ajax/settings/settimezone.php b/apps/calendar/ajax/settings/settimezone.php index 8dda28335f7..b0ca9dcd944 100644 --- a/apps/calendar/ajax/settings/settimezone.php +++ b/apps/calendar/ajax/settings/settimezone.php @@ -7,7 +7,7 @@ */ // Init owncloud -require_once('../../../../lib/base.php'); + $l=OC_L10N::get('calendar'); diff --git a/apps/calendar/ajax/settings/timeformat.php b/apps/calendar/ajax/settings/timeformat.php index e0dbe8d3cd7..728b7155efe 100644 --- a/apps/calendar/ajax/settings/timeformat.php +++ b/apps/calendar/ajax/settings/timeformat.php @@ -5,7 +5,7 @@ * later. * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); $timeformat = OC_Preferences::getValue( OC_User::getUser(), 'calendar', 'timeformat', "24"); OC_JSON::encodedPrint(array("timeformat" => $timeformat)); diff --git a/apps/calendar/ajax/settings/timezonedetection.php b/apps/calendar/ajax/settings/timezonedetection.php index f67bab901e7..d29c5568e49 100644 --- a/apps/calendar/ajax/settings/timezonedetection.php +++ b/apps/calendar/ajax/settings/timezonedetection.php @@ -5,7 +5,7 @@ * later. * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('calendar'); if($_POST['timezonedetection'] == 'on'){ diff --git a/apps/calendar/ajax/share/changepermission.php b/apps/calendar/ajax/share/changepermission.php index d91f87b613f..5538637eab4 100644 --- a/apps/calendar/ajax/share/changepermission.php +++ b/apps/calendar/ajax/share/changepermission.php @@ -5,7 +5,7 @@ * later. * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + $id = strip_tags($_GET['id']); $idtype = strip_tags($_GET['idtype']); $permission = (int) strip_tags($_GET['permission']); diff --git a/apps/calendar/ajax/share/dropdown.php b/apps/calendar/ajax/share/dropdown.php index eb396d38fd9..85530c163ed 100644 --- a/apps/calendar/ajax/share/dropdown.php +++ b/apps/calendar/ajax/share/dropdown.php @@ -5,7 +5,7 @@ * later. * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + $user = OC_USER::getUser(); $calid = $_GET['calid']; $calendar = OC_Calendar_Calendar::find($calid); diff --git a/apps/calendar/ajax/share/share.php b/apps/calendar/ajax/share/share.php index d892727701a..88885cd7c10 100644 --- a/apps/calendar/ajax/share/share.php +++ b/apps/calendar/ajax/share/share.php @@ -5,7 +5,7 @@ * later. * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + $id = strip_tags($_GET['id']); $idtype = strip_tags($_GET['idtype']); switch($idtype){ diff --git a/apps/calendar/ajax/share/unshare.php b/apps/calendar/ajax/share/unshare.php index ec3150a89aa..97ef7ab2cb0 100644 --- a/apps/calendar/ajax/share/unshare.php +++ b/apps/calendar/ajax/share/unshare.php @@ -5,7 +5,7 @@ * later. * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + $id = strip_tags($_GET['id']); $idtype = strip_tags($_GET['idtype']); switch($idtype){ diff --git a/apps/calendar/caldav.php b/apps/calendar/caldav.php index b710b99ea43..a319fd05223 100644 --- a/apps/calendar/caldav.php +++ b/apps/calendar/caldav.php @@ -9,7 +9,7 @@ // Do not load FS ... $RUNTIME_NOSETUPFS = true; -require_once('../../lib/base.php'); + OC_Util::checkAppEnabled('calendar'); // Backends diff --git a/apps/calendar/export.php b/apps/calendar/export.php index 2736eec96c2..658df9db230 100644 --- a/apps/calendar/export.php +++ b/apps/calendar/export.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once ('../../lib/base.php'); + OC_Util::checkLoggedIn(); OC_Util::checkAppEnabled('calendar'); $cal = isset($_GET['calid']) ? $_GET['calid'] : NULL; diff --git a/apps/calendar/import.php b/apps/calendar/import.php index b1c6f91df84..f4a40e3b427 100644 --- a/apps/calendar/import.php +++ b/apps/calendar/import.php @@ -7,7 +7,7 @@ */ //check for calendar rights or create new one ob_start(); -require_once ('../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_Util::checkAppEnabled('calendar'); $nl = "\n"; diff --git a/apps/calendar/index.php b/apps/calendar/index.php index f964a13ef79..4aa1f695e31 100644 --- a/apps/calendar/index.php +++ b/apps/calendar/index.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once ('../../lib/base.php'); + OC_Util::checkLoggedIn(); OC_Util::checkAppEnabled('calendar'); diff --git a/apps/calendar/resettimezone.php b/apps/calendar/resettimezone.php index 1ef9591ae39..0996924b5ad 100644 --- a/apps/calendar/resettimezone.php +++ b/apps/calendar/resettimezone.php @@ -1,4 +1,4 @@ <?php -require_once ("../../lib/base.php"); + OC_Preferences::deleteKey(OC_USER::getUser(), 'calendar', 'timezone'); ?>
\ No newline at end of file diff --git a/apps/contacts/ajax/activation.php b/apps/contacts/ajax/activation.php index d69e3dba3f8..06d1a7e24fc 100644 --- a/apps/contacts/ajax/activation.php +++ b/apps/contacts/ajax/activation.php @@ -7,7 +7,7 @@ * See the COPYING-README file. */ -require_once ("../../../lib/base.php"); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('contacts'); diff --git a/apps/contacts/ajax/addbook.php b/apps/contacts/ajax/addbook.php index f5852183cc3..f466d57e12e 100644 --- a/apps/contacts/ajax/addbook.php +++ b/apps/contacts/ajax/addbook.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('contacts'); $book = array( diff --git a/apps/contacts/ajax/addcontact.php b/apps/contacts/ajax/addcontact.php index 68da54655ae..152277181bb 100644 --- a/apps/contacts/ajax/addcontact.php +++ b/apps/contacts/ajax/addcontact.php @@ -21,7 +21,7 @@ */ // Init owncloud -require_once('../../../lib/base.php'); + function bailOut($msg) { OC_JSON::error(array('data' => array('message' => $msg))); OC_Log::write('contacts','ajax/addcontact.php: '.$msg, OC_Log::DEBUG); diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php index d2c0291e8c6..9a5e59692d6 100644 --- a/apps/contacts/ajax/addproperty.php +++ b/apps/contacts/ajax/addproperty.php @@ -21,7 +21,7 @@ */ // Init owncloud -require_once('../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); diff --git a/apps/contacts/ajax/categories/categoriesfor.php b/apps/contacts/ajax/categories/categoriesfor.php index c02c37914a2..39a7758c8fb 100644 --- a/apps/contacts/ajax/categories/categoriesfor.php +++ b/apps/contacts/ajax/categories/categoriesfor.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('contacts'); diff --git a/apps/contacts/ajax/categories/delete.php b/apps/contacts/ajax/categories/delete.php index 3ba5aa16068..3cc2dea6638 100644 --- a/apps/contacts/ajax/categories/delete.php +++ b/apps/contacts/ajax/categories/delete.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('contacts'); diff --git a/apps/contacts/ajax/categories/list.php b/apps/contacts/ajax/categories/list.php index 64d74c82e69..98c1c705180 100644 --- a/apps/contacts/ajax/categories/list.php +++ b/apps/contacts/ajax/categories/list.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('contacts'); diff --git a/apps/contacts/ajax/categories/rescan.php b/apps/contacts/ajax/categories/rescan.php index 5f1057bab44..09208c3f685 100644 --- a/apps/contacts/ajax/categories/rescan.php +++ b/apps/contacts/ajax/categories/rescan.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('contacts'); diff --git a/apps/contacts/ajax/chooseaddressbook.php b/apps/contacts/ajax/chooseaddressbook.php index d6080791299..b47c872e9aa 100644 --- a/apps/contacts/ajax/chooseaddressbook.php +++ b/apps/contacts/ajax/chooseaddressbook.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('contacts'); diff --git a/apps/contacts/ajax/contactdetails.php b/apps/contacts/ajax/contactdetails.php index 03895c862aa..13c3f80c3b5 100644 --- a/apps/contacts/ajax/contactdetails.php +++ b/apps/contacts/ajax/contactdetails.php @@ -21,7 +21,7 @@ */ // Init owncloud -require_once('../../../lib/base.php'); + function bailOut($msg) { OC_JSON::error(array('data' => array('message' => $msg))); OC_Log::write('contacts','ajax/contactdetails.php: '.$msg, OC_Log::DEBUG); diff --git a/apps/contacts/ajax/contacts.php b/apps/contacts/ajax/contacts.php index cf86764105f..3e75e4c80e3 100644 --- a/apps/contacts/ajax/contacts.php +++ b/apps/contacts/ajax/contacts.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('contacts'); diff --git a/apps/contacts/ajax/createaddressbook.php b/apps/contacts/ajax/createaddressbook.php index 28944fe864c..5cdb9b49ef8 100644 --- a/apps/contacts/ajax/createaddressbook.php +++ b/apps/contacts/ajax/createaddressbook.php @@ -6,7 +6,7 @@ * later. * See the COPYING-README file. */ -require_once('../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); diff --git a/apps/contacts/ajax/cropphoto.php b/apps/contacts/ajax/cropphoto.php index 878fb5610c6..96e66ffb69c 100644 --- a/apps/contacts/ajax/cropphoto.php +++ b/apps/contacts/ajax/cropphoto.php @@ -21,7 +21,7 @@ */ // Init owncloud -require_once('../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); diff --git a/apps/contacts/ajax/deletebook.php b/apps/contacts/ajax/deletebook.php index 46d8deb4868..b80df526f95 100644 --- a/apps/contacts/ajax/deletebook.php +++ b/apps/contacts/ajax/deletebook.php @@ -21,7 +21,7 @@ */ // Init owncloud -require_once('../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); diff --git a/apps/contacts/ajax/deletecard.php b/apps/contacts/ajax/deletecard.php index 5675aef5f15..98cdb85f0fc 100644 --- a/apps/contacts/ajax/deletecard.php +++ b/apps/contacts/ajax/deletecard.php @@ -26,7 +26,7 @@ function bailOut($msg) { } // Init owncloud -require_once('../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); diff --git a/apps/contacts/ajax/deleteproperty.php b/apps/contacts/ajax/deleteproperty.php index ab0958cac58..73786cb10cf 100644 --- a/apps/contacts/ajax/deleteproperty.php +++ b/apps/contacts/ajax/deleteproperty.php @@ -21,7 +21,7 @@ */ // Init owncloud -require_once('../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); diff --git a/apps/contacts/ajax/editaddress.php b/apps/contacts/ajax/editaddress.php index 4e6456f6045..73f34ef5c6c 100644 --- a/apps/contacts/ajax/editaddress.php +++ b/apps/contacts/ajax/editaddress.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('contacts'); diff --git a/apps/contacts/ajax/editaddressbook.php b/apps/contacts/ajax/editaddressbook.php index a6262f39b23..ef797778d95 100644 --- a/apps/contacts/ajax/editaddressbook.php +++ b/apps/contacts/ajax/editaddressbook.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('contacts'); $addressbook = OC_Contacts_App::getAddressbook($_GET['bookid']); diff --git a/apps/contacts/ajax/editname.php b/apps/contacts/ajax/editname.php index 31bdd125675..9e4d6814620 100644 --- a/apps/contacts/ajax/editname.php +++ b/apps/contacts/ajax/editname.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('contacts'); function bailOut($msg) { diff --git a/apps/contacts/ajax/getdetails.php b/apps/contacts/ajax/getdetails.php index 4819916f4c3..aac69f4c52e 100644 --- a/apps/contacts/ajax/getdetails.php +++ b/apps/contacts/ajax/getdetails.php @@ -21,7 +21,7 @@ */ // Init owncloud -require_once('../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); diff --git a/apps/contacts/ajax/importdialog.php b/apps/contacts/ajax/importdialog.php index 280e462f662..cde6bb2f5c4 100644 --- a/apps/contacts/ajax/importdialog.php +++ b/apps/contacts/ajax/importdialog.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_Util::checkAppEnabled('contacts'); $tmpl = new OC_Template('contacts', 'part.import'); diff --git a/apps/contacts/ajax/loadcard.php b/apps/contacts/ajax/loadcard.php index 037fe2a6df2..4b2a65db911 100644 --- a/apps/contacts/ajax/loadcard.php +++ b/apps/contacts/ajax/loadcard.php @@ -21,7 +21,7 @@ */ // Init owncloud -require_once('../../../lib/base.php'); + function bailOut($msg) { OC_JSON::error(array('data' => array('message' => $msg))); OC_Log::write('contacts','ajax/loadcard.php: '.$msg, OC_Log::DEBUG); diff --git a/apps/contacts/ajax/loadintro.php b/apps/contacts/ajax/loadintro.php index 8e5673655a1..7185c5cbe0a 100644 --- a/apps/contacts/ajax/loadintro.php +++ b/apps/contacts/ajax/loadintro.php @@ -21,7 +21,7 @@ */ // Init owncloud -require_once('../../../lib/base.php'); + function bailOut($msg) { OC_JSON::error(array('data' => array('message' => $msg))); OC_Log::write('contacts','ajax/loadintro.php: '.$msg, OC_Log::DEBUG); diff --git a/apps/contacts/ajax/loadphoto.php b/apps/contacts/ajax/loadphoto.php index 2c8bb7bf1ed..669f9e2844d 100644 --- a/apps/contacts/ajax/loadphoto.php +++ b/apps/contacts/ajax/loadphoto.php @@ -20,7 +20,7 @@ * */ // Init owncloud -require_once('../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('contacts'); diff --git a/apps/contacts/ajax/newcontact.php b/apps/contacts/ajax/newcontact.php index fcfd12ca80d..36c37e039e9 100644 --- a/apps/contacts/ajax/newcontact.php +++ b/apps/contacts/ajax/newcontact.php @@ -21,7 +21,7 @@ */ // Init owncloud -require_once('../../../lib/base.php'); + function bailOut($msg) { OC_JSON::error(array('data' => array('message' => $msg))); OC_Log::write('contacts','ajax/newcontact.php: '.$msg, OC_Log::DEBUG); diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php index 0df4e1998cb..36ba6a046dc 100644 --- a/apps/contacts/ajax/savecrop.php +++ b/apps/contacts/ajax/savecrop.php @@ -22,7 +22,7 @@ * Remember to delete tmp file at some point. */ // Init owncloud -require_once('../../../lib/base.php'); + OC_Log::write('contacts','ajax/savecrop.php: Huzzah!!!', OC_Log::DEBUG); // Check if we are a user diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php index 99d55e7927a..e459ed733d8 100644 --- a/apps/contacts/ajax/saveproperty.php +++ b/apps/contacts/ajax/saveproperty.php @@ -21,7 +21,7 @@ */ // Init owncloud -require_once('../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); diff --git a/apps/contacts/ajax/updateaddressbook.php b/apps/contacts/ajax/updateaddressbook.php index 211df84b1d1..06028db479a 100644 --- a/apps/contacts/ajax/updateaddressbook.php +++ b/apps/contacts/ajax/updateaddressbook.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php index 9780df46476..96231596222 100644 --- a/apps/contacts/ajax/uploadphoto.php +++ b/apps/contacts/ajax/uploadphoto.php @@ -20,7 +20,7 @@ * */ // Init owncloud -require_once('../../../lib/base.php'); + // Check if we are a user // Firefox and Konqueror tries to download application/json for me. --Arthur diff --git a/apps/contacts/carddav.php b/apps/contacts/carddav.php index 654aeb66a72..794fb890898 100644 --- a/apps/contacts/carddav.php +++ b/apps/contacts/carddav.php @@ -23,7 +23,7 @@ // Do not load FS ... $RUNTIME_NOSETUPFS = true; -require_once('../../lib/base.php'); + OC_Util::checkAppEnabled('contacts'); // Backends diff --git a/apps/contacts/dynphoto.php b/apps/contacts/dynphoto.php index 2beac15e143..c1646e483de 100644 --- a/apps/contacts/dynphoto.php +++ b/apps/contacts/dynphoto.php @@ -21,7 +21,7 @@ */ // Init owncloud -require_once('../../lib/base.php'); + $tmp_path = $_GET['tmp_path']; $maxsize = isset($_GET['maxsize']) ? $_GET['maxsize'] : -1; header("Cache-Control: no-cache, no-store, must-revalidate"); diff --git a/apps/contacts/export.php b/apps/contacts/export.php index fb3e0a41ae7..95d02a9afd4 100644 --- a/apps/contacts/export.php +++ b/apps/contacts/export.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once ("../../lib/base.php"); + OC_Util::checkLoggedIn(); OC_Util::checkAppEnabled('contacts'); $bookid = isset($_GET['bookid']) ? $_GET['bookid'] : NULL; diff --git a/apps/contacts/import.php b/apps/contacts/import.php index 04cfc397d56..8cf0a173db1 100644 --- a/apps/contacts/import.php +++ b/apps/contacts/import.php @@ -7,7 +7,7 @@ */ //check for addressbooks rights or create new one ob_start(); -require_once ('../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_Util::checkAppEnabled('calendar'); $nl = "\n"; diff --git a/apps/contacts/index.php b/apps/contacts/index.php index 4039b8afd3d..d5545e76197 100644 --- a/apps/contacts/index.php +++ b/apps/contacts/index.php @@ -6,7 +6,7 @@ * later. * See the COPYING-README file. */ -require_once('../../lib/base.php'); + // Check if we are a user OC_Util::checkLoggedIn(); diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php index 298f1215e3c..cd0ae350102 100644 --- a/apps/contacts/photo.php +++ b/apps/contacts/photo.php @@ -9,7 +9,7 @@ */ // Init owncloud -require_once('../../lib/base.php'); + OC_Util::checkLoggedIn(); OC_Util::checkAppEnabled('contacts'); diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php index 5082626499b..c7d37b755fe 100644 --- a/apps/contacts/thumbnail.php +++ b/apps/contacts/thumbnail.php @@ -21,7 +21,7 @@ */ // Init owncloud -require_once('../../lib/base.php'); + OC_JSON::checkLoggedIn(); //OC_Util::checkLoggedIn(); OC_Util::checkAppEnabled('contacts'); diff --git a/apps/external/ajax/setsites.php b/apps/external/ajax/setsites.php index 0537b7ea581..3223bf68d9b 100644 --- a/apps/external/ajax/setsites.php +++ b/apps/external/ajax/setsites.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once('../../../lib/base.php'); + OC_Util::checkAdminUser(); $sites = array(); diff --git a/apps/external/index.php b/apps/external/index.php index 1c20f59eaff..0baa62a94b6 100644 --- a/apps/external/index.php +++ b/apps/external/index.php @@ -20,7 +20,7 @@ * License along with this library. If not, see <http://www.gnu.org/licenses/>. * */ -require_once('../../lib/base.php'); + require_once('lib/external.php'); OC_Util::checkLoggedIn(); diff --git a/apps/files_sharing/ajax/getitem.php b/apps/files_sharing/ajax/getitem.php index ba01adffb9a..c838895efbe 100644 --- a/apps/files_sharing/ajax/getitem.php +++ b/apps/files_sharing/ajax/getitem.php @@ -1,7 +1,7 @@ <?php //$RUNTIME_NOAPPS = true; -require_once('../../../lib/base.php'); + OC_JSON::checkAppEnabled('files_sharing'); require_once('../lib_share.php'); diff --git a/apps/files_sharing/ajax/setpermissions.php b/apps/files_sharing/ajax/setpermissions.php index 200202c704c..d46f6f0c7b4 100644 --- a/apps/files_sharing/ajax/setpermissions.php +++ b/apps/files_sharing/ajax/setpermissions.php @@ -1,7 +1,7 @@ <?php //$RUNTIME_NOAPPS = true; -require_once('../../../lib/base.php'); + OC_JSON::checkAppEnabled('files_sharing'); require_once('../lib_share.php'); diff --git a/apps/files_sharing/ajax/share.php b/apps/files_sharing/ajax/share.php index 9b10260da5a..cd9166913cb 100644 --- a/apps/files_sharing/ajax/share.php +++ b/apps/files_sharing/ajax/share.php @@ -1,7 +1,7 @@ <?php //$RUNTIME_NOAPPS = true; -require_once('../../../lib/base.php'); + OC_JSON::checkAppEnabled('files_sharing'); require_once('../lib_share.php'); diff --git a/apps/files_sharing/ajax/unshare.php b/apps/files_sharing/ajax/unshare.php index d8a72a00efe..150d6504863 100644 --- a/apps/files_sharing/ajax/unshare.php +++ b/apps/files_sharing/ajax/unshare.php @@ -1,7 +1,7 @@ <?php //$RUNTIME_NOAPPS = true; -require_once('../../../lib/base.php'); + OC_JSON::checkAppEnabled('files_sharing'); require_once('../lib_share.php'); diff --git a/apps/files_sharing/ajax/userautocomplete.php b/apps/files_sharing/ajax/userautocomplete.php index 38b673ee51b..cc22a0cd1a7 100644 --- a/apps/files_sharing/ajax/userautocomplete.php +++ b/apps/files_sharing/ajax/userautocomplete.php @@ -1,7 +1,7 @@ <?php //$RUNTIME_NOAPPS = true; -require_once('../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('files_sharing'); diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php index 721620dc922..a9006faf1a9 100644 --- a/apps/files_sharing/list.php +++ b/apps/files_sharing/list.php @@ -20,7 +20,7 @@ * */ -require_once('../../lib/base.php'); + require_once('lib_share.php'); OC_Util::checkLoggedIn(); diff --git a/apps/files_texteditor/ajax/loadfile.php b/apps/files_texteditor/ajax/loadfile.php index 8ece844aa29..a946e26f210 100644 --- a/apps/files_texteditor/ajax/loadfile.php +++ b/apps/files_texteditor/ajax/loadfile.php @@ -21,7 +21,7 @@ */ // Init owncloud -require_once('../../../lib/base.php'); + // Check if we are a user diff --git a/apps/files_texteditor/ajax/mtime.php b/apps/files_texteditor/ajax/mtime.php index df90a68ca7a..436592c383f 100644 --- a/apps/files_texteditor/ajax/mtime.php +++ b/apps/files_texteditor/ajax/mtime.php @@ -21,7 +21,7 @@ */ // Init owncloud -require_once('../../../lib/base.php'); + // Check if we are a user diff --git a/apps/files_texteditor/ajax/savefile.php b/apps/files_texteditor/ajax/savefile.php index 57a948478f5..9f67cc4b4e6 100644 --- a/apps/files_texteditor/ajax/savefile.php +++ b/apps/files_texteditor/ajax/savefile.php @@ -21,7 +21,7 @@ */ // Init owncloud -require_once('../../../lib/base.php'); + // Check if we are a user diff --git a/apps/files_versioning/ajax/gethead.php b/apps/files_versioning/ajax/gethead.php index cc93b7a1d17..a0bfe77db51 100644 --- a/apps/files_versioning/ajax/gethead.php +++ b/apps/files_versioning/ajax/gethead.php @@ -4,7 +4,7 @@ * This file is licensed under the Affero General Public License version 3 or * later. */ -require_once('../../../lib/base.php'); + OC_JSON::checkLoggedIn(); // Fetch current commit (or HEAD if not yet set) diff --git a/apps/files_versioning/ajax/sethead.php b/apps/files_versioning/ajax/sethead.php index d1b2df9b00f..dd8b924b118 100644 --- a/apps/files_versioning/ajax/sethead.php +++ b/apps/files_versioning/ajax/sethead.php @@ -4,7 +4,7 @@ * This file is licensed under the Affero General Public License version 3 or * later. */ -require_once('../../../lib/base.php'); + OC_JSON::checkLoggedIn(); if(isset($_POST["file_versioning_head"])){ OC_Preferences::setValue(OC_User::getUser(), 'files_versioning', 'head', $_POST["file_versioning_head"]); diff --git a/apps/gallery/ajax/createAlbum.php b/apps/gallery/ajax/createAlbum.php index 152f5834bcb..ca02c3ae209 100644 --- a/apps/gallery/ajax/createAlbum.php +++ b/apps/gallery/ajax/createAlbum.php @@ -21,7 +21,7 @@ * */ -require_once('../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('gallery'); diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php index 1b3ad48f561..98cf71ec14f 100644 --- a/apps/gallery/ajax/galleryOp.php +++ b/apps/gallery/ajax/galleryOp.php @@ -22,7 +22,7 @@ */ header('Content-type: text/html; charset=UTF-8') ; -require_once('../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('gallery'); diff --git a/apps/gallery/ajax/sharing.php b/apps/gallery/ajax/sharing.php index fba85fa34ee..ce56d652c60 100644 --- a/apps/gallery/ajax/sharing.php +++ b/apps/gallery/ajax/sharing.php @@ -21,7 +21,7 @@ * */ -require_once('../../../lib/base.php'); + if (!isset($_GET['token']) || !isset($_GET['operation'])) { OC_JSON::error(array('cause' => 'Not enought arguments')); diff --git a/apps/gallery/ajax/thumbnail.php b/apps/gallery/ajax/thumbnail.php index 184171f8fca..bf42fd2becb 100644 --- a/apps/gallery/ajax/thumbnail.php +++ b/apps/gallery/ajax/thumbnail.php @@ -21,7 +21,7 @@ * */ -require_once('../../../lib/base.php'); + OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('gallery'); diff --git a/apps/gallery/index.php b/apps/gallery/index.php index 7de7c094142..8c45cfb19fc 100644 --- a/apps/gallery/index.php +++ b/apps/gallery/index.php @@ -21,7 +21,7 @@ * */ -require_once('../../lib/base.php'); + OC_Util::checkLoggedIn(); OC_Util::checkAppEnabled('gallery'); diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php index ef361a37913..efc545f0205 100644 --- a/apps/gallery/lib/album.php +++ b/apps/gallery/lib/album.php @@ -92,7 +92,7 @@ class OC_Gallery_Album { } public static function changeThumbnailPath($oldname, $newname) { - require_once('../../../lib/base.php'); + $thumbpath = OC::$CONFIG_DATADIRECTORY.'/../gallery/'; rename($thumbpath.$oldname.'.png', $thumbpath.$newname.'.png'); } diff --git a/apps/gallery/lib/images_utils.php b/apps/gallery/lib/images_utils.php index 126298913be..6f3959a342d 100644 --- a/apps/gallery/lib/images_utils.php +++ b/apps/gallery/lib/images_utils.php @@ -22,7 +22,7 @@ */ if (file_exists('../../../lib/base.php')) - require_once('../../../lib/base.php'); + elseif (file_exists('lib/base.php')) require_once('lib/base.php'); diff --git a/apps/gallery/sharing.php b/apps/gallery/sharing.php index d7430becf43..2739f63d4e0 100644 --- a/apps/gallery/sharing.php +++ b/apps/gallery/sharing.php @@ -25,7 +25,7 @@ if (!isset($_GET['token']) || empty($_GET['token'])) { exit; } -require_once('../../lib/base.php'); + OC_Util::checkAppEnabled('gallery'); diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php index 9d9c14deb17..72235bf5db8 100644 --- a/apps/media/ajax/api.php +++ b/apps/media/ajax/api.php @@ -23,7 +23,7 @@ header('Content-type: text/html; charset=UTF-8') ; -require_once('../../../lib/base.php'); + OC_JSON::checkAppEnabled('media'); require_once('../lib_collection.php'); require_once('../lib_scanner.php'); diff --git a/apps/media/ajax/autoupdate.php b/apps/media/ajax/autoupdate.php index a78b5e25dd1..ea7c5006e70 100644 --- a/apps/media/ajax/autoupdate.php +++ b/apps/media/ajax/autoupdate.php @@ -27,7 +27,7 @@ header('Content-type: text/html; charset=UTF-8') ; $RUNTIME_NOAPPS=true; $RUNTIME_NOSETUPFS=true; -require_once('../../../lib/base.php'); + OC_JSON::checkAppEnabled('media'); $autoUpdate=(isset($_GET['autoupdate']) and $_GET['autoupdate']=='true'); diff --git a/apps/media/index.php b/apps/media/index.php index 419d4ae0bde..f51d62b77cd 100644 --- a/apps/media/index.php +++ b/apps/media/index.php @@ -22,7 +22,7 @@ */ -require_once('../../lib/base.php'); + // Check if we are a user OC_Util::checkLoggedIn(); diff --git a/apps/media/server/xml.server.php b/apps/media/server/xml.server.php index cb9b68fc422..83339c91af1 100644 --- a/apps/media/server/xml.server.php +++ b/apps/media/server/xml.server.php @@ -22,7 +22,7 @@ */ -require_once('../../../lib/base.php'); + OC_Util::checkAppEnabled('media'); require_once('../lib_collection.php'); require_once('../lib_ampache.php'); diff --git a/apps/media/tomahawk.php b/apps/media/tomahawk.php index 6dd41233f12..1ff2599e103 100644 --- a/apps/media/tomahawk.php +++ b/apps/media/tomahawk.php @@ -23,7 +23,7 @@ $_POST=$_GET; //debug -require_once('../../lib/base.php'); + OC_JSON::checkAppEnabled('media'); require_once('lib_collection.php'); diff --git a/apps/remoteStorage/WebDAV.php b/apps/remoteStorage/WebDAV.php index cad465181a9..3522d1ed683 100644 --- a/apps/remoteStorage/WebDAV.php +++ b/apps/remoteStorage/WebDAV.php @@ -29,7 +29,7 @@ // Do not load FS ... $RUNTIME_NOSETUPFS = true; -require_once('../../lib/base.php'); + OC_Util::checkAppEnabled('remoteStorage'); require_once('Sabre/autoload.php'); require_once('lib_remoteStorage.php'); diff --git a/apps/remoteStorage/ajax/revokeToken.php b/apps/remoteStorage/ajax/revokeToken.php index ca56cf560ec..376fe29b3e7 100644 --- a/apps/remoteStorage/ajax/revokeToken.php +++ b/apps/remoteStorage/ajax/revokeToken.php @@ -29,7 +29,7 @@ // Do not load FS ... $RUNTIME_NOSETUPFS = true; -require_once('../../../lib/base.php'); + OC_Util::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 c00f9d5555c..d2b9eece35b 100644 --- a/apps/remoteStorage/auth.php +++ b/apps/remoteStorage/auth.php @@ -29,7 +29,7 @@ // Do not load FS ... $RUNTIME_NOSETUPFS = true; -require_once('../../lib/base.php'); + OC_Util::checkAppEnabled('remoteStorage'); require_once('Sabre/autoload.php'); require_once('lib_remoteStorage.php'); diff --git a/apps/user_migrate/ajax/export.php b/apps/user_migrate/ajax/export.php index 86745d6b162..99503cad142 100644 --- a/apps/user_migrate/ajax/export.php +++ b/apps/user_migrate/ajax/export.php @@ -21,7 +21,7 @@ * */ // Init owncloud -require_once('../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); diff --git a/apps/user_webfinger/webfinger.php b/apps/user_webfinger/webfinger.php index 9ada473ca87..51686111bf7 100644 --- a/apps/user_webfinger/webfinger.php +++ b/apps/user_webfinger/webfinger.php @@ -25,7 +25,7 @@ $SUBURI=substr(realpath($_SERVER["SCRIPT_FILENAME"]),strlen($SERVERROOT)); $WEBROOT=substr($SUBURI,0,-34); */ -require_once('../../lib/base.php'); + $request = urldecode($_GET['q']); if($_GET['q']) { $reqParts = explode('@', $request); diff --git a/core/ajax/appconfig.php b/core/ajax/appconfig.php index f815d710631..41e421b2fe4 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 cc15102bbc3..ba079e2dae1 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 a6433b1964a..3091926095f 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 c8168eaf460..d9910d5a98f 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 258bd50fcad..a55c54a9a46 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 a58489228d8..b0183af7fc5 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 75def433d30..f96add3d8c3 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 252b3d3454c..5b346bef28c 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 89bb6cfa794..1400ec67cab 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 1c78d720947..5f16e854f42 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/files/ajax/autocomplete.php b/files/ajax/autocomplete.php index 8d7a5b482bd..8cdb6188a02 100644 --- a/files/ajax/autocomplete.php +++ b/files/ajax/autocomplete.php @@ -3,7 +3,7 @@ // Init owncloud -require_once('../../lib/base.php'); + OC_JSON::checkLoggedIn(); diff --git a/files/ajax/delete.php b/files/ajax/delete.php index 1725201fdd9..d8a01d7acf1 100644 --- a/files/ajax/delete.php +++ b/files/ajax/delete.php @@ -1,7 +1,7 @@ <?php // Init owncloud -require_once('../../lib/base.php'); + OC_JSON::checkLoggedIn(); diff --git a/files/ajax/download.php b/files/ajax/download.php index 39852613ab9..65c04c36faf 100644 --- a/files/ajax/download.php +++ b/files/ajax/download.php @@ -25,7 +25,7 @@ $RUNTIME_APPTYPES=array('filesystem'); // Init owncloud -require_once('../../lib/base.php'); + // Check if we are a user OC_Util::checkLoggedIn(); diff --git a/files/ajax/list.php b/files/ajax/list.php index ec9ab7342dd..83914332a7d 100644 --- a/files/ajax/list.php +++ b/files/ajax/list.php @@ -4,7 +4,7 @@ $RUNTIME_APPTYPES=array('filesystem'); // Init owncloud -require_once('../../lib/base.php'); + OC_JSON::checkLoggedIn(); diff --git a/files/ajax/mimeicon.php b/files/ajax/mimeicon.php index ff72ba0f5b7..57898cd82d9 100644 --- a/files/ajax/mimeicon.php +++ b/files/ajax/mimeicon.php @@ -4,7 +4,7 @@ $RUNTIME_NOAPPS=false; // Init owncloud -require_once('../../lib/base.php'); + print OC_Helper::mimetypeIcon($_GET['mime']); diff --git a/files/ajax/move.php b/files/ajax/move.php index 9af3f80208f..0ad314f873c 100644 --- a/files/ajax/move.php +++ b/files/ajax/move.php @@ -1,7 +1,7 @@ <?php // Init owncloud -require_once('../../lib/base.php'); + OC_JSON::checkLoggedIn(); diff --git a/files/ajax/newfile.php b/files/ajax/newfile.php index 2d1372f06ee..472b577a32a 100644 --- a/files/ajax/newfile.php +++ b/files/ajax/newfile.php @@ -1,7 +1,7 @@ <?php // Init owncloud -require_once('../../lib/base.php'); + OC_JSON::checkLoggedIn(); diff --git a/files/ajax/newfolder.php b/files/ajax/newfolder.php index 228e369fbef..2aff95e5b35 100644 --- a/files/ajax/newfolder.php +++ b/files/ajax/newfolder.php @@ -1,7 +1,7 @@ <?php // Init owncloud -require_once('../../lib/base.php'); + OC_JSON::checkLoggedIn(); diff --git a/files/ajax/rawlist.php b/files/ajax/rawlist.php index e02c5b62733..8f1990d1b8f 100644 --- a/files/ajax/rawlist.php +++ b/files/ajax/rawlist.php @@ -4,7 +4,7 @@ $RUNTIME_APPTYPES=array('filesystem'); // Init owncloud -require_once('../../lib/base.php'); + require_once('../../lib/template.php'); OC_JSON::checkLoggedIn(); diff --git a/files/ajax/rename.php b/files/ajax/rename.php index a51b36635b3..dc5d3962abd 100644 --- a/files/ajax/rename.php +++ b/files/ajax/rename.php @@ -1,7 +1,7 @@ <?php // Init owncloud -require_once('../../lib/base.php'); + OC_JSON::checkLoggedIn(); diff --git a/files/ajax/upload.php b/files/ajax/upload.php index b04796e3248..c60e1a3752a 100644 --- a/files/ajax/upload.php +++ b/files/ajax/upload.php @@ -1,7 +1,7 @@ <?php // Init owncloud -require_once('../../lib/base.php'); + // Firefox and Konqueror tries to download application/json for me. --Arthur OC_JSON::setContentTypeHeader('text/plain'); diff --git a/search/ajax/search.php b/search/ajax/search.php index 326724d60c4..8f89256b827 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/settings/ajax/changepassword.php b/settings/ajax/changepassword.php index 860ea987871..0ed3c4919f5 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 57d82e7bd94..faeccf48b58 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 1ed53efcf06..e1eb1a78669 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 53e9be379e1..859c293722b 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 cb116ebe4e8..bebcbcc903f 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 ed48b2cae1a..bcb05fdd02b 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 5874dec9647..4368566992c 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 58d071255c2..712f5b652fe 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 4d364781894..73f86061e3f 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 2c288997a1f..325549ba3b5 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 e3b00c3bc80..bcdc3bc1338 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 298cbd64738..6383ce3c808 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 f59017600ac..0e2ca31f147 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 3ee3239dd89..9449261af7c 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(); |