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

8 files changed, 0 insertions, 243 deletions

diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php
deleted file mode 100644
index 2a81e6f9827..00000000000
--- a/apps/files_sharing/ajax/email.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-OCP\JSON::checkAppEnabled('files_sharing');
-$user = OCP\USER::getUser();
-// TODO translations
-$type = (strpos($_POST['file'], '.') === false) ? 'folder' : 'file';
-$subject = $user.' shared a '.$type.' with you';
-$link = $_POST['link'];
-$text = $user.' shared the '.$type.' '.$_POST['file'].' with you. It is available for download here: '.$link;
-$fromaddress = OCP\Config::getUserValue($user, 'settings', 'email', 'sharing-noreply@'.OCP\Util::getServerHost());
-try {
-	OCP\Util::sendMail($_POST['toaddress'], $_POST['toaddress'], $subject, $text, $fromaddress, $user);
-	OCP\JSON::success();
-} catch (Exception $exception) {
-	OCP\JSON::error(array('data' => array('message' => $exception->getMessage())));
-}
diff --git a/apps/files_sharing/ajax/getitem.php b/apps/files_sharing/ajax/getitem.php
deleted file mode 100644
index 852e5a24571..00000000000
--- a/apps/files_sharing/ajax/getitem.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
- 
-OCP\JSON::checkAppEnabled('files_sharing');
-OCP\JSON::checkLoggedIn();
-
-$item = array();
-$userDirectory = '/'.OCP\USER::getUser().'/files';
-$source = $userDirectory.$_GET['item'];
-$path = $source;
-// Search for item and shared parent folders
-while ($path != $userDirectory) {
-	if ($rows = OC_Share::getMySharedItem($path)) {
-		for ($i = 0; $i < count($rows); $i++) {
-			$uid_shared_with = $rows[$i]['uid_shared_with'];
-			if ($uid_shared_with == OC_Share::PUBLICLINK && !isset($item['privateLink'])) {
-				$token = OC_Share::getTokenFromSource($path);
-				if ($path == $source) {
-					$item['privateLink'] = $token;
-				} else {
-					// If in parent folder, include a path parameter to get direct access to file
-					$item['privateLink'] = $token.'&path='.str_replace('%2F', '/', str_replace('+', '%20', urlencode(substr($source, strlen($path)))));;
-				}
-			} else {
-				// Check if uid_shared_with is a group
-				$pos = strrpos($uid_shared_with, '@');
-				if ($pos !== false) {
-					$gid = substr($uid_shared_with, $pos + 1);
-				} else {
-					$gid = false;
-				}
-				if ($gid && OC_Group::groupExists($gid)) {
-					// Include users in the group so the users can be removed from the list of people to share with
-					if ($path == $source) {
-						$group = array(array('gid' => $gid, 'permissions' => $rows[$i]['permissions'], 'users' => OC_Group::usersInGroup($gid), 'parentFolder' => false));
-					} else {
-						$group = array(array('gid' => $gid, 'permissions' => $rows[$i]['permissions'], 'users' => OC_Group::usersInGroup($gid), 'parentFolder' => basename($path)));
-					}
-					if (!isset($item['groups'])) {
-						$item['groups'] = $group;
-					} else if (is_array($item['groups'])) {
-						$gidExists = false;
-						$currentGroups = $item['groups'];
-						// Check if the group is already included
-						foreach ($currentGroups as $g) {
-							if ($g['gid'] == $gid) {
-								$gidExists = true;
-							}
-						}
-						if (!$gidExists) {
-							$item['groups'] = array_merge($item['groups'], $group);
-						}
-					}
-				} else {
-					if ($path == $source) {
-						$user = array(array('uid' => $uid_shared_with, 'permissions' => $rows[$i]['permissions'], 'parentFolder' => false));
-					} else {
-						$user = array(array('uid' => $uid_shared_with, 'permissions' => $rows[$i]['permissions'], 'parentFolder' => basename($path)));
-					}
-					if (!isset($item['users'])) {
-						$item['users'] = $user;
-					} else if (is_array($item['users'])) {
-						$item['users'] = array_merge($item['users'], $user);
-					}
-				}
-			}
-		}
-	}
-	$path = dirname($path);
-}
-
-OCP\JSON::success(array('data' => $item));
-
-?>
diff --git a/apps/files_sharing/ajax/getstatuses.php b/apps/files_sharing/ajax/getstatuses.php
deleted file mode 100644
index 8edcb214758..00000000000
--- a/apps/files_sharing/ajax/getstatuses.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
-
-OCP\JSON::checkAppEnabled('files_sharing');
-OCP\JSON::checkLoggedIn();
-
-$items = array();
-$userDirectory = '/'.OCP\USER::getUser().'/files';
-$dirLength = strlen($userDirectory);
-if ($rows = OC_Share::getMySharedItems()) {
-	for ($i = 0; $i < count($rows); $i++) {
-		$source = $rows[$i]['source'];
-		// Strip out user directory
-		$item = substr($source, $dirLength);
-		if ($rows[$i]['uid_shared_with'] == OC_Share::PUBLICLINK) {
-			$items[$item] = true;
-		} else if (!isset($items[$item])) {
-			$items[$item] = false;
-		}
-	}
-}
-
-OCP\JSON::success(array('data' => $items));
-
-?>
\ No newline at end of file
diff --git a/apps/files_sharing/ajax/setpermissions.php b/apps/files_sharing/ajax/setpermissions.php
deleted file mode 100644
index 13daab738de..00000000000
--- a/apps/files_sharing/ajax/setpermissions.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
-
-OCP\JSON::checkAppEnabled('files_sharing');
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$source = '/'.OCP\USER::getUser().'/files'.$_POST['source'];
-$uid_shared_with = $_POST['uid_shared_with'];
-$permissions = $_POST['permissions'];
-OC_Share::setPermissions($source, $uid_shared_with, $permissions);
-
-OCP\JSON::success();
-
-?>
diff --git a/apps/files_sharing/ajax/share.php b/apps/files_sharing/ajax/share.php
deleted file mode 100644
index fb28caf7b7e..00000000000
--- a/apps/files_sharing/ajax/share.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
-
-OCP\JSON::checkAppEnabled('files_sharing');
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$userDirectory = '/'.OCP\USER::getUser().'/files';
-$sources = explode(';', $_POST['sources']);
-$uid_shared_with = $_POST['uid_shared_with'];
-$permissions = $_POST['permissions'];
-foreach ($sources as $source) {
-	$file = OC_FileCache::get($source);
-	$path = ltrim($source, '/'); 
-	$source = $userDirectory.$source;
-	// Check if the file exists or if the file is being reshared
-	if ($source && $file['encrypted'] == false && (OC_FILESYSTEM::file_exists($path) && OC_FILESYSTEM::is_readable($path) || OC_Share::getSource($source))) {
-		try {
-			$shared = new OC_Share($source, $uid_shared_with, $permissions);
-			// If this is a private link, return the token
-			if ($uid_shared_with == OC_Share::PUBLICLINK) {
-				OCP\JSON::success(array('data' => $shared->getToken()));
-			} else {
-				OCP\JSON::success();
-			}
-		} catch (Exception $exception) {
-			OCP\Util::writeLog('files_sharing', 'Unexpected Error : '.$exception->getMessage(), OCP\Util::ERROR);
-			OCP\JSON::error(array('data' => array('message' => $exception->getMessage())));
-		}
-	} else {
-		if ($file['encrypted'] == true) {
-			OCP\JSON::error(array('data' => array('message' => 'Encrypted files cannot be shared')));
-		} else {
-			OCP\Util::writeLog('files_sharing', 'File does not exist or is not readable :'.$source, OCP\Util::ERROR);
-			OCP\JSON::error(array('data' => array('message' => 'File does not exist or is not readable')));
-		}
-	}
-}
-
-?>
diff --git a/apps/files_sharing/ajax/toggleresharing.php b/apps/files_sharing/ajax/toggleresharing.php
deleted file mode 100644
index ab8e82c8c3f..00000000000
--- a/apps/files_sharing/ajax/toggleresharing.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-OCP\JSON::callCheck();
-
-OCP\JSON::checkAppEnabled('files_sharing');
-OCP\JSON::checkAdminUser();
-if ($_POST['resharing'] == true) {
-	OCP\Config::setAppValue('files_sharing', 'resharing', 'yes');
-} else {
-	OCP\Config::setAppValue('files_sharing', 'resharing', 'no');
-}
-
-?>
diff --git a/apps/files_sharing/ajax/unshare.php b/apps/files_sharing/ajax/unshare.php
deleted file mode 100644
index d291b719e38..00000000000
--- a/apps/files_sharing/ajax/unshare.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
-
-OCP\JSON::checkAppEnabled('files_sharing');
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$source = '/'.OCP\USER::getUser().'/files'.$_POST['source'];
-$uid_shared_with = $_POST['uid_shared_with'];
-OC_Share::unshare($source, $uid_shared_with);
-
-OCP\JSON::success();
-
-?>
diff --git a/apps/files_sharing/ajax/userautocomplete.php b/apps/files_sharing/ajax/userautocomplete.php
deleted file mode 100644
index 23865693a1b..00000000000
--- a/apps/files_sharing/ajax/userautocomplete.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('files_sharing');
-
-$users = array();
-$groups = array();
-$self = OCP\USER::getUser();
-$users[] = "<optgroup label='Users'>";
-$groups[] = "<optgroup label='Groups'>";
-if(OCP\Config::getAppValue('files_sharing', 'allowSharingWithEveryone', 'no') == 'yes') {
-	$allGroups = OC_Group::getGroups();
-	foreach($allGroups as $group) {
-	    $groups[] = "<option value='".$group."(group)'>".$group." (group) </option>";
-	}
-	$allUsers = OC_User::getUsers();
-	foreach($allUsers as $user) {
-		if($user != $self) {
-			$users[] = "<option value='".$user."'>".$user."</option>";
-	    }
-	}
-} else {
-	$userGroups = OC_Group::getUserGroups($self);
-	foreach ($userGroups as $group) {
-		$groupUsers = OC_Group::usersInGroup($group);
-		$userCount = 0;
-		foreach ($groupUsers as $user) {
-			if ($user != $self) {
-				$users[] = "<option value='".$user."'>".$user."</option>";
-				$userCount++;
-			}
-		}
-		// Don't include the group if only the current user is a member of it
-		if ($userCount > 0) {
-			$groups[] = "<option value='".$group."(group)'>".$group." (group) </option>";
-		}
-	}
-	$users = array_unique($users);
-}
-$users[] = "</optgroup>";
-$groups[] = "</optgroup>";
-$users = array_merge($users, $groups);
-OCP\JSON::encodedPrint($users);
-
-?>