Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support

Conflicts:
	3rdparty/Sabre/CardDAV/Plugin.php
	3rdparty/smb4php/smb.php
	apps/bookmarks/ajax/addBookmark.php
	apps/bookmarks/ajax/editBookmark.php
	apps/bookmarks/appinfo/migrate.php
	apps/calendar/ajax/calendar/edit.form.php
	apps/calendar/ajax/changeview.php
	apps/calendar/ajax/import/import.php
	apps/calendar/ajax/settings/guesstimezone.php
	apps/calendar/ajax/settings/setfirstday.php
	apps/calendar/ajax/settings/settimeformat.php
	apps/calendar/ajax/share/changepermission.php
	apps/calendar/ajax/share/share.php
	apps/calendar/ajax/share/unshare.php
	apps/calendar/appinfo/app.php
	apps/calendar/appinfo/remote.php
	apps/calendar/appinfo/update.php
	apps/calendar/appinfo/version
	apps/calendar/js/calendar.js
	apps/calendar/l10n/da.php
	apps/calendar/l10n/de.php
	apps/calendar/l10n/fi_FI.php
	apps/calendar/l10n/gl.php
	apps/calendar/l10n/he.php
	apps/calendar/l10n/hr.php
	apps/calendar/l10n/ja_JP.php
	apps/calendar/l10n/lb.php
	apps/calendar/l10n/lt_LT.php
	apps/calendar/l10n/nb_NO.php
	apps/calendar/l10n/pl.php
	apps/calendar/l10n/pt_PT.php
	apps/calendar/l10n/ro.php
	apps/calendar/l10n/ru.php
	apps/calendar/l10n/sv.php
	apps/calendar/l10n/zh_CN.php
	apps/calendar/l10n/zh_TW.php
	apps/calendar/lib/app.php
	apps/calendar/lib/calendar.php
	apps/calendar/lib/object.php
	apps/calendar/lib/share.php
	apps/calendar/templates/part.choosecalendar.rowfields.php
	apps/calendar/templates/part.import.php
	apps/calendar/templates/settings.php
	apps/contacts/ajax/activation.php
	apps/contacts/ajax/addressbook/delete.php
	apps/contacts/ajax/contact/add.php
	apps/contacts/ajax/contact/addproperty.php
	apps/contacts/ajax/contact/delete.php
	apps/contacts/ajax/contact/deleteproperty.php
	apps/contacts/ajax/contact/saveproperty.php
	apps/contacts/ajax/createaddressbook.php
	apps/contacts/ajax/cropphoto.php
	apps/contacts/ajax/currentphoto.php
	apps/contacts/ajax/importaddressbook.php
	apps/contacts/ajax/oc_photo.php
	apps/contacts/ajax/savecrop.php
	apps/contacts/ajax/selectaddressbook.php
	apps/contacts/ajax/updateaddressbook.php
	apps/contacts/ajax/uploadimport.php
	apps/contacts/ajax/uploadphoto.php
	apps/contacts/appinfo/migrate.php
	apps/contacts/appinfo/remote.php
	apps/contacts/css/contacts.css
	apps/contacts/import.php
	apps/contacts/index.php
	apps/contacts/js/contacts.js
	apps/contacts/l10n/ca.php
	apps/contacts/l10n/cs_CZ.php
	apps/contacts/l10n/da.php
	apps/contacts/l10n/de.php
	apps/contacts/l10n/el.php
	apps/contacts/l10n/eo.php
	apps/contacts/l10n/es.php
	apps/contacts/l10n/et_EE.php
	apps/contacts/l10n/eu.php
	apps/contacts/l10n/fa.php
	apps/contacts/l10n/fi_FI.php
	apps/contacts/l10n/fr.php
	apps/contacts/l10n/he.php
	apps/contacts/l10n/hr.php
	apps/contacts/l10n/hu_HU.php
	apps/contacts/l10n/ia.php
	apps/contacts/l10n/it.php
	apps/contacts/l10n/ja_JP.php
	apps/contacts/l10n/ko.php
	apps/contacts/l10n/lb.php
	apps/contacts/l10n/mk.php
	apps/contacts/l10n/nb_NO.php
	apps/contacts/l10n/nl.php
	apps/contacts/l10n/pl.php
	apps/contacts/l10n/pt_BR.php
	apps/contacts/l10n/pt_PT.php
	apps/contacts/l10n/ro.php
	apps/contacts/l10n/ru.php
	apps/contacts/l10n/sk_SK.php
	apps/contacts/l10n/sl.php
	apps/contacts/l10n/sv.php
	apps/contacts/l10n/th_TH.php
	apps/contacts/l10n/tr.php
	apps/contacts/l10n/zh_CN.php
	apps/contacts/l10n/zh_TW.php
	apps/contacts/lib/addressbook.php
	apps/contacts/lib/hooks.php
	apps/contacts/lib/vcard.php
	apps/contacts/photo.php
	apps/contacts/templates/part.contact.php
	apps/contacts/templates/part.contacts.php
	apps/contacts/templates/part.cropphoto.php
	apps/contacts/templates/part.importaddressbook.php
	apps/contacts/templates/part.selectaddressbook.php
	apps/contacts/thumbnail.php
	apps/files/ajax/download.php
	apps/files/ajax/newfile.php
	apps/files/ajax/timezone.php
	apps/files/appinfo/update.php
	apps/files/appinfo/version
	apps/files/index.php
	apps/files/js/fileactions.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files/l10n/ar.php
	apps/files/l10n/bg_BG.php
	apps/files/l10n/ca.php
	apps/files/l10n/cs_CZ.php
	apps/files/l10n/da.php
	apps/files/l10n/de.php
	apps/files/l10n/el.php
	apps/files/l10n/eo.php
	apps/files/l10n/es.php
	apps/files/l10n/et_EE.php
	apps/files/l10n/eu.php
	apps/files/l10n/fa.php
	apps/files/l10n/fi_FI.php
	apps/files/l10n/fr.php
	apps/files/l10n/gl.php
	apps/files/l10n/he.php
	apps/files/l10n/hr.php
	apps/files/l10n/hu_HU.php
	apps/files/l10n/ia.php
	apps/files/l10n/id.php
	apps/files/l10n/it.php
	apps/files/l10n/ja_JP.php
	apps/files/l10n/ko.php
	apps/files/l10n/lb.php
	apps/files/l10n/lt_LT.php
	apps/files/l10n/mk.php
	apps/files/l10n/ms_MY.php
	apps/files/l10n/nb_NO.php
	apps/files/l10n/nl.php
	apps/files/l10n/nn_NO.php
	apps/files/l10n/pl.php
	apps/files/l10n/pt_BR.php
	apps/files/l10n/pt_PT.php
	apps/files/l10n/ro.php
	apps/files/l10n/ru.php
	apps/files/l10n/sk_SK.php
	apps/files/l10n/sl.php
	apps/files/l10n/sr.php
	apps/files/l10n/sr@latin.php
	apps/files/l10n/sv.php
	apps/files/l10n/th_TH.php
	apps/files/l10n/tr.php
	apps/files/l10n/uk.php
	apps/files/l10n/zh_CN.php
	apps/files/l10n/zh_TW.php
	apps/files_archive/js/archive.js
	apps/files_encryption/lib/cryptstream.php
	apps/files_encryption/lib/proxy.php
	apps/files_encryption/tests/proxy.php
	apps/files_external/appinfo/app.php
	apps/files_external/lib/smb.php
	apps/files_external/lib/streamwrapper.php
	apps/files_external/tests/config.php
	apps/files_external/tests/smb.php
	apps/files_sharing/ajax/email.php
	apps/files_sharing/ajax/getitem.php
	apps/files_sharing/ajax/setpermissions.php
	apps/files_sharing/ajax/share.php
	apps/files_sharing/ajax/toggleresharing.php
	apps/files_sharing/ajax/unshare.php
	apps/files_sharing/ajax/userautocomplete.php
	apps/files_sharing/js/settings.js
	apps/files_sharing/js/share.js
	apps/files_sharing/lib_share.php
	apps/files_sharing/settings.php
	apps/files_sharing/sharedstorage.php
	apps/files_sharing/templates/settings.php
	apps/files_versions/ajax/rollbackVersion.php
	apps/files_versions/versions.php
	apps/gallery/ajax/thumbnail.php
	apps/gallery/appinfo/app.php
	apps/gallery/appinfo/update.php
	apps/gallery/appinfo/version
	apps/gallery/css/styles.css
	apps/gallery/index.php
	apps/gallery/js/pictures.js
	apps/gallery/l10n/ca.php
	apps/gallery/l10n/cs_CZ.php
	apps/gallery/l10n/de.php
	apps/gallery/l10n/el.php
	apps/gallery/l10n/es.php
	apps/gallery/l10n/fi_FI.php
	apps/gallery/l10n/fr.php
	apps/gallery/l10n/it.php
	apps/gallery/l10n/pl.php
	apps/gallery/l10n/pt_PT.php
	apps/gallery/l10n/ru.php
	apps/gallery/l10n/sl.php
	apps/gallery/l10n/sv.php
	apps/gallery/l10n/th_TH.php
	apps/gallery/l10n/tr.php
	apps/gallery/l10n/zh_CN.php
	apps/gallery/lib/album.php
	apps/gallery/lib/hooks_handlers.php
	apps/gallery/lib/managers.php
	apps/gallery/lib/photo.php
	apps/gallery/lib/tiles.php
	apps/gallery/lib/tiles_test.php
	apps/gallery/templates/index.php
	apps/media/lib_ampache.php
	apps/media/lib_collection.php
	apps/media/lib_media.php
	apps/remoteStorage/lib_remoteStorage.php
	apps/tasks/ajax/addtaskform.php
	apps/tasks/ajax/edittask.php
	apps/user_ldap/appinfo/update.php
	apps/user_ldap/group_ldap.php
	apps/user_ldap/lib_ldap.php
	apps/user_ldap/settings.php
	apps/user_ldap/templates/settings.php
	apps/user_ldap/user_ldap.php
	apps/user_migrate/appinfo/app.php
	apps/user_migrate/templates/settings.php
	apps/user_webfinger/host-meta.php
	config/config.sample.php
	core/js/js.js
	core/l10n/da.php
	core/l10n/de.php
	core/l10n/fi_FI.php
	core/l10n/gl.php
	core/l10n/he.php
	core/l10n/hr.php
	core/l10n/id.php
	core/l10n/ja_JP.php
	core/l10n/lb.php
	core/l10n/lt_LT.php
	core/l10n/nb_NO.php
	core/l10n/pl.php
	core/l10n/pt_PT.php
	core/l10n/ro.php
	core/l10n/ru.php
	core/l10n/sv.php
	core/lostpassword/index.php
	core/templates/layout.user.php
	core/templates/login.php
	db_structure.xml
	index.php
	l10n/af/calendar.po
	l10n/af/contacts.po
	l10n/af/core.po
	l10n/af/files.po
	l10n/af/settings.po
	l10n/ar/calendar.po
	l10n/ar/contacts.po
	l10n/ar/core.po
	l10n/ar/files.po
	l10n/ar/media.po
	l10n/ar/settings.po
	l10n/bg_BG/calendar.po
	l10n/bg_BG/contacts.po
	l10n/bg_BG/core.po
	l10n/bg_BG/files.po
	l10n/bg_BG/media.po
	l10n/bg_BG/settings.po
	l10n/ca/calendar.po
	l10n/ca/contacts.po
	l10n/ca/core.po
	l10n/ca/files.po
	l10n/ca/gallery.po
	l10n/ca/settings.po
	l10n/cs_CZ/calendar.po
	l10n/cs_CZ/contacts.po
	l10n/cs_CZ/core.po
	l10n/cs_CZ/files.po
	l10n/cs_CZ/gallery.po
	l10n/cs_CZ/settings.po
	l10n/da/calendar.po
	l10n/da/contacts.po
	l10n/da/core.po
	l10n/da/files.po
	l10n/da/settings.po
	l10n/de/calendar.po
	l10n/de/contacts.po
	l10n/de/core.po
	l10n/de/files.po
	l10n/de/gallery.po
	l10n/de/settings.po
	l10n/el/calendar.po
	l10n/el/contacts.po
	l10n/el/core.po
	l10n/el/files.po
	l10n/el/gallery.po
	l10n/el/settings.po
	l10n/eo/calendar.po
	l10n/eo/contacts.po
	l10n/eo/core.po
	l10n/eo/files.po
	l10n/eo/media.po
	l10n/eo/settings.po
	l10n/es/calendar.po
	l10n/es/contacts.po
	l10n/es/core.po
	l10n/es/files.po
	l10n/es/gallery.po
	l10n/es/settings.po
	l10n/et_EE/calendar.po
	l10n/et_EE/contacts.po
	l10n/et_EE/core.po
	l10n/et_EE/files.po
	l10n/et_EE/settings.po
	l10n/eu/calendar.po
	l10n/eu/contacts.po
	l10n/eu/core.po
	l10n/eu/files.po
	l10n/eu/settings.po
	l10n/fa/calendar.po
	l10n/fa/contacts.po
	l10n/fa/core.po
	l10n/fa/files.po
	l10n/fa/settings.po
	l10n/fi_FI/calendar.po
	l10n/fi_FI/contacts.po
	l10n/fi_FI/core.po
	l10n/fi_FI/files.po
	l10n/fi_FI/gallery.po
	l10n/fi_FI/settings.po
	l10n/fr/calendar.po
	l10n/fr/contacts.po
	l10n/fr/core.po
	l10n/fr/files.po
	l10n/fr/gallery.po
	l10n/fr/media.po
	l10n/fr/settings.po
	l10n/gl/calendar.po
	l10n/gl/contacts.po
	l10n/gl/core.po
	l10n/gl/files.po
	l10n/gl/settings.po
	l10n/he/calendar.po
	l10n/he/contacts.po
	l10n/he/core.po
	l10n/he/files.po
	l10n/he/settings.po
	l10n/hr/calendar.po
	l10n/hr/contacts.po
	l10n/hr/core.po
	l10n/hr/files.po
	l10n/hr/settings.po
	l10n/hu_HU/calendar.po
	l10n/hu_HU/contacts.po
	l10n/hu_HU/core.po
	l10n/hu_HU/files.po
	l10n/hu_HU/settings.po
	l10n/hy/calendar.po
	l10n/hy/contacts.po
	l10n/hy/core.po
	l10n/hy/files.po
	l10n/hy/settings.po
	l10n/ia/calendar.po
	l10n/ia/contacts.po
	l10n/ia/core.po
	l10n/ia/files.po
	l10n/ia/settings.po
	l10n/id/calendar.po
	l10n/id/contacts.po
	l10n/id/core.po
	l10n/id/files.po
	l10n/id/settings.po
	l10n/it/calendar.po
	l10n/it/contacts.po
	l10n/it/core.po
	l10n/it/files.po
	l10n/it/gallery.po
	l10n/it/settings.po
	l10n/ja_JP/calendar.po
	l10n/ja_JP/contacts.po
	l10n/ja_JP/core.po
	l10n/ja_JP/files.po
	l10n/ja_JP/settings.po
	l10n/ko/calendar.po
	l10n/ko/contacts.po
	l10n/ko/core.po
	l10n/ko/files.po
	l10n/ko/settings.po
	l10n/lb/calendar.po
	l10n/lb/contacts.po
	l10n/lb/core.po
	l10n/lb/files.po
	l10n/lb/settings.po
	l10n/lt_LT/calendar.po
	l10n/lt_LT/contacts.po
	l10n/lt_LT/core.po
	l10n/lt_LT/files.po
	l10n/lt_LT/settings.po
	l10n/mk/calendar.po
	l10n/mk/contacts.po
	l10n/mk/core.po
	l10n/mk/files.po
	l10n/mk/settings.po
	l10n/ms_MY/calendar.po
	l10n/ms_MY/contacts.po
	l10n/ms_MY/core.po
	l10n/ms_MY/files.po
	l10n/ms_MY/settings.po
	l10n/nb_NO/calendar.po
	l10n/nb_NO/contacts.po
	l10n/nb_NO/core.po
	l10n/nb_NO/files.po
	l10n/nb_NO/settings.po
	l10n/nl/calendar.po
	l10n/nl/contacts.po
	l10n/nl/core.po
	l10n/nl/files.po
	l10n/nl/settings.po
	l10n/nn_NO/calendar.po
	l10n/nn_NO/contacts.po
	l10n/nn_NO/core.po
	l10n/nn_NO/files.po
	l10n/nn_NO/settings.po
	l10n/pl/calendar.po
	l10n/pl/contacts.po
	l10n/pl/core.po
	l10n/pl/files.po
	l10n/pl/gallery.po
	l10n/pl/settings.po
	l10n/pt_BR/calendar.po
	l10n/pt_BR/contacts.po
	l10n/pt_BR/core.po
	l10n/pt_BR/files.po
	l10n/pt_BR/settings.po
	l10n/pt_PT/calendar.po
	l10n/pt_PT/contacts.po
	l10n/pt_PT/core.po
	l10n/pt_PT/files.po
	l10n/pt_PT/gallery.po
	l10n/pt_PT/settings.po
	l10n/ro/calendar.po
	l10n/ro/contacts.po
	l10n/ro/core.po
	l10n/ro/files.po
	l10n/ro/settings.po
	l10n/ru/calendar.po
	l10n/ru/contacts.po
	l10n/ru/core.po
	l10n/ru/files.po
	l10n/ru/gallery.po
	l10n/ru/settings.po
	l10n/sk_SK/calendar.po
	l10n/sk_SK/contacts.po
	l10n/sk_SK/core.po
	l10n/sk_SK/files.po
	l10n/sk_SK/settings.po
	l10n/sl/calendar.po
	l10n/sl/contacts.po
	l10n/sl/core.po
	l10n/sl/files.po
	l10n/sl/gallery.po
	l10n/sl/settings.po
	l10n/sr/calendar.po
	l10n/sr/contacts.po
	l10n/sr/core.po
	l10n/sr/files.po
	l10n/sr/settings.po
	l10n/sr@latin/calendar.po
	l10n/sr@latin/contacts.po
	l10n/sr@latin/core.po
	l10n/sr@latin/files.po
	l10n/sr@latin/settings.po
	l10n/sv/calendar.po
	l10n/sv/contacts.po
	l10n/sv/core.po
	l10n/sv/files.po
	l10n/sv/gallery.po
	l10n/sv/media.po
	l10n/sv/settings.po
	l10n/templates/bookmarks.pot
	l10n/templates/calendar.pot
	l10n/templates/contacts.pot
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/gallery.pot
	l10n/templates/media.pot
	l10n/templates/settings.pot
	l10n/th_TH/calendar.po
	l10n/th_TH/contacts.po
	l10n/th_TH/core.po
	l10n/th_TH/files.po
	l10n/th_TH/gallery.po
	l10n/th_TH/settings.po
	l10n/tr/calendar.po
	l10n/tr/contacts.po
	l10n/tr/core.po
	l10n/tr/files.po
	l10n/tr/gallery.po
	l10n/tr/settings.po
	l10n/uk/calendar.po
	l10n/uk/contacts.po
	l10n/uk/core.po
	l10n/uk/files.po
	l10n/uk/media.po
	l10n/uk/settings.po
	l10n/zh_CN/calendar.po
	l10n/zh_CN/contacts.po
	l10n/zh_CN/core.po
	l10n/zh_CN/files.po
	l10n/zh_CN/gallery.po
	l10n/zh_CN/settings.po
	l10n/zh_TW/calendar.po
	l10n/zh_TW/contacts.po
	l10n/zh_TW/core.po
	l10n/zh_TW/files.po
	l10n/zh_TW/settings.po
	lib/app.php
	lib/base.php
	lib/connector/sabre/file.php
	lib/connector/sabre/locks.php
	lib/connector/sabre/node.php
	lib/db.php
	lib/filecache.php
	lib/fileproxy/quota.php
	lib/files.php
	lib/filestorage/local.php
	lib/filesystemview.php
	lib/group/database.php
	lib/helper.php
	lib/installer.php
	lib/json.php
	lib/l10n.php
	lib/migrate.php
	lib/mimetypes.fixlist.php
	lib/ocs.php
	lib/preferences.php
	lib/public/json.php
	lib/public/util.php
	lib/template.php
	lib/user.php
	lib/user/database.php
	lib/util.php
	lib/vcategories.php
	ocs/providers.php
	settings/admin.php
	settings/ajax/lostpassword.php
	settings/ajax/removeuser.php
	settings/ajax/setbackgroundjobsmode.php
	settings/ajax/setlanguage.php
	settings/ajax/setquota.php
	settings/ajax/togglegroups.php
	settings/apps.php
	settings/css/settings.css
	settings/js/apps.js
	settings/js/users.js
	settings/l10n/bg_BG.php
	settings/l10n/ca.php
	settings/l10n/cs_CZ.php
	settings/l10n/da.php
	settings/l10n/de.php
	settings/l10n/el.php
	settings/l10n/eo.php
	settings/l10n/es.php
	settings/l10n/et_EE.php
	settings/l10n/eu.php
	settings/l10n/fa.php
	settings/l10n/fi_FI.php
	settings/l10n/fr.php
	settings/l10n/gl.php
	settings/l10n/he.php
	settings/l10n/hr.php
	settings/l10n/hu_HU.php
	settings/l10n/it.php
	settings/l10n/ja_JP.php
	settings/l10n/ko.php
	settings/l10n/lt_LT.php
	settings/l10n/mk.php
	settings/l10n/ms_MY.php
	settings/l10n/nb_NO.php
	settings/l10n/nl.php
	settings/l10n/nn_NO.php
	settings/l10n/pl.php
	settings/l10n/pt_BR.php
	settings/l10n/pt_PT.php
	settings/l10n/ru.php
	settings/l10n/sk_SK.php
	settings/l10n/sl.php
	settings/l10n/sv.php
	settings/l10n/th_TH.php
	settings/l10n/tr.php
	settings/l10n/zh_CN.php
	settings/personal.php
	settings/templates/admin.php
	settings/templates/users.php

14 files changed, 100 insertions, 142 deletions

diff --git a/apps/remoteStorage/ajax/revokeToken.php b/apps/remoteStorage/ajax/revokeToken.php
index 699b9e9aeec..e6a68189945 100644
--- a/apps/remoteStorage/ajax/revokeToken.php
+++ b/apps/remoteStorage/ajax/revokeToken.php
@@ -5,7 +5,7 @@
 *
 * Original:
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 * 
 * Adapted:
 * @author Michiel de Jong, 2012
@@ -25,10 +25,6 @@
 *
 */
 
-
-// Do not load FS ...
-$RUNTIME_NOSETUPFS = true;
- 
 OCP\App::checkAppEnabled('remoteStorage');
 require_once('remoteStorage/lib_remoteStorage.php');
 
diff --git a/apps/remoteStorage/appinfo/app.php b/apps/remoteStorage/appinfo/app.php
index 14b8a3d11df..c278fd73056 100644
--- a/apps/remoteStorage/appinfo/app.php
+++ b/apps/remoteStorage/appinfo/app.php
@@ -1,6 +1,2 @@
 <?php
-OCP\App::register( array( 
-  'order' => 10,
-  'id' => 'remoteStorage',
-  'name' => 'remoteStorage compatibility' ));
 OCP\App::registerPersonal('remoteStorage','settings');
diff --git a/apps/remoteStorage/appinfo/info.xml b/apps/remoteStorage/appinfo/info.xml
index fa878762a05..1388ad9c316 100644
--- a/apps/remoteStorage/appinfo/info.xml
+++ b/apps/remoteStorage/appinfo/info.xml
@@ -7,4 +7,7 @@
 	<author>Michiel de Jong</author>
 	<require>4</require>
 	<shipped>true</shipped>
+	<remote>
+		<remoteStorage>webdav.php</remoteStorage>
+	</remote>
 </info>
diff --git a/apps/remoteStorage/appinfo/version b/apps/remoteStorage/appinfo/version
index 490f510fc27..0e2c93950bb 100644
--- a/apps/remoteStorage/appinfo/version
+++ b/apps/remoteStorage/appinfo/version
@@ -1 +1 @@
-0.6
\ No newline at end of file
+0.7
\ No newline at end of file
diff --git a/apps/remoteStorage/appinfo/webfinger.php b/apps/remoteStorage/appinfo/webfinger.php
index 5d481f315f8..e8b237628c4 100644
--- a/apps/remoteStorage/appinfo/webfinger.php
+++ b/apps/remoteStorage/appinfo/webfinger.php
@@ -1,8 +1,8 @@
-<?php if(OC_User::userExists(WF_USER)) { ?>
+<?php if(OC_User::userExists(WF_USER)): ?>
     {
         "rel":"remoteStorage",
-        "template":"<?php echo WF_BASEURL; ?>/apps/remoteStorage/WebDAV.php/<?php echo WF_USER; ?>/remoteStorage/{category}/",
+        "template":"<?php echo WF_BASEURL; ?>/remote.php/remoteStorage/<?php echo WF_USER; ?>/remoteStorage/{category}/",
         "api":"WebDAV",
         "auth":"<?php echo WF_BASEURL; ?>/?app=remoteStorage&getfile=auth.php&userid=<?php echo WF_USER; ?>"
     }
-<?php } ?>
+<?php endif ?>
diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php
index a54be37b2e6..91ca43ea076 100644
--- a/apps/remoteStorage/auth.php
+++ b/apps/remoteStorage/auth.php
@@ -5,7 +5,7 @@
 *
 * Original:
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 * 
 * Adapted:
 * @author Michiel de Jong, 2012
@@ -25,9 +25,7 @@
 *
 */
 
-
-// Do not load FS ...
-$RUNTIME_NOSETUPFS = true;
+header("X-Frame-Options: Sameorigin");
 
 OCP\App::checkAppEnabled('remoteStorage');
 require_once('Sabre/autoload.php');
@@ -43,9 +41,9 @@ foreach($_GET as $k => $v) {
     $userId=$v;
   } else if($k=='redirect_uri'){
     $appUrlParts=explode('/', $v);
-    $appUrl = $appUrlParts[2];//bit dodgy i guess
+    $appUrl = htmlentities($appUrlParts[2]);//TODO: check if this is equal to client_id
   } else if($k=='scope'){
-    $categories=$v;
+    $categories=htmlentities($v);
   }
 }
 $currUser = OCP\USER::getUser();
@@ -59,64 +57,23 @@ if($userId && $appUrl && $categories) {
       header('Location: '.$_GET['redirect_uri'].'#access_token='.$existingToken.'&token_type=bearer');
     } else {
       //params ok, logged in ok, but need to click Allow still:
-?>
-<!DOCTYPE html>
-<html>
-	<head>
-	<title>ownCloud</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<link rel="shortcut icon" href="../../../core/img/favicon.png" /><link rel="apple-touch-icon-precomposed" href="../../../core/img/favicon-touch.png" />
-			<link rel="stylesheet" href="../../../core/css/styles.css" type="text/css" media="screen" />
-			<link rel="stylesheet" href="../../../core/css/auth.css" type="text/css" media="screen" />
-		</head>
-	<body id="body-login">
-	<div id="login">
-		<header>
-		<div id="header">
-			<img src="../../../core/img/logo.png" alt="ownCloud" />
-		</div>
-		</header>
-		<section id="main">
-		<div id="oauth">
-			<h2><img src="../../../core/img/remoteStorage-big.png" alt="remoteStorage" /></h2>
-			<p><strong><?php $appUrlParts = explode('/', $_GET['redirect_uri']); echo htmlentities($appUrlParts[2]); ?></strong>
-			requests read &amp; write access to your 
-			<?php
-				$categories = explode(',', htmlentities($_GET['scope']));
-				if(!count($categories)) {
-					echo htmlentities($_GET['scope']);
-				} else {
-					echo '<em>'.$categories[0].'</em>';
-					if(count($categories)==2) {
-						echo ' and <em>'.$categories[1].'</em>';
-					} else if(count($categories)>2) {
-						for($i=1; $i<count($categories)-1; $i++) {
-							echo ', <em>'.$categories[$i].'</em>';
-						}
-						echo ', and <em>'.$categories[$i].'</em>';
-					}
-				}
-			?>.
-			</p>
-			<form accept-charset="UTF-8" method="post">
-				<input id="allow-auth" name="allow" type="submit" value="Allow" />
-				<input id="deny-auth" name="deny" type="submit" value="Deny" />
-			</form>
-		</div>
-		</section>
-	</div>
-	<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash; web services under your control</p></footer>
-	</body>
-</html>
-<?php
-		}//end 'need to click Allow still'
+	$appUrlParts = explode('/', $_GET['redirect_uri']);
+	$host = $appUrlParts[2];
+	$categories = explode(',', $_GET['scope']);
+	OCP\Util::addStyle('', 'auth');
+	OCP\Template::printGuestPage('remoteStorage', 'auth', array(
+		'host' => $host,
+		'categories' => $categories,
+	));
+	}//end 'need to click Allow still'
 	} else {//login not ok
 		if($currUser) {
-			die('You are logged in as '.$currUser.' instead of '.$userId);
+			die('You are logged in as '.$currUser.' instead of '.htmlentities($userId));
 		} else {
-			header('Location: /?redirect_url='.urlencode('/apps/remoteStorage/auth.php'.$_SERVER['PATH_INFO'].'?'.$_SERVER['QUERY_STRING']));
+			// this will display the login page for us
+			OCP\Util::checkLoggedIn();
 		}
 	}
 } else {//params not ok
-	die('please use e.g. /?app=remoteStorage&getfile=auth.php&userid=admin&redirect_uri=http://host/path&scope=...');
+	die('please use e.g. '.OCP\Util::linkTo('remoteStorage', 'auth.php').'?userid=admin&redirect_uri=http://host/path&scope=...');
 }
diff --git a/apps/remoteStorage/img/remoteStorage.png b/apps/remoteStorage/img/remoteStorage.png
new file mode 100644
index 00000000000..10c2be243c2
--- /dev/null
+++ b/apps/remoteStorage/img/remoteStorage.png
diff --git a/apps/remoteStorage/lib_remoteStorage.php b/apps/remoteStorage/lib_remoteStorage.php
index b6934e87d67..b9e23680037 100644
--- a/apps/remoteStorage/lib_remoteStorage.php
+++ b/apps/remoteStorage/lib_remoteStorage.php
@@ -2,8 +2,8 @@
 
 class OC_remoteStorage {
 	public static function getValidTokens($ownCloudUser, $category) {
-		$query=OCP\DB::prepare("SELECT `token`,`appUrl`,`category` FROM `*PREFIX*authtoken` WHERE `user`=?",100);
-		$result=$query->execute(array($ownCloudUser));
+		$stmt=OCP\DB::prepare("SELECT `token`,`appUrl`,`category` FROM `*PREFIX*authtoken` WHERE `user`=?",100);
+		$result=$stmt->execute(array($ownCloudUser));
 		$ret = array();
 		while($row=$result->fetchRow()){
 			if(in_array($category, explode(',', $row['category']))) {
@@ -15,20 +15,19 @@ class OC_remoteStorage {
 
   public static function getTokenFor($appUrl, $categories) {
 		$user=OCP\USER::getUser();
-		$query=OCP\DB::prepare("SELECT `token` FROM `*PREFIX*authtoken` WHERE `user`=? AND `appUrl`=? AND `category`=?",1);
-		$result=$query->execute(array($user, $appUrl, $categories));
-		$ret = array();
+		$stmt=OCP\DB::prepare("SELECT `token` FROM `*PREFIX*authtoken` WHERE `user`=? AND `appUrl`=? AND `category`=?",1);
+		$result=$stmt->execute(array($user, $appUrl, $categories));
 		if($row=$result->fetchRow()) {
-		  return base64_encode('remoteStorage:'.$row['token']);
-    } else {
-      return false;
-    }
+			return base64_encode('remoteStorage:'.$row['token']);
+		} else {
+			return false;
+		}
 	}
 
 	public static function getAllTokens() {
 		$user=OCP\USER::getUser();
-		$query=OCP\DB::prepare("SELECT `token`,`appUrl`,`category` FROM `*PREFIX*authtoken` WHERE `user`=?",100);
-		$result=$query->execute(array($user));
+		$stmt=OCP\DB::prepare("SELECT `token`,`appUrl`,`category` FROM `*PREFIX*authtoken` WHERE `user`=?",100);
+		$result=$stmt->execute(array($user));
 		$ret = array();
 		while($row=$result->fetchRow()){
 			$ret[$row['token']] = array(
@@ -41,14 +40,14 @@ class OC_remoteStorage {
 
 	public static function deleteToken($token) {
 		$user=OCP\USER::getUser();
-		$query=OCP\DB::prepare("DELETE FROM `*PREFIX*authtoken` WHERE `token`=? AND `user`=?");
-		$result=$query->execute(array($token,$user));
+		$stmt=OCP\DB::prepare("DELETE FROM `*PREFIX*authtoken` WHERE `token`=? AND `user`=?");
+		$stmt->execute(array($token,$user));
 		return 'unknown';//how can we see if any rows were affected?
 	}
 	private static function addToken($token, $appUrl, $categories){
 		$user=OCP\USER::getUser();
-		$query=OCP\DB::prepare("INSERT INTO `*PREFIX*authtoken` (`token`,`appUrl`,`user`,`category`) VALUES(?,?,?,?)");
-		$result=$query->execute(array($token,$appUrl,$user,$categories));
+		$stmt=OCP\DB::prepare("INSERT INTO `*PREFIX*authtoken` (`token`,`appUrl`,`user`,`category`) VALUES(?,?,?,?)");
+		$stmt->execute(array($token,$appUrl,$user,$categories));
 	}
 	public static function createCategories($appUrl, $categories) {
 		$token=uniqid();
diff --git a/apps/remoteStorage/oauth_ro_auth.php b/apps/remoteStorage/oauth_ro_auth.php
index 12d02d1cf5d..bed3093c3b3 100644
--- a/apps/remoteStorage/oauth_ro_auth.php
+++ b/apps/remoteStorage/oauth_ro_auth.php
@@ -9,10 +9,10 @@
 
 class OC_Connector_Sabre_Auth_ro_oauth extends Sabre_DAV_Auth_Backend_AbstractBasic {
 	private $validTokens;
-  private $category;
+	private $category;
 	public function __construct($validTokensArg, $categoryArg) {
 		$this->validTokens = $validTokensArg;
-    $this->category = $categoryArg;
+		$this->category = $categoryArg;
 	}
 
 	/**
@@ -25,16 +25,16 @@ class OC_Connector_Sabre_Auth_ro_oauth extends Sabre_DAV_Auth_Backend_AbstractBa
 	 */
 	protected function validateUserPass($username, $password){
 		//always give read-only:
-		if(($_SERVER['REQUEST_METHOD'] == 'OPTIONS') 
+		if(($_SERVER['REQUEST_METHOD'] == 'OPTIONS')
 		    || (isset($this->validTokens[$password]))
-        || (($_SERVER['REQUEST_METHOD'] == 'GET') && ($this->category == 'public'))
-        ) {
+			|| (($_SERVER['REQUEST_METHOD'] == 'GET') && ($this->category == 'public'))
+		) {
 			OC_Util::setUpFS();
 			return true;
 		} else {
-      //var_export($_SERVER);
-      //var_export($this->validTokens);
-      //die('not getting in with "'.$username.'"/"'.$password.'"!');
+			//var_export($_SERVER);
+			//var_export($this->validTokens);
+			//die('not getting in with "'.$username.'"/"'.$password.'"!');
 			return false;	
 		}
 	}
@@ -48,8 +48,8 @@ class OC_Connector_Sabre_Auth_ro_oauth extends Sabre_DAV_Auth_Backend_AbstractBa
 		$userpass = $auth->getUserPass();
 		if (!$userpass) {
 			if(($_SERVER['REQUEST_METHOD'] == 'OPTIONS')
-	        ||(($_SERVER['REQUEST_METHOD'] == 'GET') && ($this->category == 'public'))
-          ) {
+				||(($_SERVER['REQUEST_METHOD'] == 'GET') && ($this->category == 'public'))
+			) {
 				$userpass = array('', '');
 			} else {
 				$auth->requireLogin();
diff --git a/apps/remoteStorage/remoteStorage.png b/apps/remoteStorage/remoteStorage.png
deleted file mode 100644
index 6b751c09997..00000000000
--- a/apps/remoteStorage/remoteStorage.png
+++ /dev/null
diff --git a/apps/remoteStorage/settings.php b/apps/remoteStorage/settings.php
index 9c48549fe6d..3be8b0984d8 100644
--- a/apps/remoteStorage/settings.php
+++ b/apps/remoteStorage/settings.php
@@ -4,4 +4,3 @@ require_once('lib_remoteStorage.php');
 $tmpl = new OCP\Template( 'remoteStorage', 'settings');
 
 return $tmpl->fetchPage();
-?>
diff --git a/apps/remoteStorage/templates/auth.php b/apps/remoteStorage/templates/auth.php
new file mode 100644
index 00000000000..6a7054eabb0
--- /dev/null
+++ b/apps/remoteStorage/templates/auth.php
@@ -0,0 +1,28 @@
+		<section id="main">
+		<div id="oauth">
+			<h2><img src="<?php echo image_path('', 'remoteStorage-big.png'); ?>" alt="remoteStorage" /></h2>
+			<p><strong><?php echo $_['host'] ?></strong>
+			requests read &amp; write access to your 
+			<?php
+				$categories = $_['categories'];
+				if(!count($categories)) {
+					echo $categories[0];
+				} else {
+					echo '<em>'.$categories[0].'</em>';
+					if(count($categories)==2) {
+						echo ' and <em>'.$categories[1].'</em>';
+					} else if(count($categories)>2) {
+						for($i=1; $i<count($categories)-1; $i++) {
+							echo ', <em>'.$categories[$i].'</em>';
+						}
+						echo ', and <em>'.$categories[$i].'</em>';
+					}
+				}
+			?>.
+			</p>
+			<form accept-charset="UTF-8" method="post">
+				<input id="allow-auth" name="allow" type="submit" value="Allow" />
+				<input id="deny-auth" name="deny" type="submit" value="Deny" />
+			</form>
+		</div>
+		</section>
diff --git a/apps/remoteStorage/templates/settings.php b/apps/remoteStorage/templates/settings.php
index 147378dda39..1d2a188f527 100644
--- a/apps/remoteStorage/templates/settings.php
+++ b/apps/remoteStorage/templates/settings.php
@@ -1,10 +1,6 @@
 	<fieldset class="personalblock">
-		<?php
-			echo '<img src="../apps/remoteStorage/remoteStorage.png" style="width:16px"> '
-				.'<strong>'.$l->t('remoteStorage').'</strong> user address: '
-				.OCP\USER::getUser().'@'.$_SERVER['SERVER_NAME']
-				.' (<a href="http://unhosted.org/">more info</a>)';
-		?>
+		<img src="<?php echo image_path('remoteStorage', 'remoteStorage.png') ?>" style="width:16px">
+		<strong><?php echo $l->t('remoteStorage') ?></strong> user address: <?php echo OCP\USER::getUser().'@'.$_SERVER['SERVER_NAME'] ?> (<a href="http://unhosted.org/">more info</a>)
 		<p><em>Apps that currently have access to your ownCloud:</em></p>
 		<script>
 			function revokeToken(token) {
@@ -14,15 +10,13 @@
 			}
 		</script>
 		<ul>
-		<?php
-			foreach(OC_remoteStorage::getAllTokens() as $token => $details) {
-				echo '<li onmouseover="'
-					.'document.getElementById(\'revoke_'.$token.'\').style.display=\'inline\';"'
-					.'onmouseout="document.getElementById(\'revoke_'.$token.'\').style.display=\'none\';"'
-					.'> <strong>'.$details['appUrl'].'</strong>: '.$details['categories']
-					.' <a href="#" title="Revoke" class="action" style="display:none" id="revoke_'.$token.'" onclick="'
-					.'revokeToken(\''.$token.'\');this.parentNode.style.display=\'none\';"'
-					.'><img src="/core/img/actions/delete.svg"></a></li>'."\n";
-			}
-		?></ul>
+		<?php foreach(OC_remoteStorage::getAllTokens() as $token => $details) { ?>
+			<li onmouseover="$('#revoke_<?php echo $token ?>').show();" onmouseout="$('#revoke_<?php echo $token ?>').hide();">
+				<strong><?php echo $details['appUrl'] ?></strong>: <?php echo $details['categories'] ?>
+				<a href="#" title="Revoke" class="action" style="display:none" id="revoke_<?php echo $token ?>" onclick="revokeToken('<?php echo $token ?>');$(this).hide();">
+					<img src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg') ?>">
+				</a>
+			</li>
+		<?php } ?>
+		</ul>
 	</fieldset>
diff --git a/apps/remoteStorage/WebDAV.php b/apps/remoteStorage/webdav.php
index ab498db07da..8d8ec6a45a1 100644
--- a/apps/remoteStorage/WebDAV.php
+++ b/apps/remoteStorage/webdav.php
@@ -5,7 +5,7 @@
 *
 * Original:
 * @author Frank Karlitschek
-* @copyright 2010 Frank Karlitschek karlitschek@kde.org
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
 * 
 * Adapted:
 * @author Michiel de Jong, 2011
@@ -25,22 +25,7 @@
 *
 */
 
-
-// Do not load FS ...
-$RUNTIME_NOSETUPFS = true;
-
-
-require_once('../../lib/base.php');
-
-require_once('../../lib/user.php');
-require_once('../../lib/public/user.php');
-
-require_once('../../lib/app.php');
-require_once('../../lib/public/app.php');
-
-require_once('../../3rdparty/Sabre/DAV/Auth/IBackend.php');
-require_once('../../3rdparty/Sabre/DAV/Auth/Backend/AbstractBasic.php');
-require_once('../../lib/connector/sabre/auth.php');
+OC_App::loadApps(array('filesystem','authentication'));
 
 OCP\App::checkAppEnabled('remoteStorage');
 require_once('lib_remoteStorage.php');
@@ -61,14 +46,15 @@ if(isset($_SERVER['HTTP_ORIGIN'])) {
 	header('Access-Control-Allow-Origin: *');
 }
 
-$path = substr($_SERVER["REQUEST_URI"], strlen($_SERVER["SCRIPT_NAME"]));
+$path = substr($_SERVER["REQUEST_URI"], strlen($baseuri));
+
 $pathParts =  explode('/', $path);
 // for webdav:
-// 0/     1       /   2    /   3...
-//  /$ownCloudUser/remoteStorage/$category/
+//      0       /   1    /   2...
+//  $ownCloudUser/remoteStorage/$category/
 
-if(count($pathParts) >= 3 && $pathParts[0] == '') {
-	list($dummy, $ownCloudUser, $dummy2, $category) = $pathParts;
+if(count($pathParts) >= 2) {
+	list($ownCloudUser, $dummy2, $category) = $pathParts;
 
 	OC_Util::setupFS($ownCloudUser);
 
@@ -77,13 +63,13 @@ if(count($pathParts) >= 3 && $pathParts[0] == '') {
 	$server = new Sabre_DAV_Server($publicDir);
 
 	// Path to our script
-	$server->setBaseUri(OC::$WEBROOT."/apps/remoteStorage/WebDAV.php/$ownCloudUser");
+	$server->setBaseUri($baseuri.$ownCloudUser);
 
 	// Auth backend
 	$authBackend = new OC_Connector_Sabre_Auth_ro_oauth(
-      OC_remoteStorage::getValidTokens($ownCloudUser, $category),
-      $category
-      );
+		OC_remoteStorage::getValidTokens($ownCloudUser, $category),
+		$category
+	);
 
 	$authPlugin = new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud');//should use $validTokens here
 	$server->addPlugin($authPlugin);