mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of gitorious.org:owncloud/owncloud

This commit is contained in:
Sam Tuke 2012-04-27 13:23:58 +01:00
parent 80c850d018 0aaf6d16a5
commit a1b309a42a
198 changed files with 424 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/bookmarks/addBm.php
View File

@ -21,7 +21,7 @@
*
*/
require_once('../../lib/base.php');
// Check if we are a user
OC_Util::checkLoggedIn();

4
apps/bookmarks/ajax/addBookmark.php
View File

@ -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));

2
apps/bookmarks/ajax/delBookmark.php
View File

@ -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();

2
apps/bookmarks/ajax/editBookmark.php
View File

@ -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();

2
apps/bookmarks/ajax/recordClick.php
View File

@ -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();

2
apps/bookmarks/ajax/updateList.php
View File

@ -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();

2
apps/bookmarks/index.php
View File

@ -21,7 +21,7 @@
*
*/
require_once('../../lib/base.php');
// Check if we are a user
OC_Util::checkLoggedIn();

10
apps/bookmarks/js/bookmarks.js
View File

@ -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')),
});
}

2
apps/bookmarks/templates/list.php
View File

@ -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>

2
apps/calendar/ajax/calendar/activation.php
View File

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
require_once('../../../../lib/base.php');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');
$calendarid = $_POST['calendarid'];

2
apps/calendar/ajax/calendar/delete.php
View File

@ -5,7 +5,7 @@
* later.
* See the COPYING-README file.
*/
require_once('../../../../lib/base.php');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');

2
apps/calendar/ajax/calendar/edit.form.php
View File

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
require_once('../../../../lib/base.php');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');

2
apps/calendar/ajax/calendar/edit.php
View File

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
require_once('../../../../lib/base.php');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');

2
apps/calendar/ajax/calendar/new.form.php
View File

@ -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();

2
apps/calendar/ajax/calendar/new.php
View File

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
require_once('../../../../lib/base.php');
// Check if we are a user
OC_JSON::checkLoggedIn();

2
apps/calendar/ajax/calendar/overview.php
View File

@ -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');

2
apps/calendar/ajax/calendar/update.php
View File

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
require_once('../../../../lib/base.php');
// Check if we are a user
OC_JSON::checkLoggedIn();

2
apps/calendar/ajax/categories/rescan.php
View File

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
require_once('../../../../lib/base.php');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');

2
apps/calendar/ajax/changeview.php
View File

@ -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'];

2
apps/calendar/ajax/event/delete.php
View File

@ -5,7 +5,7 @@
* later.
* See the COPYING-README file.
*/
require_once('../../../../lib/base.php');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');

2
apps/calendar/ajax/event/edit.form.php
View File

@ -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>');

2
apps/calendar/ajax/event/edit.php
View File

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
require_once('../../../../lib/base.php');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');

2
apps/calendar/ajax/event/move.php
View File

@ -5,7 +5,7 @@
* later.
* See the COPYING-README file.
*/
require_once('../../../../lib/base.php');
OC_JSON::checkLoggedIn();
$id = $_POST['id'];

2
apps/calendar/ajax/event/new.form.php
View File

@ -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>');

2
apps/calendar/ajax/event/new.php
View File

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
require_once('../../../../lib/base.php');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');

2
apps/calendar/ajax/event/resize.php
View File

@ -5,7 +5,7 @@
* later.
* See the COPYING-README file.
*/
require_once('../../../../lib/base.php');
OC_JSON::checkLoggedIn();
$id = $_POST['id'];

2
apps/calendar/ajax/events.php
View File

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
require_once ('../../../lib/base.php');
require_once('when/When.php');
OC_JSON::checkLoggedIn();

2
apps/calendar/ajax/import/dialog.php
View File

@ -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');

3
apps/calendar/ajax/import/import.php
View File

@ -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();
OC_JSON::success();

2
apps/calendar/ajax/settings/getfirstday.php
View File

@ -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));

2
apps/calendar/ajax/settings/gettimezonedetection.php
View File

@ -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')));

2
apps/calendar/ajax/settings/guesstimezone.php
View File

@ -5,7 +5,7 @@
* later.
* See the COPYING-README file.
*/
require_once('../../../../lib/base.php');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('calendar');

2
apps/calendar/ajax/settings/setfirstday.php
View File

@ -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"]);

2
apps/calendar/ajax/settings/settimeformat.php
View File

@ -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"]);

2
apps/calendar/ajax/settings/settimezone.php
View File

@ -7,7 +7,7 @@
*/
// Init owncloud
require_once('../../../../lib/base.php');
$l=OC_L10N::get('calendar');

2
apps/calendar/ajax/settings/timeformat.php
View File

@ -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));

2
apps/calendar/ajax/settings/timezonedetection.php
View File

@ -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'){

2
apps/calendar/ajax/share/changepermission.php
View File

@ -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']);

2
apps/calendar/ajax/share/dropdown.php
View File

@ -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);

2
apps/calendar/ajax/share/share.php
View File

@ -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){

2
apps/calendar/ajax/share/unshare.php
View File

@ -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){

2
apps/calendar/caldav.php
View File

@ -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

2
apps/calendar/export.php
View File

@ -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;

6
apps/calendar/index.php
View File

@ -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();

6
apps/calendar/templates/part.editevent.php
View File

@ -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>

2
apps/calendar/templates/part.newevent.php
View File

@ -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>

2
apps/contacts/ajax/activation.php
View File

@ -7,7 +7,7 @@
* See the COPYING-README file.
*/
require_once ("../../../lib/base.php");
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');

2
apps/contacts/ajax/addbook.php
View File

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
require_once('../../../lib/base.php');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');
$book = array(

2
apps/contacts/ajax/addcontact.php
View File

@ -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);

2
apps/contacts/ajax/addproperty.php
View File

@ -21,7 +21,7 @@
*/
// Init owncloud
require_once('../../../lib/base.php');
// Check if we are a user
OC_JSON::checkLoggedIn();

2
apps/contacts/ajax/categories/categoriesfor.php
View File

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
require_once('../../../../lib/base.php');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');

2
apps/contacts/ajax/categories/delete.php
View File

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
require_once('../../../../lib/base.php');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');

2
apps/contacts/ajax/categories/list.php
View File

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
require_once('../../../../lib/base.php');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');

2
apps/contacts/ajax/categories/rescan.php
View File

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
require_once('../../../../lib/base.php');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');

2
apps/contacts/ajax/chooseaddressbook.php
View File

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
require_once('../../../lib/base.php');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');

2
apps/contacts/ajax/contactdetails.php
View File

@ -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);

2
apps/contacts/ajax/contacts.php
View File

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
require_once('../../../lib/base.php');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');

2
apps/contacts/ajax/createaddressbook.php
View File

@ -6,7 +6,7 @@
* later.
* See the COPYING-README file.
*/
require_once('../../../lib/base.php');
// Check if we are a user
OC_JSON::checkLoggedIn();

2
apps/contacts/ajax/cropphoto.php
View File

@ -21,7 +21,7 @@
*/
// Init owncloud
require_once('../../../lib/base.php');
// Check if we are a user
OC_JSON::checkLoggedIn();

2
apps/contacts/ajax/deletebook.php
View File

@ -21,7 +21,7 @@
*/
// Init owncloud
require_once('../../../lib/base.php');
// Check if we are a user
OC_JSON::checkLoggedIn();

2
apps/contacts/ajax/deletecard.php
View File

@ -26,7 +26,7 @@ function bailOut($msg) {
}
// Init owncloud
require_once('../../../lib/base.php');
// Check if we are a user
OC_JSON::checkLoggedIn();

2
apps/contacts/ajax/deleteproperty.php
View File

@ -21,7 +21,7 @@
*/
// Init owncloud
require_once('../../../lib/base.php');
// Check if we are a user
OC_JSON::checkLoggedIn();

2
apps/contacts/ajax/editaddress.php
View File

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
require_once('../../../lib/base.php');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');

2
apps/contacts/ajax/editaddressbook.php
View File

@ -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']);

2
apps/contacts/ajax/editname.php
View File

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
require_once('../../../lib/base.php');
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');
function bailOut($msg) {

2
apps/contacts/ajax/getdetails.php
View File

@ -21,7 +21,7 @@
*/
// Init owncloud
require_once('../../../lib/base.php');
// Check if we are a user
OC_JSON::checkLoggedIn();

2
apps/contacts/ajax/importdialog.php
View File

@ -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');

2
apps/contacts/ajax/loadcard.php
View File

@ -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);

2
apps/contacts/ajax/loadintro.php
View File

@ -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);

2
apps/contacts/ajax/loadphoto.php
View File

@ -20,7 +20,7 @@
*
*/
// Init owncloud
require_once('../../../lib/base.php');
// Check if we are a user
OC_JSON::checkLoggedIn();
OC_JSON::checkAppEnabled('contacts');

2
apps/contacts/ajax/newcontact.php
View File

@ -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);

2
apps/contacts/ajax/savecrop.php
View File

@ -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

2
apps/contacts/ajax/saveproperty.php
View File

@ -21,7 +21,7 @@
*/
// Init owncloud
require_once('../../../lib/base.php');
// Check if we are a user
OC_JSON::checkLoggedIn();

2
apps/contacts/ajax/updateaddressbook.php
View File

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
require_once('../../../lib/base.php');
// Check if we are a user
OC_JSON::checkLoggedIn();

2
apps/contacts/ajax/uploadphoto.php
View File

@ -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

2
apps/contacts/carddav.php
View File

@ -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

23
apps/contacts/css/contacts.css
View File

@ -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; }

2
apps/contacts/dynphoto.php
View File

@ -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");

2
apps/contacts/export.php
View File

@ -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;

2
apps/contacts/import.php
View File

@ -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";

2
apps/contacts/index.php
View File

@ -6,7 +6,7 @@
* later.
* See the COPYING-README file.
*/
require_once('../../lib/base.php');
// Check if we are a user
OC_Util::checkLoggedIn();

8
apps/contacts/js/contacts.js
View File

@ -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'));
}*/

2
apps/contacts/photo.php
View File

@ -9,7 +9,7 @@
*/
// Init owncloud
require_once('../../lib/base.php');
OC_Util::checkLoggedIn();
OC_Util::checkAppEnabled('contacts');

4
apps/contacts/templates/index.php
View File

@ -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']; ?>">

2
apps/contacts/thumbnail.php
View File

@ -21,7 +21,7 @@
*/
// Init owncloud
require_once('../../lib/base.php');
OC_JSON::checkLoggedIn();
//OC_Util::checkLoggedIn();
OC_Util::checkAppEnabled('contacts');

2
apps/external/ajax/setsites.php vendored
View File

@ -6,7 +6,7 @@
* See the COPYING-README file.
*/
require_once('../../../lib/base.php');
OC_Util::checkAdminUser();
$sites = array();

2
apps/external/index.php vendored
View File

@ -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();

2
files/admin.php → apps/files/admin.php
View File

@ -23,7 +23,7 @@
// Init owncloud
require_once('../lib/base.php');
OC_Util::checkAdminUser();

2
files/ajax/autocomplete.php → apps/files/ajax/autocomplete.php
View File

@ -3,7 +3,7 @@
// Init owncloud
require_once('../../lib/base.php');
OC_JSON::checkLoggedIn();

2
files/ajax/delete.php → apps/files/ajax/delete.php
View File

@ -1,7 +1,7 @@
<?php
// Init owncloud
require_once('../../lib/base.php');
OC_JSON::checkLoggedIn();

2
files/ajax/download.php → apps/files/ajax/download.php
View File

@ -25,7 +25,7 @@
$RUNTIME_APPTYPES=array('filesystem');
// Init owncloud
require_once('../../lib/base.php');
// Check if we are a user
OC_Util::checkLoggedIn();

2
files/ajax/list.php → apps/files/ajax/list.php
View File

@ -4,7 +4,7 @@
$RUNTIME_APPTYPES=array('filesystem');
// Init owncloud
require_once('../../lib/base.php');
OC_JSON::checkLoggedIn();

2
files/ajax/mimeicon.php → apps/files/ajax/mimeicon.php
View File

@ -4,7 +4,7 @@
$RUNTIME_NOAPPS=false;
// Init owncloud
require_once('../../lib/base.php');
print OC_Helper::mimetypeIcon($_GET['mime']);

2
files/ajax/move.php → apps/files/ajax/move.php
View File

@ -1,7 +1,7 @@
<?php
// Init owncloud
require_once('../../lib/base.php');
OC_JSON::checkLoggedIn();

2
files/ajax/newfile.php → apps/files/ajax/newfile.php
View File

@ -1,7 +1,7 @@
<?php
// Init owncloud
require_once('../../lib/base.php');
OC_JSON::checkLoggedIn();

2
files/ajax/newfolder.php → apps/files/ajax/newfolder.php
View File

@ -1,7 +1,7 @@
<?php
// Init owncloud
require_once('../../lib/base.php');
OC_JSON::checkLoggedIn();

2
files/ajax/rawlist.php → apps/files/ajax/rawlist.php
View File

@ -4,7 +4,7 @@
$RUNTIME_APPTYPES=array('filesystem');
// Init owncloud
require_once('../../lib/base.php');
require_once('../../lib/template.php');
OC_JSON::checkLoggedIn();

2
files/ajax/rename.php → apps/files/ajax/rename.php
View File

@ -1,7 +1,7 @@
<?php
// Init owncloud
require_once('../../lib/base.php');
OC_JSON::checkLoggedIn();

2
files/ajax/scan.php → apps/files/ajax/scan.php
View File

@ -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';

0
files/ajax/timezone.php → apps/files/ajax/timezone.php
View File

Some files were not shown because too many files have changed in this diff Show More