nextcloud / server

lib/private/Collaboration/Collaborators/MailPlugin.php

Indentation +202 added lines, -202 removed lines

@@ -40,208 +40,208 @@
 use OCP\Share\IShare;
 
 class MailPlugin implements ISearchPlugin {
-	protected $shareeEnumeration;
-	protected $shareWithGroupOnly;
-
-	/** @var IManager */
-	private $contactsManager;
-	/** @var ICloudIdManager */
-	private $cloudIdManager;
-	/** @var IConfig */
-	private $config;
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config, IGroupManager $groupManager, IUserSession $userSession) {
-		$this->contactsManager = $contactsManager;
-		$this->cloudIdManager = $cloudIdManager;
-		$this->config = $config;
-		$this->groupManager = $groupManager;
-		$this->userSession = $userSession;
-
-		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-		$this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
-		$this->shareeEnumerationInGroupOnly = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
-	}
-
-	/**
-	 * @param $search
-	 * @param $limit
-	 * @param $offset
-	 * @param ISearchResult $searchResult
-	 * @return bool
-	 * @since 13.0.0
-	 */
-	public function search($search, $limit, $offset, ISearchResult $searchResult) {
-		$result = $userResults = ['wide' => [], 'exact' => []];
-		$userType = new SearchResultType('users');
-		$emailType = new SearchResultType('emails');
-
-		// Search in contacts
-		$addressBookContacts = $this->contactsManager->search($search, ['EMAIL', 'FN'], ['limit' => $limit, 'offset' => $offset]);
-		$lowerSearch = strtolower($search);
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['EMAIL'])) {
-				$emailAddresses = $contact['EMAIL'];
-				if (\is_string($emailAddresses)) {
-					$emailAddresses = [$emailAddresses];
-				}
-				foreach ($emailAddresses as $type => $emailAddress) {
-					$displayName = $emailAddress;
-					$emailAddressType = null;
-					if (\is_array($emailAddress)) {
-						$emailAddressData = $emailAddress;
-						$emailAddress = $emailAddressData['value'];
-						$emailAddressType = $emailAddressData['type'];
-					}
-					if (isset($contact['FN'])) {
-						$displayName = $contact['FN'] . ' (' . $emailAddress . ')';
-					}
-					$exactEmailMatch = strtolower($emailAddress) === $lowerSearch;
-
-					if (isset($contact['isLocalSystemBook'])) {
-						if ($this->shareWithGroupOnly) {
-							/*
+    protected $shareeEnumeration;
+    protected $shareWithGroupOnly;
+
+    /** @var IManager */
+    private $contactsManager;
+    /** @var ICloudIdManager */
+    private $cloudIdManager;
+    /** @var IConfig */
+    private $config;
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config, IGroupManager $groupManager, IUserSession $userSession) {
+        $this->contactsManager = $contactsManager;
+        $this->cloudIdManager = $cloudIdManager;
+        $this->config = $config;
+        $this->groupManager = $groupManager;
+        $this->userSession = $userSession;
+
+        $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+        $this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+        $this->shareeEnumerationInGroupOnly = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
+    }
+
+    /**
+     * @param $search
+     * @param $limit
+     * @param $offset
+     * @param ISearchResult $searchResult
+     * @return bool
+     * @since 13.0.0
+     */
+    public function search($search, $limit, $offset, ISearchResult $searchResult) {
+        $result = $userResults = ['wide' => [], 'exact' => []];
+        $userType = new SearchResultType('users');
+        $emailType = new SearchResultType('emails');
+
+        // Search in contacts
+        $addressBookContacts = $this->contactsManager->search($search, ['EMAIL', 'FN'], ['limit' => $limit, 'offset' => $offset]);
+        $lowerSearch = strtolower($search);
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['EMAIL'])) {
+                $emailAddresses = $contact['EMAIL'];
+                if (\is_string($emailAddresses)) {
+                    $emailAddresses = [$emailAddresses];
+                }
+                foreach ($emailAddresses as $type => $emailAddress) {
+                    $displayName = $emailAddress;
+                    $emailAddressType = null;
+                    if (\is_array($emailAddress)) {
+                        $emailAddressData = $emailAddress;
+                        $emailAddress = $emailAddressData['value'];
+                        $emailAddressType = $emailAddressData['type'];
+                    }
+                    if (isset($contact['FN'])) {
+                        $displayName = $contact['FN'] . ' (' . $emailAddress . ')';
+                    }
+                    $exactEmailMatch = strtolower($emailAddress) === $lowerSearch;
+
+                    if (isset($contact['isLocalSystemBook'])) {
+                        if ($this->shareWithGroupOnly) {
+                            /*
 							 * Check if the user may share with the user associated with the e-mail of the just found contact
 							 */
-							$userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
-							$found = false;
-							foreach ($userGroups as $userGroup) {
-								if ($this->groupManager->isInGroup($contact['UID'], $userGroup)) {
-									$found = true;
-									break;
-								}
-							}
-							if (!$found) {
-								continue;
-							}
-						}
-						if ($exactEmailMatch) {
-							try {
-								$cloud = $this->cloudIdManager->resolveCloudId($contact['CLOUD'][0]);
-							} catch (\InvalidArgumentException $e) {
-								continue;
-							}
-
-							if (!$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
-								$singleResult = [[
-									'label' => $displayName,
-									'uuid' => $contact['UID'],
-									'name' => $contact['FN'],
-									'value' => [
-										'shareType' => IShare::TYPE_USER,
-										'shareWith' => $cloud->getUser(),
-									],
-								]];
-								$searchResult->addResultSet($userType, [], $singleResult);
-								$searchResult->markExactIdMatch($emailType);
-							}
-							return false;
-						}
-
-						if ($this->shareeEnumeration) {
-							try {
-								$cloud = $this->cloudIdManager->resolveCloudId($contact['CLOUD'][0]);
-							} catch (\InvalidArgumentException $e) {
-								continue;
-							}
-
-							$addToWide = !$this->shareeEnumerationInGroupOnly;
-							if ($this->shareeEnumerationInGroupOnly) {
-								$addToWide = false;
-								$userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
-								foreach ($userGroups as $userGroup) {
-									if ($this->groupManager->isInGroup($contact['UID'], $userGroup)) {
-										$addToWide = true;
-										break;
-									}
-								}
-							}
-							if ($addToWide && !$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
-								$userResults['wide'][] = [
-									'label' => $displayName,
-									'uuid' => $contact['UID'],
-									'name' => $contact['FN'],
-									'value' => [
-										'shareType' => IShare::TYPE_USER,
-										'shareWith' => $cloud->getUser(),
-									],
-								];
-								continue;
-							}
-						}
-						continue;
-					}
-
-					if ($exactEmailMatch
-						|| isset($contact['FN']) && strtolower($contact['FN']) === $lowerSearch) {
-						if ($exactEmailMatch) {
-							$searchResult->markExactIdMatch($emailType);
-						}
-						$result['exact'][] = [
-							'label' => $displayName,
-							'uuid' => $contact['UID'],
-							'name' => $contact['FN'],
-							'type' => $emailAddressType ?? '',
-							'value' => [
-								'shareType' => IShare::TYPE_EMAIL,
-								'shareWith' => $emailAddress,
-							],
-						];
-					} else {
-						$result['wide'][] = [
-							'label' => $displayName,
-							'uuid' => $contact['UID'],
-							'name' => $contact['FN'],
-							'type' => $emailAddressType ?? '',
-							'value' => [
-								'shareType' => IShare::TYPE_EMAIL,
-								'shareWith' => $emailAddress,
-							],
-						];
-					}
-				}
-			}
-		}
-
-		$reachedEnd = true;
-		if (!$this->shareeEnumeration) {
-			$result['wide'] = [];
-			$userResults['wide'] = [];
-		} else {
-			$reachedEnd = (count($result['wide']) < $offset + $limit) &&
-				(count($userResults['wide']) < $offset + $limit);
-
-			$result['wide'] = array_slice($result['wide'], $offset, $limit);
-			$userResults['wide'] = array_slice($userResults['wide'], $offset, $limit);
-		}
-
-
-		if (!$searchResult->hasExactIdMatch($emailType) && filter_var($search, FILTER_VALIDATE_EMAIL)) {
-			$result['exact'][] = [
-				'label' => $search,
-				'uuid' => $search,
-				'value' => [
-					'shareType' => IShare::TYPE_EMAIL,
-					'shareWith' => $search,
-				],
-			];
-		}
-
-		if (!empty($userResults['wide'])) {
-			$searchResult->addResultSet($userType, $userResults['wide'], []);
-		}
-		$searchResult->addResultSet($emailType, $result['wide'], $result['exact']);
-
-		return !$reachedEnd;
-	}
-
-	public function isCurrentUser(ICloudId $cloud): bool {
-		$currentUser = $this->userSession->getUser();
-		return $currentUser instanceof IUser ? $currentUser->getUID() === $cloud->getUser() : false;
-	}
+                            $userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
+                            $found = false;
+                            foreach ($userGroups as $userGroup) {
+                                if ($this->groupManager->isInGroup($contact['UID'], $userGroup)) {
+                                    $found = true;
+                                    break;
+                                }
+                            }
+                            if (!$found) {
+                                continue;
+                            }
+                        }
+                        if ($exactEmailMatch) {
+                            try {
+                                $cloud = $this->cloudIdManager->resolveCloudId($contact['CLOUD'][0]);
+                            } catch (\InvalidArgumentException $e) {
+                                continue;
+                            }
+
+                            if (!$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
+                                $singleResult = [[
+                                    'label' => $displayName,
+                                    'uuid' => $contact['UID'],
+                                    'name' => $contact['FN'],
+                                    'value' => [
+                                        'shareType' => IShare::TYPE_USER,
+                                        'shareWith' => $cloud->getUser(),
+                                    ],
+                                ]];
+                                $searchResult->addResultSet($userType, [], $singleResult);
+                                $searchResult->markExactIdMatch($emailType);
+                            }
+                            return false;
+                        }
+
+                        if ($this->shareeEnumeration) {
+                            try {
+                                $cloud = $this->cloudIdManager->resolveCloudId($contact['CLOUD'][0]);
+                            } catch (\InvalidArgumentException $e) {
+                                continue;
+                            }
+
+                            $addToWide = !$this->shareeEnumerationInGroupOnly;
+                            if ($this->shareeEnumerationInGroupOnly) {
+                                $addToWide = false;
+                                $userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
+                                foreach ($userGroups as $userGroup) {
+                                    if ($this->groupManager->isInGroup($contact['UID'], $userGroup)) {
+                                        $addToWide = true;
+                                        break;
+                                    }
+                                }
+                            }
+                            if ($addToWide && !$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
+                                $userResults['wide'][] = [
+                                    'label' => $displayName,
+                                    'uuid' => $contact['UID'],
+                                    'name' => $contact['FN'],
+                                    'value' => [
+                                        'shareType' => IShare::TYPE_USER,
+                                        'shareWith' => $cloud->getUser(),
+                                    ],
+                                ];
+                                continue;
+                            }
+                        }
+                        continue;
+                    }
+
+                    if ($exactEmailMatch
+                        || isset($contact['FN']) && strtolower($contact['FN']) === $lowerSearch) {
+                        if ($exactEmailMatch) {
+                            $searchResult->markExactIdMatch($emailType);
+                        }
+                        $result['exact'][] = [
+                            'label' => $displayName,
+                            'uuid' => $contact['UID'],
+                            'name' => $contact['FN'],
+                            'type' => $emailAddressType ?? '',
+                            'value' => [
+                                'shareType' => IShare::TYPE_EMAIL,
+                                'shareWith' => $emailAddress,
+                            ],
+                        ];
+                    } else {
+                        $result['wide'][] = [
+                            'label' => $displayName,
+                            'uuid' => $contact['UID'],
+                            'name' => $contact['FN'],
+                            'type' => $emailAddressType ?? '',
+                            'value' => [
+                                'shareType' => IShare::TYPE_EMAIL,
+                                'shareWith' => $emailAddress,
+                            ],
+                        ];
+                    }
+                }
+            }
+        }
+
+        $reachedEnd = true;
+        if (!$this->shareeEnumeration) {
+            $result['wide'] = [];
+            $userResults['wide'] = [];
+        } else {
+            $reachedEnd = (count($result['wide']) < $offset + $limit) &&
+                (count($userResults['wide']) < $offset + $limit);
+
+            $result['wide'] = array_slice($result['wide'], $offset, $limit);
+            $userResults['wide'] = array_slice($userResults['wide'], $offset, $limit);
+        }
+
+
+        if (!$searchResult->hasExactIdMatch($emailType) && filter_var($search, FILTER_VALIDATE_EMAIL)) {
+            $result['exact'][] = [
+                'label' => $search,
+                'uuid' => $search,
+                'value' => [
+                    'shareType' => IShare::TYPE_EMAIL,
+                    'shareWith' => $search,
+                ],
+            ];
+        }
+
+        if (!empty($userResults['wide'])) {
+            $searchResult->addResultSet($userType, $userResults['wide'], []);
+        }
+        $searchResult->addResultSet($emailType, $result['wide'], $result['exact']);
+
+        return !$reachedEnd;
+    }
+
+    public function isCurrentUser(ICloudId $cloud): bool {
+        $currentUser = $this->userSession->getUser();
+        return $currentUser instanceof IUser ? $currentUser->getUID() === $cloud->getUser() : false;
+    }
 }

lib/private/Collaboration/Collaborators/UserPlugin.php

Indentation +147 added lines, -147 removed lines

@@ -40,151 +40,151 @@
 use OCP\Share\IShare;
 
 class UserPlugin implements ISearchPlugin {
-	/* @var bool */
-	protected $shareWithGroupOnly;
-	protected $shareeEnumeration;
-	protected $shareeEnumerationInGroupOnly;
-
-	/** @var IConfig */
-	private $config;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IUserManager */
-	private $userManager;
-
-	public function __construct(IConfig $config, IUserManager $userManager, IGroupManager $groupManager, IUserSession $userSession) {
-		$this->config = $config;
-
-		$this->groupManager = $groupManager;
-		$this->userSession = $userSession;
-		$this->userManager = $userManager;
-
-		$this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
-		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-		$this->shareeEnumerationInGroupOnly = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
-	}
-
-	public function search($search, $limit, $offset, ISearchResult $searchResult) {
-		$result = ['wide' => [], 'exact' => []];
-		$users = [];
-		$hasMoreResults = false;
-
-		$currentUserGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
-		if ($this->shareWithGroupOnly) {
-			// Search in all the groups this user is part of
-			foreach ($currentUserGroups as $userGroupId) {
-				$usersInGroup = $this->groupManager->displayNamesInGroup($userGroupId, $search, $limit, $offset);
-				foreach ($usersInGroup as $userId => $displayName) {
-					$userId = (string) $userId;
-					$users[$userId] = $this->userManager->get($userId);
-				}
-			}
-		} else {
-			// Search in all users
-			$usersTmp = $this->userManager->searchDisplayName($search, $limit, $offset);
-			foreach ($usersTmp as $user) {
-				if ($user->isEnabled()) { // Don't keep deactivated users
-					$users[$user->getUID()] = $user;
-				}
-			}
-		}
-
-		$this->takeOutCurrentUser($users);
-
-		if (!$this->shareeEnumeration || count($users) < $limit) {
-			$hasMoreResults = true;
-		}
-
-		$foundUserById = false;
-		$lowerSearch = strtolower($search);
-		foreach ($users as $uid => $user) {
-			$userDisplayName = $user->getDisplayName();
-			$userEmail = $user->getEMailAddress();
-			$uid = (string) $uid;
-			if (
-				strtolower($uid) === $lowerSearch ||
-				strtolower($userDisplayName) === $lowerSearch ||
-				strtolower($userEmail) === $lowerSearch
-			) {
-				if (strtolower($uid) === $lowerSearch) {
-					$foundUserById = true;
-				}
-				$result['exact'][] = [
-					'label' => $userDisplayName,
-					'value' => [
-						'shareType' => IShare::TYPE_USER,
-						'shareWith' => $uid,
-					],
-				];
-			} else {
-				$addToWideResults = false;
-				if ($this->shareeEnumeration && !$this->shareeEnumerationInGroupOnly) {
-					$addToWideResults = true;
-				}
-
-				if ($this->shareeEnumerationInGroupOnly) {
-					$commonGroups = array_intersect($currentUserGroups, $this->groupManager->getUserGroupIds($user));
-					if (!empty($commonGroups)) {
-						$addToWideResults = true;
-					}
-				}
-
-				if ($addToWideResults) {
-					$result['wide'][] = [
-						'label' => $userDisplayName,
-						'value' => [
-							'shareType' => IShare::TYPE_USER,
-							'shareWith' => $uid,
-						],
-					];
-				}
-			}
-		}
-
-		if ($offset === 0 && !$foundUserById) {
-			// On page one we try if the search result has a direct hit on the
-			// user id and if so, we add that to the exact match list
-			$user = $this->userManager->get($search);
-			if ($user instanceof IUser) {
-				$addUser = true;
-
-				if ($this->shareWithGroupOnly) {
-					// Only add, if we have a common group
-					$commonGroups = array_intersect($currentUserGroups, $this->groupManager->getUserGroupIds($user));
-					$addUser = !empty($commonGroups);
-				}
-
-				if ($addUser) {
-					$result['exact'][] = [
-						'label' => $user->getDisplayName(),
-						'value' => [
-							'shareType' => IShare::TYPE_USER,
-							'shareWith' => $user->getUID(),
-						],
-					];
-				}
-			}
-		}
-
-
-
-		$type = new SearchResultType('users');
-		$searchResult->addResultSet($type, $result['wide'], $result['exact']);
-		if (count($result['exact'])) {
-			$searchResult->markExactIdMatch($type);
-		}
-
-		return $hasMoreResults;
-	}
-
-	public function takeOutCurrentUser(array &$users) {
-		$currentUser = $this->userSession->getUser();
-		if (!is_null($currentUser)) {
-			if (isset($users[$currentUser->getUID()])) {
-				unset($users[$currentUser->getUID()]);
-			}
-		}
-	}
+    /* @var bool */
+    protected $shareWithGroupOnly;
+    protected $shareeEnumeration;
+    protected $shareeEnumerationInGroupOnly;
+
+    /** @var IConfig */
+    private $config;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IUserManager */
+    private $userManager;
+
+    public function __construct(IConfig $config, IUserManager $userManager, IGroupManager $groupManager, IUserSession $userSession) {
+        $this->config = $config;
+
+        $this->groupManager = $groupManager;
+        $this->userSession = $userSession;
+        $this->userManager = $userManager;
+
+        $this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+        $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+        $this->shareeEnumerationInGroupOnly = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
+    }
+
+    public function search($search, $limit, $offset, ISearchResult $searchResult) {
+        $result = ['wide' => [], 'exact' => []];
+        $users = [];
+        $hasMoreResults = false;
+
+        $currentUserGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
+        if ($this->shareWithGroupOnly) {
+            // Search in all the groups this user is part of
+            foreach ($currentUserGroups as $userGroupId) {
+                $usersInGroup = $this->groupManager->displayNamesInGroup($userGroupId, $search, $limit, $offset);
+                foreach ($usersInGroup as $userId => $displayName) {
+                    $userId = (string) $userId;
+                    $users[$userId] = $this->userManager->get($userId);
+                }
+            }
+        } else {
+            // Search in all users
+            $usersTmp = $this->userManager->searchDisplayName($search, $limit, $offset);
+            foreach ($usersTmp as $user) {
+                if ($user->isEnabled()) { // Don't keep deactivated users
+                    $users[$user->getUID()] = $user;
+                }
+            }
+        }
+
+        $this->takeOutCurrentUser($users);
+
+        if (!$this->shareeEnumeration || count($users) < $limit) {
+            $hasMoreResults = true;
+        }
+
+        $foundUserById = false;
+        $lowerSearch = strtolower($search);
+        foreach ($users as $uid => $user) {
+            $userDisplayName = $user->getDisplayName();
+            $userEmail = $user->getEMailAddress();
+            $uid = (string) $uid;
+            if (
+                strtolower($uid) === $lowerSearch ||
+                strtolower($userDisplayName) === $lowerSearch ||
+                strtolower($userEmail) === $lowerSearch
+            ) {
+                if (strtolower($uid) === $lowerSearch) {
+                    $foundUserById = true;
+                }
+                $result['exact'][] = [
+                    'label' => $userDisplayName,
+                    'value' => [
+                        'shareType' => IShare::TYPE_USER,
+                        'shareWith' => $uid,
+                    ],
+                ];
+            } else {
+                $addToWideResults = false;
+                if ($this->shareeEnumeration && !$this->shareeEnumerationInGroupOnly) {
+                    $addToWideResults = true;
+                }
+
+                if ($this->shareeEnumerationInGroupOnly) {
+                    $commonGroups = array_intersect($currentUserGroups, $this->groupManager->getUserGroupIds($user));
+                    if (!empty($commonGroups)) {
+                        $addToWideResults = true;
+                    }
+                }
+
+                if ($addToWideResults) {
+                    $result['wide'][] = [
+                        'label' => $userDisplayName,
+                        'value' => [
+                            'shareType' => IShare::TYPE_USER,
+                            'shareWith' => $uid,
+                        ],
+                    ];
+                }
+            }
+        }
+
+        if ($offset === 0 && !$foundUserById) {
+            // On page one we try if the search result has a direct hit on the
+            // user id and if so, we add that to the exact match list
+            $user = $this->userManager->get($search);
+            if ($user instanceof IUser) {
+                $addUser = true;
+
+                if ($this->shareWithGroupOnly) {
+                    // Only add, if we have a common group
+                    $commonGroups = array_intersect($currentUserGroups, $this->groupManager->getUserGroupIds($user));
+                    $addUser = !empty($commonGroups);
+                }
+
+                if ($addUser) {
+                    $result['exact'][] = [
+                        'label' => $user->getDisplayName(),
+                        'value' => [
+                            'shareType' => IShare::TYPE_USER,
+                            'shareWith' => $user->getUID(),
+                        ],
+                    ];
+                }
+            }
+        }
+
+
+
+        $type = new SearchResultType('users');
+        $searchResult->addResultSet($type, $result['wide'], $result['exact']);
+        if (count($result['exact'])) {
+            $searchResult->markExactIdMatch($type);
+        }
+
+        return $hasMoreResults;
+    }
+
+    public function takeOutCurrentUser(array &$users) {
+        $currentUser = $this->userSession->getUser();
+        if (!is_null($currentUser)) {
+            if (isset($users[$currentUser->getUID()])) {
+                unset($users[$currentUser->getUID()]);
+            }
+        }
+    }
 }

lib/private/Collaboration/Collaborators/RemoteGroupPlugin.php

Indentation +51 added lines, -51 removed lines

@@ -33,62 +33,62 @@
 use OCP\Share\IShare;
 
 class RemoteGroupPlugin implements ISearchPlugin {
-	protected $shareeEnumeration;
+    protected $shareeEnumeration;
 
-	/** @var ICloudIdManager */
-	private $cloudIdManager;
-	/** @var bool */
-	private $enabled = false;
+    /** @var ICloudIdManager */
+    private $cloudIdManager;
+    /** @var bool */
+    private $enabled = false;
 
-	public function __construct(ICloudFederationProviderManager $cloudFederationProviderManager, ICloudIdManager $cloudIdManager) {
-		try {
-			$fileSharingProvider = $cloudFederationProviderManager->getCloudFederationProvider('file');
-			$supportedShareTypes = $fileSharingProvider->getSupportedShareTypes();
-			if (in_array('group', $supportedShareTypes)) {
-				$this->enabled = true;
-			}
-		} catch (\Exception $e) {
-			// do nothing, just don't enable federated group shares
-		}
-		$this->cloudIdManager = $cloudIdManager;
-	}
+    public function __construct(ICloudFederationProviderManager $cloudFederationProviderManager, ICloudIdManager $cloudIdManager) {
+        try {
+            $fileSharingProvider = $cloudFederationProviderManager->getCloudFederationProvider('file');
+            $supportedShareTypes = $fileSharingProvider->getSupportedShareTypes();
+            if (in_array('group', $supportedShareTypes)) {
+                $this->enabled = true;
+            }
+        } catch (\Exception $e) {
+            // do nothing, just don't enable federated group shares
+        }
+        $this->cloudIdManager = $cloudIdManager;
+    }
 
-	public function search($search, $limit, $offset, ISearchResult $searchResult) {
-		$result = ['wide' => [], 'exact' => []];
-		$resultType = new SearchResultType('remote_groups');
+    public function search($search, $limit, $offset, ISearchResult $searchResult) {
+        $result = ['wide' => [], 'exact' => []];
+        $resultType = new SearchResultType('remote_groups');
 
-		if ($this->enabled && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
-			list($remoteGroup, $serverUrl) = $this->splitGroupRemote($search);
-			$result['exact'][] = [
-				'label' => $remoteGroup . " ($serverUrl)",
-				'guid' => $remoteGroup,
-				'name' => $remoteGroup,
-				'value' => [
-					'shareType' => IShare::TYPE_REMOTE_GROUP,
-					'shareWith' => $search,
-					'server' => $serverUrl,
-				],
-			];
-		}
+        if ($this->enabled && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
+            list($remoteGroup, $serverUrl) = $this->splitGroupRemote($search);
+            $result['exact'][] = [
+                'label' => $remoteGroup . " ($serverUrl)",
+                'guid' => $remoteGroup,
+                'name' => $remoteGroup,
+                'value' => [
+                    'shareType' => IShare::TYPE_REMOTE_GROUP,
+                    'shareWith' => $search,
+                    'server' => $serverUrl,
+                ],
+            ];
+        }
 
-		$searchResult->addResultSet($resultType, $result['wide'], $result['exact']);
+        $searchResult->addResultSet($resultType, $result['wide'], $result['exact']);
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * split group and remote from federated cloud id
-	 *
-	 * @param string $address federated share address
-	 * @return array [user, remoteURL]
-	 * @throws \InvalidArgumentException
-	 */
-	public function splitGroupRemote($address) {
-		try {
-			$cloudId = $this->cloudIdManager->resolveCloudId($address);
-			return [$cloudId->getUser(), $cloudId->getRemote()];
-		} catch (\InvalidArgumentException $e) {
-			throw new \InvalidArgumentException('Invalid Federated Cloud ID', 0, $e);
-		}
-	}
+    /**
+     * split group and remote from federated cloud id
+     *
+     * @param string $address federated share address
+     * @return array [user, remoteURL]
+     * @throws \InvalidArgumentException
+     */
+    public function splitGroupRemote($address) {
+        try {
+            $cloudId = $this->cloudIdManager->resolveCloudId($address);
+            return [$cloudId->getUser(), $cloudId->getRemote()];
+        } catch (\InvalidArgumentException $e) {
+            throw new \InvalidArgumentException('Invalid Federated Cloud ID', 0, $e);
+        }
+    }
 }

lib/private/Repair/OldGroupMembershipShares.php

Indentation +85 added lines, -85 removed lines

@@ -32,89 +32,89 @@
 
 class OldGroupMembershipShares implements IRepairStep {
 
-	/** @var \OCP\IDBConnection */
-	protected $connection;
-
-	/** @var \OCP\IGroupManager */
-	protected $groupManager;
-
-	/**
-	 * @var array [gid => [uid => (bool)]]
-	 */
-	protected $memberships;
-
-	/**
-	 * @param IDBConnection $connection
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IDBConnection $connection, IGroupManager $groupManager) {
-		$this->connection = $connection;
-		$this->groupManager = $groupManager;
-	}
-
-	/**
-	 * Returns the step's name
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return 'Remove shares of old group memberships';
-	}
-
-	/**
-	 * Run repair step.
-	 * Must throw exception on error.
-	 *
-	 * @throws \Exception in case of failure
-	 * @suppress SqlInjectionChecker
-	 */
-	public function run(IOutput $output) {
-		$deletedEntries = 0;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('s1.id')->selectAlias('s1.share_with', 'user')->selectAlias('s2.share_with', 'group')
-			->from('share', 's1')
-			->where($query->expr()->isNotNull('s1.parent'))
-				// \OC\Share\Constant::$shareTypeGroupUserUnique === 2
-				->andWhere($query->expr()->eq('s1.share_type', $query->expr()->literal(2)))
-				->andWhere($query->expr()->isNotNull('s2.id'))
-				->andWhere($query->expr()->eq('s2.share_type', $query->expr()->literal(IShare::TYPE_GROUP)))
-			->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'));
-
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete('share')
-			->where($query->expr()->eq('id', $deleteQuery->createParameter('share')));
-
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			if (!$this->isMember($row['group'], $row['user'])) {
-				$deletedEntries += $deleteQuery->setParameter('share', (int) $row['id'])
-					->execute();
-			}
-		}
-		$result->closeCursor();
-
-		if ($deletedEntries) {
-			$output->info('Removed ' . $deletedEntries . ' shares where user is not a member of the group anymore');
-		}
-	}
-
-	/**
-	 * @param string $gid
-	 * @param string $uid
-	 * @return bool
-	 */
-	protected function isMember($gid, $uid) {
-		if (isset($this->memberships[$gid][$uid])) {
-			return $this->memberships[$gid][$uid];
-		}
-
-		$isMember = $this->groupManager->isInGroup($uid, $gid);
-		if (!isset($this->memberships[$gid])) {
-			$this->memberships[$gid] = [];
-		}
-		$this->memberships[$gid][$uid] = $isMember;
-
-		return $isMember;
-	}
+    /** @var \OCP\IDBConnection */
+    protected $connection;
+
+    /** @var \OCP\IGroupManager */
+    protected $groupManager;
+
+    /**
+     * @var array [gid => [uid => (bool)]]
+     */
+    protected $memberships;
+
+    /**
+     * @param IDBConnection $connection
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IDBConnection $connection, IGroupManager $groupManager) {
+        $this->connection = $connection;
+        $this->groupManager = $groupManager;
+    }
+
+    /**
+     * Returns the step's name
+     *
+     * @return string
+     */
+    public function getName() {
+        return 'Remove shares of old group memberships';
+    }
+
+    /**
+     * Run repair step.
+     * Must throw exception on error.
+     *
+     * @throws \Exception in case of failure
+     * @suppress SqlInjectionChecker
+     */
+    public function run(IOutput $output) {
+        $deletedEntries = 0;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('s1.id')->selectAlias('s1.share_with', 'user')->selectAlias('s2.share_with', 'group')
+            ->from('share', 's1')
+            ->where($query->expr()->isNotNull('s1.parent'))
+                // \OC\Share\Constant::$shareTypeGroupUserUnique === 2
+                ->andWhere($query->expr()->eq('s1.share_type', $query->expr()->literal(2)))
+                ->andWhere($query->expr()->isNotNull('s2.id'))
+                ->andWhere($query->expr()->eq('s2.share_type', $query->expr()->literal(IShare::TYPE_GROUP)))
+            ->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'));
+
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete('share')
+            ->where($query->expr()->eq('id', $deleteQuery->createParameter('share')));
+
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            if (!$this->isMember($row['group'], $row['user'])) {
+                $deletedEntries += $deleteQuery->setParameter('share', (int) $row['id'])
+                    ->execute();
+            }
+        }
+        $result->closeCursor();
+
+        if ($deletedEntries) {
+            $output->info('Removed ' . $deletedEntries . ' shares where user is not a member of the group anymore');
+        }
+    }
+
+    /**
+     * @param string $gid
+     * @param string $uid
+     * @return bool
+     */
+    protected function isMember($gid, $uid) {
+        if (isset($this->memberships[$gid][$uid])) {
+            return $this->memberships[$gid][$uid];
+        }
+
+        $isMember = $this->groupManager->isInGroup($uid, $gid);
+        if (!isset($this->memberships[$gid])) {
+            $this->memberships[$gid] = [];
+        }
+        $this->memberships[$gid][$uid] = $isMember;
+
+        return $isMember;
+    }
 }

apps/admin_audit/lib/Actions/Sharing.php

Indentation +279 added lines, -279 removed lines

@@ -38,288 +38,288 @@
  * @package OCA\AdminAudit\Actions
  */
 class Sharing extends Action {
-	/**
-	 * Logs sharing of data
-	 *
-	 * @param array $params
-	 */
-	public function shared(array $params) {
-		if ($params['shareType'] === IShare::TYPE_LINK) {
-			$this->log(
-				'The %s "%s" with ID "%s" has been shared via link with permissions "%s" (Share ID: %s)',
-				$params,
-				[
-					'itemType',
-					'itemTarget',
-					'itemSource',
-					'permissions',
-					'id',
-				]
-			);
-		} elseif ($params['shareType'] === IShare::TYPE_USER) {
-			$this->log(
-				'The %s "%s" with ID "%s" has been shared to the user "%s" with permissions "%s"  (Share ID: %s)',
-				$params,
-				[
-					'itemType',
-					'itemTarget',
-					'itemSource',
-					'shareWith',
-					'permissions',
-					'id',
-				]
-			);
-		} elseif ($params['shareType'] === IShare::TYPE_GROUP) {
-			$this->log(
-				'The %s "%s" with ID "%s" has been shared to the group "%s" with permissions "%s"  (Share ID: %s)',
-				$params,
-				[
-					'itemType',
-					'itemTarget',
-					'itemSource',
-					'shareWith',
-					'permissions',
-					'id',
-				]
-			);
-		} elseif ($params['shareType'] === IShare::TYPE_ROOM) {
-			$this->log(
-				'The %s "%s" with ID "%s" has been shared to the room "%s" with permissions "%s" (Share ID: %s)',
-				$params,
-				[
-					'itemType',
-					'itemTarget',
-					'itemSource',
-					'shareWith',
-					'permissions',
-					'id',
-				]
-			);
-		} elseif ($params['shareType'] === IShare::TYPE_EMAIL) {
-			$this->log(
-				'The %s "%s" with ID "%s" has been shared to the email recipient "%s" with permissions "%s" (Share ID: %s)',
-				$params,
-				[
-					'itemType',
-					'itemTarget',
-					'itemSource',
-					'shareWith',
-					'permissions',
-					'id',
-				]
-			);
-		} elseif ($params['shareType'] === IShare::TYPE_CIRCLE) {
-			$this->log(
-				'The %s "%s" with ID "%s" has been shared to the circle "%s" with permissions "%s" (Share ID: %s)',
-				$params,
-				[
-					'itemType',
-					'itemTarget',
-					'itemSource',
-					'shareWith',
-					'permissions',
-					'id',
-				]
-			);
-		} elseif ($params['shareType'] === IShare::TYPE_REMOTE) {
-			$this->log(
-				'The %s "%s" with ID "%s" has been shared to the remote user "%s" with permissions "%s" (Share ID: %s)',
-				$params,
-				[
-					'itemType',
-					'itemTarget',
-					'itemSource',
-					'shareWith',
-					'permissions',
-					'id',
-				]
-			);
-		} elseif ($params['shareType'] === IShare::TYPE_REMOTE_GROUP) {
-			$this->log(
-				'The %s "%s" with ID "%s" has been shared to the remote group "%s" with permissions "%s" (Share ID: %s)',
-				$params,
-				[
-					'itemType',
-					'itemTarget',
-					'itemSource',
-					'shareWith',
-					'permissions',
-					'id',
-				]
-			);
-		}
-	}
+    /**
+     * Logs sharing of data
+     *
+     * @param array $params
+     */
+    public function shared(array $params) {
+        if ($params['shareType'] === IShare::TYPE_LINK) {
+            $this->log(
+                'The %s "%s" with ID "%s" has been shared via link with permissions "%s" (Share ID: %s)',
+                $params,
+                [
+                    'itemType',
+                    'itemTarget',
+                    'itemSource',
+                    'permissions',
+                    'id',
+                ]
+            );
+        } elseif ($params['shareType'] === IShare::TYPE_USER) {
+            $this->log(
+                'The %s "%s" with ID "%s" has been shared to the user "%s" with permissions "%s"  (Share ID: %s)',
+                $params,
+                [
+                    'itemType',
+                    'itemTarget',
+                    'itemSource',
+                    'shareWith',
+                    'permissions',
+                    'id',
+                ]
+            );
+        } elseif ($params['shareType'] === IShare::TYPE_GROUP) {
+            $this->log(
+                'The %s "%s" with ID "%s" has been shared to the group "%s" with permissions "%s"  (Share ID: %s)',
+                $params,
+                [
+                    'itemType',
+                    'itemTarget',
+                    'itemSource',
+                    'shareWith',
+                    'permissions',
+                    'id',
+                ]
+            );
+        } elseif ($params['shareType'] === IShare::TYPE_ROOM) {
+            $this->log(
+                'The %s "%s" with ID "%s" has been shared to the room "%s" with permissions "%s" (Share ID: %s)',
+                $params,
+                [
+                    'itemType',
+                    'itemTarget',
+                    'itemSource',
+                    'shareWith',
+                    'permissions',
+                    'id',
+                ]
+            );
+        } elseif ($params['shareType'] === IShare::TYPE_EMAIL) {
+            $this->log(
+                'The %s "%s" with ID "%s" has been shared to the email recipient "%s" with permissions "%s" (Share ID: %s)',
+                $params,
+                [
+                    'itemType',
+                    'itemTarget',
+                    'itemSource',
+                    'shareWith',
+                    'permissions',
+                    'id',
+                ]
+            );
+        } elseif ($params['shareType'] === IShare::TYPE_CIRCLE) {
+            $this->log(
+                'The %s "%s" with ID "%s" has been shared to the circle "%s" with permissions "%s" (Share ID: %s)',
+                $params,
+                [
+                    'itemType',
+                    'itemTarget',
+                    'itemSource',
+                    'shareWith',
+                    'permissions',
+                    'id',
+                ]
+            );
+        } elseif ($params['shareType'] === IShare::TYPE_REMOTE) {
+            $this->log(
+                'The %s "%s" with ID "%s" has been shared to the remote user "%s" with permissions "%s" (Share ID: %s)',
+                $params,
+                [
+                    'itemType',
+                    'itemTarget',
+                    'itemSource',
+                    'shareWith',
+                    'permissions',
+                    'id',
+                ]
+            );
+        } elseif ($params['shareType'] === IShare::TYPE_REMOTE_GROUP) {
+            $this->log(
+                'The %s "%s" with ID "%s" has been shared to the remote group "%s" with permissions "%s" (Share ID: %s)',
+                $params,
+                [
+                    'itemType',
+                    'itemTarget',
+                    'itemSource',
+                    'shareWith',
+                    'permissions',
+                    'id',
+                ]
+            );
+        }
+    }
 
-	/**
-	 * Logs unsharing of data
-	 *
-	 * @param array $params
-	 */
-	public function unshare(array $params) {
-		if ($params['shareType'] === IShare::TYPE_LINK) {
-			$this->log(
-				'The %s "%s" with ID "%s" has been unshared (Share ID: %s)',
-				$params,
-				[
-					'itemType',
-					'fileTarget',
-					'itemSource',
-					'id',
-				]
-			);
-		} elseif ($params['shareType'] === IShare::TYPE_USER) {
-			$this->log(
-				'The %s "%s" with ID "%s" has been unshared from the user "%s" (Share ID: %s)',
-				$params,
-				[
-					'itemType',
-					'fileTarget',
-					'itemSource',
-					'shareWith',
-					'id',
-				]
-			);
-		} elseif ($params['shareType'] === IShare::TYPE_GROUP) {
-			$this->log(
-				'The %s "%s" with ID "%s" has been unshared from the group "%s" (Share ID: %s)',
-				$params,
-				[
-					'itemType',
-					'fileTarget',
-					'itemSource',
-					'shareWith',
-					'id',
-				]
-			);
-		} elseif ($params['shareType'] === IShare::TYPE_ROOM) {
-			$this->log(
-				'The %s "%s" with ID "%s" has been unshared from the room "%s" (Share ID: %s)',
-				$params,
-				[
-					'itemType',
-					'fileTarget',
-					'itemSource',
-					'shareWith',
-					'id',
-				]
-			);
-		} elseif ($params['shareType'] === IShare::TYPE_EMAIL) {
-			$this->log(
-				'The %s "%s" with ID "%s" has been unshared from the email recipient "%s" (Share ID: %s)',
-				$params,
-				[
-					'itemType',
-					'fileTarget',
-					'itemSource',
-					'shareWith',
-					'id',
-				]
-			);
-		} elseif ($params['shareType'] === IShare::TYPE_CIRCLE) {
-			$this->log(
-				'The %s "%s" with ID "%s" has been unshared from the circle "%s" (Share ID: %s)',
-				$params,
-				[
-					'itemType',
-					'fileTarget',
-					'itemSource',
-					'shareWith',
-					'id',
-				]
-			);
-		} elseif ($params['shareType'] === IShare::TYPE_REMOTE) {
-			$this->log(
-				'The %s "%s" with ID "%s" has been unshared from the remote user "%s" (Share ID: %s)',
-				$params,
-				[
-					'itemType',
-					'fileTarget',
-					'itemSource',
-					'shareWith',
-					'id',
-				]
-			);
-		} elseif ($params['shareType'] === IShare::TYPE_REMOTE_GROUP) {
-			$this->log(
-				'The %s "%s" with ID "%s" has been unshared from the remote group "%s" (Share ID: %s)',
-				$params,
-				[
-					'itemType',
-					'fileTarget',
-					'itemSource',
-					'shareWith',
-					'id',
-				]
-			);
-		}
-	}
+    /**
+     * Logs unsharing of data
+     *
+     * @param array $params
+     */
+    public function unshare(array $params) {
+        if ($params['shareType'] === IShare::TYPE_LINK) {
+            $this->log(
+                'The %s "%s" with ID "%s" has been unshared (Share ID: %s)',
+                $params,
+                [
+                    'itemType',
+                    'fileTarget',
+                    'itemSource',
+                    'id',
+                ]
+            );
+        } elseif ($params['shareType'] === IShare::TYPE_USER) {
+            $this->log(
+                'The %s "%s" with ID "%s" has been unshared from the user "%s" (Share ID: %s)',
+                $params,
+                [
+                    'itemType',
+                    'fileTarget',
+                    'itemSource',
+                    'shareWith',
+                    'id',
+                ]
+            );
+        } elseif ($params['shareType'] === IShare::TYPE_GROUP) {
+            $this->log(
+                'The %s "%s" with ID "%s" has been unshared from the group "%s" (Share ID: %s)',
+                $params,
+                [
+                    'itemType',
+                    'fileTarget',
+                    'itemSource',
+                    'shareWith',
+                    'id',
+                ]
+            );
+        } elseif ($params['shareType'] === IShare::TYPE_ROOM) {
+            $this->log(
+                'The %s "%s" with ID "%s" has been unshared from the room "%s" (Share ID: %s)',
+                $params,
+                [
+                    'itemType',
+                    'fileTarget',
+                    'itemSource',
+                    'shareWith',
+                    'id',
+                ]
+            );
+        } elseif ($params['shareType'] === IShare::TYPE_EMAIL) {
+            $this->log(
+                'The %s "%s" with ID "%s" has been unshared from the email recipient "%s" (Share ID: %s)',
+                $params,
+                [
+                    'itemType',
+                    'fileTarget',
+                    'itemSource',
+                    'shareWith',
+                    'id',
+                ]
+            );
+        } elseif ($params['shareType'] === IShare::TYPE_CIRCLE) {
+            $this->log(
+                'The %s "%s" with ID "%s" has been unshared from the circle "%s" (Share ID: %s)',
+                $params,
+                [
+                    'itemType',
+                    'fileTarget',
+                    'itemSource',
+                    'shareWith',
+                    'id',
+                ]
+            );
+        } elseif ($params['shareType'] === IShare::TYPE_REMOTE) {
+            $this->log(
+                'The %s "%s" with ID "%s" has been unshared from the remote user "%s" (Share ID: %s)',
+                $params,
+                [
+                    'itemType',
+                    'fileTarget',
+                    'itemSource',
+                    'shareWith',
+                    'id',
+                ]
+            );
+        } elseif ($params['shareType'] === IShare::TYPE_REMOTE_GROUP) {
+            $this->log(
+                'The %s "%s" with ID "%s" has been unshared from the remote group "%s" (Share ID: %s)',
+                $params,
+                [
+                    'itemType',
+                    'fileTarget',
+                    'itemSource',
+                    'shareWith',
+                    'id',
+                ]
+            );
+        }
+    }
 
-	/**
-	 * Logs the updating of permission changes for shares
-	 *
-	 * @param array $params
-	 */
-	public function updatePermissions(array $params) {
-		$this->log(
-			'The permissions of the shared %s "%s" with ID "%s" have been changed to "%s"',
-			$params,
-			[
-				'itemType',
-				'path',
-				'itemSource',
-				'permissions',
-			]
-		);
-	}
+    /**
+     * Logs the updating of permission changes for shares
+     *
+     * @param array $params
+     */
+    public function updatePermissions(array $params) {
+        $this->log(
+            'The permissions of the shared %s "%s" with ID "%s" have been changed to "%s"',
+            $params,
+            [
+                'itemType',
+                'path',
+                'itemSource',
+                'permissions',
+            ]
+        );
+    }
 
-	/**
-	 * Logs the password changes for a share
-	 *
-	 * @param array $params
-	 */
-	public function updatePassword(array $params) {
-		$this->log(
-			'The password of the publicly shared %s "%s" with ID "%s" has been changed',
-			$params,
-			[
-				'itemType',
-				'token',
-				'itemSource',
-			]
-		);
-	}
+    /**
+     * Logs the password changes for a share
+     *
+     * @param array $params
+     */
+    public function updatePassword(array $params) {
+        $this->log(
+            'The password of the publicly shared %s "%s" with ID "%s" has been changed',
+            $params,
+            [
+                'itemType',
+                'token',
+                'itemSource',
+            ]
+        );
+    }
 
-	/**
-	 * Logs the expiration date changes for a share
-	 *
-	 * @param array $params
-	 */
-	public function updateExpirationDate(array $params) {
-		$this->log(
-			'The expiration date of the publicly shared %s with ID "%s" has been changed to "%s"',
-			$params,
-			[
-				'itemType',
-				'itemSource',
-				'date',
-			]
-		);
-	}
+    /**
+     * Logs the expiration date changes for a share
+     *
+     * @param array $params
+     */
+    public function updateExpirationDate(array $params) {
+        $this->log(
+            'The expiration date of the publicly shared %s with ID "%s" has been changed to "%s"',
+            $params,
+            [
+                'itemType',
+                'itemSource',
+                'date',
+            ]
+        );
+    }
 
-	/**
-	 * Logs access of shared files
-	 *
-	 * @param array $params
-	 */
-	public function shareAccessed(array $params) {
-		$this->log(
-			'The shared %s with the token "%s" by "%s" has been accessed.',
-			$params,
-			[
-				'itemType',
-				'token',
-				'uidOwner',
-			]
-		);
-	}
+    /**
+     * Logs access of shared files
+     *
+     * @param array $params
+     */
+    public function shareAccessed(array $params) {
+        $this->log(
+            'The shared %s with the token "%s" by "%s" has been accessed.',
+            $params,
+            [
+                'itemType',
+                'token',
+                'uidOwner',
+            ]
+        );
+    }
 }

apps/files_sharing/lib/ExpireSharesJob.php

Indentation +37 added lines, -37 removed lines

@@ -32,47 +32,47 @@
  */
 class ExpireSharesJob extends TimedJob {
 
-	/**
-	 * sets the correct interval for this timed job
-	 */
-	public function __construct() {
-		// Run once a day
-		$this->setInterval(24 * 60 * 60);
-	}
+    /**
+     * sets the correct interval for this timed job
+     */
+    public function __construct() {
+        // Run once a day
+        $this->setInterval(24 * 60 * 60);
+    }
 
-	/**
-	 * Makes the background job do its work
-	 *
-	 * @param array $argument unused argument
-	 */
-	public function run($argument) {
-		$connection = \OC::$server->getDatabaseConnection();
+    /**
+     * Makes the background job do its work
+     *
+     * @param array $argument unused argument
+     */
+    public function run($argument) {
+        $connection = \OC::$server->getDatabaseConnection();
 
-		//Current time
-		$now = new \DateTime();
-		$now = $now->format('Y-m-d H:i:s');
+        //Current time
+        $now = new \DateTime();
+        $now = $now->format('Y-m-d H:i:s');
 
-		/*
+        /*
 		 * Expire file link shares only (for now)
 		 */
-		$qb = $connection->getQueryBuilder();
-		$qb->select('id', 'file_source', 'uid_owner', 'item_type')
-			->from('share')
-			->where(
-				$qb->expr()->andX(
-					$qb->expr()->eq('share_type', $qb->expr()->literal(IShare::TYPE_LINK)),
-					$qb->expr()->lte('expiration', $qb->expr()->literal($now)),
-					$qb->expr()->orX(
-						$qb->expr()->eq('item_type', $qb->expr()->literal('file')),
-						$qb->expr()->eq('item_type', $qb->expr()->literal('folder'))
-					)
-				)
-			);
+        $qb = $connection->getQueryBuilder();
+        $qb->select('id', 'file_source', 'uid_owner', 'item_type')
+            ->from('share')
+            ->where(
+                $qb->expr()->andX(
+                    $qb->expr()->eq('share_type', $qb->expr()->literal(IShare::TYPE_LINK)),
+                    $qb->expr()->lte('expiration', $qb->expr()->literal($now)),
+                    $qb->expr()->orX(
+                        $qb->expr()->eq('item_type', $qb->expr()->literal('file')),
+                        $qb->expr()->eq('item_type', $qb->expr()->literal('folder'))
+                    )
+                )
+            );
 
-		$shares = $qb->execute();
-		while ($share = $shares->fetch()) {
-			\OC\Share\Share::unshare($share['item_type'], $share['file_source'], IShare::TYPE_LINK, null, $share['uid_owner']);
-		}
-		$shares->closeCursor();
-	}
+        $shares = $qb->execute();
+        while ($share = $shares->fetch()) {
+            \OC\Share\Share::unshare($share['item_type'], $share['file_source'], IShare::TYPE_LINK, null, $share['uid_owner']);
+        }
+        $shares->closeCursor();
+    }
 }

apps/files_sharing/lib/MountProvider.php

Indentation +200 added lines, -200 removed lines

@@ -40,204 +40,204 @@
 use OCP\Share\IShare;
 
 class MountProvider implements IMountProvider {
-	/**
-	 * @var \OCP\IConfig
-	 */
-	protected $config;
-
-	/**
-	 * @var IManager
-	 */
-	protected $shareManager;
-
-	/**
-	 * @var ILogger
-	 */
-	protected $logger;
-
-	/**
-	 * @param \OCP\IConfig $config
-	 * @param IManager $shareManager
-	 * @param ILogger $logger
-	 */
-	public function __construct(IConfig $config, IManager $shareManager, ILogger $logger) {
-		$this->config = $config;
-		$this->shareManager = $shareManager;
-		$this->logger = $logger;
-	}
-
-
-	/**
-	 * Get all mountpoints applicable for the user and check for shares where we need to update the etags
-	 *
-	 * @param \OCP\IUser $user
-	 * @param \OCP\Files\Storage\IStorageFactory $storageFactory
-	 * @return \OCP\Files\Mount\IMountPoint[]
-	 */
-	public function getMountsForUser(IUser $user, IStorageFactory $storageFactory) {
-		$shares = $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_USER, null, -1);
-		$shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_GROUP, null, -1));
-		$shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_CIRCLE, null, -1));
-		$shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_ROOM, null, -1));
-
-		// filter out excluded shares and group shares that includes self
-		$shares = array_filter($shares, function (\OCP\Share\IShare $share) use ($user) {
-			return $share->getPermissions() > 0 && $share->getShareOwner() !== $user->getUID();
-		});
-
-		$superShares = $this->buildSuperShares($shares, $user);
-
-		$mounts = [];
-		$view = new View('/' . $user->getUID() . '/files');
-		$ownerViews = [];
-		$sharingDisabledForUser = $this->shareManager->sharingDisabledForUser($user->getUID());
-		$foldersExistCache = new CappedMemoryCache();
-		foreach ($superShares as $share) {
-			try {
-				/** @var \OCP\Share\IShare $parentShare */
-				$parentShare = $share[0];
-
-				if ($parentShare->getStatus() !== IShare::STATUS_ACCEPTED &&
-					($parentShare->getShareType() === IShare::TYPE_GROUP ||
-						$parentShare->getShareType() === IShare::TYPE_USERGROUP ||
-						$parentShare->getShareType() === IShare::TYPE_USER)) {
-					continue;
-				}
-
-				$owner = $parentShare->getShareOwner();
-				if (!isset($ownerViews[$owner])) {
-					$ownerViews[$owner] = new View('/' . $parentShare->getShareOwner() . '/files');
-				}
-				$mount = new SharedMount(
-					'\OCA\Files_Sharing\SharedStorage',
-					$mounts,
-					[
-						'user' => $user->getUID(),
-						// parent share
-						'superShare' => $parentShare,
-						// children/component of the superShare
-						'groupedShares' => $share[1],
-						'ownerView' => $ownerViews[$owner],
-						'sharingDisabledForUser' => $sharingDisabledForUser
-					],
-					$storageFactory,
-					$view,
-					$foldersExistCache
-				);
-				$mounts[$mount->getMountPoint()] = $mount;
-			} catch (\Exception $e) {
-				$this->logger->logException($e);
-				$this->logger->error('Error while trying to create shared mount');
-			}
-		}
-
-		// array_filter removes the null values from the array
-		return array_values(array_filter($mounts));
-	}
-
-	/**
-	 * Groups shares by path (nodeId) and target path
-	 *
-	 * @param \OCP\Share\IShare[] $shares
-	 * @return \OCP\Share\IShare[][] array of grouped shares, each element in the
-	 * array is a group which itself is an array of shares
-	 */
-	private function groupShares(array $shares) {
-		$tmp = [];
-
-		foreach ($shares as $share) {
-			if (!isset($tmp[$share->getNodeId()])) {
-				$tmp[$share->getNodeId()] = [];
-			}
-			$tmp[$share->getNodeId()][] = $share;
-		}
-
-		$result = [];
-		// sort by stime, the super share will be based on the least recent share
-		foreach ($tmp as &$tmp2) {
-			@usort($tmp2, function ($a, $b) {
-				$aTime = $a->getShareTime()->getTimestamp();
-				$bTime = $b->getShareTime()->getTimestamp();
-				if ($aTime === $bTime) {
-					return $a->getId() < $b->getId() ? -1 : 1;
-				}
-				return $aTime < $bTime ? -1 : 1;
-			});
-			$result[] = $tmp2;
-		}
-
-		return array_values($result);
-	}
-
-	/**
-	 * Build super shares (virtual share) by grouping them by node id and target,
-	 * then for each group compute the super share and return it along with the matching
-	 * grouped shares. The most permissive permissions are used based on the permissions
-	 * of all shares within the group.
-	 *
-	 * @param \OCP\Share\IShare[] $allShares
-	 * @param \OCP\IUser $user user
-	 * @return array Tuple of [superShare, groupedShares]
-	 */
-	private function buildSuperShares(array $allShares, \OCP\IUser $user) {
-		$result = [];
-
-		$groupedShares = $this->groupShares($allShares);
-
-		/** @var \OCP\Share\IShare[] $shares */
-		foreach ($groupedShares as $shares) {
-			if (count($shares) === 0) {
-				continue;
-			}
-
-			$superShare = $this->shareManager->newShare();
-
-			// compute super share based on first entry of the group
-			$superShare->setId($shares[0]->getId())
-				->setShareOwner($shares[0]->getShareOwner())
-				->setNodeId($shares[0]->getNodeId())
-				->setShareType($shares[0]->getShareType())
-				->setTarget($shares[0]->getTarget());
-
-			// use most permissive permissions
-			$permissions = 0;
-			$status = IShare::STATUS_PENDING;
-			foreach ($shares as $share) {
-				$permissions |= $share->getPermissions();
-				$status = max($status, $share->getStatus());
-
-				if ($share->getTarget() !== $superShare->getTarget()) {
-					// adjust target, for database consistency
-					$share->setTarget($superShare->getTarget());
-					try {
-						$this->shareManager->moveShare($share, $user->getUID());
-					} catch (\InvalidArgumentException $e) {
-						// ignore as it is not important and we don't want to
-						// block FS setup
-
-						// the subsequent code anyway only uses the target of the
-						// super share
-
-						// such issue can usually happen when dealing with
-						// null groups which usually appear with group backend
-						// caching inconsistencies
-						$this->logger->debug(
-							'Could not adjust share target for share ' . $share->getId() . ' to make it consistent: ' . $e->getMessage(),
-							['app' => 'files_sharing']
-						);
-					}
-				}
-				if (!is_null($share->getNodeCacheEntry())) {
-					$superShare->setNodeCacheEntry($share->getNodeCacheEntry());
-				}
-			}
-
-			$superShare->setPermissions($permissions)
-				->setStatus($status);
-
-			$result[] = [$superShare, $shares];
-		}
-
-		return $result;
-	}
+    /**
+     * @var \OCP\IConfig
+     */
+    protected $config;
+
+    /**
+     * @var IManager
+     */
+    protected $shareManager;
+
+    /**
+     * @var ILogger
+     */
+    protected $logger;
+
+    /**
+     * @param \OCP\IConfig $config
+     * @param IManager $shareManager
+     * @param ILogger $logger
+     */
+    public function __construct(IConfig $config, IManager $shareManager, ILogger $logger) {
+        $this->config = $config;
+        $this->shareManager = $shareManager;
+        $this->logger = $logger;
+    }
+
+
+    /**
+     * Get all mountpoints applicable for the user and check for shares where we need to update the etags
+     *
+     * @param \OCP\IUser $user
+     * @param \OCP\Files\Storage\IStorageFactory $storageFactory
+     * @return \OCP\Files\Mount\IMountPoint[]
+     */
+    public function getMountsForUser(IUser $user, IStorageFactory $storageFactory) {
+        $shares = $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_USER, null, -1);
+        $shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_GROUP, null, -1));
+        $shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_CIRCLE, null, -1));
+        $shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_ROOM, null, -1));
+
+        // filter out excluded shares and group shares that includes self
+        $shares = array_filter($shares, function (\OCP\Share\IShare $share) use ($user) {
+            return $share->getPermissions() > 0 && $share->getShareOwner() !== $user->getUID();
+        });
+
+        $superShares = $this->buildSuperShares($shares, $user);
+
+        $mounts = [];
+        $view = new View('/' . $user->getUID() . '/files');
+        $ownerViews = [];
+        $sharingDisabledForUser = $this->shareManager->sharingDisabledForUser($user->getUID());
+        $foldersExistCache = new CappedMemoryCache();
+        foreach ($superShares as $share) {
+            try {
+                /** @var \OCP\Share\IShare $parentShare */
+                $parentShare = $share[0];
+
+                if ($parentShare->getStatus() !== IShare::STATUS_ACCEPTED &&
+                    ($parentShare->getShareType() === IShare::TYPE_GROUP ||
+                        $parentShare->getShareType() === IShare::TYPE_USERGROUP ||
+                        $parentShare->getShareType() === IShare::TYPE_USER)) {
+                    continue;
+                }
+
+                $owner = $parentShare->getShareOwner();
+                if (!isset($ownerViews[$owner])) {
+                    $ownerViews[$owner] = new View('/' . $parentShare->getShareOwner() . '/files');
+                }
+                $mount = new SharedMount(
+                    '\OCA\Files_Sharing\SharedStorage',
+                    $mounts,
+                    [
+                        'user' => $user->getUID(),
+                        // parent share
+                        'superShare' => $parentShare,
+                        // children/component of the superShare
+                        'groupedShares' => $share[1],
+                        'ownerView' => $ownerViews[$owner],
+                        'sharingDisabledForUser' => $sharingDisabledForUser
+                    ],
+                    $storageFactory,
+                    $view,
+                    $foldersExistCache
+                );
+                $mounts[$mount->getMountPoint()] = $mount;
+            } catch (\Exception $e) {
+                $this->logger->logException($e);
+                $this->logger->error('Error while trying to create shared mount');
+            }
+        }
+
+        // array_filter removes the null values from the array
+        return array_values(array_filter($mounts));
+    }
+
+    /**
+     * Groups shares by path (nodeId) and target path
+     *
+     * @param \OCP\Share\IShare[] $shares
+     * @return \OCP\Share\IShare[][] array of grouped shares, each element in the
+     * array is a group which itself is an array of shares
+     */
+    private function groupShares(array $shares) {
+        $tmp = [];
+
+        foreach ($shares as $share) {
+            if (!isset($tmp[$share->getNodeId()])) {
+                $tmp[$share->getNodeId()] = [];
+            }
+            $tmp[$share->getNodeId()][] = $share;
+        }
+
+        $result = [];
+        // sort by stime, the super share will be based on the least recent share
+        foreach ($tmp as &$tmp2) {
+            @usort($tmp2, function ($a, $b) {
+                $aTime = $a->getShareTime()->getTimestamp();
+                $bTime = $b->getShareTime()->getTimestamp();
+                if ($aTime === $bTime) {
+                    return $a->getId() < $b->getId() ? -1 : 1;
+                }
+                return $aTime < $bTime ? -1 : 1;
+            });
+            $result[] = $tmp2;
+        }
+
+        return array_values($result);
+    }
+
+    /**
+     * Build super shares (virtual share) by grouping them by node id and target,
+     * then for each group compute the super share and return it along with the matching
+     * grouped shares. The most permissive permissions are used based on the permissions
+     * of all shares within the group.
+     *
+     * @param \OCP\Share\IShare[] $allShares
+     * @param \OCP\IUser $user user
+     * @return array Tuple of [superShare, groupedShares]
+     */
+    private function buildSuperShares(array $allShares, \OCP\IUser $user) {
+        $result = [];
+
+        $groupedShares = $this->groupShares($allShares);
+
+        /** @var \OCP\Share\IShare[] $shares */
+        foreach ($groupedShares as $shares) {
+            if (count($shares) === 0) {
+                continue;
+            }
+
+            $superShare = $this->shareManager->newShare();
+
+            // compute super share based on first entry of the group
+            $superShare->setId($shares[0]->getId())
+                ->setShareOwner($shares[0]->getShareOwner())
+                ->setNodeId($shares[0]->getNodeId())
+                ->setShareType($shares[0]->getShareType())
+                ->setTarget($shares[0]->getTarget());
+
+            // use most permissive permissions
+            $permissions = 0;
+            $status = IShare::STATUS_PENDING;
+            foreach ($shares as $share) {
+                $permissions |= $share->getPermissions();
+                $status = max($status, $share->getStatus());
+
+                if ($share->getTarget() !== $superShare->getTarget()) {
+                    // adjust target, for database consistency
+                    $share->setTarget($superShare->getTarget());
+                    try {
+                        $this->shareManager->moveShare($share, $user->getUID());
+                    } catch (\InvalidArgumentException $e) {
+                        // ignore as it is not important and we don't want to
+                        // block FS setup
+
+                        // the subsequent code anyway only uses the target of the
+                        // super share
+
+                        // such issue can usually happen when dealing with
+                        // null groups which usually appear with group backend
+                        // caching inconsistencies
+                        $this->logger->debug(
+                            'Could not adjust share target for share ' . $share->getId() . ' to make it consistent: ' . $e->getMessage(),
+                            ['app' => 'files_sharing']
+                        );
+                    }
+                }
+                if (!is_null($share->getNodeCacheEntry())) {
+                    $superShare->setNodeCacheEntry($share->getNodeCacheEntry());
+                }
+            }
+
+            $superShare->setPermissions($permissions)
+                ->setStatus($status);
+
+            $result[] = [$superShare, $shares];
+        }
+
+        return $result;
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -81,14 +81,14 @@ 
 		$shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_ROOM, null, -1));
 
 		// filter out excluded shares and group shares that includes self
-		$shares = array_filter($shares, function (\OCP\Share\IShare $share) use ($user) {
+		$shares = array_filter($shares, function(\OCP\Share\IShare $share) use ($user) {
 			return $share->getPermissions() > 0 && $share->getShareOwner() !== $user->getUID();
 		});
 
 		$superShares = $this->buildSuperShares($shares, $user);
 
 		$mounts = [];
-		$view = new View('/' . $user->getUID() . '/files');
+		$view = new View('/'.$user->getUID().'/files');
 		$ownerViews = [];
 		$sharingDisabledForUser = $this->shareManager->sharingDisabledForUser($user->getUID());
 		$foldersExistCache = new CappedMemoryCache();
@@ -106,7 +106,7 @@ 
 
 				$owner = $parentShare->getShareOwner();
 				if (!isset($ownerViews[$owner])) {
-					$ownerViews[$owner] = new View('/' . $parentShare->getShareOwner() . '/files');
+					$ownerViews[$owner] = new View('/'.$parentShare->getShareOwner().'/files');
 				}
 				$mount = new SharedMount(
 					'\OCA\Files_Sharing\SharedStorage',
@@ -155,7 +155,7 @@ 
 		$result = [];
 		// sort by stime, the super share will be based on the least recent share
 		foreach ($tmp as &$tmp2) {
-			@usort($tmp2, function ($a, $b) {
+			@usort($tmp2, function($a, $b) {
 				$aTime = $a->getShareTime()->getTimestamp();
 				$bTime = $b->getShareTime()->getTimestamp();
 				if ($aTime === $bTime) {
@@ -222,7 +222,7 @@ 
 						// null groups which usually appear with group backend
 						// caching inconsistencies
 						$this->logger->debug(
-							'Could not adjust share target for share ' . $share->getId() . ' to make it consistent: ' . $e->getMessage(),
+							'Could not adjust share target for share '.$share->getId().' to make it consistent: '.$e->getMessage(),
 							['app' => 'files_sharing']
 						);
 					}

apps/files_sharing/lib/External/Manager.php

Indentation +555 added lines, -555 removed lines

@@ -48,600 +48,600 @@
 use OCP\Share\IShare;
 
 class Manager {
-	public const STORAGE = '\OCA\Files_Sharing\External\Storage';
-
-	/**
-	 * @var string
-	 */
-	private $uid;
-
-	/**
-	 * @var IDBConnection
-	 */
-	private $connection;
-
-	/**
-	 * @var \OC\Files\Mount\Manager
-	 */
-	private $mountManager;
-
-	/**
-	 * @var IStorageFactory
-	 */
-	private $storageLoader;
-
-	/**
-	 * @var IClientService
-	 */
-	private $clientService;
-
-	/**
-	 * @var IManager
-	 */
-	private $notificationManager;
-
-	/**
-	 * @var IDiscoveryService
-	 */
-	private $discoveryService;
-
-	/** @var ICloudFederationProviderManager */
-	private $cloudFederationProviderManager;
-
-	/** @var ICloudFederationFactory */
-	private $cloudFederationFactory;
-
-	/** @var IGroupManager  */
-	private $groupManager;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/**
-	 * @param IDBConnection $connection
-	 * @param \OC\Files\Mount\Manager $mountManager
-	 * @param IStorageFactory $storageLoader
-	 * @param IClientService $clientService
-	 * @param IManager $notificationManager
-	 * @param IDiscoveryService $discoveryService
-	 * @param ICloudFederationProviderManager $cloudFederationProviderManager
-	 * @param ICloudFederationFactory $cloudFederationFactory
-	 * @param IGroupManager $groupManager
-	 * @param IUserManager $userManager
-	 * @param string $uid
-	 */
-	public function __construct(IDBConnection $connection,
-								\OC\Files\Mount\Manager $mountManager,
-								IStorageFactory $storageLoader,
-								IClientService $clientService,
-								IManager $notificationManager,
-								IDiscoveryService $discoveryService,
-								ICloudFederationProviderManager $cloudFederationProviderManager,
-								ICloudFederationFactory $cloudFederationFactory,
-								IGroupManager $groupManager,
-								IUserManager $userManager,
-								$uid) {
-		$this->connection = $connection;
-		$this->mountManager = $mountManager;
-		$this->storageLoader = $storageLoader;
-		$this->clientService = $clientService;
-		$this->uid = $uid;
-		$this->notificationManager = $notificationManager;
-		$this->discoveryService = $discoveryService;
-		$this->cloudFederationProviderManager = $cloudFederationProviderManager;
-		$this->cloudFederationFactory = $cloudFederationFactory;
-		$this->groupManager = $groupManager;
-		$this->userManager = $userManager;
-	}
-
-	/**
-	 * add new server-to-server share
-	 *
-	 * @param string $remote
-	 * @param string $token
-	 * @param string $password
-	 * @param string $name
-	 * @param string $owner
-	 * @param int $shareType
-	 * @param boolean $accepted
-	 * @param string $user
-	 * @param int $remoteId
-	 * @param int $parent
-	 * @return Mount|null
-	 * @throws \Doctrine\DBAL\DBALException
-	 */
-	public function addShare($remote, $token, $password, $name, $owner, $shareType, $accepted=false, $user = null, $remoteId = -1, $parent = -1) {
-		$user = $user ? $user : $this->uid;
-		$accepted = $accepted ? IShare::STATUS_ACCEPTED : IShare::STATUS_PENDING;
-		$name = Filesystem::normalizePath('/' . $name);
-
-		if ($accepted !== IShare::STATUS_ACCEPTED) {
-			// To avoid conflicts with the mount point generation later,
-			// we only use a temporary mount point name here. The real
-			// mount point name will be generated when accepting the share,
-			// using the original share item name.
-			$tmpMountPointName = '{{TemporaryMountPointName#' . $name . '}}';
-			$mountPoint = $tmpMountPointName;
-			$hash = md5($tmpMountPointName);
-			$data = [
-				'remote'		=> $remote,
-				'share_token'	=> $token,
-				'password'		=> $password,
-				'name'			=> $name,
-				'owner'			=> $owner,
-				'user'			=> $user,
-				'mountpoint'	=> $mountPoint,
-				'mountpoint_hash'	=> $hash,
-				'accepted'		=> $accepted,
-				'remote_id'		=> $remoteId,
-				'share_type'    => $shareType,
-			];
-
-			$i = 1;
-			while (!$this->connection->insertIfNotExist('*PREFIX*share_external', $data, ['user', 'mountpoint_hash'])) {
-				// The external share already exists for the user
-				$data['mountpoint'] = $tmpMountPointName . '-' . $i;
-				$data['mountpoint_hash'] = md5($data['mountpoint']);
-				$i++;
-			}
-			return null;
-		}
-
-		$mountPoint = Files::buildNotExistingFileName('/', $name);
-		$mountPoint = Filesystem::normalizePath('/' . $mountPoint);
-		$hash = md5($mountPoint);
-
-		$this->writeShareToDb($remote, $token, $password, $name, $owner, $user, $mountPoint, $hash, $accepted, $remoteId, $parent, $shareType);
-
-		$options = [
-			'remote'	=> $remote,
-			'token'		=> $token,
-			'password'	=> $password,
-			'mountpoint'	=> $mountPoint,
-			'owner'		=> $owner
-		];
-		return $this->mountShare($options);
-	}
-
-	/**
-	 * write remote share to the database
-	 *
-	 * @param $remote
-	 * @param $token
-	 * @param $password
-	 * @param $name
-	 * @param $owner
-	 * @param $user
-	 * @param $mountPoint
-	 * @param $hash
-	 * @param $accepted
-	 * @param $remoteId
-	 * @param $parent
-	 * @param $shareType
-	 * @return bool
-	 */
-	private function writeShareToDb($remote, $token, $password, $name, $owner, $user, $mountPoint, $hash, $accepted, $remoteId, $parent, $shareType) {
-		$query = $this->connection->prepare('
+    public const STORAGE = '\OCA\Files_Sharing\External\Storage';
+
+    /**
+     * @var string
+     */
+    private $uid;
+
+    /**
+     * @var IDBConnection
+     */
+    private $connection;
+
+    /**
+     * @var \OC\Files\Mount\Manager
+     */
+    private $mountManager;
+
+    /**
+     * @var IStorageFactory
+     */
+    private $storageLoader;
+
+    /**
+     * @var IClientService
+     */
+    private $clientService;
+
+    /**
+     * @var IManager
+     */
+    private $notificationManager;
+
+    /**
+     * @var IDiscoveryService
+     */
+    private $discoveryService;
+
+    /** @var ICloudFederationProviderManager */
+    private $cloudFederationProviderManager;
+
+    /** @var ICloudFederationFactory */
+    private $cloudFederationFactory;
+
+    /** @var IGroupManager  */
+    private $groupManager;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /**
+     * @param IDBConnection $connection
+     * @param \OC\Files\Mount\Manager $mountManager
+     * @param IStorageFactory $storageLoader
+     * @param IClientService $clientService
+     * @param IManager $notificationManager
+     * @param IDiscoveryService $discoveryService
+     * @param ICloudFederationProviderManager $cloudFederationProviderManager
+     * @param ICloudFederationFactory $cloudFederationFactory
+     * @param IGroupManager $groupManager
+     * @param IUserManager $userManager
+     * @param string $uid
+     */
+    public function __construct(IDBConnection $connection,
+                                \OC\Files\Mount\Manager $mountManager,
+                                IStorageFactory $storageLoader,
+                                IClientService $clientService,
+                                IManager $notificationManager,
+                                IDiscoveryService $discoveryService,
+                                ICloudFederationProviderManager $cloudFederationProviderManager,
+                                ICloudFederationFactory $cloudFederationFactory,
+                                IGroupManager $groupManager,
+                                IUserManager $userManager,
+                                $uid) {
+        $this->connection = $connection;
+        $this->mountManager = $mountManager;
+        $this->storageLoader = $storageLoader;
+        $this->clientService = $clientService;
+        $this->uid = $uid;
+        $this->notificationManager = $notificationManager;
+        $this->discoveryService = $discoveryService;
+        $this->cloudFederationProviderManager = $cloudFederationProviderManager;
+        $this->cloudFederationFactory = $cloudFederationFactory;
+        $this->groupManager = $groupManager;
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * add new server-to-server share
+     *
+     * @param string $remote
+     * @param string $token
+     * @param string $password
+     * @param string $name
+     * @param string $owner
+     * @param int $shareType
+     * @param boolean $accepted
+     * @param string $user
+     * @param int $remoteId
+     * @param int $parent
+     * @return Mount|null
+     * @throws \Doctrine\DBAL\DBALException
+     */
+    public function addShare($remote, $token, $password, $name, $owner, $shareType, $accepted=false, $user = null, $remoteId = -1, $parent = -1) {
+        $user = $user ? $user : $this->uid;
+        $accepted = $accepted ? IShare::STATUS_ACCEPTED : IShare::STATUS_PENDING;
+        $name = Filesystem::normalizePath('/' . $name);
+
+        if ($accepted !== IShare::STATUS_ACCEPTED) {
+            // To avoid conflicts with the mount point generation later,
+            // we only use a temporary mount point name here. The real
+            // mount point name will be generated when accepting the share,
+            // using the original share item name.
+            $tmpMountPointName = '{{TemporaryMountPointName#' . $name . '}}';
+            $mountPoint = $tmpMountPointName;
+            $hash = md5($tmpMountPointName);
+            $data = [
+                'remote'		=> $remote,
+                'share_token'	=> $token,
+                'password'		=> $password,
+                'name'			=> $name,
+                'owner'			=> $owner,
+                'user'			=> $user,
+                'mountpoint'	=> $mountPoint,
+                'mountpoint_hash'	=> $hash,
+                'accepted'		=> $accepted,
+                'remote_id'		=> $remoteId,
+                'share_type'    => $shareType,
+            ];
+
+            $i = 1;
+            while (!$this->connection->insertIfNotExist('*PREFIX*share_external', $data, ['user', 'mountpoint_hash'])) {
+                // The external share already exists for the user
+                $data['mountpoint'] = $tmpMountPointName . '-' . $i;
+                $data['mountpoint_hash'] = md5($data['mountpoint']);
+                $i++;
+            }
+            return null;
+        }
+
+        $mountPoint = Files::buildNotExistingFileName('/', $name);
+        $mountPoint = Filesystem::normalizePath('/' . $mountPoint);
+        $hash = md5($mountPoint);
+
+        $this->writeShareToDb($remote, $token, $password, $name, $owner, $user, $mountPoint, $hash, $accepted, $remoteId, $parent, $shareType);
+
+        $options = [
+            'remote'	=> $remote,
+            'token'		=> $token,
+            'password'	=> $password,
+            'mountpoint'	=> $mountPoint,
+            'owner'		=> $owner
+        ];
+        return $this->mountShare($options);
+    }
+
+    /**
+     * write remote share to the database
+     *
+     * @param $remote
+     * @param $token
+     * @param $password
+     * @param $name
+     * @param $owner
+     * @param $user
+     * @param $mountPoint
+     * @param $hash
+     * @param $accepted
+     * @param $remoteId
+     * @param $parent
+     * @param $shareType
+     * @return bool
+     */
+    private function writeShareToDb($remote, $token, $password, $name, $owner, $user, $mountPoint, $hash, $accepted, $remoteId, $parent, $shareType) {
+        $query = $this->connection->prepare('
 				INSERT INTO `*PREFIX*share_external`
 					(`remote`, `share_token`, `password`, `name`, `owner`, `user`, `mountpoint`, `mountpoint_hash`, `accepted`, `remote_id`, `parent`, `share_type`)
 				VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
 			');
-		return $query->execute([$remote, $token, $password, $name, $owner, $user, $mountPoint, $hash, $accepted, $remoteId, $parent, $shareType]);
-	}
-
-	/**
-	 * get share
-	 *
-	 * @param int $id share id
-	 * @return mixed share of false
-	 */
-	public function getShare($id) {
-		$getShare = $this->connection->prepare('
+        return $query->execute([$remote, $token, $password, $name, $owner, $user, $mountPoint, $hash, $accepted, $remoteId, $parent, $shareType]);
+    }
+
+    /**
+     * get share
+     *
+     * @param int $id share id
+     * @return mixed share of false
+     */
+    public function getShare($id) {
+        $getShare = $this->connection->prepare('
 			SELECT `id`, `remote`, `remote_id`, `share_token`, `name`, `owner`, `user`, `mountpoint`, `accepted`, `parent`, `share_type`, `password`, `mountpoint_hash`
 			FROM  `*PREFIX*share_external`
 			WHERE `id` = ?');
-		$result = $getShare->execute([$id]);
-
-		$share = $result ? $getShare->fetch() : [];
-
-		$validShare = is_array($share) && isset($share['share_type']) && isset($share['user']);
-
-		// check if the user is allowed to access it
-		if ($validShare && (int)$share['share_type'] === IShare::TYPE_USER && $share['user'] === $this->uid) {
-			return $share;
-		} elseif ($validShare && (int)$share['share_type'] === IShare::TYPE_GROUP) {
-			$user = $this->userManager->get($this->uid);
-			if ($this->groupManager->get($share['user'])->inGroup($user)) {
-				return $share;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * accept server-to-server share
-	 *
-	 * @param int $id
-	 * @return bool True if the share could be accepted, false otherwise
-	 */
-	public function acceptShare($id) {
-		$share = $this->getShare($id);
-		$result = false;
-
-		if ($share) {
-			\OC_Util::setupFS($this->uid);
-			$shareFolder = Helper::getShareFolder();
-			$mountPoint = Files::buildNotExistingFileName($shareFolder, $share['name']);
-			$mountPoint = Filesystem::normalizePath($mountPoint);
-			$hash = md5($mountPoint);
-			$userShareAccepted = false;
-
-			if ((int)$share['share_type'] === IShare::TYPE_USER) {
-				$acceptShare = $this->connection->prepare('
+        $result = $getShare->execute([$id]);
+
+        $share = $result ? $getShare->fetch() : [];
+
+        $validShare = is_array($share) && isset($share['share_type']) && isset($share['user']);
+
+        // check if the user is allowed to access it
+        if ($validShare && (int)$share['share_type'] === IShare::TYPE_USER && $share['user'] === $this->uid) {
+            return $share;
+        } elseif ($validShare && (int)$share['share_type'] === IShare::TYPE_GROUP) {
+            $user = $this->userManager->get($this->uid);
+            if ($this->groupManager->get($share['user'])->inGroup($user)) {
+                return $share;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * accept server-to-server share
+     *
+     * @param int $id
+     * @return bool True if the share could be accepted, false otherwise
+     */
+    public function acceptShare($id) {
+        $share = $this->getShare($id);
+        $result = false;
+
+        if ($share) {
+            \OC_Util::setupFS($this->uid);
+            $shareFolder = Helper::getShareFolder();
+            $mountPoint = Files::buildNotExistingFileName($shareFolder, $share['name']);
+            $mountPoint = Filesystem::normalizePath($mountPoint);
+            $hash = md5($mountPoint);
+            $userShareAccepted = false;
+
+            if ((int)$share['share_type'] === IShare::TYPE_USER) {
+                $acceptShare = $this->connection->prepare('
 				UPDATE `*PREFIX*share_external`
 				SET `accepted` = ?,
 					`mountpoint` = ?,
 					`mountpoint_hash` = ?
 				WHERE `id` = ? AND `user` = ?');
-				$userShareAccepted = $acceptShare->execute([1, $mountPoint, $hash, $id, $this->uid]);
-			} else {
-				$result = $this->writeShareToDb(
-					$share['remote'],
-					$share['share_token'],
-					$share['password'],
-					$share['name'],
-					$share['owner'],
-					$this->uid,
-					$mountPoint, $hash, 1,
-					$share['remote_id'],
-					$id,
-					$share['share_type']);
-			}
-			if ($userShareAccepted === true) {
-				$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'accept');
-				\OC_Hook::emit(Share::class, 'federated_share_added', ['server' => $share['remote']]);
-				$result = true;
-			}
-		}
-
-		// Make sure the user has no notification for something that does not exist anymore.
-		$this->processNotification($id);
-
-		return $result;
-	}
-
-	/**
-	 * decline server-to-server share
-	 *
-	 * @param int $id
-	 * @return bool True if the share could be declined, false otherwise
-	 */
-	public function declineShare($id) {
-		$share = $this->getShare($id);
-		$result = false;
-
-		if ($share && (int)$share['share_type'] === IShare::TYPE_USER) {
-			$removeShare = $this->connection->prepare('
+                $userShareAccepted = $acceptShare->execute([1, $mountPoint, $hash, $id, $this->uid]);
+            } else {
+                $result = $this->writeShareToDb(
+                    $share['remote'],
+                    $share['share_token'],
+                    $share['password'],
+                    $share['name'],
+                    $share['owner'],
+                    $this->uid,
+                    $mountPoint, $hash, 1,
+                    $share['remote_id'],
+                    $id,
+                    $share['share_type']);
+            }
+            if ($userShareAccepted === true) {
+                $this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'accept');
+                \OC_Hook::emit(Share::class, 'federated_share_added', ['server' => $share['remote']]);
+                $result = true;
+            }
+        }
+
+        // Make sure the user has no notification for something that does not exist anymore.
+        $this->processNotification($id);
+
+        return $result;
+    }
+
+    /**
+     * decline server-to-server share
+     *
+     * @param int $id
+     * @return bool True if the share could be declined, false otherwise
+     */
+    public function declineShare($id) {
+        $share = $this->getShare($id);
+        $result = false;
+
+        if ($share && (int)$share['share_type'] === IShare::TYPE_USER) {
+            $removeShare = $this->connection->prepare('
 				DELETE FROM `*PREFIX*share_external` WHERE `id` = ? AND `user` = ?');
-			$removeShare->execute([$id, $this->uid]);
-			$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
-
-			$this->processNotification($id);
-			$result = true;
-		} elseif ($share && (int)$share['share_type'] === IShare::TYPE_GROUP) {
-			$result = $this->writeShareToDb(
-				$share['remote'],
-				$share['share_token'],
-				$share['password'],
-				$share['name'],
-				$share['owner'],
-				$this->uid,
-				$share['mountpoint'],
-				$share['mountpoint_hash'],
-				0,
-				$share['remote_id'],
-				$id,
-				$share['share_type']);
-			$this->processNotification($id);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @param int $remoteShare
-	 */
-	public function processNotification($remoteShare) {
-		$filter = $this->notificationManager->createNotification();
-		$filter->setApp('files_sharing')
-			->setUser($this->uid)
-			->setObject('remote_share', (int) $remoteShare);
-		$this->notificationManager->markProcessed($filter);
-	}
-
-	/**
-	 * inform remote server whether server-to-server share was accepted/declined
-	 *
-	 * @param string $remote
-	 * @param string $token
-	 * @param int $remoteId Share id on the remote host
-	 * @param string $feedback
-	 * @return boolean
-	 */
-	private function sendFeedbackToRemote($remote, $token, $remoteId, $feedback) {
-		$result = $this->tryOCMEndPoint($remote, $token, $remoteId, $feedback);
-
-		if ($result === true) {
-			return true;
-		}
-
-		$federationEndpoints = $this->discoveryService->discover($remote, 'FEDERATED_SHARING');
-		$endpoint = isset($federationEndpoints['share']) ? $federationEndpoints['share'] : '/ocs/v2.php/cloud/shares';
-
-		$url = rtrim($remote, '/') . $endpoint . '/' . $remoteId . '/' . $feedback . '?format=' . Share::RESPONSE_FORMAT;
-		$fields = ['token' => $token];
-
-		$client = $this->clientService->newClient();
-
-		try {
-			$response = $client->post(
-				$url,
-				[
-					'body' => $fields,
-					'connect_timeout' => 10,
-				]
-			);
-		} catch (\Exception $e) {
-			return false;
-		}
-
-		$status = json_decode($response->getBody(), true);
-
-		return ($status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200);
-	}
-
-	/**
-	 * try send accept message to ocm end-point
-	 *
-	 * @param string $remoteDomain
-	 * @param string $token
-	 * @param $remoteId id of the share
-	 * @param string $feedback
-	 * @return bool
-	 */
-	protected function tryOCMEndPoint($remoteDomain, $token, $remoteId, $feedback) {
-		switch ($feedback) {
-			case 'accept':
-				$notification = $this->cloudFederationFactory->getCloudFederationNotification();
-				$notification->setMessage(
-					'SHARE_ACCEPTED',
-					'file',
-					$remoteId,
-					[
-						'sharedSecret' => $token,
-						'message' => 'Recipient accept the share'
-					]
-
-				);
-				return $this->cloudFederationProviderManager->sendNotification($remoteDomain, $notification);
-			case 'decline':
-				$notification = $this->cloudFederationFactory->getCloudFederationNotification();
-				$notification->setMessage(
-					'SHARE_DECLINED',
-					'file',
-					$remoteId,
-					[
-						'sharedSecret' => $token,
-						'message' => 'Recipient declined the share'
-					]
-
-				);
-				return $this->cloudFederationProviderManager->sendNotification($remoteDomain, $notification);
-		}
-
-		return false;
-	}
-
-
-	/**
-	 * remove '/user/files' from the path and trailing slashes
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	protected function stripPath($path) {
-		$prefix = '/' . $this->uid . '/files';
-		return rtrim(substr($path, strlen($prefix)), '/');
-	}
-
-	public function getMount($data) {
-		$data['manager'] = $this;
-		$mountPoint = '/' . $this->uid . '/files' . $data['mountpoint'];
-		$data['mountpoint'] = $mountPoint;
-		$data['certificateManager'] = \OC::$server->getCertificateManager($this->uid);
-		return new Mount(self::STORAGE, $mountPoint, $data, $this, $this->storageLoader);
-	}
-
-	/**
-	 * @param array $data
-	 * @return Mount
-	 */
-	protected function mountShare($data) {
-		$mount = $this->getMount($data);
-		$this->mountManager->addMount($mount);
-		return $mount;
-	}
-
-	/**
-	 * @return \OC\Files\Mount\Manager
-	 */
-	public function getMountManager() {
-		return $this->mountManager;
-	}
-
-	/**
-	 * @param string $source
-	 * @param string $target
-	 * @return bool
-	 */
-	public function setMountPoint($source, $target) {
-		$source = $this->stripPath($source);
-		$target = $this->stripPath($target);
-		$sourceHash = md5($source);
-		$targetHash = md5($target);
-
-		$query = $this->connection->prepare('
+            $removeShare->execute([$id, $this->uid]);
+            $this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
+
+            $this->processNotification($id);
+            $result = true;
+        } elseif ($share && (int)$share['share_type'] === IShare::TYPE_GROUP) {
+            $result = $this->writeShareToDb(
+                $share['remote'],
+                $share['share_token'],
+                $share['password'],
+                $share['name'],
+                $share['owner'],
+                $this->uid,
+                $share['mountpoint'],
+                $share['mountpoint_hash'],
+                0,
+                $share['remote_id'],
+                $id,
+                $share['share_type']);
+            $this->processNotification($id);
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param int $remoteShare
+     */
+    public function processNotification($remoteShare) {
+        $filter = $this->notificationManager->createNotification();
+        $filter->setApp('files_sharing')
+            ->setUser($this->uid)
+            ->setObject('remote_share', (int) $remoteShare);
+        $this->notificationManager->markProcessed($filter);
+    }
+
+    /**
+     * inform remote server whether server-to-server share was accepted/declined
+     *
+     * @param string $remote
+     * @param string $token
+     * @param int $remoteId Share id on the remote host
+     * @param string $feedback
+     * @return boolean
+     */
+    private function sendFeedbackToRemote($remote, $token, $remoteId, $feedback) {
+        $result = $this->tryOCMEndPoint($remote, $token, $remoteId, $feedback);
+
+        if ($result === true) {
+            return true;
+        }
+
+        $federationEndpoints = $this->discoveryService->discover($remote, 'FEDERATED_SHARING');
+        $endpoint = isset($federationEndpoints['share']) ? $federationEndpoints['share'] : '/ocs/v2.php/cloud/shares';
+
+        $url = rtrim($remote, '/') . $endpoint . '/' . $remoteId . '/' . $feedback . '?format=' . Share::RESPONSE_FORMAT;
+        $fields = ['token' => $token];
+
+        $client = $this->clientService->newClient();
+
+        try {
+            $response = $client->post(
+                $url,
+                [
+                    'body' => $fields,
+                    'connect_timeout' => 10,
+                ]
+            );
+        } catch (\Exception $e) {
+            return false;
+        }
+
+        $status = json_decode($response->getBody(), true);
+
+        return ($status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200);
+    }
+
+    /**
+     * try send accept message to ocm end-point
+     *
+     * @param string $remoteDomain
+     * @param string $token
+     * @param $remoteId id of the share
+     * @param string $feedback
+     * @return bool
+     */
+    protected function tryOCMEndPoint($remoteDomain, $token, $remoteId, $feedback) {
+        switch ($feedback) {
+            case 'accept':
+                $notification = $this->cloudFederationFactory->getCloudFederationNotification();
+                $notification->setMessage(
+                    'SHARE_ACCEPTED',
+                    'file',
+                    $remoteId,
+                    [
+                        'sharedSecret' => $token,
+                        'message' => 'Recipient accept the share'
+                    ]
+
+                );
+                return $this->cloudFederationProviderManager->sendNotification($remoteDomain, $notification);
+            case 'decline':
+                $notification = $this->cloudFederationFactory->getCloudFederationNotification();
+                $notification->setMessage(
+                    'SHARE_DECLINED',
+                    'file',
+                    $remoteId,
+                    [
+                        'sharedSecret' => $token,
+                        'message' => 'Recipient declined the share'
+                    ]
+
+                );
+                return $this->cloudFederationProviderManager->sendNotification($remoteDomain, $notification);
+        }
+
+        return false;
+    }
+
+
+    /**
+     * remove '/user/files' from the path and trailing slashes
+     *
+     * @param string $path
+     * @return string
+     */
+    protected function stripPath($path) {
+        $prefix = '/' . $this->uid . '/files';
+        return rtrim(substr($path, strlen($prefix)), '/');
+    }
+
+    public function getMount($data) {
+        $data['manager'] = $this;
+        $mountPoint = '/' . $this->uid . '/files' . $data['mountpoint'];
+        $data['mountpoint'] = $mountPoint;
+        $data['certificateManager'] = \OC::$server->getCertificateManager($this->uid);
+        return new Mount(self::STORAGE, $mountPoint, $data, $this, $this->storageLoader);
+    }
+
+    /**
+     * @param array $data
+     * @return Mount
+     */
+    protected function mountShare($data) {
+        $mount = $this->getMount($data);
+        $this->mountManager->addMount($mount);
+        return $mount;
+    }
+
+    /**
+     * @return \OC\Files\Mount\Manager
+     */
+    public function getMountManager() {
+        return $this->mountManager;
+    }
+
+    /**
+     * @param string $source
+     * @param string $target
+     * @return bool
+     */
+    public function setMountPoint($source, $target) {
+        $source = $this->stripPath($source);
+        $target = $this->stripPath($target);
+        $sourceHash = md5($source);
+        $targetHash = md5($target);
+
+        $query = $this->connection->prepare('
 			UPDATE `*PREFIX*share_external`
 			SET `mountpoint` = ?, `mountpoint_hash` = ?
 			WHERE `mountpoint_hash` = ?
 			AND `user` = ?
 		');
-		$result = (bool)$query->execute([$target, $targetHash, $sourceHash, $this->uid]);
+        $result = (bool)$query->execute([$target, $targetHash, $sourceHash, $this->uid]);
 
-		return $result;
-	}
+        return $result;
+    }
 
-	public function removeShare($mountPoint) {
-		$mountPointObj = $this->mountManager->find($mountPoint);
-		$id = $mountPointObj->getStorage()->getCache()->getId('');
+    public function removeShare($mountPoint) {
+        $mountPointObj = $this->mountManager->find($mountPoint);
+        $id = $mountPointObj->getStorage()->getCache()->getId('');
 
-		$mountPoint = $this->stripPath($mountPoint);
-		$hash = md5($mountPoint);
+        $mountPoint = $this->stripPath($mountPoint);
+        $hash = md5($mountPoint);
 
-		$getShare = $this->connection->prepare('
+        $getShare = $this->connection->prepare('
 			SELECT `remote`, `share_token`, `remote_id`, `share_type`, `id`
 			FROM  `*PREFIX*share_external`
 			WHERE `mountpoint_hash` = ? AND `user` = ?');
-		$result = $getShare->execute([$hash, $this->uid]);
-
-		$share = $getShare->fetch();
-		$getShare->closeCursor();
-		if ($result && $share !== false && (int)$share['share_type'] === IShare::TYPE_USER) {
-			try {
-				$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
-			} catch (\Throwable $e) {
-				// if we fail to notify the remote (probably cause the remote is down)
-				// we still want the share to be gone to prevent undeletable remotes
-			}
-
-			$query = $this->connection->prepare('
+        $result = $getShare->execute([$hash, $this->uid]);
+
+        $share = $getShare->fetch();
+        $getShare->closeCursor();
+        if ($result && $share !== false && (int)$share['share_type'] === IShare::TYPE_USER) {
+            try {
+                $this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
+            } catch (\Throwable $e) {
+                // if we fail to notify the remote (probably cause the remote is down)
+                // we still want the share to be gone to prevent undeletable remotes
+            }
+
+            $query = $this->connection->prepare('
 			DELETE FROM `*PREFIX*share_external`
 			WHERE `id` = ?
 			');
-			$result = (bool)$query->execute([(int)$share['id']]);
-		} elseif ($result && (int)$share['share_type'] === IShare::TYPE_GROUP) {
-			$query = $this->connection->prepare('
+            $result = (bool)$query->execute([(int)$share['id']]);
+        } elseif ($result && (int)$share['share_type'] === IShare::TYPE_GROUP) {
+            $query = $this->connection->prepare('
 				UPDATE `*PREFIX*share_external`
 				SET `accepted` = ?
 				WHERE `id` = ?');
-			$result = (bool)$query->execute([0, (int)$share['id']]);
-		}
-
-		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();
-	}
-
-	/**
-	 * remove all shares for user $uid if the user was deleted
-	 *
-	 * @param string $uid
-	 * @return bool
-	 */
-	public function removeUserShares($uid) {
-		$getShare = $this->connection->prepare('
+            $result = (bool)$query->execute([0, (int)$share['id']]);
+        }
+
+        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();
+    }
+
+    /**
+     * remove all shares for user $uid if the user was deleted
+     *
+     * @param string $uid
+     * @return bool
+     */
+    public function removeUserShares($uid) {
+        $getShare = $this->connection->prepare('
 			SELECT `remote`, `share_token`, `remote_id`
 			FROM  `*PREFIX*share_external`
 			WHERE `user` = ?');
-		$result = $getShare->execute([$uid]);
+        $result = $getShare->execute([$uid]);
 
-		if ($result) {
-			$shares = $getShare->fetchAll();
-			foreach ($shares as $share) {
-				$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
-			}
-		}
+        if ($result) {
+            $shares = $getShare->fetchAll();
+            foreach ($shares as $share) {
+                $this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
+            }
+        }
 
-		$query = $this->connection->prepare('
+        $query = $this->connection->prepare('
 			DELETE FROM `*PREFIX*share_external`
 			WHERE `user` = ?
 		');
-		return (bool)$query->execute([$uid]);
-	}
-
-	/**
-	 * return a list of shares which are not yet accepted by the user
-	 *
-	 * @return array list of open server-to-server shares
-	 */
-	public function getOpenShares() {
-		return $this->getShares(false);
-	}
-
-	/**
-	 * return a list of shares which are accepted by the user
-	 *
-	 * @return array list of accepted server-to-server shares
-	 */
-	public function getAcceptedShares() {
-		return $this->getShares(true);
-	}
-
-	/**
-	 * return a list of shares for the user
-	 *
-	 * @param bool|null $accepted True for accepted only,
-	 *                            false for not accepted,
-	 *                            null for all shares of the user
-	 * @return array list of open server-to-server shares
-	 */
-	private function getShares($accepted) {
-		$user = $this->userManager->get($this->uid);
-		$groups = $this->groupManager->getUserGroups($user);
-		$userGroups = [];
-		foreach ($groups as $group) {
-			$userGroups[] = $group->getGID();
-		}
-
-		$query = 'SELECT `id`, `remote`, `remote_id`, `share_token`, `name`, `owner`, `user`, `mountpoint`, `accepted`
+        return (bool)$query->execute([$uid]);
+    }
+
+    /**
+     * return a list of shares which are not yet accepted by the user
+     *
+     * @return array list of open server-to-server shares
+     */
+    public function getOpenShares() {
+        return $this->getShares(false);
+    }
+
+    /**
+     * return a list of shares which are accepted by the user
+     *
+     * @return array list of accepted server-to-server shares
+     */
+    public function getAcceptedShares() {
+        return $this->getShares(true);
+    }
+
+    /**
+     * return a list of shares for the user
+     *
+     * @param bool|null $accepted True for accepted only,
+     *                            false for not accepted,
+     *                            null for all shares of the user
+     * @return array list of open server-to-server shares
+     */
+    private function getShares($accepted) {
+        $user = $this->userManager->get($this->uid);
+        $groups = $this->groupManager->getUserGroups($user);
+        $userGroups = [];
+        foreach ($groups as $group) {
+            $userGroups[] = $group->getGID();
+        }
+
+        $query = 'SELECT `id`, `remote`, `remote_id`, `share_token`, `name`, `owner`, `user`, `mountpoint`, `accepted`
 		          FROM `*PREFIX*share_external`
 				  WHERE (`user` = ? OR `user` IN (?))';
-		$parameters = [$this->uid, implode(',',$userGroups)];
-		if (!is_null($accepted)) {
-			$query .= ' AND `accepted` = ?';
-			$parameters[] = (int) $accepted;
-		}
-		$query .= ' ORDER BY `id` ASC';
-
-		$shares = $this->connection->prepare($query);
-		$result = $shares->execute($parameters);
-
-		return $result ? $shares->fetchAll() : [];
-	}
+        $parameters = [$this->uid, implode(',',$userGroups)];
+        if (!is_null($accepted)) {
+            $query .= ' AND `accepted` = ?';
+            $parameters[] = (int) $accepted;
+        }
+        $query .= ' ORDER BY `id` ASC';
+
+        $shares = $this->connection->prepare($query);
+        $result = $shares->execute($parameters);
+
+        return $result ? $shares->fetchAll() : [];
+    }
 }

Spacing +21 added lines, -21 removed lines

@@ -150,17 +150,17 @@ 
 	 * @return Mount|null
 	 * @throws \Doctrine\DBAL\DBALException
 	 */
-	public function addShare($remote, $token, $password, $name, $owner, $shareType, $accepted=false, $user = null, $remoteId = -1, $parent = -1) {
+	public function addShare($remote, $token, $password, $name, $owner, $shareType, $accepted = false, $user = null, $remoteId = -1, $parent = -1) {
 		$user = $user ? $user : $this->uid;
 		$accepted = $accepted ? IShare::STATUS_ACCEPTED : IShare::STATUS_PENDING;
-		$name = Filesystem::normalizePath('/' . $name);
+		$name = Filesystem::normalizePath('/'.$name);
 
 		if ($accepted !== IShare::STATUS_ACCEPTED) {
 			// To avoid conflicts with the mount point generation later,
 			// we only use a temporary mount point name here. The real
 			// mount point name will be generated when accepting the share,
 			// using the original share item name.
-			$tmpMountPointName = '{{TemporaryMountPointName#' . $name . '}}';
+			$tmpMountPointName = '{{TemporaryMountPointName#'.$name.'}}';
 			$mountPoint = $tmpMountPointName;
 			$hash = md5($tmpMountPointName);
 			$data = [
@@ -180,7 +180,7 @@ 
 			$i = 1;
 			while (!$this->connection->insertIfNotExist('*PREFIX*share_external', $data, ['user', 'mountpoint_hash'])) {
 				// The external share already exists for the user
-				$data['mountpoint'] = $tmpMountPointName . '-' . $i;
+				$data['mountpoint'] = $tmpMountPointName.'-'.$i;
 				$data['mountpoint_hash'] = md5($data['mountpoint']);
 				$i++;
 			}
@@ -188,7 +188,7 @@ 
 		}
 
 		$mountPoint = Files::buildNotExistingFileName('/', $name);
-		$mountPoint = Filesystem::normalizePath('/' . $mountPoint);
+		$mountPoint = Filesystem::normalizePath('/'.$mountPoint);
 		$hash = md5($mountPoint);
 
 		$this->writeShareToDb($remote, $token, $password, $name, $owner, $user, $mountPoint, $hash, $accepted, $remoteId, $parent, $shareType);
@@ -247,9 +247,9 @@ 
 		$validShare = is_array($share) && isset($share['share_type']) && isset($share['user']);
 
 		// check if the user is allowed to access it
-		if ($validShare && (int)$share['share_type'] === IShare::TYPE_USER && $share['user'] === $this->uid) {
+		if ($validShare && (int) $share['share_type'] === IShare::TYPE_USER && $share['user'] === $this->uid) {
 			return $share;
-		} elseif ($validShare && (int)$share['share_type'] === IShare::TYPE_GROUP) {
+		} elseif ($validShare && (int) $share['share_type'] === IShare::TYPE_GROUP) {
 			$user = $this->userManager->get($this->uid);
 			if ($this->groupManager->get($share['user'])->inGroup($user)) {
 				return $share;
@@ -277,7 +277,7 @@ 
 			$hash = md5($mountPoint);
 			$userShareAccepted = false;
 
-			if ((int)$share['share_type'] === IShare::TYPE_USER) {
+			if ((int) $share['share_type'] === IShare::TYPE_USER) {
 				$acceptShare = $this->connection->prepare('
 				UPDATE `*PREFIX*share_external`
 				SET `accepted` = ?,
@@ -321,7 +321,7 @@ 
 		$share = $this->getShare($id);
 		$result = false;
 
-		if ($share && (int)$share['share_type'] === IShare::TYPE_USER) {
+		if ($share && (int) $share['share_type'] === IShare::TYPE_USER) {
 			$removeShare = $this->connection->prepare('
 				DELETE FROM `*PREFIX*share_external` WHERE `id` = ? AND `user` = ?');
 			$removeShare->execute([$id, $this->uid]);
@@ -329,7 +329,7 @@ 
 
 			$this->processNotification($id);
 			$result = true;
-		} elseif ($share && (int)$share['share_type'] === IShare::TYPE_GROUP) {
+		} elseif ($share && (int) $share['share_type'] === IShare::TYPE_GROUP) {
 			$result = $this->writeShareToDb(
 				$share['remote'],
 				$share['share_token'],
@@ -379,7 +379,7 @@ 
 		$federationEndpoints = $this->discoveryService->discover($remote, 'FEDERATED_SHARING');
 		$endpoint = isset($federationEndpoints['share']) ? $federationEndpoints['share'] : '/ocs/v2.php/cloud/shares';
 
-		$url = rtrim($remote, '/') . $endpoint . '/' . $remoteId . '/' . $feedback . '?format=' . Share::RESPONSE_FORMAT;
+		$url = rtrim($remote, '/').$endpoint.'/'.$remoteId.'/'.$feedback.'?format='.Share::RESPONSE_FORMAT;
 		$fields = ['token' => $token];
 
 		$client = $this->clientService->newClient();
@@ -451,13 +451,13 @@ 
 	 * @return string
 	 */
 	protected function stripPath($path) {
-		$prefix = '/' . $this->uid . '/files';
+		$prefix = '/'.$this->uid.'/files';
 		return rtrim(substr($path, strlen($prefix)), '/');
 	}
 
 	public function getMount($data) {
 		$data['manager'] = $this;
-		$mountPoint = '/' . $this->uid . '/files' . $data['mountpoint'];
+		$mountPoint = '/'.$this->uid.'/files'.$data['mountpoint'];
 		$data['mountpoint'] = $mountPoint;
 		$data['certificateManager'] = \OC::$server->getCertificateManager($this->uid);
 		return new Mount(self::STORAGE, $mountPoint, $data, $this, $this->storageLoader);
@@ -497,7 +497,7 @@ 
 			WHERE `mountpoint_hash` = ?
 			AND `user` = ?
 		');
-		$result = (bool)$query->execute([$target, $targetHash, $sourceHash, $this->uid]);
+		$result = (bool) $query->execute([$target, $targetHash, $sourceHash, $this->uid]);
 
 		return $result;
 	}
@@ -517,7 +517,7 @@ 
 
 		$share = $getShare->fetch();
 		$getShare->closeCursor();
-		if ($result && $share !== false && (int)$share['share_type'] === IShare::TYPE_USER) {
+		if ($result && $share !== false && (int) $share['share_type'] === IShare::TYPE_USER) {
 			try {
 				$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
 			} catch (\Throwable $e) {
@@ -529,13 +529,13 @@ 
 			DELETE FROM `*PREFIX*share_external`
 			WHERE `id` = ?
 			');
-			$result = (bool)$query->execute([(int)$share['id']]);
-		} elseif ($result && (int)$share['share_type'] === IShare::TYPE_GROUP) {
+			$result = (bool) $query->execute([(int) $share['id']]);
+		} elseif ($result && (int) $share['share_type'] === IShare::TYPE_GROUP) {
 			$query = $this->connection->prepare('
 				UPDATE `*PREFIX*share_external`
 				SET `accepted` = ?
 				WHERE `id` = ?');
-			$result = (bool)$query->execute([0, (int)$share['id']]);
+			$result = (bool) $query->execute([0, (int) $share['id']]);
 		}
 
 		if ($result) {
@@ -559,7 +559,7 @@ 
 
 
 		$query->delete('federated_reshares')
-			->where($query->expr()->in('share_id', $query->createFunction('(' . $select . ')')));
+			->where($query->expr()->in('share_id', $query->createFunction('('.$select.')')));
 		$query->execute();
 
 		$deleteReShares = $this->connection->getQueryBuilder();
@@ -592,7 +592,7 @@ 
 			DELETE FROM `*PREFIX*share_external`
 			WHERE `user` = ?
 		');
-		return (bool)$query->execute([$uid]);
+		return (bool) $query->execute([$uid]);
 	}
 
 	/**
@@ -632,7 +632,7 @@ 
 		$query = 'SELECT `id`, `remote`, `remote_id`, `share_token`, `name`, `owner`, `user`, `mountpoint`, `accepted`
 		          FROM `*PREFIX*share_external`
 				  WHERE (`user` = ? OR `user` IN (?))';
-		$parameters = [$this->uid, implode(',',$userGroups)];
+		$parameters = [$this->uid, implode(',', $userGroups)];
 		if (!is_null($accepted)) {
 			$query .= ' AND `accepted` = ?';
 			$parameters[] = (int) $accepted;

apps/files_sharing/lib/Updater.php

Indentation +65 added lines, -65 removed lines

@@ -31,80 +31,80 @@
 
 class Updater {
 
-	/**
-	 * @param array $params
-	 */
-	public static function renameHook($params) {
-		self::renameChildren($params['oldpath'], $params['newpath']);
-		self::moveShareToShare($params['newpath']);
-	}
+    /**
+     * @param array $params
+     */
+    public static function renameHook($params) {
+        self::renameChildren($params['oldpath'], $params['newpath']);
+        self::moveShareToShare($params['newpath']);
+    }
 
-	/**
-	 * Fix for https://github.com/owncloud/core/issues/20769
-	 *
-	 * The owner is allowed to move their files (if they are shared) into a receiving folder
-	 * In this case we need to update the parent of the moved share. Since they are
-	 * effectively handing over ownership of the file the rest of the code needs to know
-	 * they need to build up the reshare tree.
-	 *
-	 * @param string $path
-	 */
-	private static function moveShareToShare($path) {
-		$userFolder = \OC::$server->getUserFolder();
+    /**
+     * Fix for https://github.com/owncloud/core/issues/20769
+     *
+     * The owner is allowed to move their files (if they are shared) into a receiving folder
+     * In this case we need to update the parent of the moved share. Since they are
+     * effectively handing over ownership of the file the rest of the code needs to know
+     * they need to build up the reshare tree.
+     *
+     * @param string $path
+     */
+    private static function moveShareToShare($path) {
+        $userFolder = \OC::$server->getUserFolder();
 
-		// If the user folder can't be constructed (e.g. link share) just return.
-		if ($userFolder === null) {
-			return;
-		}
+        // If the user folder can't be constructed (e.g. link share) just return.
+        if ($userFolder === null) {
+            return;
+        }
 
-		$src = $userFolder->get($path);
+        $src = $userFolder->get($path);
 
-		$shareManager = \OC::$server->getShareManager();
+        $shareManager = \OC::$server->getShareManager();
 
-		$shares = $shareManager->getSharesBy($userFolder->getOwner()->getUID(), IShare::TYPE_USER, $src, false, -1);
-		$shares = array_merge($shares, $shareManager->getSharesBy($userFolder->getOwner()->getUID(), IShare::TYPE_GROUP, $src, false, -1));
-		$shares = array_merge($shares, $shareManager->getSharesBy($userFolder->getOwner()->getUID(), IShare::TYPE_ROOM, $src, false, -1));
+        $shares = $shareManager->getSharesBy($userFolder->getOwner()->getUID(), IShare::TYPE_USER, $src, false, -1);
+        $shares = array_merge($shares, $shareManager->getSharesBy($userFolder->getOwner()->getUID(), IShare::TYPE_GROUP, $src, false, -1));
+        $shares = array_merge($shares, $shareManager->getSharesBy($userFolder->getOwner()->getUID(), IShare::TYPE_ROOM, $src, false, -1));
 
-		// If the path we move is not a share we don't care
-		if (empty($shares)) {
-			return;
-		}
+        // If the path we move is not a share we don't care
+        if (empty($shares)) {
+            return;
+        }
 
-		// Check if the destination is inside a share
-		$mountManager = \OC::$server->getMountManager();
-		$dstMount = $mountManager->find($src->getPath());
-		if (!($dstMount instanceof \OCA\Files_Sharing\SharedMount)) {
-			return;
-		}
+        // Check if the destination is inside a share
+        $mountManager = \OC::$server->getMountManager();
+        $dstMount = $mountManager->find($src->getPath());
+        if (!($dstMount instanceof \OCA\Files_Sharing\SharedMount)) {
+            return;
+        }
 
-		$newOwner = $dstMount->getShare()->getShareOwner();
+        $newOwner = $dstMount->getShare()->getShareOwner();
 
-		//Ownership is moved over
-		foreach ($shares as $share) {
-			/** @var IShare $share */
-			$share->setShareOwner($newOwner);
-			$shareManager->updateShare($share);
-		}
-	}
+        //Ownership is moved over
+        foreach ($shares as $share) {
+            /** @var IShare $share */
+            $share->setShareOwner($newOwner);
+            $shareManager->updateShare($share);
+        }
+    }
 
-	/**
-	 * rename mount point from the children if the parent was renamed
-	 *
-	 * @param string $oldPath old path relative to data/user/files
-	 * @param string $newPath new path relative to data/user/files
-	 */
-	private static function renameChildren($oldPath, $newPath) {
-		$absNewPath =  \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $newPath);
-		$absOldPath =  \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $oldPath);
+    /**
+     * rename mount point from the children if the parent was renamed
+     *
+     * @param string $oldPath old path relative to data/user/files
+     * @param string $newPath new path relative to data/user/files
+     */
+    private static function renameChildren($oldPath, $newPath) {
+        $absNewPath =  \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $newPath);
+        $absOldPath =  \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $oldPath);
 
-		$mountManager = \OC\Files\Filesystem::getMountManager();
-		$mountedShares = $mountManager->findIn('/' . \OCP\User::getUser() . '/files/' . $oldPath);
-		foreach ($mountedShares as $mount) {
-			if ($mount->getStorage()->instanceOfStorage(ISharedStorage::class)) {
-				$mountPoint = $mount->getMountPoint();
-				$target = str_replace($absOldPath, $absNewPath, $mountPoint);
-				$mount->moveMount($target);
-			}
-		}
-	}
+        $mountManager = \OC\Files\Filesystem::getMountManager();
+        $mountedShares = $mountManager->findIn('/' . \OCP\User::getUser() . '/files/' . $oldPath);
+        foreach ($mountedShares as $mount) {
+            if ($mount->getStorage()->instanceOfStorage(ISharedStorage::class)) {
+                $mountPoint = $mount->getMountPoint();
+                $target = str_replace($absOldPath, $absNewPath, $mountPoint);
+                $mount->moveMount($target);
+            }
+        }
+    }
 }