diff options
198 files changed, 424 insertions, 242 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..ceeb034ec9d 100644 --- a/apps/bookmarks/ajax/addBookmark.php +++ b/apps/bookmarks/ajax/addBookmark.php @@ -24,12 +24,12 @@ //no apps or filesystem $RUNTIME_NOSETUPFS=true; -require_once('../../../lib/base.php'); + // Check if we are a user OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('bookmarks'); -require_once('../bookmarksHelper.php'); +require_once(OC::$APPSROOT . '/apps/bookmarks/bookmarksHelper.php'); $id = addBookmark($_GET['url'], $_GET['title'], $_GET['tags']); OC_JSON::success(array('data' => $id));
\ No newline at end of file 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/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js index 16ed14c89b2..38b8c43eb7d 100644 --- a/apps/bookmarks/js/bookmarks.js +++ b/apps/bookmarks/js/bookmarks.js @@ -20,7 +20,7 @@ function getBookmarks() { } $.ajax({ - url: 'ajax/updateList.php', + url: OC.filePath('bookmarks', 'ajax', 'updateList.php'), data: 'tag=' + encodeURIComponent($('#bookmarkFilterTag').val()) + '&page=' + bookmarks_page + '&sort=' + bookmarks_sorting, success: function(bookmarks){ if (bookmarks.data.length) { @@ -63,7 +63,7 @@ function addOrEditBookmark(event) { if (id == 0) { $.ajax({ - url: 'ajax/addBookmark.php', + url: OC.filePath('bookmarks', 'ajax', 'addBookmark.php'), data: 'url=' + encodeURIComponent(url) + '&title=' + encodeURIComponent(title) + '&tags=' + encodeURIComponent(tags), success: function(response){ $('.bookmarks_input').val(''); @@ -75,7 +75,7 @@ function addOrEditBookmark(event) { } else { $.ajax({ - url: 'ajax/editBookmark.php', + url: OC.filePath('bookmarks', 'ajax', 'editBookmark.php'), data: 'id=' + id + '&url=' + encodeURIComponent(url) + '&title=' + encodeURIComponent(title) + '&tags=' + encodeURIComponent(tags), success: function(){ $('.bookmarks_input').val(''); @@ -92,7 +92,7 @@ function addOrEditBookmark(event) { function delBookmark(event) { var record = $(this).parent().parent(); $.ajax({ - url: 'ajax/delBookmark.php', + url: OC.filePath('bookmarks', 'ajax', 'delBookmark.php'), data: 'url=' + encodeURIComponent($(this).parent().parent().children('.bookmark_url:first').text()), success: function(data){ record.remove(); @@ -164,7 +164,7 @@ function updateOnBottom() { function recordClick(event) { $.ajax({ - url: 'ajax/recordClick.php', + url: OC.filePath('bookmarks', 'ajax', 'recordClick.php'), data: 'url=' + encodeURIComponent($(this).attr('href')), }); } diff --git a/apps/bookmarks/templates/list.php b/apps/bookmarks/templates/list.php index 1abdbb7f838..9fe9ee7a9a9 100644 --- a/apps/bookmarks/templates/list.php +++ b/apps/bookmarks/templates/list.php @@ -20,7 +20,7 @@ <div id="firstrun" style="display: none;"> <?php echo $l->t('You have no bookmarks'); - require_once('bookmarklet.php'); + require_once(OC::$APPSROOT . '/apps/bookmarks/templates/bookmarklet.php'); createBookmarklet(); ?> </div> 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 76e29cbe265..736a5625530 100644 --- a/apps/calendar/ajax/changeview.php +++ b/apps/calendar/ajax/changeview.php @@ -5,8 +5,6 @@ * later. * 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 fd7b709393a..3b726651641 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 97b0907c839..e963da32958 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 f65b67b84ac..172488f6241 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 63995602de2..75d174c13e1 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 91b95546569..62087e9a817 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 75d6e0b2547..260b6914426 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 5b3d26b53b7..8adaa4c98f3 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'); OC_JSON::checkLoggedIn(); 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 4d5e7340aef..5848cac448d 100644 --- a/apps/calendar/ajax/import/import.php +++ b/apps/calendar/ajax/import/import.php @@ -7,7 +7,6 @@ */ //check for calendar rights or create new one ob_start(); -require_once ('../../../../lib/base.php'); OC_JSON::checkLoggedIn(); OC_Util::checkAppEnabled('calendar'); $nl="\r\n"; @@ -127,4 +126,4 @@ sleep(3); if(is_writable('import_tmp/')){ unlink($progressfile); } -OC_JSON::success();
\ No newline at end of file +OC_JSON::success(); 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 41d49e7b521..faf2a13c56b 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 2e81040b477..70f1ec26ae6 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 5bedbaaf0a6..c68fc23a6cb 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..7210b25879f 100644 --- a/apps/calendar/caldav.php +++ b/apps/calendar/caldav.php @@ -8,8 +8,8 @@ // Do not load FS ... $RUNTIME_NOSETUPFS = true; +require_once('../inc.php'); -require_once('../../lib/base.php'); OC_Util::checkAppEnabled('calendar'); // Backends diff --git a/apps/calendar/export.php b/apps/calendar/export.php index 95cba03906f..0972ee0f788 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/index.php b/apps/calendar/index.php index c44de7f07df..417d2b6c225 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'); @@ -22,8 +22,8 @@ foreach($calendars as $calendar){ $eventSources[] = OC_Calendar_Calendar::getEventSourceInfo($calendar); } -$eventSources[] = array('url' => 'ajax/events.php?calendar_id=shared_rw', 'backgroundColor' => '#1D2D44', 'borderColor' => '#888', 'textColor' => 'white', 'editable'=>'true'); -$eventSources[] = array('url' => 'ajax/events.php?calendar_id=shared_r', 'backgroundColor' => '#1D2D44', 'borderColor' => '#888', 'textColor' => 'white', 'editable' => 'false'); +$eventSources[] = array('url' => '?app=calendar&getfile=ajax/events.php?calendar_id=shared_rw', 'backgroundColor' => '#1D2D44', 'borderColor' => '#888', 'textColor' => 'white', 'editable'=>'true'); +$eventSources[] = array('url' => '?app=calendar&getfile=ajax/events.php?calendar_id=shared_r', 'backgroundColor' => '#1D2D44', 'borderColor' => '#888', 'textColor' => 'white', 'editable' => 'false'); OC_Hook::emit('OC_Calendar', 'getSources', array('sources' => &$eventSources)); $categories = OC_Calendar_App::getCategoryOptions(); diff --git a/apps/calendar/templates/part.editevent.php b/apps/calendar/templates/part.editevent.php index 58314db1a6b..102366f8f08 100644 --- a/apps/calendar/templates/part.editevent.php +++ b/apps/calendar/templates/part.editevent.php @@ -5,9 +5,9 @@ <?php echo $this->inc("part.eventform"); ?> <div style="width: 100%;text-align: center;color: #FF1D1D;" id="errorbox"></div> <span id="actions"> - <input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('ajax/event/edit.php');"> - <input type="button" class="submit" style="float: left;" name="delete" value="<?php echo $l->t("Delete");?>" onclick="Calendar.UI.submitDeleteEventForm('ajax/event/delete.php');"> - <input type="button" class="submit" style="float: right;" name="export" value="<?php echo $l->t("Export");?>" onclick="window.location='export.php?eventid=<?php echo $_['eventid'] ?>';"> + <input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('?app=calendar&getfile=ajax/event/edit.php');"> + <input type="button" class="submit" style="float: left;" name="delete" value="<?php echo $l->t("Delete");?>" onclick="Calendar.UI.submitDeleteEventForm('?app=calendar&getfile=ajax/event/delete.php');"> + <input type="button" class="submit" style="float: right;" name="export" value="<?php echo $l->t("Export");?>" onclick="window.location='?app=calendar&getfile=export.php?eventid=<?php echo $_['eventid'] ?>';"> </span> </form> </div> diff --git a/apps/calendar/templates/part.newevent.php b/apps/calendar/templates/part.newevent.php index 11416260344..f4bb867b180 100644 --- a/apps/calendar/templates/part.newevent.php +++ b/apps/calendar/templates/part.newevent.php @@ -3,7 +3,7 @@ <?php echo $this->inc("part.eventform"); ?> <div style="width: 100%;text-align: center;color: #FF1D1D;" id="errorbox"></div> <span id="actions"> - <input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('ajax/event/new.php');"> + <input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('?app=calendar&getfile=ajax/event/new.php');"> </span> </form> </div> 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 2f95cdc9328..c076d97a7c2 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 d003834ef8c..c1a0e2b0583 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 15d4718241e..082776f7f27 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..1a11ccdb3f7 100644 --- a/apps/contacts/carddav.php +++ b/apps/contacts/carddav.php @@ -22,8 +22,8 @@ // Do not load FS ... $RUNTIME_NOSETUPFS = true; +require_once('../inc.php'); -require_once('../../lib/base.php'); OC_Util::checkAppEnabled('contacts'); // Backends diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css index ae96c5e4e9f..e3d2cfbdd66 100644 --- a/apps/contacts/css/contacts.css +++ b/apps/contacts/css/contacts.css @@ -11,7 +11,7 @@ #actionbar { height: 30px; width: 60px; position: fixed; right: 0px; top: 4em; margin: 0 0 0 0; padding: 0 0 0 0; z-index: 1000; } #contacts_deletecard {position:absolute;top:15px;right:25px;} #contacts_downloadcard {position:absolute;top:15px;right:50px;} -#contacts_propertymenu_button { position:absolute;top:15px;right:150px; background:url('../../../core/img/actions/add.svg') no-repeat center; } +#contacts_propertymenu_button { position:absolute;top:15px;right:150px; background:url('%webroot%/core/img/actions/add.svg') no-repeat center; } #contacts_propertymenu { background-color: #fff; position:absolute;top:40px;right:150px; overflow:hidden; text-overflow:ellipsis; /*border: thin solid #1d2d44;*/ -moz-box-shadow:0 0 10px #000; -webkit-box-shadow:0 0 10px #000; box-shadow:0 0 10px #000; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; -moz-border-radius:0.5em; -webkit-border-radius:0.5em; border-radius:0.5em; } #contacts_propertymenu li { display: block; font-weight: bold; height: 20px; width: 100px; } #contacts_propertymenu li a { padding: 3px; display: block } @@ -35,20 +35,20 @@ dl.form { width: 100%; float: left; clear: right; margin: 0; padding: 0; } #address.form dl { min-width: 10em; } .droptarget { margin: 0.5em; padding: 0.5em; border: thin solid #ccc; -moz-border-radius:.3em; -webkit-border-radius:.3em; border-radius:.3em; } .droppable { margin: 0.5em; padding: 0.5em; border: thin dashed #333; -moz-border-radius:.3em; -webkit-border-radius:.3em; border-radius:.3em; } -.loading { background: url('../../../core/img/loading.gif') no-repeat center !important; /*cursor: progress; */ cursor: wait; } -.ui-autocomplete-loading { background: url('../../../core/img/loading.gif') right center no-repeat; } +.loading { background: url('%webroot%/core/img/loading.gif') no-repeat center !important; /*cursor: progress; */ cursor: wait; } +.ui-autocomplete-loading { background: url('%webroot%/core/img/loading.gif') right center no-repeat; } .float { float: left; } .listactions { height: 1em; width:60px; float: left; clear: right; } .add,.edit,.delete,.mail, .globe, .upload, .cloud { cursor: pointer; width: 20px; height: 20px; margin: 0; float: left; position:relative; opacity: 0.1; } .add:hover,.edit:hover,.delete:hover,.mail:hover, .globe:hover, .upload:hover, .cloud:hover { opacity: 1.0 } -.add { background:url('../../../core/img/actions/add.svg') no-repeat center; clear: both; } -.delete { background:url('../../../core/img/actions/delete.svg') no-repeat center; } -.edit { background:url('../../../core/img/actions/rename.svg') no-repeat center; } -.mail { background:url('../../../core/img/actions/mail.svg') no-repeat center; } -.upload { background:url('../../../core/img/actions/upload.svg') no-repeat center; } -.cloud { background:url('../../../core/img/places/picture.svg') no-repeat center; } +.add { background:url('%webroot%/core/img/actions/add.svg') no-repeat center; clear: both; } +.delete { background:url('%webroot%/core/img/actions/delete.svg') no-repeat center; } +.edit { background:url('%webroot%/core/img/actions/rename.svg') no-repeat center; } +.mail { background:url('%webroot%/core/img/actions/mail.svg') no-repeat center; } +.upload { background:url('%webroot%/core/img/actions/upload.svg') no-repeat center; } +.cloud { background:url('%webroot%/core/img/places/picture.svg') no-repeat center; } /*.globe { background:url('../img/globe.svg') no-repeat center; }*/ -.globe { background:url('../../../core/img/actions/public.svg') no-repeat center; } +.globe { background:url('%webroot%/core/img/actions/public.svg') no-repeat center; } .transparent{ opacity: 0.6; } #edit_name_dialog { padding:0; } #edit_name_dialog > input { width: 15em; } @@ -65,7 +65,7 @@ dl.form { width: 100%; float: left; clear: right; margin: 0; padding: 0; } .contactpart legend { width:auto; padding:.3em; border:1px solid #ddd; font-weight:bold; cursor:pointer; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; } #cropbox { margin: auto; } -#contacts_details_photo { border-radius: 0.5em; border: thin solid #bbb; margin: 0.3em; background: url(../../../core/img/loading.gif) no-repeat center center; display: block; -moz-box-shadow: 0 1px 3px #777; -webkit-box-shadow: 0 1px 3px #777; box-shadow: 0 1px 3px #777; } +#contacts_details_photo { border-radius: 0.5em; border: thin solid #bbb; margin: 0.3em; background: url('%webroot%/core/img/loading.gif') no-repeat center center; display: block; -moz-box-shadow: 0 1px 3px #777; -webkit-box-shadow: 0 1px 3px #777; box-shadow: 0 1px 3px #777; } #contacts_details_photo:hover { background: #fff; cursor: default; } #phototools { position:absolute; margin: 5px 0 0 10px; width:auto; height:22px; padding:0px; background-color:#fff; list-style-type:none; border-radius: 0.5em; -moz-box-shadow: 0 1px 3px #777; -webkit-box-shadow: 0 1px 3px #777; box-shadow: 0 1px 3px #777; } #phototools li { display: inline; } @@ -101,4 +101,3 @@ input[type="checkbox"] { width: 20px; height: 20px; vertical-align: bottom; } .propertylist li > select { float: left; max-width: 8em; } .typelist { float: left; max-width: 10em; } /* for multiselect */ .addresslist { clear: both; } - 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 45f1b0c53dc..8e0a427399b 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('contacts'); $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/js/contacts.js b/apps/contacts/js/contacts.js index e649e1744c3..edb7da70407 100644 --- a/apps/contacts/js/contacts.js +++ b/apps/contacts/js/contacts.js @@ -302,7 +302,7 @@ Contacts={ Contacts.UI.loadHandlers(); Contacts.UI.Card.loadContact(jsondata.data); $('#leftcontent .active').removeClass('active'); - var item = '<li data-id="'+jsondata.data.id+'" class="active"><a href="index.php?id='+jsondata.data.id+'" style="background: url(thumbnail.php?id='+jsondata.data.id+') no-repeat scroll 0% 0% transparent;">'+Contacts.UI.Card.fn+'</a></li>'; + var item = '<li data-id="'+jsondata.data.id+'" class="active"><a href="index.php?id='+jsondata.data.id+'" style="background: url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+jsondata.data.id+') no-repeat scroll 0% 0% transparent;">'+Contacts.UI.Card.fn+'</a></li>'; var added = false; $('#leftcontent ul li').each(function(){ if ($(this).text().toLowerCase() > Contacts.UI.Card.fn.toLowerCase()) { @@ -1528,12 +1528,12 @@ Contacts={ lazyupdate:function(){ $('#contacts li').live('inview', function(){ if (!$(this).find('a').attr('style')) { - $(this).find('a').css('background','url(thumbnail.php?id='+$(this).data('id')+') no-repeat'); + $(this).find('a').css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+$(this).data('id')+') no-repeat'); } }); }, refreshThumbnail:function(id){ - $('#contacts [data-id="'+id+'"]').find('a').css('background','url(thumbnail.php?id='+id+'&refresh=1'+Math.random()+') no-repeat'); + $('#contacts [data-id="'+id+'"]').find('a').css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+id+'&refresh=1'+Math.random()+') no-repeat'); } } } @@ -1592,7 +1592,7 @@ $(document).ready(function(){ // whole part of element is visible if (!$(this).find('a').attr('style')) { //alert($(this).data('id') + ' has background: ' + $(this).attr('style')); - $(this).find('a').css('background','url(thumbnail.php?id='+$(this).data('id')+') no-repeat'); + $(this).find('a').css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+$(this).data('id')+') no-repeat'); }/* else { alert($(this).data('id') + ' has style ' + $(this).attr('style').match('url')); }*/ diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php index 117d0a9808f..c19ccccbc7f 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/templates/index.php b/apps/contacts/templates/index.php index 256d10afc07..d7aabbe76a5 100644 --- a/apps/contacts/templates/index.php +++ b/apps/contacts/templates/index.php @@ -16,8 +16,8 @@ </div> <div id="bottomcontrols"> <form> - <img class="svg" id="contacts_newcontact" src="img/contact-new.svg" alt="<?php echo $l->t('Add Contact'); ?>" title="<?php echo $l->t('Add Contact'); ?>" /> - <img class="svg" id="chooseaddressbook" src="../../core/img/actions/settings.svg" alt="<?php echo $l->t('Addressbooks'); ?>" title="<?php echo $l->t('Addressbooks'); ?>" /> + <img class="svg" id="contacts_newcontact" src="<?php echo OC_Helper::linkTo('contacts', 'img/contact-new.svg'); ?>" alt="<?php echo $l->t('Add Contact'); ?>" title="<?php echo $l->t('Add Contact'); ?>" /> + <img class="svg" id="chooseaddressbook" src="core/img/actions/settings.svg" alt="<?php echo $l->t('Addressbooks'); ?>" title="<?php echo $l->t('Addressbooks'); ?>" /> </form> </div> <div id="rightcontent" class="rightcontent" data-id="<?php echo $_['id']; ?>"> diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php index 28b8eba22c9..13f16954caf 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/files/admin.php b/apps/files/admin.php index 4ae3ee51236..bdea70506fb 100644 --- a/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/files/ajax/autocomplete.php b/apps/files/ajax/autocomplete.php index 8d7a5b482bd..8cdb6188a02 100644 --- a/files/ajax/autocomplete.php +++ b/apps/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/apps/files/ajax/delete.php index 1725201fdd9..d8a01d7acf1 100644 --- a/files/ajax/delete.php +++ b/apps/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/apps/files/ajax/download.php index 39852613ab9..65c04c36faf 100644 --- a/files/ajax/download.php +++ b/apps/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/apps/files/ajax/list.php index ec9ab7342dd..83914332a7d 100644 --- a/files/ajax/list.php +++ b/apps/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/apps/files/ajax/mimeicon.php index ff72ba0f5b7..57898cd82d9 100644 --- a/files/ajax/mimeicon.php +++ b/apps/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/apps/files/ajax/move.php index 9af3f80208f..0ad314f873c 100644 --- a/files/ajax/move.php +++ b/apps/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/apps/files/ajax/newfile.php index 2d1372f06ee..472b577a32a 100644 --- a/files/ajax/newfile.php +++ b/apps/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/apps/files/ajax/newfolder.php index 228e369fbef..2aff95e5b35 100644 --- a/files/ajax/newfolder.php +++ b/apps/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/apps/files/ajax/rawlist.php index e02c5b62733..8f1990d1b8f 100644 --- a/files/ajax/rawlist.php +++ b/apps/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/apps/files/ajax/rename.php index a51b36635b3..dc5d3962abd 100644 --- a/files/ajax/rename.php +++ b/apps/files/ajax/rename.php @@ -1,7 +1,7 @@ <?php // Init owncloud -require_once('../../lib/base.php'); + OC_JSON::checkLoggedIn(); diff --git a/files/ajax/scan.php b/apps/files/ajax/scan.php index c60e34b5176..a227dcc3ffc 100644 --- a/files/ajax/scan.php +++ b/apps/files/ajax/scan.php @@ -1,7 +1,5 @@ <?php -require_once '../../lib/base.php'; - set_time_limit(0);//scanning can take ages $force=isset($_GET['force']) and $_GET['force']=='true'; diff --git a/files/ajax/timezone.php b/apps/files/ajax/timezone.php index 8e1d2aa1ec1..8e1d2aa1ec1 100644 --- a/files/ajax/timezone.php +++ b/apps/files/ajax/timezone.php diff --git a/files/ajax/upload.php b/apps/files/ajax/upload.php index b04796e3248..c60e1a3752a 100644 --- a/files/ajax/upload.php +++ b/apps/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/files/appinfo/app.php b/apps/files/appinfo/app.php index c4a2ee7407a..c4a2ee7407a 100644 --- a/files/appinfo/app.php +++ b/apps/files/appinfo/app.php diff --git a/files/css/files.css b/apps/files/css/files.css index 9dce2d9f944..a135f7ded5b 100644 --- a/files/css/files.css +++ b/apps/files/css/files.css @@ -20,7 +20,7 @@ #new>ul>li>p { cursor:pointer; } #new>ul>li>input { padding:0.3em; margin:-0.3em; } -#file_newfolder_name { background-image:url('../../core/img/places/folder.svg'); font-weight:normal; width:7em; } +#file_newfolder_name { background-image:url('%webroot%/core/img/places/folder.svg'); font-weight:normal; width:7em; } .file_upload_start, .file_upload_filename { font-size:1em; } #file_newfolder_submit, #file_upload_submit { width:3em; } .file_upload_target { display:none; } @@ -85,7 +85,7 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; } .selectedActions a img { position:relative; top:.3em; } /* add breadcrumb divider to the File item in navigation panel */ -#navigation>ul>li:first-child { background:url('../../core/img/breadcrumb-start.svg') no-repeat 12.5em 0px; width:12.5em; padding-right:1em; position:fixed; } +#navigation>ul>li:first-child { background:url('%webroot%/core/img/breadcrumb-start.svg') no-repeat 12.5em 0px; width:12.5em; padding-right:1em; position:fixed; } #navigation>ul>li:first-child+li { padding-top:2.9em; } #scanning-message{ top:40%; left:40%; position:absolute; display:none } diff --git a/files/download.php b/apps/files/download.php index d1f5ba486d7..ec4a6e1fc9c 100644 --- a/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/files/index.php b/apps/files/index.php index 84dbb9f343f..8464db30f01 100644 --- a/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/files/js/admin.js b/apps/files/js/admin.js index bfa96670635..bfa96670635 100644 --- a/files/js/admin.js +++ b/apps/files/js/admin.js diff --git a/files/js/fileactions.js b/apps/files/js/fileactions.js index 975af938440..68268a7d3a9 100644 --- a/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -135,7 +135,7 @@ $(document).ready(function(){ var downloadScope = 'file'; } FileActions.register(downloadScope,'Download',function(){return OC.imagePath('core','actions/download')},function(filename){ - window.location='ajax/download.php?files='+encodeURIComponent(filename)+'&dir='+encodeURIComponent($('#dir').val()); + window.location=OC.filePath('files', 'ajax', 'download.php') + '?files='+encodeURIComponent(filename)+'&dir='+encodeURIComponent($('#dir').val()); }); }); diff --git a/files/js/filelist.js b/apps/files/js/filelist.js index febdfc473b1..febdfc473b1 100644 --- a/files/js/filelist.js +++ b/apps/files/js/filelist.js diff --git a/files/js/files.js b/apps/files/js/files.js index e13e256efc4..2dce00035e1 100644 --- a/files/js/files.js +++ b/apps/files/js/files.js @@ -169,7 +169,7 @@ $(document).ready(function() { var dir=$('#dir').val()||'/'; $('#notification').text(t('files','generating ZIP-file, it may take some time.')); $('#notification').fadeIn(); - window.location='ajax/download.php?files='+encodeURIComponent(files)+'&dir='+encodeURIComponent(dir); + window.location=OC.filePath('files', 'ajax', 'download.php') + '?files='+encodeURIComponent(files)+'&dir='+encodeURIComponent(dir); return false; }); @@ -572,7 +572,7 @@ var folderDropOptions={ var target=$(this).text().trim(); var dir=$('#dir').val(); $.ajax({ - url: 'ajax/move.php', + url: OC.filePath('files', 'ajax', 'move.php'), data: "dir="+encodeURIComponent(dir)+"&file="+encodeURIComponent(file)+'&target='+encodeURIComponent(dir)+'/'+encodeURIComponent(target), complete: function(data){boolOperationFinished(data, function(){ var el = $('#fileList tr').filterAttr('data-file',file).find('td.filename'); @@ -598,7 +598,7 @@ var crumbDropOptions={ return; } $.ajax({ - url: 'ajax/move.php', + url: OC.filePath('files', 'ajax', 'move.php'), data: "dir="+encodeURIComponent(dir)+"&file="+encodeURIComponent(file)+'&target='+encodeURIComponent(target), complete: function(data){boolOperationFinished(data, function(){ FileList.remove(file); diff --git a/files/js/jquery.fileupload.js b/apps/files/js/jquery.fileupload.js index a89e9dc2c44..a89e9dc2c44 100644 --- a/files/js/jquery.fileupload.js +++ b/apps/files/js/jquery.fileupload.js diff --git a/files/js/jquery.iframe-transport.js b/apps/files/js/jquery.iframe-transport.js index d85c0c11297..d85c0c11297 100644 --- a/files/js/jquery.iframe-transport.js +++ b/apps/files/js/jquery.iframe-transport.js diff --git a/files/js/timezone.js b/apps/files/js/timezone.js index d569683f210..4749417199d 100644 --- a/files/js/timezone.js +++ b/apps/files/js/timezone.js @@ -3,7 +3,7 @@ $(document).ready(function() { var visitortimezone = (-new Date().getTimezoneOffset()/60); $.ajax({ type: "GET", - url: "ajax/timezone.php", + url: OC.filePath('files', 'ajax', 'timezone.php'), data: 'time='+ visitortimezone, success: function(){ location.reload(); diff --git a/files/l10n/ar.php b/apps/files/l10n/ar.php index 50edc0d6979..50edc0d6979 100644 --- a/files/l10n/ar.php +++ b/apps/files/l10n/ar.php diff --git a/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php index 027a7698203..027a7698203 100644 --- a/files/l10n/bg_BG.php +++ b/apps/files/l10n/bg_BG.php diff --git a/files/l10n/ca.php b/apps/files/l10n/ca.php index b85b36f5c02..b85b36f5c02 100644 --- a/files/l10n/ca.php +++ b/apps/files/l10n/ca.php diff --git a/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php index 5d26b26604a..5d26b26604a 100644 --- a/files/l10n/cs_CZ.php +++ b/apps/files/l10n/cs_CZ.php diff --git a/files/l10n/da.php b/apps/files/l10n/da.php index f86a98d44c1..f86a98d44c1 100644 --- a/files/l10n/da.php +++ b/apps/files/l10n/da.php diff --git a/files/l10n/de.php b/apps/files/l10n/de.php index 94d312c3e9e..94d312c3e9e 100644 --- a/files/l10n/de.php +++ b/apps/files/l10n/de.php diff --git a/files/l10n/el.php b/apps/files/l10n/el.php index 27a80fcc98c..27a80fcc98c 100644 --- a/files/l10n/el.php +++ b/apps/files/l10n/el.php diff --git a/files/l10n/eo.php b/apps/files/l10n/eo.php index 42dc4f1280e..42dc4f1280e 100644 --- a/files/l10n/eo.php +++ b/apps/files/l10n/eo.php diff --git a/files/l10n/es.php b/apps/files/l10n/es.php index 11665ac3c32..11665ac3c32 100644 --- a/files/l10n/es.php +++ b/apps/files/l10n/es.php diff --git a/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php index 415eb632312..415eb632312 100644 --- a/files/l10n/et_EE.php +++ b/apps/files/l10n/et_EE.php diff --git a/files/l10n/eu.php b/apps/files/l10n/eu.php index b9873e6c3fa..b9873e6c3fa 100644 --- a/files/l10n/eu.php +++ b/apps/files/l10n/eu.php diff --git a/files/l10n/fr.php b/apps/files/l10n/fr.php index cf90223a06a..cf90223a06a 100644 --- a/files/l10n/fr.php +++ b/apps/files/l10n/fr.php diff --git a/files/l10n/gl.php b/apps/files/l10n/gl.php index 83cf93be795..83cf93be795 100644 --- a/files/l10n/gl.php +++ b/apps/files/l10n/gl.php diff --git a/files/l10n/he.php b/apps/files/l10n/he.php index 79ae1edb7a5..79ae1edb7a5 100644 --- a/files/l10n/he.php +++ b/apps/files/l10n/he.php diff --git a/files/l10n/hr.php b/apps/files/l10n/hr.php index 670e87f6557..670e87f6557 100644 --- a/files/l10n/hr.php +++ b/apps/files/l10n/hr.php diff --git a/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php index a176ffce647..a176ffce647 100644 --- a/files/l10n/hu_HU.php +++ b/apps/files/l10n/hu_HU.php diff --git a/files/l10n/ia.php b/apps/files/l10n/ia.php index 8753b871c9e..8753b871c9e 100644 --- a/files/l10n/ia.php +++ b/apps/files/l10n/ia.php diff --git a/files/l10n/id.php b/apps/files/l10n/id.php index 902eeeb4ec2..902eeeb4ec2 100644 --- a/files/l10n/id.php +++ b/apps/files/l10n/id.php diff --git a/files/l10n/it.php b/apps/files/l10n/it.php index 919ff0b5aae..919ff0b5aae 100644 --- a/files/l10n/it.php +++ b/apps/files/l10n/it.php diff --git a/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php index 24c4e36ee6e..24c4e36ee6e 100644 --- a/files/l10n/ja_JP.php +++ b/apps/files/l10n/ja_JP.php diff --git a/files/l10n/lb.php b/apps/files/l10n/lb.php index 43956fcd63e..43956fcd63e 100644 --- a/files/l10n/lb.php +++ b/apps/files/l10n/lb.php diff --git a/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php index 1bec35e0f8c..1bec35e0f8c 100644 --- a/files/l10n/lt_LT.php +++ b/apps/files/l10n/lt_LT.php diff --git a/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php index 038ffd521a0..038ffd521a0 100644 --- a/files/l10n/ms_MY.php +++ b/apps/files/l10n/ms_MY.php diff --git a/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php index c4ef4989a58..c4ef4989a58 100644 --- a/files/l10n/nb_NO.php +++ b/apps/files/l10n/nb_NO.php diff --git a/files/l10n/nl.php b/apps/files/l10n/nl.php index 36b4695a476..36b4695a476 100644 --- a/files/l10n/nl.php +++ b/apps/files/l10n/nl.php diff --git a/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php index 34f2f6be960..34f2f6be960 100644 --- a/files/l10n/nn_NO.php +++ b/apps/files/l10n/nn_NO.php diff --git a/files/l10n/pl.php b/apps/files/l10n/pl.php index d110f52ab1d..d110f52ab1d 100644 --- a/files/l10n/pl.php +++ b/apps/files/l10n/pl.php diff --git a/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php index 57b1af2ae6d..57b1af2ae6d 100644 --- a/files/l10n/pt_BR.php +++ b/apps/files/l10n/pt_BR.php diff --git a/files/l10n/ro.php b/apps/files/l10n/ro.php index 9d8d6e2d5df..9d8d6e2d5df 100644 --- a/files/l10n/ro.php +++ b/apps/files/l10n/ro.php diff --git a/files/l10n/ru.php b/apps/files/l10n/ru.php index 88a6d8ee19c..88a6d8ee19c 100644 --- a/files/l10n/ru.php +++ b/apps/files/l10n/ru.php diff --git a/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php index 0d91ae35a51..0d91ae35a51 100644 --- a/files/l10n/sk_SK.php +++ b/apps/files/l10n/sk_SK.php diff --git a/files/l10n/sl.php b/apps/files/l10n/sl.php index 5a09e0fe20b..5a09e0fe20b 100644 --- a/files/l10n/sl.php +++ b/apps/files/l10n/sl.php diff --git a/files/l10n/sr.php b/apps/files/l10n/sr.php index 7e2ac3b1366..7e2ac3b1366 100644 --- a/files/l10n/sr.php +++ b/apps/files/l10n/sr.php diff --git a/files/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php index 1b5addbc571..1b5addbc571 100644 --- a/files/l10n/sr@latin.php +++ b/apps/files/l10n/sr@latin.php diff --git a/files/l10n/sv.php b/apps/files/l10n/sv.php index dfd32f3f5c2..dfd32f3f5c2 100644 --- a/files/l10n/sv.php +++ b/apps/files/l10n/sv.php diff --git a/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php index e7e2fb94b1e..e7e2fb94b1e 100644 --- a/files/l10n/th_TH.php +++ b/apps/files/l10n/th_TH.php diff --git a/files/l10n/tr.php b/apps/files/l10n/tr.php index 5fc46056175..5fc46056175 100644 --- a/files/l10n/tr.php +++ b/apps/files/l10n/tr.php diff --git a/files/l10n/xgettextfiles b/apps/files/l10n/xgettextfiles index 9e22680e455..9e22680e455 100644 --- a/files/l10n/xgettextfiles +++ b/apps/files/l10n/xgettextfiles diff --git a/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php index ab23a55d29e..ab23a55d29e 100644 --- a/files/l10n/zh_CN.php +++ b/apps/files/l10n/zh_CN.php diff --git a/files/settings.php b/apps/files/settings.php index c47eb130095..41017c064ef 100644 --- a/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/files/templates/admin.php b/apps/files/templates/admin.php index 01fe1105260..01fe1105260 100644 --- a/files/templates/admin.php +++ b/apps/files/templates/admin.php diff --git a/files/templates/index.php b/apps/files/templates/index.php index 3c76eb0187d..fc385e1ed3a 100644 --- a/files/templates/index.php +++ b/apps/files/templates/index.php @@ -12,7 +12,7 @@ </ul> </div> <div class="file_upload_wrapper svg"> - <form data-upload-id='1' class="file_upload_form" action="ajax/upload.php" method="post" enctype="multipart/form-data" target="file_upload_target_1"> + <form data-upload-id='1' class="file_upload_form" action="<?php echo OC_Helper::linkto('files', 'ajax/upload.php'); ?>" method="post" enctype="multipart/form-data" target="file_upload_target_1"> <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload"> <input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)"> <input type="hidden" name="dir" value="<?php echo htmlentities($_['dir']) ?>" id="dir"> diff --git a/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php index 16da6bb97b4..16da6bb97b4 100644 --- a/files/templates/part.breadcrumb.php +++ b/apps/files/templates/part.breadcrumb.php diff --git a/files/templates/part.list.php b/apps/files/templates/part.list.php index b2db4cbb8df..b2db4cbb8df 100644 --- a/files/templates/part.list.php +++ b/apps/files/templates/part.list.php diff --git a/apps/files/webdav.php b/apps/files/webdav.php new file mode 100644 index 00000000000..940bbfef52e --- /dev/null +++ b/apps/files/webdav.php @@ -0,0 +1,52 @@ +<?php + +/** + * ownCloud + * + * @author Frank Karlitschek + * @author Jakob Sack + * @copyright 2010 Frank Karlitschek karlitschek@kde.org + * @copyright 2011 Jakob Sack kde@jakobsack.de + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + * + */ + +// Do not load FS ... +$RUNTIME_NOSETUPFS = true; +require_once('../inc.php'); + +// only need filesystem apps +$RUNTIME_APPTYPES=array('filesystem','authentication'); + + + +// Backends +$authBackend = new OC_Connector_Sabre_Auth(); +$lockBackend = new OC_Connector_Sabre_Locks(); + +// Create ownCloud Dir +$publicDir = new OC_Connector_Sabre_Directory(''); + +// Fire up server +$server = new Sabre_DAV_Server($publicDir); +$server->setBaseUri(OC::$APPSWEBROOT.'/apps/files/webdav.php'); + +// Load plugins +$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud')); +$server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend)); +$server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload + +// And off we go! +$server->exec(); diff --git a/apps/files_imageviewer/css/jquery.fancybox-1.3.4.css b/apps/files_imageviewer/css/jquery.fancybox-1.3.4.css index 1dfd9b95d35..5fdf7af14cb 100644 --- a/apps/files_imageviewer/css/jquery.fancybox-1.3.4.css +++ b/apps/files_imageviewer/css/jquery.fancybox-1.3.4.css @@ -35,7 +35,7 @@ left: 0;
width: 40px;
height: 480px;
- background-image: url('../img/fancybox.png'); + background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png');
}
#fancybox-overlay {
@@ -99,7 +99,7 @@ right: -15px;
width: 30px;
height: 30px;
- background: transparent url('../img/fancybox.png') -40px 0px;
+ background: transparent url('%appswebroot%/apps/files_imageviewer/img/fancybox.png') -40px 0px;
cursor: pointer;
z-index: 1103;
display: none;
@@ -137,7 +137,7 @@ width: 35%;
cursor: pointer;
outline: none;
- background: transparent url('../img/blank.gif');
+ background: transparent url('%appswebroot%/apps/files_imageviewer/img/blank.gif');
z-index: 1102;
display: none;
}
@@ -163,12 +163,12 @@ }
#fancybox-left-ico {
- background-image: url('../img/fancybox.png');
+ background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png');
background-position: -40px -30px;
}
#fancybox-right-ico {
- background-image: url('../img/fancybox.png');
+ background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png');
background-position: -40px -60px;
}
@@ -199,13 +199,13 @@ top: -20px;
left: 0;
width: 100%;
- background-image: url('../img/fancybox-x.png');
+ background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox-x.png');
}
#fancybox-bg-ne {
top: -20px;
right: -20px;
- background-image: url('../img/fancybox.png');
+ background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png');
background-position: -40px -162px;
}
@@ -213,14 +213,14 @@ top: 0;
right: -20px;
height: 100%;
- background-image: url('../img/fancybox-y.png');
+ background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox-y.png');
background-position: -20px 0px;
}
#fancybox-bg-se {
bottom: -20px;
right: -20px;
- background-image: url('../img/fancybox.png');
+ background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png');
background-position: -40px -182px;
}
@@ -228,14 +228,14 @@ bottom: -20px;
left: 0;
width: 100%;
- background-image: url('../img/fancybox-x.png');
+ background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox-x.png');
background-position: 0px -20px;
}
#fancybox-bg-sw {
bottom: -20px;
left: -20px;
- background-image: url('../img/fancybox.png');
+ background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png');
background-position: -40px -142px;
}
@@ -243,13 +243,13 @@ top: 0;
left: -20px;
height: 100%;
- background-image: url('../img/fancybox-y.png');
+ background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox-y.png');
}
#fancybox-bg-nw {
top: -20px;
left: -20px;
- background-image: url('../img/fancybox.png');
+ background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png');
background-position: -40px -122px;
}
@@ -282,7 +282,7 @@ #fancybox-title-over {
padding: 10px;
- background-image: url('../img/fancy_title_over.png'); + background-image: url('%appswebroot%/apps/files_imageviewer/img/fancy_title_over.png');
display: block;
}
@@ -306,7 +306,7 @@ #fancybox-title-float-left {
padding: 0 0 0 15px;
- background: url('../img/fancybox.png') -40px -90px no-repeat; + background: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png') -40px -90px no-repeat;
}
#fancybox-title-float-main {
@@ -314,25 +314,25 @@ line-height: 29px;
font-weight: bold;
padding: 0 0 3px 0;
- background: url('../img/fancybox-x.png') 0px -40px; + background: url('%appswebroot%/apps/files_imageviewer/img/fancybox-x.png') 0px -40px;
}
#fancybox-title-float-right {
padding: 0 0 0 15px;
- background: url('../img/fancybox.png') -55px -90px no-repeat; + background: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png') -55px -90px no-repeat;
}
/* IE6 */
-.fancybox-ie6 #fancybox-close { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/fancy_close.png', sizingMethod='scale'); } +.fancybox-ie6 #fancybox-close { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_close.png', sizingMethod='scale'); }
-.fancybox-ie6 #fancybox-left-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/fancy_nav_left.png', sizingMethod='scale'); } -.fancybox-ie6 #fancybox-right-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/fancy_nav_right.png', sizingMethod='scale'); } +.fancybox-ie6 #fancybox-left-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_nav_left.png', sizingMethod='scale'); }
+.fancybox-ie6 #fancybox-right-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_nav_right.png', sizingMethod='scale'); }
-.fancybox-ie6 #fancybox-title-over { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/fancy_title_over.png', sizingMethod='scale'); zoom: 1; } -.fancybox-ie6 #fancybox-title-float-left { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/fancy_title_left.png', sizingMethod='scale'); } -.fancybox-ie6 #fancybox-title-float-main { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/fancy_title_main.png', sizingMethod='scale'); } -.fancybox-ie6 #fancybox-title-float-right { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/fancy_title_right.png', sizingMethod='scale'); } +.fancybox-ie6 #fancybox-title-over { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_title_over.png', sizingMethod='scale'); zoom: 1; }
+.fancybox-ie6 #fancybox-title-float-left { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_title_left.png', sizingMethod='scale'); }
+.fancybox-ie6 #fancybox-title-float-main { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_title_main.png', sizingMethod='scale'); }
+.fancybox-ie6 #fancybox-title-float-right { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_title_right.png', sizingMethod='scale'); }
.fancybox-ie6 #fancybox-bg-w, .fancybox-ie6 #fancybox-bg-e, .fancybox-ie6 #fancybox-left, .fancybox-ie6 #fancybox-right, #fancybox-hide-sel-frame {
height: expression(this.parentNode.clientHeight + "px");
@@ -343,17 +343,17 @@ top: expression( (-20 + (document.documentElement.clientHeight ? document.documentElement.clientHeight/2 : document.body.clientHeight/2 ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop )) + 'px');
}
-#fancybox-loading.fancybox-ie6 div { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/fancy_loading.png', sizingMethod='scale'); } +#fancybox-loading.fancybox-ie6 div { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_loading.png', sizingMethod='scale'); }
/* IE6, IE7, IE8 */
.fancybox-ie .fancybox-bg { background: transparent !important; }
-.fancybox-ie #fancybox-bg-n { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/fancy_shadow_n.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-ne { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/fancy_shadow_ne.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-e { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/fancy_shadow_e.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-se { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/fancy_shadow_se.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-s { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/fancy_shadow_s.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-sw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/fancy_shadow_sw.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-w { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/fancy_shadow_w.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-nw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../img/fancy_shadow_nw.png', sizingMethod='scale'); } +.fancybox-ie #fancybox-bg-n { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_n.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-ne { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_ne.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-e { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_e.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-se { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_se.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-s { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_s.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-sw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_sw.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-w { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_w.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-nw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_nw.png', sizingMethod='scale'); }
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/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/css/sharing.css b/apps/gallery/css/sharing.css index eaac82ebd60..d061fc3e6c1 100644 --- a/apps/gallery/css/sharing.css +++ b/apps/gallery/css/sharing.css @@ -5,4 +5,4 @@ div.gallery_box:hover { color: black; } div.gallery_box h1 {font-size: 17px; font-weight: normal;} div#breadcrumb { border: 0; width: 70%; margin: 0 auto; padding: 25px 0; font-family: Verdana; text-align: center;} span.breadcrumbelement { margin: 10px; margin-right: 0; cursor: pointer;} -span.inside { background-image: url('../img/breadcrumb.png'); padding-left: 20px; background-position: left; background-repeat: no-repeat;} +span.inside { background-image: url('%appswebroot%/apps/gallery/img/breadcrumb.png'); padding-left: 20px; background-position: left; background-repeat: no-repeat;} 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/gallery/templates/index.php b/apps/gallery/templates/index.php index cf654b68c0b..43ba5131864 100644 --- a/apps/gallery/templates/index.php +++ b/apps/gallery/templates/index.php @@ -24,7 +24,7 @@ $l = OC_L10N::get('gallery'); </div> </div> <div id="g-album-loading" class="crumb" style="display:none"> - <img src="img/loading.gif"> + <img src="<?php echo OC_Helper::linkto('gallery', 'img/loading.gif'); ?>"> </div> </div> <div id="gallery_list"> diff --git a/apps/inc.php b/apps/inc.php new file mode 100644 index 00000000000..cbfab014173 --- /dev/null +++ b/apps/inc.php @@ -0,0 +1 @@ +<?php require_once('/Applications/MAMP/htdocs/owncloud/lib/base.php'); ?>
\ No newline at end of file diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php index 9d9c14deb17..9c7b3efce75 100644 --- a/apps/media/ajax/api.php +++ b/apps/media/ajax/api.php @@ -23,10 +23,9 @@ 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'); +require_once(OC::$APPSROOT . '/apps/media/lib_collection.php'); +require_once(OC::$APPSROOT . '/apps/media/lib_scanner.php'); error_reporting(E_ALL); //no script error reporting because of getID3 @@ -127,5 +126,4 @@ if($arguments['action']){ exit; } } - -?> +?>
\ No newline at end of file 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..cdb347628bf 100644 --- a/apps/media/index.php +++ b/apps/media/index.php @@ -22,14 +22,14 @@ */ -require_once('../../lib/base.php'); + // Check if we are a user OC_Util::checkLoggedIn(); OC_Util::checkAppEnabled('media'); -require_once('lib_collection.php'); -require_once('lib_scanner.php'); +require_once(OC::$APPSROOT . '/apps/media/lib_collection.php'); +require_once(OC::$APPSROOT . '/apps/media/lib_scanner.php'); OC_Util::addScript('media','player'); OC_Util::addScript('media','music'); diff --git a/apps/media/server/xml.server.php b/apps/media/server/xml.server.php index cb9b68fc422..deb189fbede 100644 --- a/apps/media/server/xml.server.php +++ b/apps/media/server/xml.server.php @@ -21,11 +21,11 @@ * */ +require_once('../../inc.php'); -require_once('../../../lib/base.php'); OC_Util::checkAppEnabled('media'); -require_once('../lib_collection.php'); -require_once('../lib_ampache.php'); + require_once(OC::$APPSROOT . '/apps/media/lib_collection.php'); + require_once(OC::$APPSROOT . '/apps/media/lib_ampache.php'); $arguments=$_POST; if(!isset($_POST['action']) and isset($_GET['action'])){ diff --git a/apps/media/tomahawk.php b/apps/media/tomahawk.php index 6dd41233f12..019e80b0f24 100644 --- a/apps/media/tomahawk.php +++ b/apps/media/tomahawk.php @@ -22,10 +22,10 @@ */ $_POST=$_GET; //debug +require_once('../inc.php'); -require_once('../../lib/base.php'); OC_JSON::checkAppEnabled('media'); -require_once('lib_collection.php'); +require_once(OC::$APPSROOT . '/apps/media/lib_collection.php'); $user=isset($_POST['user'])?$_POST['user']:''; $pass=isset($_POST['pass'])?$_POST['pass']:''; 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 2be648642a1..69d7cfc3b93 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/js/js.js b/core/js/js.js index 019c40a0e1b..12303d7dd91 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -31,8 +31,9 @@ t.cache={}; OC={ webroot:oc_webroot, + appswebroot:oc_appswebroot, currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false, - coreApps:['files','admin','log','search','settings','core','3rdparty'], + coreApps:['admin','log','search','settings','core','3rdparty'], /** * get an absolute url to a file in an appen * @param app the id of the app the file belongs to @@ -51,16 +52,34 @@ OC={ */ filePath:function(app,type,file){ var isCore=OC.coreApps.indexOf(app)!=-1; - app+='/'; - var link=OC.webroot+'/'; - if(!isCore){ + var link=OC.webroot; + if((file.substring(file.length-3) == 'php' || file.substring(file.length-3) == 'css') && !isCore){ + link+='/?app=' + app + '&getfile='; + if(type){ + link+=encodeURI(type + '/'); + } + link+= file; + }else if(file.substring(file.length-3) != 'php' && !isCore){ + link=OC.appswebroot; + link+='/'; link+='apps/'; + link+=app+'/'; + if(type){ + link+=type+'/'; + } + link+=file; + }else{ + link+='/'; + app+='/'; + if(!isCore){ + link+='apps/'; + } + link+=app; + if(type){ + link+=type+'/'; + } + link+=file; } - link+=app; - if(type){ - link+=type+'/'; - } - link+=file; return link; }, /** diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index a3aa1e8c149..6a3dac02ea7 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -107,7 +107,7 @@ OCdialogs = { $(c_id + ' #dirtree').focus(function() { var t = $(this); t.data('oldval', t.val())}) .change({dcid: c_id}, OC.dialogs.handleTreeListSelect); $(c_id).ready(function(){ - $.getJSON(OC.webroot+'/files/ajax/rawlist.php', {mimetype: mimetype_filter} ,function(r){OC.dialogs.fillFilePicker(r, c_id, callback)}); + $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'), {mimetype: mimetype_filter} ,function(r){OC.dialogs.fillFilePicker(r, c_id, callback)}); }).data('multiselect', multiselect).data('mimetype',mimetype_filter); // build buttons var b = [ @@ -222,7 +222,7 @@ OCdialogs = { $(this).children().each(function(i, element) { if (skip_first) {skip_first = false; return; }path += '/'+$(element).text(); }); $(event.data.dcid).data('path', path); $(event.data.dcid + ' .filepicker_loader').css('visibility', 'visible'); - $.getJSON(OC.webroot+'/files/ajax/rawlist.php', {dir: path, mimetype: $(event.data.dcid).data('mimetype')}, function(r){OC.dialogs.fillFilePicker(r, event.data.dcid)}); + $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'), {dir: path, mimetype: $(event.data.dcid).data('mimetype')}, function(r){OC.dialogs.fillFilePicker(r, event.data.dcid)}); }, // this function is in early development state, please dont use it unlsess you know what you are doing handlePickerClick:function(element, name, dcid) { diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 2bd2e20df70..7ba7abdbf12 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -9,6 +9,7 @@ <?php endforeach; ?> <script type="text/javascript"> var oc_webroot = '<?php echo OC::$WEBROOT; ?>'; + var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>'; </script> <?php foreach($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 61eb0de9f42..df7897717f6 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -9,6 +9,7 @@ <?php endforeach; ?> <script type="text/javascript"> var oc_webroot = '<?php echo OC::$WEBROOT; ?>'; + var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>'; var oc_current_user = '<?php echo OC_User::getUser() ?>'; </script> <?php foreach($_['jsfiles'] as $jsfile): ?> diff --git a/files/webdav.php b/files/webdav.php index 25e33024470..3ed687041ca 100644 --- a/files/webdav.php +++ b/files/webdav.php @@ -25,11 +25,12 @@ // Do not load FS ... $RUNTIME_NOSETUPFS = true; +require_once('../lib/base.php'); // only need filesystem apps $RUNTIME_APPTYPES=array('filesystem','authentication'); -require_once('../lib/base.php'); + // Backends $authBackend = new OC_Connector_Sabre_Auth(); diff --git a/index.php b/index.php index 9fff459807e..fe8f7f15038 100644 --- a/index.php +++ b/index.php @@ -50,14 +50,18 @@ if($_SERVER['REQUEST_METHOD']=='PROPFIND'){ // Someone is logged in : elseif(OC_User::isLoggedIn()) { + OC_App::loadApps(); if(isset($_GET["logout"]) and ($_GET["logout"])) { - OC_App::loadApps(); OC_User::logout(); header("Location: ".OC::$WEBROOT.'/'); exit(); - } - else { - OC_Util::redirectToDefaultPage(); + }else{ + if(is_null(OC::$REQUESTEDFILE)){ + OC::loadapp(); + }else{ + OC::loadfile(); + } + } // For all others cases, we display the guest page : diff --git a/lib/base.php b/lib/base.php index a30f4e38c78..1e28ea1ccfd 100644 --- a/lib/base.php +++ b/lib/base.php @@ -62,15 +62,22 @@ class OC{ * the root path of the 3rdparty folder for http requests (e.g. owncloud/3rdparty) */ public static $THIRDPARTYWEBROOT = ''; - /** - * The installation path of the apps folder on the server (e.g. /srv/http/owncloud) - */ - public static $APPSROOT = ''; - /** - * the root path of the apps folder for http requests (e.g. owncloud) - */ - public static $APPSWEBROOT = ''; - + /** + * The installation path of the apps folder on the server (e.g. /srv/http/owncloud) + */ + public static $APPSROOT = ''; + /** + * the root path of the apps folder for http requests (e.g. owncloud) + */ + public static $APPSWEBROOT = ''; + /* + * requested app + */ + public static $REQUESTEDAPP = ''; + /* + * requested file of app + */ + public static $REQUESTEDFILE = ''; /** * SPL autoload */ @@ -164,12 +171,15 @@ class OC{ } // search the apps folder - if(file_exists(OC::$SERVERROOT.'/apps')){ + if(OC_Config::getValue('appsroot', '')<>''){ + OC::$APPSROOT=OC_Config::getValue('appsroot', ''); + OC::$APPSWEBROOT=OC_Config::getValue('appsurl', ''); + }elseif(file_exists(OC::$SERVERROOT.'/apps')){ OC::$APPSROOT=OC::$SERVERROOT; OC::$APPSWEBROOT=OC::$WEBROOT; }elseif(file_exists(OC::$SERVERROOT.'/../apps')){ - OC::$APPSWEBROOT=rtrim(dirname(OC::$WEBROOT), '/'); OC::$APPSROOT=rtrim(dirname(OC::$SERVERROOT), '/'); + OC::$APPSWEBROOT=rtrim(dirname(OC::$WEBROOT), '/'); }else{ echo("apps directory not found! Please put the ownCloud apps folder in the ownCloud folder or the folder above. You can also configure the location in the config.php file."); exit; @@ -264,6 +274,34 @@ class OC{ ini_set('session.cookie_httponly','1;'); session_start(); } + + public static function loadapp(){ + if(file_exists(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/index.php')){ + require_once(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/index.php'); + }else{ + trigger_error('The requested App was not found.', E_USER_ERROR);//load default app instead? + } + } + + public static function loadfile(){ + if(file_exists(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE)){ + if(substr(OC::$REQUESTEDFILE, -3) == 'css'){ + $appswebroot = (string) OC::$APPSWEBROOT; + $webroot = (string) OC::$WEBROOT; + $cssfile = file_get_contents(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE); + $cssfile = str_replace('%appswebroot%', $appswebroot, $cssfile); + $cssfile = str_replace('%webroot%', $webroot, $cssfile); + header('Content-Type: text/css'); + echo $cssfile; + exit; + }elseif(substr(OC::$REQUESTEDFILE, -3) == 'php'){ + require_once(OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE); + } + }else{ + header('HTTP/1.0 404 Not Found'); + exit; + } + } public static function init(){ // register autoloader @@ -384,6 +422,30 @@ class OC{ //make sure temporary files are cleaned up register_shutdown_function(array('OC_Helper','cleanTmp')); + + //parse the given parameters + self::$REQUESTEDAPP = (isset($_GET['app'])?strip_tags($_GET['app']):'files'); + self::$REQUESTEDFILE = (isset($_GET['getfile'])?$_GET['getfile']:null); + if(substr_count(self::$REQUESTEDFILE, '?') != 0){ + $file = substr(self::$REQUESTEDFILE, 0, strpos(self::$REQUESTEDFILE, '?')); + $param = substr(self::$REQUESTEDFILE, strpos(self::$REQUESTEDFILE, '?') + 1); + parse_str($param, $get); + $_GET = array_merge($_GET, $get); + self::$REQUESTEDFILE = $file; + $_GET['getfile'] = $file; + } + if(!is_null(self::$REQUESTEDFILE)){ + $subdir = OC::$APPSROOT . '/' . self::$REQUESTEDAPP . '/' . self::$REQUESTEDFILE; + $parent = OC::$APPSROOT . '/' . self::$REQUESTEDAPP; + if(!OC_Helper::issubdirectory($subdir, $parent)){ + self::$REQUESTEDFILE = null; + header('HTTP/1.0 404 Not Found'); + exit; + } + } + + //update path to lib base + @file_put_contents(OC::$APPSROOT . '/apps/inc.php', '<?php require_once(\'' . OC::$SERVERROOT . '/lib/base.php' . '\'); ?>'); } } diff --git a/lib/helper.php b/lib/helper.php index beb10280d93..c5af76dbe52 100755 --- a/lib/helper.php +++ b/lib/helper.php @@ -41,7 +41,15 @@ class OC_Helper { $app .= '/'; // Check if the app is in the app folder if( file_exists( OC::$APPSROOT . '/apps/'. $app.$file )){ - $urlLinkTo = OC::$APPSWEBROOT . '/apps/' . $app . $file; + if(substr($file, -3) == 'php' || substr($file, -3) == 'css'){ + if(substr($app, -1, 1) == '/'){ + $app = substr($app, 0, strlen($app) - 1); + } + $urlLinkTo = OC::$WEBROOT . '/?app=' . $app; + $urlLinkTo .= ($file!='index.php')?'&getfile=' . urlencode($file):''; + }else{ + $urlLinkTo = OC::$APPSWEBROOT . '/apps/' . $app . $file; + } } else{ $urlLinkTo = OC::$WEBROOT . '/' . $app . $file; @@ -543,4 +551,40 @@ class OC_Helper { return $newpath; } + + /* + * checks if $sub is a subdirectory of $parent + * + * @param $sub + * @param $parent + * @return bool + */ + public static function issubdirectory($sub, $parent){ + if($sub == null || $sub == '' || $parent == null || $parent == ''){ + return false; + } + $realpath_sub = realpath($sub); + $realpath_parent = realpath($parent); + if(($realpath_sub == false && substr_count($realpath_sub, './') != 0) || ($realpath_parent == false && substr_count($realpath_parent, './') != 0)){ //it checks for both ./ and ../ + return false; + } + if($realpath_sub && $realpath_sub != '' && $realpath_parent && $realpath_parent != ''){ + if(substr($realpath_sub, 0, strlen($realpath_parent)) == $realpath_parent){ + return true; + } + }else{ + if(substr($sub, 0, strlen($parent)) == $parent){ + return true; + } + } + /* + echo 'SUB: ' . $sub . "\n"; + echo 'PAR: ' . $parent . "\n"; + echo 'REALSUB: ' . $realpath_sub . "\n"; + echo 'REALPAR: ' . $realpath_parent . "\n"; + echo substr($realpath_sub, 0, strlen($realpath_parent)); + exit; + */ + return false; + } } diff --git a/lib/template.php b/lib/template.php index eeba2410b68..57e9c15f5e6 100644 --- a/lib/template.php +++ b/lib/template.php @@ -323,7 +323,16 @@ class OC_Template{ */ public function appendIfExist($type, $root, $web, $file) { if (is_file($root.'/'.$file)) { - $this->append( $type, $web.'/'.$file); + $pathes = explode('/', $file); + if($type == 'cssfiles' && $root == OC::$APPSROOT && $pathes[0] == 'apps'){ + $app = $pathes[1]; + unset($pathes[0]); + unset($pathes[1]); + $path = implode('/', $pathes); + $this->append( $type, OC_Helper::linkTo($app, $path)); + }else{ + $this->append( $type, $web.'/'.$file); + } return true; } return false; diff --git a/lib/util.php b/lib/util.php index 29d0691a63d..b30b9dfd481 100644 --- a/lib/util.php +++ b/lib/util.php @@ -301,7 +301,7 @@ class OC_Util { if(isset($_REQUEST['redirect_url'])) { header( 'Location: '.$_REQUEST['redirect_url']); } else { - header( 'Location: '.OC::$WEBROOT.'/'.OC_Appconfig::getValue('core', 'defaultpage', 'files/index.php')); + header( 'Location: '.OC::$WEBROOT.'/'.OC_Appconfig::getValue('core', 'defaultpage', '?app=files')); } exit(); } |