nextcloud / server

apps/files/ajax/list.php

Indentation +56 added lines, -56 removed lines

@@ -32,72 +32,72 @@
 $dir = \OC\Files\Filesystem::normalizePath($dir);
 
 try {
-	$dirInfo = \OC\Files\Filesystem::getFileInfo($dir);
-	if (!$dirInfo || !$dirInfo->getType() === 'dir') {
-		header("HTTP/1.0 404 Not Found");
-		exit();
-	}
+    $dirInfo = \OC\Files\Filesystem::getFileInfo($dir);
+    if (!$dirInfo || !$dirInfo->getType() === 'dir') {
+        header("HTTP/1.0 404 Not Found");
+        exit();
+    }
 
-	$data = array();
-	$baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir=';
+    $data = array();
+    $baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir=';
 
-	$permissions = $dirInfo->getPermissions();
+    $permissions = $dirInfo->getPermissions();
 
-	$sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name';
-	$sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false;
-	$mimetypeFilters = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes']) : '';
+    $sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name';
+    $sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false;
+    $mimetypeFilters = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes']) : '';
 
-	$files = [];
-	// Clean up duplicates from array
-	if (is_array($mimetypeFilters) && count($mimetypeFilters)) {
-		$mimetypeFilters = array_unique($mimetypeFilters);
+    $files = [];
+    // Clean up duplicates from array
+    if (is_array($mimetypeFilters) && count($mimetypeFilters)) {
+        $mimetypeFilters = array_unique($mimetypeFilters);
 
-		if (!in_array('httpd/unix-directory', $mimetypeFilters)) {
-			// append folder filter to be able to browse folders
-			$mimetypeFilters[] = 'httpd/unix-directory';
-		}
+        if (!in_array('httpd/unix-directory', $mimetypeFilters)) {
+            // append folder filter to be able to browse folders
+            $mimetypeFilters[] = 'httpd/unix-directory';
+        }
 
-		// create filelist with mimetype filter - as getFiles only supports on
-		// mimetype filter at once we will filter this folder for each
-		// mimetypeFilter
-		foreach ($mimetypeFilters as $mimetypeFilter) {
-			$files = array_merge($files, \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection, $mimetypeFilter));
-		}
+        // create filelist with mimetype filter - as getFiles only supports on
+        // mimetype filter at once we will filter this folder for each
+        // mimetypeFilter
+        foreach ($mimetypeFilters as $mimetypeFilter) {
+            $files = array_merge($files, \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection, $mimetypeFilter));
+        }
 
-		// sort the files accordingly
-		$files = \OCA\Files\Helper::sortFiles($files, $sortAttribute, $sortDirection);
-	} else {
-		// create file list without mimetype filter
-		$files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection);
-	}
+        // sort the files accordingly
+        $files = \OCA\Files\Helper::sortFiles($files, $sortAttribute, $sortDirection);
+    } else {
+        // create file list without mimetype filter
+        $files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection);
+    }
 
-	$data['directory'] = $dir;
-	$data['files'] = \OCA\Files\Helper::formatFileInfos($files);
-	$data['permissions'] = $permissions;
+    $data['directory'] = $dir;
+    $data['files'] = \OCA\Files\Helper::formatFileInfos($files);
+    $data['permissions'] = $permissions;
 
-	OCP\JSON::success(array('data' => $data));
+    OCP\JSON::success(array('data' => $data));
 } catch (\OCP\Files\StorageNotAvailableException $e) {
-	\OCP\Util::logException('files', $e);
-	OCP\JSON::error([
-		'data' => [
-			'exception' => '\OCP\Files\StorageNotAvailableException',
-			'message' => $l->t('Storage is temporarily not available')
-		]
-	]);
+    \OCP\Util::logException('files', $e);
+    OCP\JSON::error([
+        'data' => [
+            'exception' => '\OCP\Files\StorageNotAvailableException',
+            'message' => $l->t('Storage is temporarily not available')
+        ]
+    ]);
 } catch (\OCP\Files\StorageInvalidException $e) {
-	\OCP\Util::logException('files', $e);
-	OCP\JSON::error(array(
-		'data' => array(
-			'exception' => '\OCP\Files\StorageInvalidException',
-			'message' => $l->t('Storage invalid')
-		)
-	));
+    \OCP\Util::logException('files', $e);
+    OCP\JSON::error(array(
+        'data' => array(
+            'exception' => '\OCP\Files\StorageInvalidException',
+            'message' => $l->t('Storage invalid')
+        )
+    ));
 } catch (\Exception $e) {
-	\OCP\Util::logException('files', $e);
-	OCP\JSON::error(array(
-		'data' => array(
-			'exception' => '\Exception',
-			'message' => $l->t('Unknown error')
-		)
-	));
+    \OCP\Util::logException('files', $e);
+    OCP\JSON::error(array(
+        'data' => array(
+            'exception' => '\Exception',
+            'message' => $l->t('Unknown error')
+        )
+    ));
 }

apps/files/lib/Helper.php

Indentation +211 added lines, -211 removed lines

@@ -37,234 +37,234 @@
  * Helper class for manipulating file information
  */
 class Helper {
-	/**
-	 * @param string $dir
-	 * @return array
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public static function buildFileStorageStatistics($dir) {
-		// information about storage capacities
-		$storageInfo = \OC_Helper::getStorageInfo($dir);
-		$l = \OC::$server->getL10N('files');
-		$maxUploadFileSize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']);
-		$maxHumanFileSize = \OCP\Util::humanFileSize($maxUploadFileSize);
-		$maxHumanFileSize = $l->t('Upload (max. %s)', array($maxHumanFileSize));
+    /**
+     * @param string $dir
+     * @return array
+     * @throws \OCP\Files\NotFoundException
+     */
+    public static function buildFileStorageStatistics($dir) {
+        // information about storage capacities
+        $storageInfo = \OC_Helper::getStorageInfo($dir);
+        $l = \OC::$server->getL10N('files');
+        $maxUploadFileSize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']);
+        $maxHumanFileSize = \OCP\Util::humanFileSize($maxUploadFileSize);
+        $maxHumanFileSize = $l->t('Upload (max. %s)', array($maxHumanFileSize));
 
-		return [
-			'uploadMaxFilesize' => $maxUploadFileSize,
-			'maxHumanFilesize'  => $maxHumanFileSize,
-			'freeSpace' => $storageInfo['free'],
-			'usedSpacePercent'  => (int)$storageInfo['relative'],
-			'owner' => $storageInfo['owner'],
-			'ownerDisplayName' => $storageInfo['ownerDisplayName'],
-		];
-	}
+        return [
+            'uploadMaxFilesize' => $maxUploadFileSize,
+            'maxHumanFilesize'  => $maxHumanFileSize,
+            'freeSpace' => $storageInfo['free'],
+            'usedSpacePercent'  => (int)$storageInfo['relative'],
+            'owner' => $storageInfo['owner'],
+            'ownerDisplayName' => $storageInfo['ownerDisplayName'],
+        ];
+    }
 
-	/**
-	 * Determine icon for a given file
-	 *
-	 * @param \OCP\Files\FileInfo $file file info
-	 * @return string icon URL
-	 */
-	public static function determineIcon($file) {
-		if($file['type'] === 'dir') {
-			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir');
-			// TODO: move this part to the client side, using mountType
-			if ($file->isShared()) {
-				$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-shared');
-			} elseif ($file->isMounted()) {
-				$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external');
-			}
-		}else{
-			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype());
-		}
+    /**
+     * Determine icon for a given file
+     *
+     * @param \OCP\Files\FileInfo $file file info
+     * @return string icon URL
+     */
+    public static function determineIcon($file) {
+        if($file['type'] === 'dir') {
+            $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir');
+            // TODO: move this part to the client side, using mountType
+            if ($file->isShared()) {
+                $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-shared');
+            } elseif ($file->isMounted()) {
+                $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external');
+            }
+        }else{
+            $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype());
+        }
 
-		return substr($icon, 0, -3) . 'svg';
-	}
+        return substr($icon, 0, -3) . 'svg';
+    }
 
-	/**
-	 * Comparator function to sort files alphabetically and have
-	 * the directories appear first
-	 *
-	 * @param \OCP\Files\FileInfo $a file
-	 * @param \OCP\Files\FileInfo $b file
-	 * @return int -1 if $a must come before $b, 1 otherwise
-	 */
-	public static function compareFileNames(FileInfo $a, FileInfo $b) {
-		$aType = $a->getType();
-		$bType = $b->getType();
-		if ($aType === 'dir' and $bType !== 'dir') {
-			return -1;
-		} elseif ($aType !== 'dir' and $bType === 'dir') {
-			return 1;
-		} else {
-			return \OCP\Util::naturalSortCompare($a->getName(), $b->getName());
-		}
-	}
+    /**
+     * Comparator function to sort files alphabetically and have
+     * the directories appear first
+     *
+     * @param \OCP\Files\FileInfo $a file
+     * @param \OCP\Files\FileInfo $b file
+     * @return int -1 if $a must come before $b, 1 otherwise
+     */
+    public static function compareFileNames(FileInfo $a, FileInfo $b) {
+        $aType = $a->getType();
+        $bType = $b->getType();
+        if ($aType === 'dir' and $bType !== 'dir') {
+            return -1;
+        } elseif ($aType !== 'dir' and $bType === 'dir') {
+            return 1;
+        } else {
+            return \OCP\Util::naturalSortCompare($a->getName(), $b->getName());
+        }
+    }
 
-	/**
-	 * Comparator function to sort files by date
-	 *
-	 * @param \OCP\Files\FileInfo $a file
-	 * @param \OCP\Files\FileInfo $b file
-	 * @return int -1 if $a must come before $b, 1 otherwise
-	 */
-	public static function compareTimestamp(FileInfo $a, FileInfo $b) {
-		$aTime = $a->getMTime();
-		$bTime = $b->getMTime();
-		return ($aTime < $bTime) ? -1 : 1;
-	}
+    /**
+     * Comparator function to sort files by date
+     *
+     * @param \OCP\Files\FileInfo $a file
+     * @param \OCP\Files\FileInfo $b file
+     * @return int -1 if $a must come before $b, 1 otherwise
+     */
+    public static function compareTimestamp(FileInfo $a, FileInfo $b) {
+        $aTime = $a->getMTime();
+        $bTime = $b->getMTime();
+        return ($aTime < $bTime) ? -1 : 1;
+    }
 
-	/**
-	 * Comparator function to sort files by size
-	 *
-	 * @param \OCP\Files\FileInfo $a file
-	 * @param \OCP\Files\FileInfo $b file
-	 * @return int -1 if $a must come before $b, 1 otherwise
-	 */
-	public static function compareSize(FileInfo $a, FileInfo $b) {
-		$aSize = $a->getSize();
-		$bSize = $b->getSize();
-		return ($aSize < $bSize) ? -1 : 1;
-	}
+    /**
+     * Comparator function to sort files by size
+     *
+     * @param \OCP\Files\FileInfo $a file
+     * @param \OCP\Files\FileInfo $b file
+     * @return int -1 if $a must come before $b, 1 otherwise
+     */
+    public static function compareSize(FileInfo $a, FileInfo $b) {
+        $aSize = $a->getSize();
+        $bSize = $b->getSize();
+        return ($aSize < $bSize) ? -1 : 1;
+    }
 
-	/**
-	 * Formats the file info to be returned as JSON to the client.
-	 *
-	 * @param \OCP\Files\FileInfo $i
-	 * @return array formatted file info
-	 */
-	public static function formatFileInfo(FileInfo $i) {
-		$entry = array();
+    /**
+     * Formats the file info to be returned as JSON to the client.
+     *
+     * @param \OCP\Files\FileInfo $i
+     * @return array formatted file info
+     */
+    public static function formatFileInfo(FileInfo $i) {
+        $entry = array();
 
-		$entry['id'] = $i['fileid'];
-		$entry['parentId'] = $i['parent'];
-		$entry['mtime'] = $i['mtime'] * 1000;
-		// only pick out the needed attributes
-		$entry['name'] = $i->getName();
-		$entry['permissions'] = $i['permissions'];
-		$entry['mimetype'] = $i['mimetype'];
-		$entry['size'] = $i['size'];
-		$entry['type'] = $i['type'];
-		$entry['etag'] = $i['etag'];
-		if (isset($i['tags'])) {
-			$entry['tags'] = $i['tags'];
-		}
-		if (isset($i['displayname_owner'])) {
-			$entry['shareOwner'] = $i['displayname_owner'];
-		}
-		if (isset($i['is_share_mount_point'])) {
-			$entry['isShareMountPoint'] = $i['is_share_mount_point'];
-		}
-		$mountType = null;
-		if ($i->isShared()) {
-			$mountType = 'shared';
-		} else if ($i->isMounted()) {
-			$mountType = 'external';
-		}
-		if ($mountType !== null) {
-			if ($i->getInternalPath() === '') {
-				$mountType .= '-root';
-			}
-			$entry['mountType'] = $mountType;
-		}
-		if (isset($i['extraData'])) {
-			$entry['extraData'] = $i['extraData'];
-		}
-		return $entry;
-	}
+        $entry['id'] = $i['fileid'];
+        $entry['parentId'] = $i['parent'];
+        $entry['mtime'] = $i['mtime'] * 1000;
+        // only pick out the needed attributes
+        $entry['name'] = $i->getName();
+        $entry['permissions'] = $i['permissions'];
+        $entry['mimetype'] = $i['mimetype'];
+        $entry['size'] = $i['size'];
+        $entry['type'] = $i['type'];
+        $entry['etag'] = $i['etag'];
+        if (isset($i['tags'])) {
+            $entry['tags'] = $i['tags'];
+        }
+        if (isset($i['displayname_owner'])) {
+            $entry['shareOwner'] = $i['displayname_owner'];
+        }
+        if (isset($i['is_share_mount_point'])) {
+            $entry['isShareMountPoint'] = $i['is_share_mount_point'];
+        }
+        $mountType = null;
+        if ($i->isShared()) {
+            $mountType = 'shared';
+        } else if ($i->isMounted()) {
+            $mountType = 'external';
+        }
+        if ($mountType !== null) {
+            if ($i->getInternalPath() === '') {
+                $mountType .= '-root';
+            }
+            $entry['mountType'] = $mountType;
+        }
+        if (isset($i['extraData'])) {
+            $entry['extraData'] = $i['extraData'];
+        }
+        return $entry;
+    }
 
-	/**
-	 * Format file info for JSON
-	 * @param \OCP\Files\FileInfo[] $fileInfos file infos
-	 * @return array
-	 */
-	public static function formatFileInfos($fileInfos) {
-		$files = array();
-		foreach ($fileInfos as $i) {
-			$files[] = self::formatFileInfo($i);
-		}
+    /**
+     * Format file info for JSON
+     * @param \OCP\Files\FileInfo[] $fileInfos file infos
+     * @return array
+     */
+    public static function formatFileInfos($fileInfos) {
+        $files = array();
+        foreach ($fileInfos as $i) {
+            $files[] = self::formatFileInfo($i);
+        }
 
-		return $files;
-	}
+        return $files;
+    }
 
-	/**
-	 * Retrieves the contents of the given directory and
-	 * returns it as a sorted array of FileInfo.
-	 *
-	 * @param string $dir path to the directory
-	 * @param string $sortAttribute attribute to sort on
-	 * @param bool $sortDescending true for descending sort, false otherwise
-	 * @param string $mimetypeFilter limit returned content to this mimetype or mimepart
-	 * @return \OCP\Files\FileInfo[] files
-	 */
-	public static function getFiles($dir, $sortAttribute = 'name', $sortDescending = false, $mimetypeFilter = '') {
-		$content = \OC\Files\Filesystem::getDirectoryContent($dir, $mimetypeFilter);
+    /**
+     * Retrieves the contents of the given directory and
+     * returns it as a sorted array of FileInfo.
+     *
+     * @param string $dir path to the directory
+     * @param string $sortAttribute attribute to sort on
+     * @param bool $sortDescending true for descending sort, false otherwise
+     * @param string $mimetypeFilter limit returned content to this mimetype or mimepart
+     * @return \OCP\Files\FileInfo[] files
+     */
+    public static function getFiles($dir, $sortAttribute = 'name', $sortDescending = false, $mimetypeFilter = '') {
+        $content = \OC\Files\Filesystem::getDirectoryContent($dir, $mimetypeFilter);
 
-		return self::sortFiles($content, $sortAttribute, $sortDescending);
-	}
+        return self::sortFiles($content, $sortAttribute, $sortDescending);
+    }
 
-	/**
-	 * Populate the result set with file tags
-	 *
-	 * @param array $fileList
-	 * @param string $fileIdentifier identifier attribute name for values in $fileList
-	 * @return array file list populated with tags
-	 */
-	public static function populateTags(array $fileList, $fileIdentifier = 'fileid') {
-		$filesById = [];
-		foreach ($fileList as $fileData) {
-			$filesById[$fileData[$fileIdentifier]] = $fileData;
-		}
-		$tagger = \OC::$server->getTagManager()->load('files');
-		$tags = $tagger->getTagsForObjects(array_keys($filesById));
+    /**
+     * Populate the result set with file tags
+     *
+     * @param array $fileList
+     * @param string $fileIdentifier identifier attribute name for values in $fileList
+     * @return array file list populated with tags
+     */
+    public static function populateTags(array $fileList, $fileIdentifier = 'fileid') {
+        $filesById = [];
+        foreach ($fileList as $fileData) {
+            $filesById[$fileData[$fileIdentifier]] = $fileData;
+        }
+        $tagger = \OC::$server->getTagManager()->load('files');
+        $tags = $tagger->getTagsForObjects(array_keys($filesById));
 
-		if (!is_array($tags)) {
-			throw new \UnexpectedValueException('$tags must be an array');
-		}
+        if (!is_array($tags)) {
+            throw new \UnexpectedValueException('$tags must be an array');
+        }
 
-		if (!empty($tags)) {
-			foreach ($tags as $fileId => $fileTags) {
-				$filesById[$fileId]['tags'] = $fileTags;
-			}
+        if (!empty($tags)) {
+            foreach ($tags as $fileId => $fileTags) {
+                $filesById[$fileId]['tags'] = $fileTags;
+            }
 
-			foreach ($filesById as $key => $fileWithTags) {
-				foreach($fileList as $key2 => $file){
-					if( $file[$fileIdentifier] == $key){
-						$fileList[$key2] = $fileWithTags;
-					}
-				}
-			}
+            foreach ($filesById as $key => $fileWithTags) {
+                foreach($fileList as $key2 => $file){
+                    if( $file[$fileIdentifier] == $key){
+                        $fileList[$key2] = $fileWithTags;
+                    }
+                }
+            }
 
-			foreach ($fileList as $key => $file) {
-				if (!array_key_exists('tags', $file)) {
-					$fileList[$key]['tags'] = [];
-				}
-			}
+            foreach ($fileList as $key => $file) {
+                if (!array_key_exists('tags', $file)) {
+                    $fileList[$key]['tags'] = [];
+                }
+            }
 
-		}
-		return $fileList;
-	}
+        }
+        return $fileList;
+    }
 
-	/**
-	 * Sort the given file info array
-	 *
-	 * @param \OCP\Files\FileInfo[] $files files to sort
-	 * @param string $sortAttribute attribute to sort on
-	 * @param bool $sortDescending true for descending sort, false otherwise
-	 * @return \OCP\Files\FileInfo[] sorted files
-	 */
-	public static function sortFiles($files, $sortAttribute = 'name', $sortDescending = false) {
-		$sortFunc = 'compareFileNames';
-		if ($sortAttribute === 'mtime') {
-			$sortFunc = 'compareTimestamp';
-		} else if ($sortAttribute === 'size') {
-			$sortFunc = 'compareSize';
-		}
-		usort($files, array('\OCA\Files\Helper', $sortFunc));
-		if ($sortDescending) {
-			$files = array_reverse($files);
-		}
-		return $files;
-	}
+    /**
+     * Sort the given file info array
+     *
+     * @param \OCP\Files\FileInfo[] $files files to sort
+     * @param string $sortAttribute attribute to sort on
+     * @param bool $sortDescending true for descending sort, false otherwise
+     * @return \OCP\Files\FileInfo[] sorted files
+     */
+    public static function sortFiles($files, $sortAttribute = 'name', $sortDescending = false) {
+        $sortFunc = 'compareFileNames';
+        if ($sortAttribute === 'mtime') {
+            $sortFunc = 'compareTimestamp';
+        } else if ($sortAttribute === 'size') {
+            $sortFunc = 'compareSize';
+        }
+        usort($files, array('\OCA\Files\Helper', $sortFunc));
+        if ($sortDescending) {
+            $files = array_reverse($files);
+        }
+        return $files;
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -54,7 +54,7 @@ 
 			'uploadMaxFilesize' => $maxUploadFileSize,
 			'maxHumanFilesize'  => $maxHumanFileSize,
 			'freeSpace' => $storageInfo['free'],
-			'usedSpacePercent'  => (int)$storageInfo['relative'],
+			'usedSpacePercent'  => (int) $storageInfo['relative'],
 			'owner' => $storageInfo['owner'],
 			'ownerDisplayName' => $storageInfo['ownerDisplayName'],
 		];
@@ -67,7 +67,7 @@ 
 	 * @return string icon URL
 	 */
 	public static function determineIcon($file) {
-		if($file['type'] === 'dir') {
+		if ($file['type'] === 'dir') {
 			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir');
 			// TODO: move this part to the client side, using mountType
 			if ($file->isShared()) {
@@ -75,11 +75,11 @@ 
 			} elseif ($file->isMounted()) {
 				$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external');
 			}
-		}else{
+		} else {
 			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype());
 		}
 
-		return substr($icon, 0, -3) . 'svg';
+		return substr($icon, 0, -3).'svg';
 	}
 
 	/**
@@ -229,8 +229,8 @@ 
 			}
 
 			foreach ($filesById as $key => $fileWithTags) {
-				foreach($fileList as $key2 => $file){
-					if( $file[$fileIdentifier] == $key){
+				foreach ($fileList as $key2 => $file) {
+					if ($file[$fileIdentifier] == $key) {
 						$fileList[$key2] = $fileWithTags;
 					}
 				}

apps/files_sharing/lib/Controller/ShareAPIController.php

Indentation +876 added lines, -876 removed lines

@@ -52,889 +52,889 @@
  */
 class ShareAPIController extends OCSController {
 
-	/** @var IManager */
-	private $shareManager;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IRequest */
-	protected $request;
-	/** @var IRootFolder */
-	private $rootFolder;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var string */
-	private $currentUser;
-	/** @var IL10N */
-	private $l;
-	/** @var \OCP\Files\Node */
-	private $lockedNode;
-
-	/**
-	 * Share20OCS constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IManager $shareManager
-	 * @param IGroupManager $groupManager
-	 * @param IUserManager $userManager
-	 * @param IRootFolder $rootFolder
-	 * @param IURLGenerator $urlGenerator
-	 * @param string $userId
-	 * @param IL10N $l10n
-	 */
-	public function __construct(
-		$appName,
-		IRequest $request,
-		IManager $shareManager,
-		IGroupManager $groupManager,
-		IUserManager $userManager,
-		IRootFolder $rootFolder,
-		IURLGenerator $urlGenerator,
-		$userId,
-		IL10N $l10n
-	) {
-		parent::__construct($appName, $request);
-
-		$this->shareManager = $shareManager;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->request = $request;
-		$this->rootFolder = $rootFolder;
-		$this->urlGenerator = $urlGenerator;
-		$this->currentUser = $userId;
-		$this->l = $l10n;
-	}
-
-	/**
-	 * Convert an IShare to an array for OCS output
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @param Node|null $recipientNode
-	 * @return array
-	 * @throws NotFoundException In case the node can't be resolved.
-	 */
-	protected function formatShare(\OCP\Share\IShare $share, Node $recipientNode = null) {
-		$sharedBy = $this->userManager->get($share->getSharedBy());
-		$shareOwner = $this->userManager->get($share->getShareOwner());
-
-		$result = [
-			'id' => $share->getId(),
-			'share_type' => $share->getShareType(),
-			'uid_owner' => $share->getSharedBy(),
-			'displayname_owner' => $sharedBy !== null ? $sharedBy->getDisplayName() : $share->getSharedBy(),
-			'permissions' => $share->getPermissions(),
-			'stime' => $share->getShareTime()->getTimestamp(),
-			'parent' => null,
-			'expiration' => null,
-			'token' => null,
-			'uid_file_owner' => $share->getShareOwner(),
-			'displayname_file_owner' => $shareOwner !== null ? $shareOwner->getDisplayName() : $share->getShareOwner(),
-		];
-
-		$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-		if ($recipientNode) {
-			$node = $recipientNode;
-		} else {
-			$nodes = $userFolder->getById($share->getNodeId());
-
-			if (empty($nodes)) {
-				// fallback to guessing the path
-				$node = $userFolder->get($share->getTarget());
-				if ($node === null) {
-					throw new NotFoundException();
-				}
-			} else {
-				$node = $nodes[0];
-			}
-		}
-
-		$result['path'] = $userFolder->getRelativePath($node->getPath());
-		if ($node instanceOf \OCP\Files\Folder) {
-			$result['item_type'] = 'folder';
-		} else {
-			$result['item_type'] = 'file';
-		}
-		$result['mimetype'] = $node->getMimetype();
-		$result['storage_id'] = $node->getStorage()->getId();
-		$result['storage'] = $node->getStorage()->getCache()->getNumericStorageId();
-		$result['item_source'] = $node->getId();
-		$result['file_source'] = $node->getId();
-		$result['file_parent'] = $node->getParent()->getId();
-		$result['file_target'] = $share->getTarget();
-
-		$expiration = $share->getExpirationDate();
-		if ($expiration !== null) {
-			$result['expiration'] = $expiration->format('Y-m-d 00:00:00');
-		}
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
-			$sharedWith = $this->userManager->get($share->getSharedWith());
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = $sharedWith !== null ? $sharedWith->getDisplayName() : $share->getSharedWith();
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			$group = $this->groupManager->get($share->getSharedWith());
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = $group !== null ? $group->getDisplayName() : $share->getSharedWith();
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
-
-			$result['share_with'] = $share->getPassword();
-			$result['share_with_displayname'] = $share->getPassword();
-
-			$result['token'] = $share->getToken();
-			$result['url'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $share->getToken()]);
-
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_REMOTE) {
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'CLOUD');
-			$result['token'] = $share->getToken();
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
-			$result['share_with'] = $share->getSharedWith();
-			$result['password'] = $share->getPassword();
-			$result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'EMAIL');
-			$result['token'] = $share->getToken();
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_CIRCLE) {
-			$result['share_with_displayname'] = $share->getSharedWith();
-			$result['share_with'] = explode(' ', $share->getSharedWith(), 2)[0];
-		}
-
-
-		$result['mail_send'] = $share->getMailSend() ? 1 : 0;
-
-		return $result;
-	}
-
-	/**
-	 * Check if one of the users address books knows the exact property, if
-	 * yes we return the full name.
-	 *
-	 * @param string $query
-	 * @param string $property
-	 * @return string
-	 */
-	private function getDisplayNameFromAddressBook($query, $property) {
-		// FIXME: If we inject the contacts manager it gets initialized bofore any address books are registered
-		$result = \OC::$server->getContactsManager()->search($query, [$property]);
-		foreach ($result as $r) {
-			foreach($r[$property] as $value) {
-				if ($value === $query) {
-					return $r['FN'];
-				}
-			}
-		}
-
-		return $query;
-	}
-
-	/**
-	 * Get a specific share by id
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $id
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 */
-	public function getShare($id) {
-		try {
-			$share = $this->getShareById($id);
-		} catch (ShareNotFound $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		if ($this->canAccessShare($share)) {
-			try {
-				$share = $this->formatShare($share);
-				return new DataResponse([$share]);
-			} catch (NotFoundException $e) {
-				//Fall trough
-			}
-		}
-
-		throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-	}
-
-	/**
-	 * Delete a share
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $id
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 */
-	public function deleteShare($id) {
-		try {
-			$share = $this->getShareById($id);
-		} catch (ShareNotFound $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		try {
-			$this->lock($share->getNode());
-		} catch (LockedException $e) {
-			throw new OCSNotFoundException($this->l->t('could not delete share'));
-		}
-
-		if (!$this->canAccessShare($share)) {
-			throw new OCSNotFoundException($this->l->t('Could not delete share'));
-		}
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP &&
-			$share->getShareOwner() !== $this->currentUser &&
-			$share->getSharedBy() !== $this->currentUser) {
-			$this->shareManager->deleteFromSelf($share, $this->currentUser);
-		} else {
-			$this->shareManager->deleteShare($share);
-		}
-
-		return new DataResponse();
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $path
-	 * @param int $permissions
-	 * @param int $shareType
-	 * @param string $shareWith
-	 * @param string $publicUpload
-	 * @param string $password
-	 * @param string $expireDate
-	 *
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 * @throws OCSForbiddenException
-	 * @throws OCSBadRequestException
-	 * @throws OCSException
-	 */
-	public function createShare(
-		$path = null,
-		$permissions = \OCP\Constants::PERMISSION_ALL,
-		$shareType = -1,
-		$shareWith = null,
-		$publicUpload = 'false',
-		$password = '',
-		$expireDate = ''
-	) {
-		$share = $this->shareManager->newShare();
-
-		// Verify path
-		if ($path === null) {
-			throw new OCSNotFoundException($this->l->t('Please specify a file or folder path'));
-		}
-
-		$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-		try {
-			$path = $userFolder->get($path);
-		} catch (NotFoundException $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
-		}
-
-		$share->setNode($path);
-
-		try {
-			$this->lock($share->getNode());
-		} catch (LockedException $e) {
-			throw new OCSNotFoundException($this->l->t('Could not create share'));
-		}
-
-		if ($permissions < 0 || $permissions > \OCP\Constants::PERMISSION_ALL) {
-			throw new OCSNotFoundException($this->l->t('invalid permissions'));
-		}
-
-		// Shares always require read permissions
-		$permissions |= \OCP\Constants::PERMISSION_READ;
-
-		if ($path instanceof \OCP\Files\File) {
-			// Single file shares should never have delete or create permissions
-			$permissions &= ~\OCP\Constants::PERMISSION_DELETE;
-			$permissions &= ~\OCP\Constants::PERMISSION_CREATE;
-		}
-
-		/*
+    /** @var IManager */
+    private $shareManager;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IRequest */
+    protected $request;
+    /** @var IRootFolder */
+    private $rootFolder;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var string */
+    private $currentUser;
+    /** @var IL10N */
+    private $l;
+    /** @var \OCP\Files\Node */
+    private $lockedNode;
+
+    /**
+     * Share20OCS constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IManager $shareManager
+     * @param IGroupManager $groupManager
+     * @param IUserManager $userManager
+     * @param IRootFolder $rootFolder
+     * @param IURLGenerator $urlGenerator
+     * @param string $userId
+     * @param IL10N $l10n
+     */
+    public function __construct(
+        $appName,
+        IRequest $request,
+        IManager $shareManager,
+        IGroupManager $groupManager,
+        IUserManager $userManager,
+        IRootFolder $rootFolder,
+        IURLGenerator $urlGenerator,
+        $userId,
+        IL10N $l10n
+    ) {
+        parent::__construct($appName, $request);
+
+        $this->shareManager = $shareManager;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->request = $request;
+        $this->rootFolder = $rootFolder;
+        $this->urlGenerator = $urlGenerator;
+        $this->currentUser = $userId;
+        $this->l = $l10n;
+    }
+
+    /**
+     * Convert an IShare to an array for OCS output
+     *
+     * @param \OCP\Share\IShare $share
+     * @param Node|null $recipientNode
+     * @return array
+     * @throws NotFoundException In case the node can't be resolved.
+     */
+    protected function formatShare(\OCP\Share\IShare $share, Node $recipientNode = null) {
+        $sharedBy = $this->userManager->get($share->getSharedBy());
+        $shareOwner = $this->userManager->get($share->getShareOwner());
+
+        $result = [
+            'id' => $share->getId(),
+            'share_type' => $share->getShareType(),
+            'uid_owner' => $share->getSharedBy(),
+            'displayname_owner' => $sharedBy !== null ? $sharedBy->getDisplayName() : $share->getSharedBy(),
+            'permissions' => $share->getPermissions(),
+            'stime' => $share->getShareTime()->getTimestamp(),
+            'parent' => null,
+            'expiration' => null,
+            'token' => null,
+            'uid_file_owner' => $share->getShareOwner(),
+            'displayname_file_owner' => $shareOwner !== null ? $shareOwner->getDisplayName() : $share->getShareOwner(),
+        ];
+
+        $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+        if ($recipientNode) {
+            $node = $recipientNode;
+        } else {
+            $nodes = $userFolder->getById($share->getNodeId());
+
+            if (empty($nodes)) {
+                // fallback to guessing the path
+                $node = $userFolder->get($share->getTarget());
+                if ($node === null) {
+                    throw new NotFoundException();
+                }
+            } else {
+                $node = $nodes[0];
+            }
+        }
+
+        $result['path'] = $userFolder->getRelativePath($node->getPath());
+        if ($node instanceOf \OCP\Files\Folder) {
+            $result['item_type'] = 'folder';
+        } else {
+            $result['item_type'] = 'file';
+        }
+        $result['mimetype'] = $node->getMimetype();
+        $result['storage_id'] = $node->getStorage()->getId();
+        $result['storage'] = $node->getStorage()->getCache()->getNumericStorageId();
+        $result['item_source'] = $node->getId();
+        $result['file_source'] = $node->getId();
+        $result['file_parent'] = $node->getParent()->getId();
+        $result['file_target'] = $share->getTarget();
+
+        $expiration = $share->getExpirationDate();
+        if ($expiration !== null) {
+            $result['expiration'] = $expiration->format('Y-m-d 00:00:00');
+        }
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
+            $sharedWith = $this->userManager->get($share->getSharedWith());
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = $sharedWith !== null ? $sharedWith->getDisplayName() : $share->getSharedWith();
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            $group = $this->groupManager->get($share->getSharedWith());
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = $group !== null ? $group->getDisplayName() : $share->getSharedWith();
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
+
+            $result['share_with'] = $share->getPassword();
+            $result['share_with_displayname'] = $share->getPassword();
+
+            $result['token'] = $share->getToken();
+            $result['url'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $share->getToken()]);
+
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_REMOTE) {
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'CLOUD');
+            $result['token'] = $share->getToken();
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
+            $result['share_with'] = $share->getSharedWith();
+            $result['password'] = $share->getPassword();
+            $result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'EMAIL');
+            $result['token'] = $share->getToken();
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_CIRCLE) {
+            $result['share_with_displayname'] = $share->getSharedWith();
+            $result['share_with'] = explode(' ', $share->getSharedWith(), 2)[0];
+        }
+
+
+        $result['mail_send'] = $share->getMailSend() ? 1 : 0;
+
+        return $result;
+    }
+
+    /**
+     * Check if one of the users address books knows the exact property, if
+     * yes we return the full name.
+     *
+     * @param string $query
+     * @param string $property
+     * @return string
+     */
+    private function getDisplayNameFromAddressBook($query, $property) {
+        // FIXME: If we inject the contacts manager it gets initialized bofore any address books are registered
+        $result = \OC::$server->getContactsManager()->search($query, [$property]);
+        foreach ($result as $r) {
+            foreach($r[$property] as $value) {
+                if ($value === $query) {
+                    return $r['FN'];
+                }
+            }
+        }
+
+        return $query;
+    }
+
+    /**
+     * Get a specific share by id
+     *
+     * @NoAdminRequired
+     *
+     * @param string $id
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     */
+    public function getShare($id) {
+        try {
+            $share = $this->getShareById($id);
+        } catch (ShareNotFound $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        if ($this->canAccessShare($share)) {
+            try {
+                $share = $this->formatShare($share);
+                return new DataResponse([$share]);
+            } catch (NotFoundException $e) {
+                //Fall trough
+            }
+        }
+
+        throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+    }
+
+    /**
+     * Delete a share
+     *
+     * @NoAdminRequired
+     *
+     * @param string $id
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     */
+    public function deleteShare($id) {
+        try {
+            $share = $this->getShareById($id);
+        } catch (ShareNotFound $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        try {
+            $this->lock($share->getNode());
+        } catch (LockedException $e) {
+            throw new OCSNotFoundException($this->l->t('could not delete share'));
+        }
+
+        if (!$this->canAccessShare($share)) {
+            throw new OCSNotFoundException($this->l->t('Could not delete share'));
+        }
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP &&
+            $share->getShareOwner() !== $this->currentUser &&
+            $share->getSharedBy() !== $this->currentUser) {
+            $this->shareManager->deleteFromSelf($share, $this->currentUser);
+        } else {
+            $this->shareManager->deleteShare($share);
+        }
+
+        return new DataResponse();
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $path
+     * @param int $permissions
+     * @param int $shareType
+     * @param string $shareWith
+     * @param string $publicUpload
+     * @param string $password
+     * @param string $expireDate
+     *
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     * @throws OCSForbiddenException
+     * @throws OCSBadRequestException
+     * @throws OCSException
+     */
+    public function createShare(
+        $path = null,
+        $permissions = \OCP\Constants::PERMISSION_ALL,
+        $shareType = -1,
+        $shareWith = null,
+        $publicUpload = 'false',
+        $password = '',
+        $expireDate = ''
+    ) {
+        $share = $this->shareManager->newShare();
+
+        // Verify path
+        if ($path === null) {
+            throw new OCSNotFoundException($this->l->t('Please specify a file or folder path'));
+        }
+
+        $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+        try {
+            $path = $userFolder->get($path);
+        } catch (NotFoundException $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
+        }
+
+        $share->setNode($path);
+
+        try {
+            $this->lock($share->getNode());
+        } catch (LockedException $e) {
+            throw new OCSNotFoundException($this->l->t('Could not create share'));
+        }
+
+        if ($permissions < 0 || $permissions > \OCP\Constants::PERMISSION_ALL) {
+            throw new OCSNotFoundException($this->l->t('invalid permissions'));
+        }
+
+        // Shares always require read permissions
+        $permissions |= \OCP\Constants::PERMISSION_READ;
+
+        if ($path instanceof \OCP\Files\File) {
+            // Single file shares should never have delete or create permissions
+            $permissions &= ~\OCP\Constants::PERMISSION_DELETE;
+            $permissions &= ~\OCP\Constants::PERMISSION_CREATE;
+        }
+
+        /*
 		 * Hack for https://github.com/owncloud/core/issues/22587
 		 * We check the permissions via webdav. But the permissions of the mount point
 		 * do not equal the share permissions. Here we fix that for federated mounts.
 		 */
-		if ($path->getStorage()->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
-			$permissions &= ~($permissions & ~$path->getPermissions());
-		}
-
-		if ($shareType === \OCP\Share::SHARE_TYPE_USER) {
-			// Valid user is required to share
-			if ($shareWith === null || !$this->userManager->userExists($shareWith)) {
-				throw new OCSNotFoundException($this->l->t('Please specify a valid user'));
-			}
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_GROUP) {
-			if (!$this->shareManager->allowGroupSharing()) {
-				throw new OCSNotFoundException($this->l->t('Group sharing is disabled by the administrator'));
-			}
-
-			// Valid group is required to share
-			if ($shareWith === null || !$this->groupManager->groupExists($shareWith)) {
-				throw new OCSNotFoundException($this->l->t('Please specify a valid group'));
-			}
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_LINK) {
-			//Can we even share links?
-			if (!$this->shareManager->shareApiAllowLinks()) {
-				throw new OCSNotFoundException($this->l->t('Public link sharing is disabled by the administrator'));
-			}
-
-			/*
+        if ($path->getStorage()->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
+            $permissions &= ~($permissions & ~$path->getPermissions());
+        }
+
+        if ($shareType === \OCP\Share::SHARE_TYPE_USER) {
+            // Valid user is required to share
+            if ($shareWith === null || !$this->userManager->userExists($shareWith)) {
+                throw new OCSNotFoundException($this->l->t('Please specify a valid user'));
+            }
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_GROUP) {
+            if (!$this->shareManager->allowGroupSharing()) {
+                throw new OCSNotFoundException($this->l->t('Group sharing is disabled by the administrator'));
+            }
+
+            // Valid group is required to share
+            if ($shareWith === null || !$this->groupManager->groupExists($shareWith)) {
+                throw new OCSNotFoundException($this->l->t('Please specify a valid group'));
+            }
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_LINK) {
+            //Can we even share links?
+            if (!$this->shareManager->shareApiAllowLinks()) {
+                throw new OCSNotFoundException($this->l->t('Public link sharing is disabled by the administrator'));
+            }
+
+            /*
 			 * For now we only allow 1 link share.
 			 * Return the existing link share if this is a duplicate
 			 */
-			$existingShares = $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_LINK, $path, false, 1, 0);
-			if (!empty($existingShares)) {
-				return new DataResponse($this->formatShare($existingShares[0]));
-			}
-
-			if ($publicUpload === 'true') {
-				// Check if public upload is allowed
-				if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
-					throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
-				}
-
-				// Public upload can only be set for folders
-				if ($path instanceof \OCP\Files\File) {
-					throw new OCSNotFoundException($this->l->t('Public upload is only possible for publicly shared folders'));
-				}
-
-				$share->setPermissions(
-					\OCP\Constants::PERMISSION_READ |
-					\OCP\Constants::PERMISSION_CREATE |
-					\OCP\Constants::PERMISSION_UPDATE |
-					\OCP\Constants::PERMISSION_DELETE
-				);
-			} else {
-				$share->setPermissions(\OCP\Constants::PERMISSION_READ);
-			}
-
-			// Set password
-			if ($password !== '') {
-				$share->setPassword($password);
-			}
-
-			//Expire date
-			if ($expireDate !== '') {
-				try {
-					$expireDate = $this->parseDate($expireDate);
-					$share->setExpirationDate($expireDate);
-				} catch (\Exception $e) {
-					throw new OCSNotFoundException($this->l->t('Invalid date, date format must be YYYY-MM-DD'));
-				}
-			}
-
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) {
-			if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
-				throw new OCSForbiddenException($this->l->t('Sharing %s failed because the back end does not allow shares from type %s', [$path->getPath(), $shareType]));
-			}
-
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_EMAIL) {
-			if ($share->getNodeType() === 'file') {
-				$share->setPermissions(\OCP\Constants::PERMISSION_READ);
-			} else {
-				$share->setPermissions(
-					\OCP\Constants::PERMISSION_READ |
-					\OCP\Constants::PERMISSION_CREATE |
-					\OCP\Constants::PERMISSION_UPDATE |
-					\OCP\Constants::PERMISSION_DELETE);
-			}
-			$share->setSharedWith($shareWith);
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_CIRCLE) {
-			if (!\OCP\App::isEnabled('circles')) {
-				throw new OCSNotFoundException($this->l->t('You cannot share to a Circle if the app is not enabled'));
-			}
-
-			$circle = \OCA\Circles\Api\Circles::detailsCircle($shareWith);
-
-			// Valid circle is required to share
-			if ($circle === null) {
-				throw new OCSNotFoundException($this->l->t('Please specify a valid circle'));
-			}
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} else {
-			throw new OCSBadRequestException($this->l->t('Unknown share type'));
-		}
-
-		$share->setShareType($shareType);
-		$share->setSharedBy($this->currentUser);
-
-		try {
-			$share = $this->shareManager->createShare($share);
-		} catch (GenericShareException $e) {
-			$code = $e->getCode() === 0 ? 403 : $e->getCode();
-			throw new OCSException($e->getHint(), $code);
-		} catch (\Exception $e) {
-			throw new OCSForbiddenException($e->getMessage());
-		}
-
-		$output = $this->formatShare($share);
-
-		return new DataResponse($output);
-	}
-
-	/**
-	 * @param \OCP\Files\File|\OCP\Files\Folder $node
-	 * @param boolean $includeTags
-	 * @return DataResponse
-	 */
-	private function getSharedWithMe($node = null, $includeTags) {
-
-		$userShares = $this->shareManager->getSharedWith($this->currentUser, \OCP\Share::SHARE_TYPE_USER, $node, -1, 0);
-		$groupShares = $this->shareManager->getSharedWith($this->currentUser, \OCP\Share::SHARE_TYPE_GROUP, $node, -1, 0);
-		$circleShares = $this->shareManager->getSharedWith($this->currentUser, \OCP\Share::SHARE_TYPE_CIRCLE, $node, -1, 0);
-
-		$shares = array_merge($userShares, $groupShares, $circleShares);
-
-		$shares = array_filter($shares, function (IShare $share) {
-			return $share->getShareOwner() !== $this->currentUser;
-		});
-
-		$formatted = [];
-		foreach ($shares as $share) {
-			if ($this->canAccessShare($share)) {
-				try {
-					$formatted[] = $this->formatShare($share);
-				} catch (NotFoundException $e) {
-					// Ignore this share
-				}
-			}
-		}
-
-		if ($includeTags) {
-			$formatted = Helper::populateTags($formatted, 'file_source');
-		}
-
-		return new DataResponse($formatted);
-	}
-
-	/**
-	 * @param \OCP\Files\Folder $folder
-	 * @return DataResponse
-	 * @throws OCSBadRequestException
-	 */
-	private function getSharesInDir($folder) {
-		if (!($folder instanceof \OCP\Files\Folder)) {
-			throw new OCSBadRequestException($this->l->t('Not a directory'));
-		}
-
-		$nodes = $folder->getDirectoryListing();
-		/** @var \OCP\Share\IShare[] $shares */
-		$shares = [];
-		foreach ($nodes as $node) {
-			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_USER, $node, false, -1, 0));
-			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_GROUP, $node, false, -1, 0));
-			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_LINK, $node, false, -1, 0));
-			if($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_EMAIL)) {
-				$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_EMAIL, $node, false, -1, 0));
-			}
-			if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
-				$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_REMOTE, $node, false, -1, 0));
-			}
-		}
-
-		$formatted = [];
-		foreach ($shares as $share) {
-			try {
-				$formatted[] = $this->formatShare($share);
-			} catch (NotFoundException $e) {
-				//Ignore this share
-			}
-		}
-
-		return new DataResponse($formatted);
-	}
-
-	/**
-	 * The getShares function.
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $shared_with_me
-	 * @param string $reshares
-	 * @param string $subfiles
-	 * @param string $path
-	 *
-	 * - Get shares by the current user
-	 * - Get shares by the current user and reshares (?reshares=true)
-	 * - Get shares with the current user (?shared_with_me=true)
-	 * - Get shares for a specific path (?path=...)
-	 * - Get all shares in a folder (?subfiles=true&path=..)
-	 *
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 */
-	public function getShares(
-		$shared_with_me = 'false',
-		$reshares = 'false',
-		$subfiles = 'false',
-		$path = null,
-		$include_tags = 'false'
-	) {
-
-		if ($path !== null) {
-			$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-			try {
-				$path = $userFolder->get($path);
-				$this->lock($path);
-			} catch (\OCP\Files\NotFoundException $e) {
-				throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
-			} catch (LockedException $e) {
-				throw new OCSNotFoundException($this->l->t('Could not lock path'));
-			}
-		}
-
-		if ($shared_with_me === 'true') {
-			$result = $this->getSharedWithMe($path, $include_tags);
-			return $result;
-		}
-
-		if ($subfiles === 'true') {
-			$result = $this->getSharesInDir($path);
-			return $result;
-		}
-
-		if ($reshares === 'true') {
-			$reshares = true;
-		} else {
-			$reshares = false;
-		}
-
-		// Get all shares
-		$userShares = $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_USER, $path, $reshares, -1, 0);
-		$groupShares = $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_GROUP, $path, $reshares, -1, 0);
-		$linkShares = $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_LINK, $path, $reshares, -1, 0);
-		if ($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_EMAIL)) {
-			$mailShares = $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_EMAIL, $path, $reshares, -1, 0);
-		} else {
-			$mailShares = [];
-		}
-		if ($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_CIRCLE)) {
-			$circleShares = $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_CIRCLE, $path, $reshares, -1, 0);
-		} else {
-			$circleShares = [];
-		}
-
-		$shares = array_merge($userShares, $groupShares, $linkShares, $mailShares, $circleShares);
-
-		if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
-			$federatedShares = $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_REMOTE, $path, $reshares, -1, 0);
-			$shares = array_merge($shares, $federatedShares);
-		}
-
-		$formatted = [];
-		foreach ($shares as $share) {
-			try {
-				$formatted[] = $this->formatShare($share, $path);
-			} catch (NotFoundException $e) {
-				//Ignore share
-			}
-		}
-
-		if ($include_tags) {
-			$formatted = Helper::populateTags($formatted, 'file_source');
-		}
-
-		return new DataResponse($formatted);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param int $id
-	 * @param int $permissions
-	 * @param string $password
-	 * @param string $publicUpload
-	 * @param string $expireDate
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 * @throws OCSBadRequestException
-	 * @throws OCSForbiddenException
-	 */
-	public function updateShare(
-		$id,
-		$permissions = null,
-		$password = null,
-		$publicUpload = null,
-		$expireDate = null
-	) {
-		try {
-			$share = $this->getShareById($id);
-		} catch (ShareNotFound $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		$this->lock($share->getNode());
-
-		if (!$this->canAccessShare($share, false)) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		if ($permissions === null && $password === null && $publicUpload === null && $expireDate === null) {
-			throw new OCSBadRequestException($this->l->t('Wrong or no update parameter given'));
-		}
-
-		/*
+            $existingShares = $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_LINK, $path, false, 1, 0);
+            if (!empty($existingShares)) {
+                return new DataResponse($this->formatShare($existingShares[0]));
+            }
+
+            if ($publicUpload === 'true') {
+                // Check if public upload is allowed
+                if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
+                    throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
+                }
+
+                // Public upload can only be set for folders
+                if ($path instanceof \OCP\Files\File) {
+                    throw new OCSNotFoundException($this->l->t('Public upload is only possible for publicly shared folders'));
+                }
+
+                $share->setPermissions(
+                    \OCP\Constants::PERMISSION_READ |
+                    \OCP\Constants::PERMISSION_CREATE |
+                    \OCP\Constants::PERMISSION_UPDATE |
+                    \OCP\Constants::PERMISSION_DELETE
+                );
+            } else {
+                $share->setPermissions(\OCP\Constants::PERMISSION_READ);
+            }
+
+            // Set password
+            if ($password !== '') {
+                $share->setPassword($password);
+            }
+
+            //Expire date
+            if ($expireDate !== '') {
+                try {
+                    $expireDate = $this->parseDate($expireDate);
+                    $share->setExpirationDate($expireDate);
+                } catch (\Exception $e) {
+                    throw new OCSNotFoundException($this->l->t('Invalid date, date format must be YYYY-MM-DD'));
+                }
+            }
+
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) {
+            if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
+                throw new OCSForbiddenException($this->l->t('Sharing %s failed because the back end does not allow shares from type %s', [$path->getPath(), $shareType]));
+            }
+
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_EMAIL) {
+            if ($share->getNodeType() === 'file') {
+                $share->setPermissions(\OCP\Constants::PERMISSION_READ);
+            } else {
+                $share->setPermissions(
+                    \OCP\Constants::PERMISSION_READ |
+                    \OCP\Constants::PERMISSION_CREATE |
+                    \OCP\Constants::PERMISSION_UPDATE |
+                    \OCP\Constants::PERMISSION_DELETE);
+            }
+            $share->setSharedWith($shareWith);
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_CIRCLE) {
+            if (!\OCP\App::isEnabled('circles')) {
+                throw new OCSNotFoundException($this->l->t('You cannot share to a Circle if the app is not enabled'));
+            }
+
+            $circle = \OCA\Circles\Api\Circles::detailsCircle($shareWith);
+
+            // Valid circle is required to share
+            if ($circle === null) {
+                throw new OCSNotFoundException($this->l->t('Please specify a valid circle'));
+            }
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } else {
+            throw new OCSBadRequestException($this->l->t('Unknown share type'));
+        }
+
+        $share->setShareType($shareType);
+        $share->setSharedBy($this->currentUser);
+
+        try {
+            $share = $this->shareManager->createShare($share);
+        } catch (GenericShareException $e) {
+            $code = $e->getCode() === 0 ? 403 : $e->getCode();
+            throw new OCSException($e->getHint(), $code);
+        } catch (\Exception $e) {
+            throw new OCSForbiddenException($e->getMessage());
+        }
+
+        $output = $this->formatShare($share);
+
+        return new DataResponse($output);
+    }
+
+    /**
+     * @param \OCP\Files\File|\OCP\Files\Folder $node
+     * @param boolean $includeTags
+     * @return DataResponse
+     */
+    private function getSharedWithMe($node = null, $includeTags) {
+
+        $userShares = $this->shareManager->getSharedWith($this->currentUser, \OCP\Share::SHARE_TYPE_USER, $node, -1, 0);
+        $groupShares = $this->shareManager->getSharedWith($this->currentUser, \OCP\Share::SHARE_TYPE_GROUP, $node, -1, 0);
+        $circleShares = $this->shareManager->getSharedWith($this->currentUser, \OCP\Share::SHARE_TYPE_CIRCLE, $node, -1, 0);
+
+        $shares = array_merge($userShares, $groupShares, $circleShares);
+
+        $shares = array_filter($shares, function (IShare $share) {
+            return $share->getShareOwner() !== $this->currentUser;
+        });
+
+        $formatted = [];
+        foreach ($shares as $share) {
+            if ($this->canAccessShare($share)) {
+                try {
+                    $formatted[] = $this->formatShare($share);
+                } catch (NotFoundException $e) {
+                    // Ignore this share
+                }
+            }
+        }
+
+        if ($includeTags) {
+            $formatted = Helper::populateTags($formatted, 'file_source');
+        }
+
+        return new DataResponse($formatted);
+    }
+
+    /**
+     * @param \OCP\Files\Folder $folder
+     * @return DataResponse
+     * @throws OCSBadRequestException
+     */
+    private function getSharesInDir($folder) {
+        if (!($folder instanceof \OCP\Files\Folder)) {
+            throw new OCSBadRequestException($this->l->t('Not a directory'));
+        }
+
+        $nodes = $folder->getDirectoryListing();
+        /** @var \OCP\Share\IShare[] $shares */
+        $shares = [];
+        foreach ($nodes as $node) {
+            $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_USER, $node, false, -1, 0));
+            $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_GROUP, $node, false, -1, 0));
+            $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_LINK, $node, false, -1, 0));
+            if($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_EMAIL)) {
+                $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_EMAIL, $node, false, -1, 0));
+            }
+            if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
+                $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_REMOTE, $node, false, -1, 0));
+            }
+        }
+
+        $formatted = [];
+        foreach ($shares as $share) {
+            try {
+                $formatted[] = $this->formatShare($share);
+            } catch (NotFoundException $e) {
+                //Ignore this share
+            }
+        }
+
+        return new DataResponse($formatted);
+    }
+
+    /**
+     * The getShares function.
+     *
+     * @NoAdminRequired
+     *
+     * @param string $shared_with_me
+     * @param string $reshares
+     * @param string $subfiles
+     * @param string $path
+     *
+     * - Get shares by the current user
+     * - Get shares by the current user and reshares (?reshares=true)
+     * - Get shares with the current user (?shared_with_me=true)
+     * - Get shares for a specific path (?path=...)
+     * - Get all shares in a folder (?subfiles=true&path=..)
+     *
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     */
+    public function getShares(
+        $shared_with_me = 'false',
+        $reshares = 'false',
+        $subfiles = 'false',
+        $path = null,
+        $include_tags = 'false'
+    ) {
+
+        if ($path !== null) {
+            $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+            try {
+                $path = $userFolder->get($path);
+                $this->lock($path);
+            } catch (\OCP\Files\NotFoundException $e) {
+                throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
+            } catch (LockedException $e) {
+                throw new OCSNotFoundException($this->l->t('Could not lock path'));
+            }
+        }
+
+        if ($shared_with_me === 'true') {
+            $result = $this->getSharedWithMe($path, $include_tags);
+            return $result;
+        }
+
+        if ($subfiles === 'true') {
+            $result = $this->getSharesInDir($path);
+            return $result;
+        }
+
+        if ($reshares === 'true') {
+            $reshares = true;
+        } else {
+            $reshares = false;
+        }
+
+        // Get all shares
+        $userShares = $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_USER, $path, $reshares, -1, 0);
+        $groupShares = $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_GROUP, $path, $reshares, -1, 0);
+        $linkShares = $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_LINK, $path, $reshares, -1, 0);
+        if ($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_EMAIL)) {
+            $mailShares = $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_EMAIL, $path, $reshares, -1, 0);
+        } else {
+            $mailShares = [];
+        }
+        if ($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_CIRCLE)) {
+            $circleShares = $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_CIRCLE, $path, $reshares, -1, 0);
+        } else {
+            $circleShares = [];
+        }
+
+        $shares = array_merge($userShares, $groupShares, $linkShares, $mailShares, $circleShares);
+
+        if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
+            $federatedShares = $this->shareManager->getSharesBy($this->currentUser, \OCP\Share::SHARE_TYPE_REMOTE, $path, $reshares, -1, 0);
+            $shares = array_merge($shares, $federatedShares);
+        }
+
+        $formatted = [];
+        foreach ($shares as $share) {
+            try {
+                $formatted[] = $this->formatShare($share, $path);
+            } catch (NotFoundException $e) {
+                //Ignore share
+            }
+        }
+
+        if ($include_tags) {
+            $formatted = Helper::populateTags($formatted, 'file_source');
+        }
+
+        return new DataResponse($formatted);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param int $id
+     * @param int $permissions
+     * @param string $password
+     * @param string $publicUpload
+     * @param string $expireDate
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     * @throws OCSBadRequestException
+     * @throws OCSForbiddenException
+     */
+    public function updateShare(
+        $id,
+        $permissions = null,
+        $password = null,
+        $publicUpload = null,
+        $expireDate = null
+    ) {
+        try {
+            $share = $this->getShareById($id);
+        } catch (ShareNotFound $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        $this->lock($share->getNode());
+
+        if (!$this->canAccessShare($share, false)) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        if ($permissions === null && $password === null && $publicUpload === null && $expireDate === null) {
+            throw new OCSBadRequestException($this->l->t('Wrong or no update parameter given'));
+        }
+
+        /*
 		 * expirationdate, password and publicUpload only make sense for link shares
 		 */
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
-
-			$newPermissions = null;
-			if ($publicUpload === 'true') {
-				$newPermissions = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE;
-			} else if ($publicUpload === 'false') {
-				$newPermissions = \OCP\Constants::PERMISSION_READ;
-			}
-
-			if ($permissions !== null) {
-				$newPermissions = (int)$permissions;
-			}
-
-			if ($newPermissions !== null &&
-				!in_array($newPermissions, [
-					\OCP\Constants::PERMISSION_READ,
-					\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE, // legacy
-					\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE, // correct
-					\OCP\Constants::PERMISSION_CREATE, // hidden file list
-					\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE, // allow to edit single files
-				])
-			) {
-				throw new OCSBadRequestException($this->l->t('Can\'t change permissions for public share links'));
-			}
-
-			if (
-				// legacy
-				$newPermissions === (\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE) ||
-				// correct
-				$newPermissions === (\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE)
-			) {
-				if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
-					throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
-				}
-
-				if (!($share->getNode() instanceof \OCP\Files\Folder)) {
-					throw new OCSBadRequestException($this->l->t('Public upload is only possible for publicly shared folders'));
-				}
-
-				// normalize to correct public upload permissions
-				$newPermissions = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE;
-			}
-
-			if ($newPermissions !== null) {
-				$share->setPermissions($newPermissions);
-				$permissions = $newPermissions;
-			}
-
-			if ($expireDate === '') {
-				$share->setExpirationDate(null);
-			} else if ($expireDate !== null) {
-				try {
-					$expireDate = $this->parseDate($expireDate);
-				} catch (\Exception $e) {
-					throw new OCSBadRequestException($e->getMessage());
-				}
-				$share->setExpirationDate($expireDate);
-			}
-
-			if ($password === '') {
-				$share->setPassword(null);
-			} else if ($password !== null) {
-				$share->setPassword($password);
-			}
-
-		} else {
-			if ($permissions !== null) {
-				$permissions = (int)$permissions;
-				$share->setPermissions($permissions);
-			}
-
-			if ($share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
-				if ($password === '') {
-					$share->setPassword(null);
-				} else if ($password !== null) {
-					$share->setPassword($password);
-				}
-			}
-
-			if ($expireDate === '') {
-				$share->setExpirationDate(null);
-			} else if ($expireDate !== null) {
-				try {
-					$expireDate = $this->parseDate($expireDate);
-				} catch (\Exception $e) {
-					throw new OCSBadRequestException($e->getMessage());
-				}
-				$share->setExpirationDate($expireDate);
-			}
-
-		}
-
-		if ($permissions !== null && $share->getShareOwner() !== $this->currentUser) {
-			/* Check if this is an incomming share */
-			$incomingShares = $this->shareManager->getSharedWith($this->currentUser, \OCP\Share::SHARE_TYPE_USER, $share->getNode(), -1, 0);
-			$incomingShares = array_merge($incomingShares, $this->shareManager->getSharedWith($this->currentUser, \OCP\Share::SHARE_TYPE_GROUP, $share->getNode(), -1, 0));
-
-			/** @var \OCP\Share\IShare[] $incomingShares */
-			if (!empty($incomingShares)) {
-				$maxPermissions = 0;
-				foreach ($incomingShares as $incomingShare) {
-					$maxPermissions |= $incomingShare->getPermissions();
-				}
-
-				if ($share->getPermissions() & ~$maxPermissions) {
-					throw new OCSNotFoundException($this->l->t('Cannot increase permissions'));
-				}
-			}
-		}
-
-
-		try {
-			$share = $this->shareManager->updateShare($share);
-		} catch (\Exception $e) {
-			throw new OCSBadRequestException($e->getMessage());
-		}
-
-		return new DataResponse($this->formatShare($share));
-	}
-
-	/**
-	 * @param \OCP\Share\IShare $share
-	 * @return bool
-	 */
-	protected function canAccessShare(\OCP\Share\IShare $share, $checkGroups = true) {
-		// A file with permissions 0 can't be accessed by us. So Don't show it
-		if ($share->getPermissions() === 0) {
-			return false;
-		}
-
-		// Owner of the file and the sharer of the file can always get share
-		if ($share->getShareOwner() === $this->currentUser ||
-			$share->getSharedBy() === $this->currentUser
-		) {
-			return true;
-		}
-
-		// If the share is shared with you (or a group you are a member of)
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER &&
-			$share->getSharedWith() === $this->currentUser
-		) {
-			return true;
-		}
-
-		if ($checkGroups && $share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			$sharedWith = $this->groupManager->get($share->getSharedWith());
-			$user = $this->userManager->get($this->currentUser);
-			if ($user !== null && $sharedWith !== null && $sharedWith->inGroup($user)) {
-				return true;
-			}
-		}
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_CIRCLE) {
-			// TODO: have a sanity check like above?
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Make sure that the passed date is valid ISO 8601
-	 * So YYYY-MM-DD
-	 * If not throw an exception
-	 *
-	 * @param string $expireDate
-	 *
-	 * @throws \Exception
-	 * @return \DateTime
-	 */
-	private function parseDate($expireDate) {
-		try {
-			$date = new \DateTime($expireDate);
-		} catch (\Exception $e) {
-			throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
-		}
-
-		if ($date === false) {
-			throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
-		}
-
-		$date->setTime(0, 0, 0);
-
-		return $date;
-	}
-
-	/**
-	 * Since we have multiple providers but the OCS Share API v1 does
-	 * not support this we need to check all backends.
-	 *
-	 * @param string $id
-	 * @return \OCP\Share\IShare
-	 * @throws ShareNotFound
-	 */
-	private function getShareById($id) {
-		$share = null;
-
-		// First check if it is an internal share.
-		try {
-			$share = $this->shareManager->getShareById('ocinternal:' . $id);
-			return $share;
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-
-		try {
-			if ($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_CIRCLE)) {
-				$share = $this->shareManager->getShareById('ocCircleShare:' . $id);
-				return $share;
-			}
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-		try {
-			if ($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_EMAIL)) {
-				$share = $this->shareManager->getShareById('ocMailShare:' . $id);
-				return $share;
-			}
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-		if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
-			throw new ShareNotFound();
-		}
-		$share = $this->shareManager->getShareById('ocFederatedSharing:' . $id);
-
-		return $share;
-	}
-
-	/**
-	 * Lock a Node
-	 *
-	 * @param \OCP\Files\Node $node
-	 */
-	private function lock(\OCP\Files\Node $node) {
-		$node->lock(ILockingProvider::LOCK_SHARED);
-		$this->lockedNode = $node;
-	}
-
-	/**
-	 * Cleanup the remaining locks
-	 */
-	public function cleanup() {
-		if ($this->lockedNode !== null) {
-			$this->lockedNode->unlock(ILockingProvider::LOCK_SHARED);
-		}
-	}
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
+
+            $newPermissions = null;
+            if ($publicUpload === 'true') {
+                $newPermissions = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE;
+            } else if ($publicUpload === 'false') {
+                $newPermissions = \OCP\Constants::PERMISSION_READ;
+            }
+
+            if ($permissions !== null) {
+                $newPermissions = (int)$permissions;
+            }
+
+            if ($newPermissions !== null &&
+                !in_array($newPermissions, [
+                    \OCP\Constants::PERMISSION_READ,
+                    \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE, // legacy
+                    \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE, // correct
+                    \OCP\Constants::PERMISSION_CREATE, // hidden file list
+                    \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE, // allow to edit single files
+                ])
+            ) {
+                throw new OCSBadRequestException($this->l->t('Can\'t change permissions for public share links'));
+            }
+
+            if (
+                // legacy
+                $newPermissions === (\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE) ||
+                // correct
+                $newPermissions === (\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE)
+            ) {
+                if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
+                    throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
+                }
+
+                if (!($share->getNode() instanceof \OCP\Files\Folder)) {
+                    throw new OCSBadRequestException($this->l->t('Public upload is only possible for publicly shared folders'));
+                }
+
+                // normalize to correct public upload permissions
+                $newPermissions = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE;
+            }
+
+            if ($newPermissions !== null) {
+                $share->setPermissions($newPermissions);
+                $permissions = $newPermissions;
+            }
+
+            if ($expireDate === '') {
+                $share->setExpirationDate(null);
+            } else if ($expireDate !== null) {
+                try {
+                    $expireDate = $this->parseDate($expireDate);
+                } catch (\Exception $e) {
+                    throw new OCSBadRequestException($e->getMessage());
+                }
+                $share->setExpirationDate($expireDate);
+            }
+
+            if ($password === '') {
+                $share->setPassword(null);
+            } else if ($password !== null) {
+                $share->setPassword($password);
+            }
+
+        } else {
+            if ($permissions !== null) {
+                $permissions = (int)$permissions;
+                $share->setPermissions($permissions);
+            }
+
+            if ($share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
+                if ($password === '') {
+                    $share->setPassword(null);
+                } else if ($password !== null) {
+                    $share->setPassword($password);
+                }
+            }
+
+            if ($expireDate === '') {
+                $share->setExpirationDate(null);
+            } else if ($expireDate !== null) {
+                try {
+                    $expireDate = $this->parseDate($expireDate);
+                } catch (\Exception $e) {
+                    throw new OCSBadRequestException($e->getMessage());
+                }
+                $share->setExpirationDate($expireDate);
+            }
+
+        }
+
+        if ($permissions !== null && $share->getShareOwner() !== $this->currentUser) {
+            /* Check if this is an incomming share */
+            $incomingShares = $this->shareManager->getSharedWith($this->currentUser, \OCP\Share::SHARE_TYPE_USER, $share->getNode(), -1, 0);
+            $incomingShares = array_merge($incomingShares, $this->shareManager->getSharedWith($this->currentUser, \OCP\Share::SHARE_TYPE_GROUP, $share->getNode(), -1, 0));
+
+            /** @var \OCP\Share\IShare[] $incomingShares */
+            if (!empty($incomingShares)) {
+                $maxPermissions = 0;
+                foreach ($incomingShares as $incomingShare) {
+                    $maxPermissions |= $incomingShare->getPermissions();
+                }
+
+                if ($share->getPermissions() & ~$maxPermissions) {
+                    throw new OCSNotFoundException($this->l->t('Cannot increase permissions'));
+                }
+            }
+        }
+
+
+        try {
+            $share = $this->shareManager->updateShare($share);
+        } catch (\Exception $e) {
+            throw new OCSBadRequestException($e->getMessage());
+        }
+
+        return new DataResponse($this->formatShare($share));
+    }
+
+    /**
+     * @param \OCP\Share\IShare $share
+     * @return bool
+     */
+    protected function canAccessShare(\OCP\Share\IShare $share, $checkGroups = true) {
+        // A file with permissions 0 can't be accessed by us. So Don't show it
+        if ($share->getPermissions() === 0) {
+            return false;
+        }
+
+        // Owner of the file and the sharer of the file can always get share
+        if ($share->getShareOwner() === $this->currentUser ||
+            $share->getSharedBy() === $this->currentUser
+        ) {
+            return true;
+        }
+
+        // If the share is shared with you (or a group you are a member of)
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER &&
+            $share->getSharedWith() === $this->currentUser
+        ) {
+            return true;
+        }
+
+        if ($checkGroups && $share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            $sharedWith = $this->groupManager->get($share->getSharedWith());
+            $user = $this->userManager->get($this->currentUser);
+            if ($user !== null && $sharedWith !== null && $sharedWith->inGroup($user)) {
+                return true;
+            }
+        }
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_CIRCLE) {
+            // TODO: have a sanity check like above?
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Make sure that the passed date is valid ISO 8601
+     * So YYYY-MM-DD
+     * If not throw an exception
+     *
+     * @param string $expireDate
+     *
+     * @throws \Exception
+     * @return \DateTime
+     */
+    private function parseDate($expireDate) {
+        try {
+            $date = new \DateTime($expireDate);
+        } catch (\Exception $e) {
+            throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
+        }
+
+        if ($date === false) {
+            throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
+        }
+
+        $date->setTime(0, 0, 0);
+
+        return $date;
+    }
+
+    /**
+     * Since we have multiple providers but the OCS Share API v1 does
+     * not support this we need to check all backends.
+     *
+     * @param string $id
+     * @return \OCP\Share\IShare
+     * @throws ShareNotFound
+     */
+    private function getShareById($id) {
+        $share = null;
+
+        // First check if it is an internal share.
+        try {
+            $share = $this->shareManager->getShareById('ocinternal:' . $id);
+            return $share;
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+
+        try {
+            if ($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_CIRCLE)) {
+                $share = $this->shareManager->getShareById('ocCircleShare:' . $id);
+                return $share;
+            }
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+        try {
+            if ($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_EMAIL)) {
+                $share = $this->shareManager->getShareById('ocMailShare:' . $id);
+                return $share;
+            }
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+        if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
+            throw new ShareNotFound();
+        }
+        $share = $this->shareManager->getShareById('ocFederatedSharing:' . $id);
+
+        return $share;
+    }
+
+    /**
+     * Lock a Node
+     *
+     * @param \OCP\Files\Node $node
+     */
+    private function lock(\OCP\Files\Node $node) {
+        $node->lock(ILockingProvider::LOCK_SHARED);
+        $this->lockedNode = $node;
+    }
+
+    /**
+     * Cleanup the remaining locks
+     */
+    public function cleanup() {
+        if ($this->lockedNode !== null) {
+            $this->lockedNode->unlock(ILockingProvider::LOCK_SHARED);
+        }
+    }
 }