From 25d474579acd4ead174a83b22f1a3d712e6b682a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 22 Aug 2012 11:45:36 -0400
Subject: [PATCH] Removing most of files_sharing, the Share API implemented the
 majority of it

---
 apps/files_sharing/ajax/email.php             |  18 -
 apps/files_sharing/ajax/getitem.php           |  71 ---
 apps/files_sharing/ajax/getstatuses.php       |  22 -
 apps/files_sharing/ajax/setpermissions.php    |  12 -
 apps/files_sharing/ajax/share.php             |  37 --
 apps/files_sharing/ajax/toggleresharing.php   |   9 -
 apps/files_sharing/ajax/unshare.php           |  11 -
 apps/files_sharing/ajax/userautocomplete.php  |  30 -
 apps/files_sharing/appinfo/app.php            |  22 +-
 apps/files_sharing/js/list.js                 |  54 --
 apps/files_sharing/js/settings.js             |   9 -
 apps/files_sharing/js/share.js                | 375 -------------
 .../files_sharing/{ => lib}/sharedstorage.php |   0
 apps/files_sharing/lib_share.php              | 518 ------------------
 apps/files_sharing/list.php                   |  35 --
 apps/files_sharing/settings.php               |   9 -
 apps/files_sharing/templates/list.php         |  30 -
 apps/files_sharing/templates/settings.php     |   6 -
 18 files changed, 1 insertion(+), 1267 deletions(-)
 delete mode 100644 apps/files_sharing/ajax/email.php
 delete mode 100644 apps/files_sharing/ajax/getitem.php
 delete mode 100644 apps/files_sharing/ajax/getstatuses.php
 delete mode 100644 apps/files_sharing/ajax/setpermissions.php
 delete mode 100644 apps/files_sharing/ajax/share.php
 delete mode 100644 apps/files_sharing/ajax/toggleresharing.php
 delete mode 100644 apps/files_sharing/ajax/unshare.php
 delete mode 100644 apps/files_sharing/ajax/userautocomplete.php
 delete mode 100644 apps/files_sharing/js/list.js
 delete mode 100644 apps/files_sharing/js/settings.js
 delete mode 100644 apps/files_sharing/js/share.js
 rename apps/files_sharing/{ => lib}/sharedstorage.php (100%)
 delete mode 100644 apps/files_sharing/lib_share.php
 delete mode 100644 apps/files_sharing/list.php
 delete mode 100644 apps/files_sharing/settings.php
 delete mode 100644 apps/files_sharing/templates/list.php
 delete mode 100644 apps/files_sharing/templates/settings.php

diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php
deleted file mode 100644
index aba4f699fa..0000000000
--- a/apps/files_sharing/ajax/email.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('files_sharing');
-OCP\JSON::callCheck();
-
-$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 06a80102de..0000000000
--- a/apps/files_sharing/ajax/getitem.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?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 1be4d9a0d9..0000000000
--- a/apps/files_sharing/ajax/getstatuses.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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));
diff --git a/apps/files_sharing/ajax/setpermissions.php b/apps/files_sharing/ajax/setpermissions.php
deleted file mode 100644
index 0a2cf78f76..0000000000
--- a/apps/files_sharing/ajax/setpermissions.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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 3f224d1b67..0000000000
--- a/apps/files_sharing/ajax/share.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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 7da4fdfeea..0000000000
--- a/apps/files_sharing/ajax/toggleresharing.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-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 02a59c4016..0000000000
--- a/apps/files_sharing/ajax/unshare.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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 388a4844b9..0000000000
--- a/apps/files_sharing/ajax/userautocomplete.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('files_sharing');
-
-$users = array();
-$groups = array();
-$self = OCP\USER::getUser();
-$userGroups = OC_Group::getUserGroups($self);
-$users[] = "<optgroup label='Users'>";
-$groups[] = "<optgroup label='Groups'>";
-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);
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 7495a5bbe6..fcebacc19d 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -1,28 +1,8 @@
 <?php
 
-OC::$CLASSPATH['OC_Share'] = "apps/files_sharing/lib_share.php";
 OC::$CLASSPATH['OC_Share_Backend_File'] = "apps/files_sharing/lib/share/file.php";
 OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'apps/files_sharing/lib/share/folder.php';
-OC::$CLASSPATH['OC_Filestorage_Shared'] = "apps/files_sharing/sharedstorage.php";
-
-OCP\App::registerAdmin('files_sharing', 'settings');
-
+OC::$CLASSPATH['OC_Filestorage_Shared'] = "apps/files_sharing/lib/sharedstorage.php";
 OCP\Util::connectHook('OC_Filesystem', 'setup', 'OC_Filestorage_Shared', 'setup');
-
-OCP\Util::connectHook("OC_Filesystem", "post_delete", "OC_Share", "deleteItem");
-OCP\Util::connectHook("OC_Filesystem", "post_rename", "OC_Share", "renameItem");
-OCP\Util::connectHook("OC_Filesystem", "post_write", "OC_Share", "updateItem");
-
-OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OC_Share', 'removeUser');
-OCP\Util::connectHook('OC_User', 'post_addToGroup', 'OC_Share', 'addToGroupShare');
-OCP\Util::connectHook('OC_User', 'post_removeFromGroup', 'OC_Share', 'removeFromGroupShare');
-
-$dir = isset($_GET['dir']) ? $_GET['dir'] : '/';
-if ($dir != '/Shared' || OCP\Config::getAppValue('files_sharing', 'resharing', 'yes') == 'yes') {
-	OCP\Util::addScript('core', 'share');
-}
-OCP\Util::addscript("3rdparty", "chosen/chosen.jquery.min");
-OCP\Util::addStyle( 'files_sharing', 'sharing' );
-OCP\Util::addStyle("3rdparty", "chosen/chosen");
 OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
 OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');
diff --git a/apps/files_sharing/js/list.js b/apps/files_sharing/js/list.js
deleted file mode 100644
index 41eabd1f4a..0000000000
--- a/apps/files_sharing/js/list.js
+++ /dev/null
@@ -1,54 +0,0 @@
-$(document).ready(function() {
-	$( "#source" ).autocomplete({
-		source: "../../files/ajax/autocomplete.php",
-		minLength: 1
-	});
-	$( "#uid_shared_with" ).autocomplete({
-		source: "ajax/userautocomplete.php",
-		minLength: 1
-	});
-	$("button.delete").live('click', function( event ) {
-		event.preventDefault();
-// 		var row=$(this);
-		var source=$(this).attr('data-source');
-		var uid_shared_with=$(this).attr('data-uid_shared_with');
-		var data='source='+encodeURIComponent(source)+'&uid_shared_with='+encodeURIComponent(uid_shared_with);
-		$.ajax({
-			type: 'GET',
-			url: 'ajax/unshare.php',
-			cache: false,
-			data: data
-// 			success: function(){
-// 				row.remove();
-// 			}
-		});
-	});
-	$('#share_item').submit(function( event ){
-		event.preventDefault();
-		var source=$('#source').val();
-		var uid_shared_with=$('#uid_shared_with').val();
-		var permissions=$('#permissions').val()||0;
-		var data='source='+source+'&uid_shared_with='+uid_shared_with+'&permissions='+permissions;
-		$.ajax({
-			type: 'GET',
-			url: 'ajax/share.php',
-			cache: false,
-			data: data,
-// 			success: function(token){
-// 				if(token){
-// 					var html="<tr class='link' id='"+token+"'>";
-// 					html+="<td class='path'>"+path+"</td>";
-// 					var expire=($('#expire').val())?$('#expire').val():'Never'
-// 					html+="<td class='expire'>"+expire+"</td>"
-// 					html+="<td class='link'><a href='get.php?token="+token+"'>"+$('#baseUrl').val()+"?token="+token+"</a></td>"
-// 					html+="<td><button class='delete fancybutton' data-token='"+token+"'>Delete</button></td>"
-// 					html+="</tr>"
-// 					$(html).insertBefore($('#newlink_row'));
-// 					$('#expire').val('');
-// 					$('#expire_time').val('');
-// 					$('#path').val('');
-// 				}
-// 			}
-		});
-	});
-});
\ No newline at end of file
diff --git a/apps/files_sharing/js/settings.js b/apps/files_sharing/js/settings.js
deleted file mode 100644
index bb7d79fecb..0000000000
--- a/apps/files_sharing/js/settings.js
+++ /dev/null
@@ -1,9 +0,0 @@
-$(document).ready(function() {
-	$('#allowResharing').bind('change', function() {
-		var checked = 1;
-		if (!this.checked) {
-			checked = 0;
-		}
-		$.post(OC.filePath('files_sharing','ajax','toggleresharing.php'), 'resharing='+checked);
-	});
-});
\ No newline at end of file
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
deleted file mode 100644
index 3cfa3583b1..0000000000
--- a/apps/files_sharing/js/share.js
+++ /dev/null
@@ -1,375 +0,0 @@
-OC.Share={
-	icons:[],
-	itemUsers:[],
-	itemGroups:[],
-	itemPrivateLink:false,
-	usersAndGroups:[],
-	loadIcons:function() {
-		// Cache all icons for shared files
-		$.getJSON(OC.filePath('files_sharing', 'ajax', 'getstatuses.php'), function(result) {
-			if (result && result.status === 'success') {
-				$.each(result.data, function(item, hasPrivateLink) {
-					if (hasPrivateLink) {
-						OC.Share.icons[item] = OC.imagePath('core', 'actions/public');
-					} else {
-						OC.Share.icons[item] = OC.imagePath('core', 'actions/shared');
-					}
-				});
-			}
-		});
-	},
-	loadItem:function(item) {
-		$.ajax({type: 'GET', url: OC.filePath('files_sharing', 'ajax', 'getitem.php'), data: { item: item }, async: false, success: function(result) {
-			if (result && result.status === 'success') {
-				var item = result.data;
-				OC.Share.itemUsers = item.users;
-				OC.Share.itemGroups = item.groups;
-				OC.Share.itemPrivateLink = item.privateLink;
-			}
-		}});
-	},
-	share:function(source, uid_shared_with, permissions, callback) {
-		$.post(OC.filePath('files_sharing', 'ajax', 'share.php'), { sources: source, uid_shared_with: uid_shared_with, permissions: permissions }, function(result) {
-			if (result && result.status === 'success') {
-				if (callback) {
-					callback(result.data);
-				}
-			} else {
-				OC.dialogs.alert(result.data.message, 'Error while sharing');
-			}
-		});
-	},
-	unshare:function(source, uid_shared_with, callback) {
-		$.post(OC.filePath('files_sharing', 'ajax', 'unshare.php'), { source: source, uid_shared_with: uid_shared_with }, function(result) {
-			if (result && result.status === 'success') {
-				if (callback) {
-					callback();
-				}
-			} else {
-				OC.dialogs.alert('Error', 'Error while unsharing');
-			}
-		});
-	},
-	changePermissions:function(source, uid_shared_with, permissions) {
-		$.post(OC.filePath('files_sharing','ajax','setpermissions.php'), { source: source, uid_shared_with: uid_shared_with, permissions: permissions }, function(result) {
-			if (!result || result.status !== 'success') {
-				OC.dialogs.alert('Error', 'Error while changing permissions');
-			}
-		});
-	},
-	showDropDown:function(item, appendTo) {
-		OC.Share.loadItem(item);
-		var html = '<div id="dropdown" class="drop" data-item="'+item+'">';
-		html += '<select data-placeholder="User or Group" id="share_with" class="chzen-select">';
-		html += '<option value="" selected="selected" disabled="disabled">Your groups & members</option>';
-		html += '</select>';
-		html += '<div id="sharedWithList">';
-		html += '<ul id="userList"></ul>';
-		html += '<div id="groups" style="display:none;">';
-		html += '<br />';
-		html += 'Groups: ';
-		html += '<ul id="groupList"></ul>';
-		html += '</div>';
-		html += '</div>';
-		html += '<div id="privateLink">';
-		html += '<input type="checkbox" name="privateLinkCheckbox" id="privateLinkCheckbox" value="1" /><label for="privateLinkCheckbox">Share with private link</label>';
-		html += '<br />';
-		html += '<form id="emailPrivateLink">';
-		html += '<input id="privateLinkText" style="display:none; width:90%;" />';
-		html += '<input id="email" style="display:none; width:65%;" value="" placeholder="Email link to person" />';
-		html += '<input id="emailButton" style="display:none;" type="submit" value="Send" />';
-		html += '</form>';
-		html += '</div>';
-		$(html).appendTo(appendTo);
-		if (OC.Share.usersAndGroups.length < 1) {
-			$.ajax({type: 'GET', url: OC.filePath('files_sharing', 'ajax', 'userautocomplete.php'), async: false, success: function(users) {
-				if (users) {
-					OC.Share.usersAndGroups = users;
-					$.each(users, function(index, user) {
-						$(user).appendTo('#share_with');
-					});
-					$('#share_with').trigger('liszt:updated');
-				}
-			}});
-		} else {
-			$.each(OC.Share.usersAndGroups, function(index, user) {
-				$(user).appendTo('#share_with');
-			});
-			$('#share_with').trigger('liszt:updated');
-		}
-		if (OC.Share.itemUsers) {
-			$.each(OC.Share.itemUsers, function(index, user) {
-				if (user.parentFolder) {
-					OC.Share.addSharedWith(user.uid, user.permissions, false, user.parentFolder);
-				} else {
-					OC.Share.addSharedWith(user.uid, user.permissions, false, false);
-				}
-			});
-		}
-		if (OC.Share.itemGroups) {
-			$.each(OC.Share.itemGroups, function(index, group) {
-				if (group.parentFolder) {
-					OC.Share.addSharedWith(group.gid, group.permissions, group.users, group.parentFolder);
-				} else {
-					OC.Share.addSharedWith(group.gid, group.permissions, group.users, false);
-				}
-			});
-		}
-		if (OC.Share.itemPrivateLink) {
-			OC.Share.showPrivateLink(item, OC.Share.itemPrivateLink);
-		}
-		$('#dropdown').show('blind');
-		$('#share_with').chosen();
-	},
-	hideDropDown:function(callback) {
-		$('#dropdown').hide('blind', function() {
-			$('#dropdown').remove();
-			if (callback) {
-				callback.call();
-			}
-		});
-	},
-	addSharedWith:function(uid_shared_with, permissions, isGroup, parentFolder) {
-		if (parentFolder) {
-			var sharedWith = '<li>Parent folder '+parentFolder+' shared with '+uid_shared_with+'</li>';
-		} else {
-			var checked = ((permissions > 0) ? 'checked="checked"' : 'style="display:none;"');
-			var style = ((permissions == 0) ? 'style="display:none;"' : '');
-			var sharedWith = '<li data-uid_shared_with="'+uid_shared_with+'">';
-			sharedWith += '<a href="" class="unshare" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core','actions/delete')+'"/></a>';
-			sharedWith += uid_shared_with;
-			sharedWith += '<input type="checkbox" name="permissions" id="'+uid_shared_with+'" class="permissions" '+checked+' />';
-			sharedWith += '<label class="edit" for="'+uid_shared_with+'" '+style+'>can edit</label>';
-			sharedWith += '</li>';
-		}
-		if (isGroup) {
-			// Groups are added to a different list
-			$('#groups').show();
-			$(sharedWith).appendTo('#groupList');
-			// Remove group from select form
-			$('#share_with option[value="'+uid_shared_with+'(group)"]').remove();
-			$('#share_with').trigger('liszt:updated');
-			// Remove users in group from select form
-			$.each(isGroup, function(index, user) {
-				$('#share_with option[value="'+user+'"]').remove();
-				$('#share_with').trigger('liszt:updated');
-			});
-		} else {
-			$(sharedWith).appendTo('#userList');
-			// Remove user from select form
-			$('#share_with option[value="'+uid_shared_with+'"]').remove();
-			$('#share_with').trigger('liszt:updated');
-		}
-		
-	},
-	removeSharedWith:function(uid_shared_with) {
-		var option;
-		if ($('#userList li[data-uid_shared_with="'+uid_shared_with+'"]').length > 0) {
-			$('#userList li[data-uid_shared_with="'+uid_shared_with+'"]').remove();
-			option = '<option value="'+uid_shared_with+'">'+uid_shared_with+'</option>';
-		} else if ($('#groupList li[data-uid_shared_with="'+uid_shared_with+'"]').length > 0) {
-			$('#groupList li[data-uid_shared_with="'+uid_shared_with+'"]').remove();
-			if ($('#groupList li').length < 1) {
-				$('#groups').hide();
-			}
-			option = '<option value="'+uid_shared_with+'(group)">'+uid_shared_with+' (group)</option>';
-		}
-		$(option).appendTo('#share_with');
-		$('#share_with').trigger('liszt:updated');
-	},
-	showPrivateLink:function(item, token) {
-		$('#privateLinkCheckbox').attr('checked', true);
-		var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&token='+token;
-		if (token.indexOf('&path=') == -1) {
-			link += '&file=' + encodeURIComponent(item).replace(/%2F/g, '/');
-		} else {
-			// Disable checkbox if inside a shared parent folder
-			$('#privateLinkCheckbox').attr('disabled', 'true');
-		}
-		$('#privateLinkText').val(link);
-		$('#privateLinkText').show('blind', function() {
-			$('#privateLinkText').after('<br id="emailBreak" />');
-			$('#email').show();
-			$('#emailButton').show();
-		});
-	},
-	hidePrivateLink:function() {
-		$('#privateLinkText').hide('blind');
-		$('#emailBreak').remove();
-		$('#email').hide();
-		$('#emailButton').hide();
-	},
-	emailPrivateLink:function() {
-		var link = $('#privateLinkText').val();
-		var file = link.substr(link.lastIndexOf('/') + 1).replace(/%20/g, ' ');
-		var email = $('#email').val();
-		if (email != '') {
-			$.post(OC.filePath('files_sharing', 'ajax', 'email.php'), { toaddress: email, link: link, file: file }, function(result) {
-				if (result && result.status == 'success') {
-					$('#email').css('font-weight', 'bold');
-					$('#email').animate({ fontWeight: 'normal' }, 2000, function() {
-						$(this).val('');
-					}).val('Email sent');
-				} else {
-					OC.dialogs.alert(result.data.message, 'Error while sharing');
-				}
-			});
-		}
-	},
-	dirname:function(path) {
-		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
-	}
-}
-
-$(document).ready(function() {
-
-	if (typeof FileActions !== 'undefined') {
-		OC.Share.loadIcons();
-		FileActions.register('all', 'Share', function(filename) {
-			// Return the correct sharing icon
-			if (scanFiles.scanning) { return; } // workaround to prevent additional http request block scanning feedback
-			var item =  $('#dir').val() + '/' + filename;
-			// Check if icon is in cache
-			if (OC.Share.icons[item]) {
-				return OC.Share.icons[item];
-			} else {
-				var last = '';
-				var path = OC.Share.dirname(item);
-				// Search for possible parent folders that are shared
-				while (path != last) {
-					if (OC.Share.icons[path]) {
-						OC.Share.icons[item] = OC.Share.icons[path];
-						return OC.Share.icons[item];
-					}
-					last = path;
-					path = OC.Share.dirname(path);
-				}
-				OC.Share.icons[item] = OC.imagePath('core', 'actions/share');
-				return OC.Share.icons[item];
-			}
-		}, function(filename) {
-			var file = $('#dir').val() + '/' + filename;
-			var appendTo = $('tr').filterAttr('data-file',filename).find('td.filename');
-			// Check if drop down is already visible for a different file
-			if (($('#dropdown').length > 0)) {
-				if (file != $('#dropdown').data('item')) {
-					OC.Share.hideDropDown(function () {
-						$('tr').removeClass('mouseOver');
-						$('tr').filterAttr('data-file',filename).addClass('mouseOver');
-						OC.Share.showDropDown(file, appendTo);
-					});
-				}
-			} else {
-				$('tr').filterAttr('data-file',filename).addClass('mouseOver');
-				OC.Share.showDropDown(file, appendTo);
-			}
-		});
-	};
-	
-	$(this).click(function(event) {
-		if (!($(event.target).hasClass('drop')) && $(event.target).parents().index($('#dropdown')) == -1) {
-			if ($('#dropdown').is(':visible')) {
-				OC.Share.hideDropDown(function() {
-					$('tr').removeClass('mouseOver');
-				});
-			}
-		}
-	});
-
-	$('#sharedWithList li').live('mouseenter', function(event) {
-		// Show permissions and unshare button
-		$(':hidden', this).show();
-	});
-	
-	$('#sharedWithList li').live('mouseleave', function(event) {
-		// Hide permissions and unshare button
-		$('a', this).hide();
-		if (!$('input:[type=checkbox]', this).is(':checked')) {
-			$('input:[type=checkbox]', this).hide();
-			$('label', this).hide();
-		}
-	});
-	
-	$('#share_with').live('change', function() {
-		var item = $('#dropdown').data('item');
-		var uid_shared_with = $(this).val();
-		var pos = uid_shared_with.indexOf('(group)');
-		var isGroup = false;
-		if (pos != -1) {
-			// Remove '(group)' from uid_shared_with
-			uid_shared_with = uid_shared_with.substr(0, pos);
-			isGroup = true;
-		}
-		OC.Share.share(item, uid_shared_with, 0, function() {
-			if (isGroup) {
-				// Reload item because we don't know which users are in the group
-				OC.Share.loadItem(item);
-				var users;
-				$.each(OC.Share.itemGroups, function(index, group) {
-					if (group.gid == uid_shared_with) {
-						users = group.users;
-					}
-				});
-				OC.Share.addSharedWith(uid_shared_with, 0, users, false);
-			} else {
-				OC.Share.addSharedWith(uid_shared_with, 0, false, false);
-			}
-			// Change icon
-			if (!OC.Share.itemPrivateLink) {
-				OC.Share.icons[item] = OC.imagePath('core', 'actions/shared');
-			}
-		});
-	});
-	
-	$('.unshare').live('click', function() {
-		var item = $('#dropdown').data('item');
-		var uid_shared_with = $(this).parent().data('uid_shared_with');
-		OC.Share.unshare(item, uid_shared_with, function() {
-			OC.Share.removeSharedWith(uid_shared_with);
-			// Reload item to update cached users and groups for the icon check
-			OC.Share.loadItem(item);
-			// Change icon
-			if (!OC.Share.itemPrivateLink && !OC.Share.itemUsers && !OC.Share.itemGroups) {
-				OC.Share.icons[item] = OC.imagePath('core', 'actions/share');
-			}
-		});
-	});
-	
-	$('.permissions').live('change', function() {
-		var permissions = (this.checked) ? 1 : 0;
-		OC.Share.changePermissions($('#dropdown').data('item'), $(this).parent().data('uid_shared_with'), permissions);
-	});
-	
-	$('#privateLinkCheckbox').live('change', function() {
-		var item = $('#dropdown').data('item');
-		if (this.checked) {
-			// Create a private link
-			OC.Share.share(item, 'public', 0, function(token) {
-				OC.Share.showPrivateLink(item, token);
-				// Change icon
-				OC.Share.icons[item] = OC.imagePath('core', 'actions/public');
-			});
-		} else {
-			// Delete private link
-			OC.Share.unshare(item, 'public', function() {
-				OC.Share.hidePrivateLink();
-				// Change icon
-				if (OC.Share.itemUsers || OC.Share.itemGroups) {
-					OC.Share.icons[item] = OC.imagePath('core', 'actions/shared');
-				} else {
-					OC.Share.icons[item] = OC.imagePath('core', 'actions/share');
-				}
-			});
-		}
-	});
-	
-	$('#privateLinkText').live('click', function() {
-		$(this).focus();
-		$(this).select();
-	});
-
-	$('#emailPrivateLink').live('submit', function(event) {
-		event.preventDefault();
-		OC.Share.emailPrivateLink();
-	});
-});
\ No newline at end of file
diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
similarity index 100%
rename from apps/files_sharing/sharedstorage.php
rename to apps/files_sharing/lib/sharedstorage.php
diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
deleted file mode 100644
index 1c061cde07..0000000000
--- a/apps/files_sharing/lib_share.php
+++ /dev/null
@@ -1,518 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Michael Gapczynski
- * @copyright 2011 Michael Gapczynski GapczynskiM@gmail.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * This class manages shared items within the database. 
- */
-class OC_Share {
-
-	const WRITE = 1;
-	const DELETE = 2;
-	const UNSHARED = -1;
-	const PUBLICLINK = "public";
-
-	private $token;
-      
-	/**
-	 * Share an item, adds an entry into the database
-	 * @param $source The source location of the item
-	 * @param $uid_shared_with The user or group to share the item with
-	 * @param $permissions The permissions, use the constants WRITE and DELETE
-	 */
-	public function __construct($source, $uid_shared_with, $permissions) {
-		$uid_owner = OCP\USER::getUser();
-		$query = OCP\DB::prepare("INSERT INTO *PREFIX*sharing VALUES(?,?,?,?,?)");
-		// Check if this is a reshare and use the original source
-		if ($result = OC_Share::getSource($source)) {
-			$source = $result;
-		}
-		if ($uid_shared_with == self::PUBLICLINK) {
-			$token = sha1("$uid_shared_with-$source");
-			OCP\Util::emitHook('OC_Share', 'public', array('source'=>$source, 'token'=>$token, 'permissions'=>$permissions));
-			$query->execute(array($uid_owner, self::PUBLICLINK, $source, $token, $permissions));
-			$this->token = $token;
-		} else {
-			if (OC_Group::groupExists($uid_shared_with)) {
-				$gid = $uid_shared_with;
-				$uid_shared_with = OC_Group::usersInGroup($gid);
-				// Remove the owner from the list of users in the group
-				$uid_shared_with = array_diff($uid_shared_with, array($uid_owner));
-			} else if (OCP\User::userExists($uid_shared_with)) {
-				$userGroups = OC_Group::getUserGroups($uid_owner);
-				// Check if the user is in one of the owner's groups
-				foreach ($userGroups as $group) {
-					if ($inGroup = OC_Group::inGroup($uid_shared_with, $group)) {
-						$gid = null;
-						$uid_shared_with = array($uid_shared_with);
-						break;
-					}
-				}
-				if (!$inGroup) {
-					throw new Exception("You can't share with ".$uid_shared_with);
-				}
-			} else {
-				throw new Exception($uid_shared_with." is not a user");
-			}
-			foreach ($uid_shared_with as $uid) {
-				// Check if this item is already shared with the user
-				$checkSource = OCP\DB::prepare("SELECT source FROM *PREFIX*sharing WHERE source = ? AND uid_shared_with ".self::getUsersAndGroups($uid, false));
-				$resultCheckSource = $checkSource->execute(array($source))->fetchAll();
-				// TODO Check if the source is inside a folder
-				if (count($resultCheckSource) > 0) {
-					if (!isset($gid)) {
-						throw new Exception("This item is already shared with ".$uid);
-					} else {
-						// Skip this user if sharing with a group
-						continue;
-					}
-				}
-				// Check if the target already exists for the user, if it does append a number to the name
-				$sharedFolder = '/'.$uid.'/files/Shared';
-				$target = $sharedFolder."/".basename($source);
-				$checkTarget = OCP\DB::prepare("SELECT source FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with ".self::getUsersAndGroups($uid, false)." LIMIT 1");
-				$result = $checkTarget->execute(array($target))->fetchAll();
-				if (count($result) > 0) {
-					if ($pos = strrpos($target, ".")) {
-						$name = substr($target, 0, $pos);
-						$ext = substr($target, $pos);
-					} else {
-						$name = $target;
-						$ext = "";
-					}
-					$counter = 1;
-					while (count($result) > 0) {
-						$target = $name."_".$counter.$ext;
-						$result = $checkTarget->execute(array($target))->fetchAll();
-						$counter++;
-					}
-				}
-				// Update mtime of shared folder to invoke a file cache rescan
-				$rootView=new OC_FilesystemView('/');
-				if (!$rootView->is_dir($sharedFolder)) {
-					if (!$rootView->is_dir('/'.$uid.'/files')) {
-						OC_Util::tearDownFS();
-						OC_Util::setupFS($uid);
-						OC_Util::tearDownFS();
-					}
-					$rootView->mkdir($sharedFolder);
-				}
-				$rootView->touch($sharedFolder);
-				if (isset($gid)) {
-					$uid = $uid."@".$gid;
-				}
-				OCP\Util::emitHook('OC_Share', 'user', array('source'=>$source, 'target'=>$target, 'with'=>$uid, 'permissions'=>$permissions));
-				$query->execute(array($uid_owner, $uid, $source, $target, $permissions));
-			}
-		}
-	}
-
-	/**
-	* Remove any duplicate or trailing '/' from the path
-	* @return A clean path
-	*/
-	private static function cleanPath($path) {
-		$path = rtrim($path, "/");
-		return preg_replace('{(/)\1+}', "/", $path);
-	}
-
-	/**
-	* Generate a string to be used for searching for uid_shared_with that handles both users and groups
-	* @param $uid (Optional) The uid to get the user groups for, a gid to get the users in a group, or if not set the current user
-	* @return An IN operator as a string
-	*/
-	private static function getUsersAndGroups($uid = null, $includePrivateLinks = true) {
-		$in = " IN(";
-		if (isset($uid) && OC_Group::groupExists($uid)) {
-			$users = OC_Group::usersInGroup($uid);
-			foreach ($users as $user) {
-				// Add a comma only if the the current element isn't the last
-				if ($user !== end($users)) {
-					$in .= "'".$user."@".$uid."', ";
-				} else {
-					$in .= "'".$user."@".$uid."'";
-				}
-			}
-		} else if (isset($uid)) {
-			// TODO Check if this is necessary, only constructor needs it as IN. It would be better for other queries to just return =$uid
-			$in .= "'".$uid."'";
-			$groups = OC_Group::getUserGroups($uid);
-			foreach ($groups as $group) {
-				$in .= ", '".$uid."@".$group."'";
-			}
-		} else {
-			$uid = OCP\USER::getUser();
-			$in .= "'".$uid."'";
-			$groups = OC_Group::getUserGroups($uid);
-			foreach ($groups as $group) {
-				$in .= ", '".$uid."@".$group."'";
-			}
-		}
-		if ($includePrivateLinks) {
-			$in .= ", '".self::PUBLICLINK."'";
-		}
-		$in .= ")";
-		return $in;
-	}
-
-	private static function updateFolder($uid_shared_with) {
-		if ($uid_shared_with != self::PUBLICLINK) {
-			if (OC_Group::groupExists($uid_shared_with)) {
-				$uid_shared_with = OC_Group::usersInGroup($uid_shared_with);
-				// Remove the owner from the list of users in the group
-				$uid_shared_with = array_diff($uid_shared_with, array(OCP\USER::getUser()));
-			} else {
-				$pos = strrpos($uid_shared_with, '@');
-				if ($pos !== false && OC_Group::groupExists(substr($uid_shared_with, $pos + 1))) {
-					$uid_shared_with = array(substr($uid_shared_with, 0, $pos));
-				} else {
-					$uid_shared_with = array($uid_shared_with);
-				}
-			}
-			foreach ($uid_shared_with as $uid) {
-				$sharedFolder = $uid.'/files/Shared';
-				// Update mtime of shared folder to invoke a file cache rescan
-				$rootView = new OC_FilesystemView('/');
-				$rootView->touch($sharedFolder);
-			}
-		}
-	}
-
-	/**
-	 * Create a new entry in the database for a file inside a shared folder
-	 *
-	 * $oldTarget and $newTarget may be the same value. $oldTarget exists in case the file is being moved outside of the folder
-	 *
-	 * @param $oldTarget The current target location
-	 * @param $newTarget The new target location
-	 */
-	public static function pullOutOfFolder($oldTarget, $newTarget) {
-		$folders = self::getParentFolders($oldTarget);
-		$source = $folders['source'].substr($oldTarget, strlen($folders['target']));
-		$item = self::getItem($folders['target']);
-		$query = OCP\DB::prepare("INSERT INTO *PREFIX*sharing VALUES(?,?,?,?,?)");
-		$query->execute(array($item[0]['uid_owner'], OCP\USER::getUser(), $source, $newTarget, $item[0]['permissions']));
-	}
-
-	/**
-	 * Get the item with the specified target location
-	 * @param $target The target location of the item
-	 * @return An array with the item
-	 */
-	public static function getItem($target) {
-		$target = self::cleanPath($target);
-		$query = OCP\DB::prepare("SELECT uid_owner, source, permissions FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with = ? LIMIT 1");
-		return $query->execute(array($target, OCP\USER::getUser()))->fetchAll();
-	}
-
-	 /**
-	 * Get the item with the specified source location
-	 * @param $source The source location of the item
-	 * @return An array with the users and permissions the item is shared with
-	 */
-	public static function getMySharedItem($source) {
-		$source = self::cleanPath($source);
-		$query = OCP\DB::prepare("SELECT uid_shared_with, permissions FROM *PREFIX*sharing WHERE source = ? AND uid_owner = ?");
-		$result = $query->execute(array($source, OCP\USER::getUser()))->fetchAll();
-		if (count($result) > 0) {
-			return $result;
-		} else if ($originalSource = self::getSource($source)) {
-			return $query->execute(array($originalSource, OCP\USER::getUser()))->fetchAll();
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Get all items the current user is sharing
-	 * @return An array with all items the user is sharing
-	 */
-	public static function getMySharedItems() {
-		$query = OCP\DB::prepare("SELECT uid_shared_with, source, permissions FROM *PREFIX*sharing WHERE uid_owner = ?");
-		return $query->execute(array(OCP\USER::getUser()))->fetchAll();
-	}
-
-	/**
-	 * Get the items within a shared folder that have their own entry for the purpose of name, location, or permissions that differ from the folder itself
-	 *
-	 * Works for both target and source folders. Can be used for getting all items shared with you e.g. pass '/MTGap/files'
-	 *
-	 * @param $folder The folder of the items to look for
-	 * @return An array with all items in the database that are in the folder
-	 */
-	public static function getItemsInFolder($folder) {
-		$folder = self::cleanPath($folder);
-		// Append '/' in order to filter out the folder itself if not already there
-		if (substr($folder, -1) !== "/") {
-			$folder .= "/";
-		}
-		$length = strlen($folder);
-		$query = OCP\DB::prepare("SELECT uid_owner, source, target, permissions FROM *PREFIX*sharing WHERE SUBSTR(source, 1, ?) = ? OR SUBSTR(target, 1, ?) = ? AND uid_shared_with ".self::getUsersAndGroups());
-		return $query->execute(array($length, $folder, $length, $folder))->fetchAll();
-	}
-
-	/**
-	 * Get the source and target parent folders of the specified target location
-	 * @param $target The target location of the item
-	 * @return An array with the keys 'source' and 'target' with the values of the source and target parent folders
-	 */
-	public static function getParentFolders($target) {
-		$target = self::cleanPath($target);
-		$query = OCP\DB::prepare("SELECT source FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with".self::getUsersAndGroups()." LIMIT 1");
-		// Prevent searching for user directory e.g. '/MTGap/files'
-		$userDirectory = substr($target, 0, strpos($target, "files") + 5);
-		$target = dirname($target);
-		$result = array();
-		while ($target != "" && $target != "/" && $target != "." && $target != $userDirectory && $target != "\\") {
-			// Check if the parent directory of this target location is shared
-			$result = $query->execute(array($target))->fetchAll();
-			if (count($result) > 0) {
-				break;
-			}
-			$target = dirname($target);
-		}
-		if (count($result) > 0) {
-			// Return both the source folder and the target folder
-			return array("source" => $result[0]['source'], "target" => $target);
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Get the source location of the item at the specified target location
-	 * @param $target The target location of the item
-	 * @return Source location or false if target location is not valid
-	 */
-	public static function getSource($target) {
-		$target = self::cleanPath($target);
-		$query = OCP\DB::prepare("SELECT source FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with ".self::getUsersAndGroups()." LIMIT 1");
-		$result = $query->execute(array($target))->fetchAll();
-		if (count($result) > 0) {
-			return $result[0]['source'];
-		} else {
-			$folders = self::getParentFolders($target);
-			if ($folders == true) {
-				return $folders['source'].substr($target, strlen($folders['target']));
-			} else {
-				return false;
-			}
-		}
-	}
-
-	public static function getTarget($source) {
-		$source = self::cleanPath($source);
-		$query = OCP\DB::prepare("SELECT target FROM *PREFIX*sharing WHERE source = ? AND uid_owner = ? LIMIT 1");
-		$result = $query->execute(array($source, OCP\USER::getUser()))->fetchAll();
-		if (count($result) > 0) {
-			return $result[0]['target'];
-		} else {
-			// TODO Check in folders
-			return false;
-		}
-	}
-
-	/**
-	 * Get the user's permissions for the item at the specified target location
-	 * @param $target The target location of the item
-	 * @return The permissions, use bitwise operators to check against the constants WRITE and DELETE
-	 */
-	public static function getPermissions($target) {
-		$target = self::cleanPath($target);
-		$query = OCP\DB::prepare("SELECT permissions FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with ".self::getUsersAndGroups()." LIMIT 1");
-		$result = $query->execute(array($target))->fetchAll();
-		if (count($result) > 0) {
-			return $result[0]['permissions'];
-		} else {
-			$folders = self::getParentFolders($target);
-			if ($folders == true) {
-				$result = $query->execute(array($folders['target']))->fetchAll();
-				if (count($result) > 0) {
-					return $result[0]['permissions'];
-				}
-			} else {
-				OCP\Util::writeLog('files_sharing',"Not existing parent folder : ".$target,OCP\Util::ERROR);
-				return false;
-			}
-		}
-	}
-
-	/**
-	 * Get the token for a public link
-	 * @return The token of the public link, a sha1 hash
-	 */
-	public function getToken() {
-		return $this->token;
-	}
-
-	/**
-	 * Get the token for a public link
-	 * @param $source The source location of the item
-	 * @return The token of the public link, a sha1 hash
-	 */
-	public static function getTokenFromSource($source) {
-		$query = OCP\DB::prepare("SELECT target FROM *PREFIX*sharing WHERE source = ? AND uid_shared_with = ? AND uid_owner = ? LIMIT 1");
-		$result = $query->execute(array($source, self::PUBLICLINK, OCP\USER::getUser()))->fetchAll();
-		if (count($result) > 0) {
-			return $result[0]['target'];
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Set the target location to a new value
-	 *
-	 * You must use the pullOutOfFolder() function to change the target location of a file inside a shared folder if the target location differs from the folder
-	 *
-	 * @param $oldTarget The current target location
-	 * @param $newTarget The new target location 
-	 */
-	public static function setTarget($oldTarget, $newTarget) {
-		$oldTarget = self::cleanPath($oldTarget);
-		$newTarget = self::cleanPath($newTarget);
-		$query = OCP\DB::prepare("UPDATE *PREFIX*sharing SET target = REPLACE(target, ?, ?) WHERE uid_shared_with ".self::getUsersAndGroups());
-		$query->execute(array($oldTarget, $newTarget));
-	}
-
-	/**
-	* Change the permissions for the specified item and user
-	*
-	* You must construct a new shared item to change the permissions of a file inside a shared folder if the permissions differ from the folder
-	*
-	* @param $source The source location of the item
-	* @param $uid_shared_with The user to change the permissions for
-	* @param $permissions The permissions, use the constants WRITE and DELETE
-	*/
-	public static function setPermissions($source, $uid_shared_with, $permissions) {
-		$source = self::cleanPath($source);
-		$query = OCP\DB::prepare("UPDATE *PREFIX*sharing SET permissions = ? WHERE SUBSTR(source, 1, ?) = ? AND uid_owner = ? AND uid_shared_with ".self::getUsersAndGroups($uid_shared_with));
-		$query->execute(array($permissions, strlen($source), $source, OCP\USER::getUser()));
-	}
-
-	/**
-	* Unshare the item, removes it from all specified users
-	*
-	* You must use the pullOutOfFolder() function to unshare a file inside a shared folder and set $newTarget to nothing
-	*
-	* @param $source The source location of the item
-	* @param $uid_shared_with Array of users to unshare the item from
-	*/
-	public static function unshare($source, $uid_shared_with) {
-		$source = self::cleanPath($source);
-		$uid_owner = OCP\USER::getUser();
-		$query = OCP\DB::prepare("DELETE FROM *PREFIX*sharing WHERE SUBSTR(source, 1, ?) = ? AND uid_owner = ? AND uid_shared_with ".self::getUsersAndGroups($uid_shared_with, false));
-		$query->execute(array(strlen($source), $source, $uid_owner));
-		self::updateFolder($uid_shared_with);
-	}
-
-	/**
-	* Unshare the item from the current user, removes it only from the database and doesn't touch the source file
-	*
-	* You must use the pullOutOfFolder() function before you call unshareFromMySelf() and set the delete parameter to false to unshare from self a file inside a shared folder
-	*
-	* @param $target The target location of the item
-	* @param $delete (Optional) If true delete the entry from the database, if false the permission is set to UNSHARED
-	*/
-	public static function unshareFromMySelf($target, $delete = true) {
-		$target = self::cleanPath($target);
-		if ($delete) {
-			$query = OCP\DB::prepare("DELETE FROM *PREFIX*sharing WHERE SUBSTR(target, 1, ?) = ? AND uid_shared_with ".self::getUsersAndGroups());
-			$query->execute(array(strlen($target), $target));
-		} else {
-			$query = OCP\DB::prepare("UPDATE *PREFIX*sharing SET permissions = ? WHERE SUBSTR(target, 1, ?) = ? AND uid_shared_with ".self::getUsersAndGroups());
-			$query->execute(array(self::UNSHARED, strlen($target), $target));
-		}
-	}
-
-	/**
-	* Remove the item from the database, the owner deleted the file
-	* @param $arguments Array of arguments passed from OC_Hook
-	*/
-	public static function deleteItem($arguments) {
-		$source = "/".OCP\USER::getUser()."/files".self::cleanPath($arguments['path']);
-		$result = self::getMySharedItem($source);
-		if (is_array($result)) {
-			foreach ($result as $item) {
-				self::updateFolder($item['uid_shared_with']);
-			}
-		}
-		$query = OCP\DB::prepare("DELETE FROM *PREFIX*sharing WHERE SUBSTR(source, 1, ?) = ? AND uid_owner = ?");
-		$query->execute(array(strlen($source), $source, OCP\USER::getUser()));
-	}
-
-	/**
-	* Rename the item in the database, the owner renamed the file
-	* @param $arguments Array of arguments passed from OC_Hook
-	*/
-	public static function renameItem($arguments) {
-		$oldSource = "/".OCP\USER::getUser()."/files".self::cleanPath($arguments['oldpath']);
-		$newSource = "/".OCP\USER::getUser()."/files".self::cleanPath($arguments['newpath']);
-		$query = OCP\DB::prepare("UPDATE *PREFIX*sharing SET source = REPLACE(source, ?, ?) WHERE uid_owner = ?");
-		$query->execute(array($oldSource, $newSource, OCP\USER::getUser()));
-	}
-
-	public static function updateItem($arguments) {
-		$source = "/".OCP\USER::getUser()."/files".self::cleanPath($arguments['path']);
-		$result = self::getMySharedItem($source);
-		if (is_array($result)) {
-			foreach ($result as $item) {
-				self::updateFolder($item['uid_shared_with']);
-			}
-		}
-	}
-
-	public static function removeUser($arguments) {
-		$query = OCP\DB::prepare("SELECT uid_shared_with FROM *PREFIX*sharing WHERE uid_owner = ?");
-		$result = $query->execute(array($arguments['uid']))->fetchAll();
-		if (is_array($result)) {
-			$result = array_unique($result);
-			foreach ($result as $item) {
-				self::updateFolder($item['uid_shared_with']);
-			}
-			$query = OCP\DB::prepare('DELETE FROM *PREFIX*sharing WHERE uid_owner = ? OR uid_shared_with '.self::getUsersAndGroups($arguments['uid']));
-			$query->execute(array($arguments['uid']));
-		}
-	}
-
-	public static function addToGroupShare($arguments) {
-		$length = -strlen($arguments['gid']) - 1;
-		$query = OCP\DB::prepare('SELECT uid_owner, source, permissions FROM *PREFIX*sharing WHERE SUBSTR(uid_shared_with, '.$length.') = ?');
-		$gid = '@'.$arguments['gid'];
-		$result = $query->execute(array($gid))->fetchAll();
-		if (count($result) > 0) {
-			$lastSource = '';
-			for ($i = 0; $i < count($result); $i++) {
-				if ($result[$i]['source'] != $lastSource) {
-					new OC_Share($result[$i]['source'], $arguments['gid'], $result[$i]['permissions']);
-					$lastSource = $result[$i]['source'];
-				}
-			}
-		}
-	}
-
-	public static function removeFromGroupShare($arguments) {
-		$query = OCP\DB::prepare('DELETE FROM *PREFIX*sharing WHERE uid_shared_with = ?');
-		$query->execute(array($arguments['uid'].'@'.$arguments['gid']));
-		self::updateFolder($arguments['uid']);
-	}
-
-}
diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php
deleted file mode 100644
index 54704c942f..0000000000
--- a/apps/files_sharing/list.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Michael Gapczynski
- * @copyright 2011 Michael Gapczynski GapczynskiM@gmail.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-
-require_once('lib_share.php');
-
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('files_sharing');
-
-OCP\App::setActiveNavigationEntry("files_sharing_list");
-
-OCP\Util::addscript("files_sharing", "list");
-
-$tmpl = new OCP\Template("files_sharing", "list", "user");
-$tmpl->assign("shared_items", OC_Share::getMySharedItems());
-$tmpl->printPage();
diff --git a/apps/files_sharing/settings.php b/apps/files_sharing/settings.php
deleted file mode 100644
index 7b63a26515..0000000000
--- a/apps/files_sharing/settings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-OCP\User::checkAdminUser();
-OCP\Util::addscript('files_sharing', 'settings');
-$tmpl = new OCP\Template('files_sharing', 'settings');
-$tmpl->assign('allowResharing', OCP\Config::getAppValue('files_sharing', 'resharing', 'yes'));
-return $tmpl->fetchPage();
-
-?>
\ No newline at end of file
diff --git a/apps/files_sharing/templates/list.php b/apps/files_sharing/templates/list.php
deleted file mode 100644
index d46ff818ac..0000000000
--- a/apps/files_sharing/templates/list.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<fieldset>
-	<legend><?php echo $l->t('Your Shared Files');?></legend>
-	<table id="itemlist">
-		<thead>
-			<tr>
-				<th><?php echo $l->t('Item');?></th>
-				<th><?php echo $l->t('Shared With');?></th>
-				<th><?php echo $l->t('Permissions');?></th>
-			</tr>
-		</thead>
-		<tbody>
-			<?php foreach($_['shared_items'] as $item):?>
-				<tr class="item">
-					<td class="source"><?php echo substr($item['source'], strlen("/".$_SESSION['user_id']."/files/"));?></td>
-					<td class="uid_shared_with"><?php echo $item['uid_shared_with'];?></td>
-					<td class="permissions"><?php echo $l->t('Read'); echo($item['permissions'] & OC_SHARE::WRITE ? ", ".$l->t('Edit') : ""); echo($item['permissions'] & OC_SHARE::DELETE ? ", ".$l->t('Delete') : "");?></td>
-					<td><button class="delete" data-source="<?php echo $item['source'];?>" data-uid_shared_with="<?php echo $item['uid_shared_with'];?>"><?php echo $l->t('Delete');?></button></td>
-				</tr>
-			<?php endforeach;?>
-			<tr id="share_item_row">
-				<form action="#" id="share_item">
-					<td class="source"><input placeholder="Item" id="source" /></td>
-					<td class="uid_shared_with"><input placeholder="Share With" id="uid_shared_with" /></td>
-					<td class="permissions"><input placeholder="Permissions" id="permissions" /></td>
-					<td><input type="submit" value="Share" /></td>
-				</form>
-			</tr>
-		</tbody>
-	</table>
-</fieldset>
diff --git a/apps/files_sharing/templates/settings.php b/apps/files_sharing/templates/settings.php
deleted file mode 100644
index 5b6ba5f33e..0000000000
--- a/apps/files_sharing/templates/settings.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<form id="resharing">
-	<fieldset class="personalblock">
-	<input type="checkbox" name="allowResharing" id="allowResharing" value="1" <?php if ($_['allowResharing'] == 'yes') echo ' checked="checked"'; ?> /> <label for="allowResharing"><?php echo $l->t('Enable Resharing'); ?></label> <br/>
-	<em><?php echo $l->t('Allow users to reshare files they don\'t own');?></em>
-	</fieldset>
-</form>
\ No newline at end of file