From 20852fd8c071b949962406d7ffb3b6e173eb171b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Thu, 19 May 2016 17:22:12 +0200
Subject: [PATCH] remove reshares and the mapping in the federated_reshares
 table on unshare from self

---
 apps/files_sharing/lib/external/manager.php | 35 ++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php
index 22525b4e06..5b7a13f1eb 100644
--- a/apps/files_sharing/lib/external/manager.php
+++ b/apps/files_sharing/lib/external/manager.php
@@ -325,6 +325,10 @@ class Manager {
 	}
 
 	public function removeShare($mountPoint) {
+
+		$mountPointObj = $this->mountManager->find($mountPoint);
+		$id = $mountPointObj->getStorage()->getCache()->getId();
+
 		$mountPoint = $this->stripPath($mountPoint);
 		$hash = md5($mountPoint);
 
@@ -345,7 +349,36 @@ class Manager {
 			WHERE `mountpoint_hash` = ?
 			AND `user` = ?
 		');
-		return (bool)$query->execute(array($hash, $this->uid));
+		$result = (bool)$query->execute(array($hash, $this->uid));
+
+		if($result) {
+			$this->removeReShares($id);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * remove re-shares from share table and mapping in the federated_reshares table
+	 * 
+	 * @param $mountPointId
+	 */
+	protected function removeReShares($mountPointId) {
+		$selectQuery = $this->connection->getQueryBuilder();
+		$query = $this->connection->getQueryBuilder();
+		$selectQuery->select('id')->from('share')
+			->where($selectQuery->expr()->eq('file_source', $query->createNamedParameter($mountPointId)));
+		$select = $selectQuery->getSQL();
+
+
+		$query->delete('federated_reshares')
+			->where($query->expr()->in('share_id', $query->createFunction('(' . $select . ')')));
+		$query->execute();
+
+		$deleteReShares = $this->connection->getQueryBuilder();
+		$deleteReShares->delete('share')
+			->where($deleteReShares->expr()->eq('file_source', $deleteReShares->createNamedParameter($mountPointId)));
+		$deleteReShares->execute();
 	}
 
 	/**