nextcloud / server

apps/files/lib/Service/TagService.php

Unused Use Statements -1 removed lines

@@ -24,7 +24,6 @@
 
 namespace OCA\Files\Service;
 
-use OC\Files\FileInfo;
 use OCP\Files\Node;
 
 /**

Indentation +68 added lines, -68 removed lines

@@ -33,83 +33,83 @@
  */
 class TagService {
 
-	/**
-	 * @var \OCP\IUserSession
-	 */
-	private $userSession;
+    /**
+     * @var \OCP\IUserSession
+     */
+    private $userSession;
 
-	/**
-	 * @var \OCP\ITags
-	 */
-	private $tagger;
+    /**
+     * @var \OCP\ITags
+     */
+    private $tagger;
 
-	/**
-	 * @var \OCP\Files\Folder
-	 */
-	private $homeFolder;
+    /**
+     * @var \OCP\Files\Folder
+     */
+    private $homeFolder;
 
-	public function __construct(
-		\OCP\IUserSession $userSession,
-		\OCP\ITags $tagger,
-		\OCP\Files\Folder $homeFolder
-	) {
-		$this->userSession = $userSession;
-		$this->tagger = $tagger;
-		$this->homeFolder = $homeFolder;
-	}
+    public function __construct(
+        \OCP\IUserSession $userSession,
+        \OCP\ITags $tagger,
+        \OCP\Files\Folder $homeFolder
+    ) {
+        $this->userSession = $userSession;
+        $this->tagger = $tagger;
+        $this->homeFolder = $homeFolder;
+    }
 
-	/**
-	 * Updates the tags of the specified file path.
-	 * The passed tags are absolute, which means they will
-	 * replace the actual tag selection.
-	 *
-	 * @param string $path path
-	 * @param array  $tags array of tags
-	 * @return array list of tags
-	 * @throws \OCP\Files\NotFoundException if the file does not exist
-	 */
-	public function updateFileTags($path, $tags) {
-		$fileId = $this->homeFolder->get($path)->getId();
+    /**
+     * Updates the tags of the specified file path.
+     * The passed tags are absolute, which means they will
+     * replace the actual tag selection.
+     *
+     * @param string $path path
+     * @param array  $tags array of tags
+     * @return array list of tags
+     * @throws \OCP\Files\NotFoundException if the file does not exist
+     */
+    public function updateFileTags($path, $tags) {
+        $fileId = $this->homeFolder->get($path)->getId();
 
-		$currentTags = $this->tagger->getTagsForObjects(array($fileId));
+        $currentTags = $this->tagger->getTagsForObjects(array($fileId));
 
-		if (!empty($currentTags)) {
-			$currentTags = current($currentTags);
-		}
+        if (!empty($currentTags)) {
+            $currentTags = current($currentTags);
+        }
 
-		$newTags = array_diff($tags, $currentTags);
-		foreach ($newTags as $tag) {
-			$this->tagger->tagAs($fileId, $tag);
-		}
-		$deletedTags = array_diff($currentTags, $tags);
-		foreach ($deletedTags as $tag) {
-			$this->tagger->unTag($fileId, $tag);
-		}
+        $newTags = array_diff($tags, $currentTags);
+        foreach ($newTags as $tag) {
+            $this->tagger->tagAs($fileId, $tag);
+        }
+        $deletedTags = array_diff($currentTags, $tags);
+        foreach ($deletedTags as $tag) {
+            $this->tagger->unTag($fileId, $tag);
+        }
 
-		// TODO: re-read from tagger to make sure the
-		// list is up to date, in case of concurrent changes ?
-		return $tags;
-	}
+        // TODO: re-read from tagger to make sure the
+        // list is up to date, in case of concurrent changes ?
+        return $tags;
+    }
 
-	/**
-	 * Get all files for the given tag
-	 *
-	 * @param string $tagName tag name to filter by
-	 * @return Node[] list of matching files
-	 * @throws \Exception if the tag does not exist
-	 */
-	public function getFilesByTag($tagName) {
-		try {
-			$fileIds = $this->tagger->getIdsForTag($tagName);
-		} catch (\Exception $e) {
-			return [];
-		}
+    /**
+     * Get all files for the given tag
+     *
+     * @param string $tagName tag name to filter by
+     * @return Node[] list of matching files
+     * @throws \Exception if the tag does not exist
+     */
+    public function getFilesByTag($tagName) {
+        try {
+            $fileIds = $this->tagger->getIdsForTag($tagName);
+        } catch (\Exception $e) {
+            return [];
+        }
 
-		$allNodes = [];
-		foreach ($fileIds as $fileId) {
-			$allNodes = array_merge($allNodes, $this->homeFolder->getById((int) $fileId));
-		}
-		return $allNodes;
-	}
+        $allNodes = [];
+        foreach ($fileIds as $fileId) {
+            $allNodes = array_merge($allNodes, $this->homeFolder->getById((int) $fileId));
+        }
+        return $allNodes;
+    }
 }
 

apps/files_external/lib/Command/Config.php

Unused Use Statements -3 removed lines

@@ -27,11 +27,8 @@
 use OCA\Files_External\NotFoundException;
 use OCA\Files_External\Service\GlobalStoragesService;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\Table;
-use Symfony\Component\Console\Helper\TableHelper;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Config extends Base {

Indentation +77 added lines, -77 removed lines

@@ -32,87 +32,87 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Config extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	protected $globalService;
+    /**
+     * @var GlobalStoragesService
+     */
+    protected $globalService;
 
-	function __construct(GlobalStoragesService $globalService) {
-		parent::__construct();
-		$this->globalService = $globalService;
-	}
+    function __construct(GlobalStoragesService $globalService) {
+        parent::__construct();
+        $this->globalService = $globalService;
+    }
 
-	protected function configure() {
-		$this
-			->setName('files_external:config')
-			->setDescription('Manage backend configuration for a mount')
-			->addArgument(
-				'mount_id',
-				InputArgument::REQUIRED,
-				'The id of the mount to edit'
-			)->addArgument(
-				'key',
-				InputArgument::REQUIRED,
-				'key of the config option to set/get'
-			)->addArgument(
-				'value',
-				InputArgument::OPTIONAL,
-				'value to set the config option to, when no value is provided the existing value will be printed'
-			);
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:config')
+            ->setDescription('Manage backend configuration for a mount')
+            ->addArgument(
+                'mount_id',
+                InputArgument::REQUIRED,
+                'The id of the mount to edit'
+            )->addArgument(
+                'key',
+                InputArgument::REQUIRED,
+                'key of the config option to set/get'
+            )->addArgument(
+                'value',
+                InputArgument::OPTIONAL,
+                'value to set the config option to, when no value is provided the existing value will be printed'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$mountId = $input->getArgument('mount_id');
-		$key = $input->getArgument('key');
-		try {
-			$mount = $this->globalService->getStorage($mountId);
-		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
-			return 404;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $mountId = $input->getArgument('mount_id');
+        $key = $input->getArgument('key');
+        try {
+            $mount = $this->globalService->getStorage($mountId);
+        } catch (NotFoundException $e) {
+            $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
+            return 404;
+        }
 
-		$value = $input->getArgument('value');
-		if ($value) {
-			$this->setOption($mount, $key, $value, $output);
-		} else {
-			$this->getOption($mount, $key, $output);
-		}
-	}
+        $value = $input->getArgument('value');
+        if ($value) {
+            $this->setOption($mount, $key, $value, $output);
+        } else {
+            $this->getOption($mount, $key, $output);
+        }
+    }
 
-	/**
-	 * @param StorageConfig $mount
-	 * @param string $key
-	 * @param OutputInterface $output
-	 */
-	protected function getOption(StorageConfig $mount, $key, OutputInterface $output) {
-		if ($key === 'mountpoint' || $key === 'mount_point') {
-			$value = $mount->getMountPoint();
-		} else {
-			$value = $mount->getBackendOption($key);
-		}
-		if (!is_string($value)) { // show bools and objects correctly
-			$value = json_encode($value);
-		}
-		$output->writeln($value);
-	}
+    /**
+     * @param StorageConfig $mount
+     * @param string $key
+     * @param OutputInterface $output
+     */
+    protected function getOption(StorageConfig $mount, $key, OutputInterface $output) {
+        if ($key === 'mountpoint' || $key === 'mount_point') {
+            $value = $mount->getMountPoint();
+        } else {
+            $value = $mount->getBackendOption($key);
+        }
+        if (!is_string($value)) { // show bools and objects correctly
+            $value = json_encode($value);
+        }
+        $output->writeln($value);
+    }
 
-	/**
-	 * @param StorageConfig $mount
-	 * @param string $key
-	 * @param string $value
-	 * @param OutputInterface $output
-	 */
-	protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) {
-		$decoded = json_decode($value, true);
-		if (!is_null($decoded)) {
-			$value = $decoded;
-		}
-		if ($key === 'mountpoint' || $key === 'mount_point') {
-			$mount->setMountPoint($value);
-		} else {
-			$mount->setBackendOption($key, $value);
-		}
-		$this->globalService->updateStorage($mount);
-	}
+    /**
+     * @param StorageConfig $mount
+     * @param string $key
+     * @param string $value
+     * @param OutputInterface $output
+     */
+    protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) {
+        $decoded = json_decode($value, true);
+        if (!is_null($decoded)) {
+            $value = $decoded;
+        }
+        if ($key === 'mountpoint' || $key === 'mount_point') {
+            $mount->setMountPoint($value);
+        } else {
+            $mount->setBackendOption($key, $value);
+        }
+        $this->globalService->updateStorage($mount);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 		try {
 			$mount = $this->globalService->getStorage($mountId);
 		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
+			$output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts"</error>');
 			return 404;
 		}
 

apps/files_external/lib/Lib/Storage/AmazonS3.php

Doc Comments +3 added lines

@@ -230,6 +230,9 @@
 		return false;
 	}
 
+	/**
+	 * @param string $path
+	 */
 	private function batchDelete ($path = null) {
 		$params = array(
 			'Bucket' => $this->bucket

Indentation +589 added lines, -589 removed lines

@@ -37,7 +37,7 @@ 
 namespace OCA\Files_External\Lib\Storage;
 
 set_include_path(get_include_path() . PATH_SEPARATOR .
-	\OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php');
+    \OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php');
 require 'aws-autoloader.php';
 
 use Aws\S3\S3Client;
@@ -46,593 +46,593 @@ 
 
 class AmazonS3 extends \OC\Files\Storage\Common {
 
-	/**
-	 * @var \Aws\S3\S3Client
-	 */
-	private $connection;
-	/**
-	 * @var string
-	 */
-	private $bucket;
-	/**
-	 * @var array
-	 */
-	private static $tmpFiles = array();
-	/**
-	 * @var array
-	 */
-	private $params;
-	/**
-	 * @var bool
-	 */
-	private $test = false;
-	/**
-	 * @var int
-	 */
-	private $timeout = 15;
-	/**
-	 * @var int in seconds
-	 */
-	private $rescanDelay = 10;
-
-	/** @var string  */
-	private $id;
-
-	/**
-	 * @param string $path
-	 * @return string correctly encoded path
-	 */
-	private function normalizePath($path) {
-		$path = trim($path, '/');
-
-		if (!$path) {
-			$path = '.';
-		}
-
-		return $path;
-	}
-
-	/**
-	 * when running the tests wait to let the buckets catch up
-	 */
-	private function testTimeout() {
-		if ($this->test) {
-			sleep($this->timeout);
-		}
-	}
-
-	private function isRoot($path) {
-		return $path === '.';
-	}
-
-	private function cleanKey($path) {
-		if ($this->isRoot($path)) {
-			return '/';
-		}
-		return $path;
-	}
-
-	public function __construct($params) {
-		if (empty($params['key']) || empty($params['secret']) || empty($params['bucket'])) {
-			throw new \Exception("Access Key, Secret and Bucket have to be configured.");
-		}
-
-		$this->id = 'amazon::' . $params['bucket'];
-		$this->updateLegacyId($params);
-
-		$this->bucket = $params['bucket'];
-		$this->test = isset($params['test']);
-		$this->timeout = (!isset($params['timeout'])) ? 15 : $params['timeout'];
-		$this->rescanDelay = (!isset($params['rescanDelay'])) ? 10 : $params['rescanDelay'];
-		$params['region'] = empty($params['region']) ? 'eu-west-1' : $params['region'];
-		$params['hostname'] = empty($params['hostname']) ? 's3.amazonaws.com' : $params['hostname'];
-		if (!isset($params['port']) || $params['port'] === '') {
-			$params['port'] = ($params['use_ssl'] === false) ? 80 : 443;
-		}
-		$this->params = $params;
-	}
-
-	/**
-	 * Updates old storage ids (v0.2.1 and older) that are based on key and secret to new ones based on the bucket name.
-	 * TODO Do this in an update.php. requires iterating over all users and loading the mount.json from their home
-	 *
-	 * @param array $params
-	 */
-	public function updateLegacyId (array $params) {
-		$oldId = 'amazon::' . $params['key'] . md5($params['secret']);
-
-		// find by old id or bucket
-		$stmt = \OC::$server->getDatabaseConnection()->prepare(
-			'SELECT `numeric_id`, `id` FROM `*PREFIX*storages` WHERE `id` IN (?, ?)'
-		);
-		$stmt->execute(array($oldId, $this->id));
-		while ($row = $stmt->fetch()) {
-			$storages[$row['id']] = $row['numeric_id'];
-		}
-
-		if (isset($storages[$this->id]) && isset($storages[$oldId])) {
-			// if both ids exist, delete the old storage and corresponding filecache entries
-			\OC\Files\Cache\Storage::remove($oldId);
-		} else if (isset($storages[$oldId])) {
-			// if only the old id exists do an update
-			$stmt = \OC::$server->getDatabaseConnection()->prepare(
-				'UPDATE `*PREFIX*storages` SET `id` = ? WHERE `id` = ?'
-			);
-			$stmt->execute(array($this->id, $oldId));
-		}
-		// only the bucket based id may exist, do nothing
-	}
-
-	/**
-	 * Remove a file or folder
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	protected function remove($path) {
-		// remember fileType to reduce http calls
-		$fileType = $this->filetype($path);
-		if ($fileType === 'dir') {
-			return $this->rmdir($path);
-		} else if ($fileType === 'file') {
-			return $this->unlink($path);
-		} else {
-			return false;
-		}
-	}
-
-	public function mkdir($path) {
-		$path = $this->normalizePath($path);
-
-		if ($this->is_dir($path)) {
-			return false;
-		}
-
-		try {
-			$this->getConnection()->putObject(array(
-				'Bucket' => $this->bucket,
-				'Key' => $path . '/',
-				'Body' => '',
-				'ContentType' => 'httpd/unix-directory'
-			));
-			$this->testTimeout();
-		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-
-		return true;
-	}
-
-	public function file_exists($path) {
-		return $this->filetype($path) !== false;
-	}
-
-
-	public function rmdir($path) {
-		$path = $this->normalizePath($path);
-
-		if ($this->isRoot($path)) {
-			return $this->clearBucket();
-		}
-
-		if (!$this->file_exists($path)) {
-			return false;
-		}
-
-		return $this->batchDelete($path);
-	}
-
-	protected function clearBucket() {
-		try {
-			$this->getConnection()->clearBucket($this->bucket);
-			return true;
-			// clearBucket() is not working with Ceph, so if it fails we try the slower approach
-		} catch (\Exception $e) {
-			return $this->batchDelete();
-		}
-		return false;
-	}
-
-	private function batchDelete ($path = null) {
-		$params = array(
-			'Bucket' => $this->bucket
-		);
-		if ($path !== null) {
-			$params['Prefix'] = $path . '/';
-		}
-		try {
-			// Since there are no real directories on S3, we need
-			// to delete all objects prefixed with the path.
-			do {
-				// instead of the iterator, manually loop over the list ...
-				$objects = $this->getConnection()->listObjects($params);
-				// ... so we can delete the files in batches
-				$this->getConnection()->deleteObjects(array(
-					'Bucket' => $this->bucket,
-					'Objects' => $objects['Contents']
-				));
-				$this->testTimeout();
-				// we reached the end when the list is no longer truncated
-			} while ($objects['IsTruncated']);
-		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-		return true;
-	}
-
-	public function opendir($path) {
-		$path = $this->normalizePath($path);
-
-		if ($this->isRoot($path)) {
-			$path = '';
-		} else {
-			$path .= '/';
-		}
-
-		try {
-			$files = array();
-			$result = $this->getConnection()->getIterator('ListObjects', array(
-				'Bucket' => $this->bucket,
-				'Delimiter' => '/',
-				'Prefix' => $path
-			), array('return_prefixes' => true));
-
-			foreach ($result as $object) {
-				if (isset($object['Key']) && $object['Key'] === $path) {
-					// it's the directory itself, skip
-					continue;
-				}
-				$file = basename(
-					isset($object['Key']) ? $object['Key'] : $object['Prefix']
-				);
-				$files[] = $file;
-			}
-
-			return IteratorDirectory::wrap($files);
-		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-	}
-
-	public function stat($path) {
-		$path = $this->normalizePath($path);
-
-		try {
-			$stat = array();
-			if ($this->is_dir($path)) {
-				//folders don't really exist
-				$stat['size'] = -1; //unknown
-				$stat['mtime'] = time() - $this->rescanDelay * 1000;
-			} else {
-				$result = $this->getConnection()->headObject(array(
-					'Bucket' => $this->bucket,
-					'Key' => $path
-				));
-
-				$stat['size'] = $result['ContentLength'] ? $result['ContentLength'] : 0;
-				if ($result['Metadata']['lastmodified']) {
-					$stat['mtime'] = strtotime($result['Metadata']['lastmodified']);
-				} else {
-					$stat['mtime'] = strtotime($result['LastModified']);
-				}
-			}
-			$stat['atime'] = time();
-
-			return $stat;
-		} catch(S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-	}
-
-	public function filetype($path) {
-		$path = $this->normalizePath($path);
-
-		if ($this->isRoot($path)) {
-			return 'dir';
-		}
-
-		try {
-			if ($this->getConnection()->doesObjectExist($this->bucket, $path)) {
-				return 'file';
-			}
-			if ($this->getConnection()->doesObjectExist($this->bucket, $path.'/')) {
-				return 'dir';
-			}
-		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-
-		return false;
-	}
-
-	public function unlink($path) {
-		$path = $this->normalizePath($path);
-
-		if ($this->is_dir($path)) {
-			return $this->rmdir($path);
-		}
-
-		try {
-			$this->getConnection()->deleteObject(array(
-				'Bucket' => $this->bucket,
-				'Key' => $path
-			));
-			$this->testTimeout();
-		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-
-		return true;
-	}
-
-	public function fopen($path, $mode) {
-		$path = $this->normalizePath($path);
-
-		switch ($mode) {
-			case 'r':
-			case 'rb':
-				$tmpFile = \OCP\Files::tmpFile();
-				self::$tmpFiles[$tmpFile] = $path;
-
-				try {
-					$this->getConnection()->getObject(array(
-						'Bucket' => $this->bucket,
-						'Key' => $path,
-						'SaveAs' => $tmpFile
-					));
-				} catch (S3Exception $e) {
-					\OCP\Util::logException('files_external', $e);
-					return false;
-				}
-
-				return fopen($tmpFile, 'r');
-			case 'w':
-			case 'wb':
-			case 'a':
-			case 'ab':
-			case 'r+':
-			case 'w+':
-			case 'wb+':
-			case 'a+':
-			case 'x':
-			case 'x+':
-			case 'c':
-			case 'c+':
-				if (strrpos($path, '.') !== false) {
-					$ext = substr($path, strrpos($path, '.'));
-				} else {
-					$ext = '';
-				}
-				$tmpFile = \OCP\Files::tmpFile($ext);
-				\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
-				if ($this->file_exists($path)) {
-					$source = $this->fopen($path, 'r');
-					file_put_contents($tmpFile, $source);
-				}
-				self::$tmpFiles[$tmpFile] = $path;
-
-				return fopen('close://' . $tmpFile, $mode);
-		}
-		return false;
-	}
-
-	public function touch($path, $mtime = null) {
-		$path = $this->normalizePath($path);
-
-		$metadata = array();
-		if (is_null($mtime)) {
-			$mtime = time();
-		}
-		$metadata = [
-			'lastmodified' => gmdate(\Aws\Common\Enum\DateFormat::RFC1123, $mtime)
-		];
-
-		$fileType = $this->filetype($path);
-		try {
-			if ($fileType !== false) {
-				if ($fileType === 'dir' && ! $this->isRoot($path)) {
-					$path .= '/';
-				}
-				$this->getConnection()->copyObject([
-					'Bucket' => $this->bucket,
-					'Key' => $this->cleanKey($path),
-					'Metadata' => $metadata,
-					'CopySource' => $this->bucket . '/' . $path,
-					'MetadataDirective' => 'REPLACE',
-				]);
-				$this->testTimeout();
-			} else {
-				$mimeType = \OC::$server->getMimeTypeDetector()->detectPath($path);
-				$this->getConnection()->putObject([
-					'Bucket' => $this->bucket,
-					'Key' => $this->cleanKey($path),
-					'Metadata' => $metadata,
-					'Body' => '',
-					'ContentType' => $mimeType,
-					'MetadataDirective' => 'REPLACE',
-				]);
-				$this->testTimeout();
-			}
-		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-
-		return true;
-	}
-
-	public function copy($path1, $path2) {
-		$path1 = $this->normalizePath($path1);
-		$path2 = $this->normalizePath($path2);
-
-		if ($this->is_file($path1)) {
-			try {
-				$this->getConnection()->copyObject(array(
-					'Bucket' => $this->bucket,
-					'Key' => $this->cleanKey($path2),
-					'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1)
-				));
-				$this->testTimeout();
-			} catch (S3Exception $e) {
-				\OCP\Util::logException('files_external', $e);
-				return false;
-			}
-		} else {
-			$this->remove($path2);
-
-			try {
-				$this->getConnection()->copyObject(array(
-					'Bucket' => $this->bucket,
-					'Key' => $path2 . '/',
-					'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1 . '/')
-				));
-				$this->testTimeout();
-			} catch (S3Exception $e) {
-				\OCP\Util::logException('files_external', $e);
-				return false;
-			}
-
-			$dh = $this->opendir($path1);
-			if (is_resource($dh)) {
-				while (($file = readdir($dh)) !== false) {
-					if (\OC\Files\Filesystem::isIgnoredDir($file)) {
-						continue;
-					}
-
-					$source = $path1 . '/' . $file;
-					$target = $path2 . '/' . $file;
-					$this->copy($source, $target);
-				}
-			}
-		}
-
-		return true;
-	}
-
-	public function rename($path1, $path2) {
-		$path1 = $this->normalizePath($path1);
-		$path2 = $this->normalizePath($path2);
-
-		if ($this->is_file($path1)) {
-
-			if ($this->copy($path1, $path2) === false) {
-				return false;
-			}
-
-			if ($this->unlink($path1) === false) {
-				$this->unlink($path2);
-				return false;
-			}
-		} else {
-
-			if ($this->copy($path1, $path2) === false) {
-				return false;
-			}
-
-			if ($this->rmdir($path1) === false) {
-				$this->rmdir($path2);
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	public function test() {
-		$test = $this->getConnection()->getBucketAcl(array(
-			'Bucket' => $this->bucket,
-		));
-		if (isset($test) && !is_null($test->getPath('Owner/ID'))) {
-			return true;
-		}
-		return false;
-	}
-
-	public function getId() {
-		return $this->id;
-	}
-
-	/**
-	 * Returns the connection
-	 *
-	 * @return S3Client connected client
-	 * @throws \Exception if connection could not be made
-	 */
-	public function getConnection() {
-		if (!is_null($this->connection)) {
-			return $this->connection;
-		}
-
-		$scheme = ($this->params['use_ssl'] === false) ? 'http' : 'https';
-		$base_url = $scheme . '://' . $this->params['hostname'] . ':' . $this->params['port'] . '/';
-
-		$this->connection = S3Client::factory(array(
-			'key' => $this->params['key'],
-			'secret' => $this->params['secret'],
-			'base_url' => $base_url,
-			'region' => $this->params['region'],
-			S3Client::COMMAND_PARAMS => [
-				'PathStyle' => $this->params['use_path_style'],
-			],
-		));
-
-		if (!$this->connection->isValidBucketName($this->bucket)) {
-			throw new \Exception("The configured bucket name is invalid.");
-		}
-
-		if (!$this->connection->doesBucketExist($this->bucket)) {
-			try {
-				$this->connection->createBucket(array(
-					'Bucket' => $this->bucket
-				));
-				$this->connection->waitUntilBucketExists(array(
-					'Bucket' => $this->bucket,
-					'waiter.interval' => 1,
-					'waiter.max_attempts' => 15
-				));
-				$this->testTimeout();
-			} catch (S3Exception $e) {
-				\OCP\Util::logException('files_external', $e);
-				throw new \Exception('Creation of bucket failed. '.$e->getMessage());
-			}
-		}
-
-		return $this->connection;
-	}
-
-	public function writeBack($tmpFile) {
-		if (!isset(self::$tmpFiles[$tmpFile])) {
-			return false;
-		}
-
-		try {
-			$this->getConnection()->putObject(array(
-				'Bucket' => $this->bucket,
-				'Key' => $this->cleanKey(self::$tmpFiles[$tmpFile]),
-				'SourceFile' => $tmpFile,
-				'ContentType' => \OC::$server->getMimeTypeDetector()->detect($tmpFile),
-				'ContentLength' => filesize($tmpFile)
-			));
-			$this->testTimeout();
-
-			unlink($tmpFile);
-		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
-			return false;
-		}
-	}
-
-	/**
-	 * check if curl is installed
-	 */
-	public static function checkDependencies() {
-		return true;
-	}
+    /**
+     * @var \Aws\S3\S3Client
+     */
+    private $connection;
+    /**
+     * @var string
+     */
+    private $bucket;
+    /**
+     * @var array
+     */
+    private static $tmpFiles = array();
+    /**
+     * @var array
+     */
+    private $params;
+    /**
+     * @var bool
+     */
+    private $test = false;
+    /**
+     * @var int
+     */
+    private $timeout = 15;
+    /**
+     * @var int in seconds
+     */
+    private $rescanDelay = 10;
+
+    /** @var string  */
+    private $id;
+
+    /**
+     * @param string $path
+     * @return string correctly encoded path
+     */
+    private function normalizePath($path) {
+        $path = trim($path, '/');
+
+        if (!$path) {
+            $path = '.';
+        }
+
+        return $path;
+    }
+
+    /**
+     * when running the tests wait to let the buckets catch up
+     */
+    private function testTimeout() {
+        if ($this->test) {
+            sleep($this->timeout);
+        }
+    }
+
+    private function isRoot($path) {
+        return $path === '.';
+    }
+
+    private function cleanKey($path) {
+        if ($this->isRoot($path)) {
+            return '/';
+        }
+        return $path;
+    }
+
+    public function __construct($params) {
+        if (empty($params['key']) || empty($params['secret']) || empty($params['bucket'])) {
+            throw new \Exception("Access Key, Secret and Bucket have to be configured.");
+        }
+
+        $this->id = 'amazon::' . $params['bucket'];
+        $this->updateLegacyId($params);
+
+        $this->bucket = $params['bucket'];
+        $this->test = isset($params['test']);
+        $this->timeout = (!isset($params['timeout'])) ? 15 : $params['timeout'];
+        $this->rescanDelay = (!isset($params['rescanDelay'])) ? 10 : $params['rescanDelay'];
+        $params['region'] = empty($params['region']) ? 'eu-west-1' : $params['region'];
+        $params['hostname'] = empty($params['hostname']) ? 's3.amazonaws.com' : $params['hostname'];
+        if (!isset($params['port']) || $params['port'] === '') {
+            $params['port'] = ($params['use_ssl'] === false) ? 80 : 443;
+        }
+        $this->params = $params;
+    }
+
+    /**
+     * Updates old storage ids (v0.2.1 and older) that are based on key and secret to new ones based on the bucket name.
+     * TODO Do this in an update.php. requires iterating over all users and loading the mount.json from their home
+     *
+     * @param array $params
+     */
+    public function updateLegacyId (array $params) {
+        $oldId = 'amazon::' . $params['key'] . md5($params['secret']);
+
+        // find by old id or bucket
+        $stmt = \OC::$server->getDatabaseConnection()->prepare(
+            'SELECT `numeric_id`, `id` FROM `*PREFIX*storages` WHERE `id` IN (?, ?)'
+        );
+        $stmt->execute(array($oldId, $this->id));
+        while ($row = $stmt->fetch()) {
+            $storages[$row['id']] = $row['numeric_id'];
+        }
+
+        if (isset($storages[$this->id]) && isset($storages[$oldId])) {
+            // if both ids exist, delete the old storage and corresponding filecache entries
+            \OC\Files\Cache\Storage::remove($oldId);
+        } else if (isset($storages[$oldId])) {
+            // if only the old id exists do an update
+            $stmt = \OC::$server->getDatabaseConnection()->prepare(
+                'UPDATE `*PREFIX*storages` SET `id` = ? WHERE `id` = ?'
+            );
+            $stmt->execute(array($this->id, $oldId));
+        }
+        // only the bucket based id may exist, do nothing
+    }
+
+    /**
+     * Remove a file or folder
+     *
+     * @param string $path
+     * @return bool
+     */
+    protected function remove($path) {
+        // remember fileType to reduce http calls
+        $fileType = $this->filetype($path);
+        if ($fileType === 'dir') {
+            return $this->rmdir($path);
+        } else if ($fileType === 'file') {
+            return $this->unlink($path);
+        } else {
+            return false;
+        }
+    }
+
+    public function mkdir($path) {
+        $path = $this->normalizePath($path);
+
+        if ($this->is_dir($path)) {
+            return false;
+        }
+
+        try {
+            $this->getConnection()->putObject(array(
+                'Bucket' => $this->bucket,
+                'Key' => $path . '/',
+                'Body' => '',
+                'ContentType' => 'httpd/unix-directory'
+            ));
+            $this->testTimeout();
+        } catch (S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+
+        return true;
+    }
+
+    public function file_exists($path) {
+        return $this->filetype($path) !== false;
+    }
+
+
+    public function rmdir($path) {
+        $path = $this->normalizePath($path);
+
+        if ($this->isRoot($path)) {
+            return $this->clearBucket();
+        }
+
+        if (!$this->file_exists($path)) {
+            return false;
+        }
+
+        return $this->batchDelete($path);
+    }
+
+    protected function clearBucket() {
+        try {
+            $this->getConnection()->clearBucket($this->bucket);
+            return true;
+            // clearBucket() is not working with Ceph, so if it fails we try the slower approach
+        } catch (\Exception $e) {
+            return $this->batchDelete();
+        }
+        return false;
+    }
+
+    private function batchDelete ($path = null) {
+        $params = array(
+            'Bucket' => $this->bucket
+        );
+        if ($path !== null) {
+            $params['Prefix'] = $path . '/';
+        }
+        try {
+            // Since there are no real directories on S3, we need
+            // to delete all objects prefixed with the path.
+            do {
+                // instead of the iterator, manually loop over the list ...
+                $objects = $this->getConnection()->listObjects($params);
+                // ... so we can delete the files in batches
+                $this->getConnection()->deleteObjects(array(
+                    'Bucket' => $this->bucket,
+                    'Objects' => $objects['Contents']
+                ));
+                $this->testTimeout();
+                // we reached the end when the list is no longer truncated
+            } while ($objects['IsTruncated']);
+        } catch (S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+        return true;
+    }
+
+    public function opendir($path) {
+        $path = $this->normalizePath($path);
+
+        if ($this->isRoot($path)) {
+            $path = '';
+        } else {
+            $path .= '/';
+        }
+
+        try {
+            $files = array();
+            $result = $this->getConnection()->getIterator('ListObjects', array(
+                'Bucket' => $this->bucket,
+                'Delimiter' => '/',
+                'Prefix' => $path
+            ), array('return_prefixes' => true));
+
+            foreach ($result as $object) {
+                if (isset($object['Key']) && $object['Key'] === $path) {
+                    // it's the directory itself, skip
+                    continue;
+                }
+                $file = basename(
+                    isset($object['Key']) ? $object['Key'] : $object['Prefix']
+                );
+                $files[] = $file;
+            }
+
+            return IteratorDirectory::wrap($files);
+        } catch (S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+    }
+
+    public function stat($path) {
+        $path = $this->normalizePath($path);
+
+        try {
+            $stat = array();
+            if ($this->is_dir($path)) {
+                //folders don't really exist
+                $stat['size'] = -1; //unknown
+                $stat['mtime'] = time() - $this->rescanDelay * 1000;
+            } else {
+                $result = $this->getConnection()->headObject(array(
+                    'Bucket' => $this->bucket,
+                    'Key' => $path
+                ));
+
+                $stat['size'] = $result['ContentLength'] ? $result['ContentLength'] : 0;
+                if ($result['Metadata']['lastmodified']) {
+                    $stat['mtime'] = strtotime($result['Metadata']['lastmodified']);
+                } else {
+                    $stat['mtime'] = strtotime($result['LastModified']);
+                }
+            }
+            $stat['atime'] = time();
+
+            return $stat;
+        } catch(S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+    }
+
+    public function filetype($path) {
+        $path = $this->normalizePath($path);
+
+        if ($this->isRoot($path)) {
+            return 'dir';
+        }
+
+        try {
+            if ($this->getConnection()->doesObjectExist($this->bucket, $path)) {
+                return 'file';
+            }
+            if ($this->getConnection()->doesObjectExist($this->bucket, $path.'/')) {
+                return 'dir';
+            }
+        } catch (S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+
+        return false;
+    }
+
+    public function unlink($path) {
+        $path = $this->normalizePath($path);
+
+        if ($this->is_dir($path)) {
+            return $this->rmdir($path);
+        }
+
+        try {
+            $this->getConnection()->deleteObject(array(
+                'Bucket' => $this->bucket,
+                'Key' => $path
+            ));
+            $this->testTimeout();
+        } catch (S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+
+        return true;
+    }
+
+    public function fopen($path, $mode) {
+        $path = $this->normalizePath($path);
+
+        switch ($mode) {
+            case 'r':
+            case 'rb':
+                $tmpFile = \OCP\Files::tmpFile();
+                self::$tmpFiles[$tmpFile] = $path;
+
+                try {
+                    $this->getConnection()->getObject(array(
+                        'Bucket' => $this->bucket,
+                        'Key' => $path,
+                        'SaveAs' => $tmpFile
+                    ));
+                } catch (S3Exception $e) {
+                    \OCP\Util::logException('files_external', $e);
+                    return false;
+                }
+
+                return fopen($tmpFile, 'r');
+            case 'w':
+            case 'wb':
+            case 'a':
+            case 'ab':
+            case 'r+':
+            case 'w+':
+            case 'wb+':
+            case 'a+':
+            case 'x':
+            case 'x+':
+            case 'c':
+            case 'c+':
+                if (strrpos($path, '.') !== false) {
+                    $ext = substr($path, strrpos($path, '.'));
+                } else {
+                    $ext = '';
+                }
+                $tmpFile = \OCP\Files::tmpFile($ext);
+                \OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
+                if ($this->file_exists($path)) {
+                    $source = $this->fopen($path, 'r');
+                    file_put_contents($tmpFile, $source);
+                }
+                self::$tmpFiles[$tmpFile] = $path;
+
+                return fopen('close://' . $tmpFile, $mode);
+        }
+        return false;
+    }
+
+    public function touch($path, $mtime = null) {
+        $path = $this->normalizePath($path);
+
+        $metadata = array();
+        if (is_null($mtime)) {
+            $mtime = time();
+        }
+        $metadata = [
+            'lastmodified' => gmdate(\Aws\Common\Enum\DateFormat::RFC1123, $mtime)
+        ];
+
+        $fileType = $this->filetype($path);
+        try {
+            if ($fileType !== false) {
+                if ($fileType === 'dir' && ! $this->isRoot($path)) {
+                    $path .= '/';
+                }
+                $this->getConnection()->copyObject([
+                    'Bucket' => $this->bucket,
+                    'Key' => $this->cleanKey($path),
+                    'Metadata' => $metadata,
+                    'CopySource' => $this->bucket . '/' . $path,
+                    'MetadataDirective' => 'REPLACE',
+                ]);
+                $this->testTimeout();
+            } else {
+                $mimeType = \OC::$server->getMimeTypeDetector()->detectPath($path);
+                $this->getConnection()->putObject([
+                    'Bucket' => $this->bucket,
+                    'Key' => $this->cleanKey($path),
+                    'Metadata' => $metadata,
+                    'Body' => '',
+                    'ContentType' => $mimeType,
+                    'MetadataDirective' => 'REPLACE',
+                ]);
+                $this->testTimeout();
+            }
+        } catch (S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+
+        return true;
+    }
+
+    public function copy($path1, $path2) {
+        $path1 = $this->normalizePath($path1);
+        $path2 = $this->normalizePath($path2);
+
+        if ($this->is_file($path1)) {
+            try {
+                $this->getConnection()->copyObject(array(
+                    'Bucket' => $this->bucket,
+                    'Key' => $this->cleanKey($path2),
+                    'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1)
+                ));
+                $this->testTimeout();
+            } catch (S3Exception $e) {
+                \OCP\Util::logException('files_external', $e);
+                return false;
+            }
+        } else {
+            $this->remove($path2);
+
+            try {
+                $this->getConnection()->copyObject(array(
+                    'Bucket' => $this->bucket,
+                    'Key' => $path2 . '/',
+                    'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1 . '/')
+                ));
+                $this->testTimeout();
+            } catch (S3Exception $e) {
+                \OCP\Util::logException('files_external', $e);
+                return false;
+            }
+
+            $dh = $this->opendir($path1);
+            if (is_resource($dh)) {
+                while (($file = readdir($dh)) !== false) {
+                    if (\OC\Files\Filesystem::isIgnoredDir($file)) {
+                        continue;
+                    }
+
+                    $source = $path1 . '/' . $file;
+                    $target = $path2 . '/' . $file;
+                    $this->copy($source, $target);
+                }
+            }
+        }
+
+        return true;
+    }
+
+    public function rename($path1, $path2) {
+        $path1 = $this->normalizePath($path1);
+        $path2 = $this->normalizePath($path2);
+
+        if ($this->is_file($path1)) {
+
+            if ($this->copy($path1, $path2) === false) {
+                return false;
+            }
+
+            if ($this->unlink($path1) === false) {
+                $this->unlink($path2);
+                return false;
+            }
+        } else {
+
+            if ($this->copy($path1, $path2) === false) {
+                return false;
+            }
+
+            if ($this->rmdir($path1) === false) {
+                $this->rmdir($path2);
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public function test() {
+        $test = $this->getConnection()->getBucketAcl(array(
+            'Bucket' => $this->bucket,
+        ));
+        if (isset($test) && !is_null($test->getPath('Owner/ID'))) {
+            return true;
+        }
+        return false;
+    }
+
+    public function getId() {
+        return $this->id;
+    }
+
+    /**
+     * Returns the connection
+     *
+     * @return S3Client connected client
+     * @throws \Exception if connection could not be made
+     */
+    public function getConnection() {
+        if (!is_null($this->connection)) {
+            return $this->connection;
+        }
+
+        $scheme = ($this->params['use_ssl'] === false) ? 'http' : 'https';
+        $base_url = $scheme . '://' . $this->params['hostname'] . ':' . $this->params['port'] . '/';
+
+        $this->connection = S3Client::factory(array(
+            'key' => $this->params['key'],
+            'secret' => $this->params['secret'],
+            'base_url' => $base_url,
+            'region' => $this->params['region'],
+            S3Client::COMMAND_PARAMS => [
+                'PathStyle' => $this->params['use_path_style'],
+            ],
+        ));
+
+        if (!$this->connection->isValidBucketName($this->bucket)) {
+            throw new \Exception("The configured bucket name is invalid.");
+        }
+
+        if (!$this->connection->doesBucketExist($this->bucket)) {
+            try {
+                $this->connection->createBucket(array(
+                    'Bucket' => $this->bucket
+                ));
+                $this->connection->waitUntilBucketExists(array(
+                    'Bucket' => $this->bucket,
+                    'waiter.interval' => 1,
+                    'waiter.max_attempts' => 15
+                ));
+                $this->testTimeout();
+            } catch (S3Exception $e) {
+                \OCP\Util::logException('files_external', $e);
+                throw new \Exception('Creation of bucket failed. '.$e->getMessage());
+            }
+        }
+
+        return $this->connection;
+    }
+
+    public function writeBack($tmpFile) {
+        if (!isset(self::$tmpFiles[$tmpFile])) {
+            return false;
+        }
+
+        try {
+            $this->getConnection()->putObject(array(
+                'Bucket' => $this->bucket,
+                'Key' => $this->cleanKey(self::$tmpFiles[$tmpFile]),
+                'SourceFile' => $tmpFile,
+                'ContentType' => \OC::$server->getMimeTypeDetector()->detect($tmpFile),
+                'ContentLength' => filesize($tmpFile)
+            ));
+            $this->testTimeout();
+
+            unlink($tmpFile);
+        } catch (S3Exception $e) {
+            \OCP\Util::logException('files_external', $e);
+            return false;
+        }
+    }
+
+    /**
+     * check if curl is installed
+     */
+    public static function checkDependencies() {
+        return true;
+    }
 
 }

Spacing +18 added lines, -18 removed lines

@@ -36,8 +36,8 @@ 
 
 namespace OCA\Files_External\Lib\Storage;
 
-set_include_path(get_include_path() . PATH_SEPARATOR .
-	\OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php');
+set_include_path(get_include_path().PATH_SEPARATOR.
+	\OC_App::getAppPath('files_external').'/3rdparty/aws-sdk-php');
 require 'aws-autoloader.php';
 
 use Aws\S3\S3Client;
@@ -117,7 +117,7 @@ 
 			throw new \Exception("Access Key, Secret and Bucket have to be configured.");
 		}
 
-		$this->id = 'amazon::' . $params['bucket'];
+		$this->id = 'amazon::'.$params['bucket'];
 		$this->updateLegacyId($params);
 
 		$this->bucket = $params['bucket'];
@@ -138,8 +138,8 @@ 
 	 *
 	 * @param array $params
 	 */
-	public function updateLegacyId (array $params) {
-		$oldId = 'amazon::' . $params['key'] . md5($params['secret']);
+	public function updateLegacyId(array $params) {
+		$oldId = 'amazon::'.$params['key'].md5($params['secret']);
 
 		// find by old id or bucket
 		$stmt = \OC::$server->getDatabaseConnection()->prepare(
@@ -191,7 +191,7 @@ 
 		try {
 			$this->getConnection()->putObject(array(
 				'Bucket' => $this->bucket,
-				'Key' => $path . '/',
+				'Key' => $path.'/',
 				'Body' => '',
 				'ContentType' => 'httpd/unix-directory'
 			));
@@ -234,12 +234,12 @@ 
 		return false;
 	}
 
-	private function batchDelete ($path = null) {
+	private function batchDelete($path = null) {
 		$params = array(
 			'Bucket' => $this->bucket
 		);
 		if ($path !== null) {
-			$params['Prefix'] = $path . '/';
+			$params['Prefix'] = $path.'/';
 		}
 		try {
 			// Since there are no real directories on S3, we need
@@ -322,7 +322,7 @@ 
 			$stat['atime'] = time();
 
 			return $stat;
-		} catch(S3Exception $e) {
+		} catch (S3Exception $e) {
 			\OCP\Util::logException('files_external', $e);
 			return false;
 		}
@@ -417,7 +417,7 @@ 
 				}
 				self::$tmpFiles[$tmpFile] = $path;
 
-				return fopen('close://' . $tmpFile, $mode);
+				return fopen('close://'.$tmpFile, $mode);
 		}
 		return false;
 	}
@@ -436,14 +436,14 @@ 
 		$fileType = $this->filetype($path);
 		try {
 			if ($fileType !== false) {
-				if ($fileType === 'dir' && ! $this->isRoot($path)) {
+				if ($fileType === 'dir' && !$this->isRoot($path)) {
 					$path .= '/';
 				}
 				$this->getConnection()->copyObject([
 					'Bucket' => $this->bucket,
 					'Key' => $this->cleanKey($path),
 					'Metadata' => $metadata,
-					'CopySource' => $this->bucket . '/' . $path,
+					'CopySource' => $this->bucket.'/'.$path,
 					'MetadataDirective' => 'REPLACE',
 				]);
 				$this->testTimeout();
@@ -476,7 +476,7 @@ 
 				$this->getConnection()->copyObject(array(
 					'Bucket' => $this->bucket,
 					'Key' => $this->cleanKey($path2),
-					'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1)
+					'CopySource' => S3Client::encodeKey($this->bucket.'/'.$path1)
 				));
 				$this->testTimeout();
 			} catch (S3Exception $e) {
@@ -489,8 +489,8 @@ 
 			try {
 				$this->getConnection()->copyObject(array(
 					'Bucket' => $this->bucket,
-					'Key' => $path2 . '/',
-					'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1 . '/')
+					'Key' => $path2.'/',
+					'CopySource' => S3Client::encodeKey($this->bucket.'/'.$path1.'/')
 				));
 				$this->testTimeout();
 			} catch (S3Exception $e) {
@@ -505,8 +505,8 @@ 
 						continue;
 					}
 
-					$source = $path1 . '/' . $file;
-					$target = $path2 . '/' . $file;
+					$source = $path1.'/'.$file;
+					$target = $path2.'/'.$file;
 					$this->copy($source, $target);
 				}
 			}
@@ -570,7 +570,7 @@ 
 		}
 
 		$scheme = ($this->params['use_ssl'] === false) ? 'http' : 'https';
-		$base_url = $scheme . '://' . $this->params['hostname'] . ':' . $this->params['port'] . '/';
+		$base_url = $scheme.'://'.$this->params['hostname'].':'.$this->params['port'].'/';
 
 		$this->connection = S3Client::factory(array(
 			'key' => $this->params['key'],

apps/files_external/lib/Lib/Storage/Dropbox.php

Doc Comments +3 added lines

@@ -75,6 +75,9 @@
 		return false;
 	}
 
+	/**
+	 * @param string $path
+	 */
 	private function setMetaData($path, $metaData) {
 		$this->metaData[ltrim($path, '/')] = $metaData;
 	}

Indentation +292 added lines, -292 removed lines

@@ -39,320 +39,320 @@
 
 class Dropbox extends \OC\Files\Storage\Common {
 
-	private $dropbox;
-	private $root;
-	private $id;
-	private $metaData = array();
-	private $oauth;
+    private $dropbox;
+    private $root;
+    private $id;
+    private $metaData = array();
+    private $oauth;
 
-	private static $tempFiles = array();
+    private static $tempFiles = array();
 
-	public function __construct($params) {
-		if (isset($params['configured']) && $params['configured'] == 'true'
-			&& isset($params['app_key'])
-			&& isset($params['app_secret'])
-			&& isset($params['token'])
-			&& isset($params['token_secret'])
-		) {
-			$this->root = isset($params['root']) ? $params['root'] : '';
-			$this->id = 'dropbox::'.$params['app_key'] . $params['token']. '/' . $this->root;
-			$this->oauth = new \Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
-			$this->oauth->setToken($params['token'], $params['token_secret']);
-			// note: Dropbox_API connection is lazy
-			$this->dropbox = new \Dropbox_API($this->oauth, 'auto');
-		} else {
-			throw new \Exception('Creating Dropbox storage failed');
-		}
-	}
+    public function __construct($params) {
+        if (isset($params['configured']) && $params['configured'] == 'true'
+            && isset($params['app_key'])
+            && isset($params['app_secret'])
+            && isset($params['token'])
+            && isset($params['token_secret'])
+        ) {
+            $this->root = isset($params['root']) ? $params['root'] : '';
+            $this->id = 'dropbox::'.$params['app_key'] . $params['token']. '/' . $this->root;
+            $this->oauth = new \Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
+            $this->oauth->setToken($params['token'], $params['token_secret']);
+            // note: Dropbox_API connection is lazy
+            $this->dropbox = new \Dropbox_API($this->oauth, 'auto');
+        } else {
+            throw new \Exception('Creating Dropbox storage failed');
+        }
+    }
 
-	/**
-	 * @param string $path
-	 */
-	private function deleteMetaData($path) {
-		$path = ltrim($this->root.$path, '/');
-		if (isset($this->metaData[$path])) {
-			unset($this->metaData[$path]);
-			return true;
-		}
-		return false;
-	}
+    /**
+     * @param string $path
+     */
+    private function deleteMetaData($path) {
+        $path = ltrim($this->root.$path, '/');
+        if (isset($this->metaData[$path])) {
+            unset($this->metaData[$path]);
+            return true;
+        }
+        return false;
+    }
 
-	private function setMetaData($path, $metaData) {
-		$this->metaData[ltrim($path, '/')] = $metaData;
-	}
+    private function setMetaData($path, $metaData) {
+        $this->metaData[ltrim($path, '/')] = $metaData;
+    }
 
-	/**
-	 * Returns the path's metadata
-	 * @param string $path path for which to return the metadata
-	 * @param bool $list if true, also return the directory's contents
-	 * @return mixed directory contents if $list is true, file metadata if $list is
-	 * false, null if the file doesn't exist or "false" if the operation failed
-	 */
-	private function getDropBoxMetaData($path, $list = false) {
-		$path = ltrim($this->root.$path, '/');
-		if ( ! $list && isset($this->metaData[$path])) {
-			return $this->metaData[$path];
-		} else {
-			if ($list) {
-				try {
-					$response = $this->dropbox->getMetaData($path);
-				} catch (\Dropbox_Exception_Forbidden $e) {
-					throw new StorageNotAvailableException('Dropbox API rate limit exceeded', StorageNotAvailableException::STATUS_ERROR, $e);
-				} catch (\Exception $exception) {
-					\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-					return false;
-				}
-				$contents = array();
-				if ($response && isset($response['contents'])) {
-					// Cache folder's contents
-					foreach ($response['contents'] as $file) {
-						if (!isset($file['is_deleted']) || !$file['is_deleted']) {
-							$this->setMetaData($path.'/'.basename($file['path']), $file);
-							$contents[] = $file;
-						}
-					}
-					unset($response['contents']);
-				}
-				if (!isset($response['is_deleted']) || !$response['is_deleted']) {
-					$this->setMetaData($path, $response);
-				}
-				// Return contents of folder only
-				return $contents;
-			} else {
-				try {
-					$requestPath = $path;
-					if ($path === '.') {
-						$requestPath = '';
-					}
+    /**
+     * Returns the path's metadata
+     * @param string $path path for which to return the metadata
+     * @param bool $list if true, also return the directory's contents
+     * @return mixed directory contents if $list is true, file metadata if $list is
+     * false, null if the file doesn't exist or "false" if the operation failed
+     */
+    private function getDropBoxMetaData($path, $list = false) {
+        $path = ltrim($this->root.$path, '/');
+        if ( ! $list && isset($this->metaData[$path])) {
+            return $this->metaData[$path];
+        } else {
+            if ($list) {
+                try {
+                    $response = $this->dropbox->getMetaData($path);
+                } catch (\Dropbox_Exception_Forbidden $e) {
+                    throw new StorageNotAvailableException('Dropbox API rate limit exceeded', StorageNotAvailableException::STATUS_ERROR, $e);
+                } catch (\Exception $exception) {
+                    \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+                    return false;
+                }
+                $contents = array();
+                if ($response && isset($response['contents'])) {
+                    // Cache folder's contents
+                    foreach ($response['contents'] as $file) {
+                        if (!isset($file['is_deleted']) || !$file['is_deleted']) {
+                            $this->setMetaData($path.'/'.basename($file['path']), $file);
+                            $contents[] = $file;
+                        }
+                    }
+                    unset($response['contents']);
+                }
+                if (!isset($response['is_deleted']) || !$response['is_deleted']) {
+                    $this->setMetaData($path, $response);
+                }
+                // Return contents of folder only
+                return $contents;
+            } else {
+                try {
+                    $requestPath = $path;
+                    if ($path === '.') {
+                        $requestPath = '';
+                    }
 
-					$response = $this->dropbox->getMetaData($requestPath, 'false');
-					if (!isset($response['is_deleted']) || !$response['is_deleted']) {
-						$this->setMetaData($path, $response);
-						return $response;
-					}
-					return null;
-				} catch (\Dropbox_Exception_Forbidden $e) {
-					throw new StorageNotAvailableException('Dropbox API rate limit exceeded', StorageNotAvailableException::STATUS_ERROR, $e);
-				} catch (\Exception $exception) {
-					if ($exception instanceof \Dropbox_Exception_NotFound) {
-						// don't log, might be a file_exist check
-						return false;
-					}
-					\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-					return false;
-				}
-			}
-		}
-	}
+                    $response = $this->dropbox->getMetaData($requestPath, 'false');
+                    if (!isset($response['is_deleted']) || !$response['is_deleted']) {
+                        $this->setMetaData($path, $response);
+                        return $response;
+                    }
+                    return null;
+                } catch (\Dropbox_Exception_Forbidden $e) {
+                    throw new StorageNotAvailableException('Dropbox API rate limit exceeded', StorageNotAvailableException::STATUS_ERROR, $e);
+                } catch (\Exception $exception) {
+                    if ($exception instanceof \Dropbox_Exception_NotFound) {
+                        // don't log, might be a file_exist check
+                        return false;
+                    }
+                    \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+                    return false;
+                }
+            }
+        }
+    }
 
-	public function getId(){
-		return $this->id;
-	}
+    public function getId(){
+        return $this->id;
+    }
 
-	public function mkdir($path) {
-		$path = $this->root.$path;
-		try {
-			$this->dropbox->createFolder($path);
-			return true;
-		} catch (\Exception $exception) {
-			\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-	}
+    public function mkdir($path) {
+        $path = $this->root.$path;
+        try {
+            $this->dropbox->createFolder($path);
+            return true;
+        } catch (\Exception $exception) {
+            \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+    }
 
-	public function rmdir($path) {
-		return $this->unlink($path);
-	}
+    public function rmdir($path) {
+        return $this->unlink($path);
+    }
 
-	public function opendir($path) {
-		$contents = $this->getDropBoxMetaData($path, true);
-		if ($contents !== false) {
-			$files = array();
-			foreach ($contents as $file) {
-				$files[] = basename($file['path']);
-			}
-			return IteratorDirectory::wrap($files);
-		}
-		return false;
-	}
+    public function opendir($path) {
+        $contents = $this->getDropBoxMetaData($path, true);
+        if ($contents !== false) {
+            $files = array();
+            foreach ($contents as $file) {
+                $files[] = basename($file['path']);
+            }
+            return IteratorDirectory::wrap($files);
+        }
+        return false;
+    }
 
-	public function stat($path) {
-		$metaData = $this->getDropBoxMetaData($path);
-		if ($metaData) {
-			$stat['size'] = $metaData['bytes'];
-			$stat['atime'] = time();
-			$stat['mtime'] = (isset($metaData['modified'])) ? strtotime($metaData['modified']) : time();
-			return $stat;
-		}
-		return false;
-	}
+    public function stat($path) {
+        $metaData = $this->getDropBoxMetaData($path);
+        if ($metaData) {
+            $stat['size'] = $metaData['bytes'];
+            $stat['atime'] = time();
+            $stat['mtime'] = (isset($metaData['modified'])) ? strtotime($metaData['modified']) : time();
+            return $stat;
+        }
+        return false;
+    }
 
-	public function filetype($path) {
-		if ($path == '' || $path == '/') {
-			return 'dir';
-		} else {
-			$metaData = $this->getDropBoxMetaData($path);
-			if ($metaData) {
-				if ($metaData['is_dir'] == 'true') {
-					return 'dir';
-				} else {
-					return 'file';
-				}
-			}
-		}
-		return false;
-	}
+    public function filetype($path) {
+        if ($path == '' || $path == '/') {
+            return 'dir';
+        } else {
+            $metaData = $this->getDropBoxMetaData($path);
+            if ($metaData) {
+                if ($metaData['is_dir'] == 'true') {
+                    return 'dir';
+                } else {
+                    return 'file';
+                }
+            }
+        }
+        return false;
+    }
 
-	public function file_exists($path) {
-		if ($path == '' || $path == '/') {
-			return true;
-		}
-		if ($this->getDropBoxMetaData($path)) {
-			return true;
-		}
-		return false;
-	}
+    public function file_exists($path) {
+        if ($path == '' || $path == '/') {
+            return true;
+        }
+        if ($this->getDropBoxMetaData($path)) {
+            return true;
+        }
+        return false;
+    }
 
-	public function unlink($path) {
-		try {
-			$this->dropbox->delete($this->root.$path);
-			$this->deleteMetaData($path);
-			return true;
-		} catch (\Exception $exception) {
-			\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-	}
+    public function unlink($path) {
+        try {
+            $this->dropbox->delete($this->root.$path);
+            $this->deleteMetaData($path);
+            return true;
+        } catch (\Exception $exception) {
+            \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+    }
 
-	public function rename($path1, $path2) {
-		try {
-			// overwrite if target file exists and is not a directory
-			$destMetaData = $this->getDropBoxMetaData($path2);
-			if (isset($destMetaData) && $destMetaData !== false && !$destMetaData['is_dir']) {
-				$this->unlink($path2);
-			}
-			$this->dropbox->move($this->root.$path1, $this->root.$path2);
-			$this->deleteMetaData($path1);
-			return true;
-		} catch (\Exception $exception) {
-			\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-	}
+    public function rename($path1, $path2) {
+        try {
+            // overwrite if target file exists and is not a directory
+            $destMetaData = $this->getDropBoxMetaData($path2);
+            if (isset($destMetaData) && $destMetaData !== false && !$destMetaData['is_dir']) {
+                $this->unlink($path2);
+            }
+            $this->dropbox->move($this->root.$path1, $this->root.$path2);
+            $this->deleteMetaData($path1);
+            return true;
+        } catch (\Exception $exception) {
+            \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+    }
 
-	public function copy($path1, $path2) {
-		$path1 = $this->root.$path1;
-		$path2 = $this->root.$path2;
-		try {
-			$this->dropbox->copy($path1, $path2);
-			return true;
-		} catch (\Exception $exception) {
-			\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-	}
+    public function copy($path1, $path2) {
+        $path1 = $this->root.$path1;
+        $path2 = $this->root.$path2;
+        try {
+            $this->dropbox->copy($path1, $path2);
+            return true;
+        } catch (\Exception $exception) {
+            \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+    }
 
-	public function fopen($path, $mode) {
-		$path = $this->root.$path;
-		switch ($mode) {
-			case 'r':
-			case 'rb':
-				try {
-					// slashes need to stay
-					$encodedPath = str_replace('%2F', '/', rawurlencode(trim($path, '/')));
-					$downloadUrl = 'https://api-content.dropbox.com/1/files/auto/' . $encodedPath;
-					$headers = $this->oauth->getOAuthHeader($downloadUrl, [], 'GET');
+    public function fopen($path, $mode) {
+        $path = $this->root.$path;
+        switch ($mode) {
+            case 'r':
+            case 'rb':
+                try {
+                    // slashes need to stay
+                    $encodedPath = str_replace('%2F', '/', rawurlencode(trim($path, '/')));
+                    $downloadUrl = 'https://api-content.dropbox.com/1/files/auto/' . $encodedPath;
+                    $headers = $this->oauth->getOAuthHeader($downloadUrl, [], 'GET');
 
-					$client = \OC::$server->getHTTPClientService()->newClient();
-					try {
-						$response = $client->get($downloadUrl, [
-							'headers' => $headers,
-							'stream' => true,
-						]);
-					} catch (RequestException $e) {
-						if (!is_null($e->getResponse())) {
-							if ($e->getResponse()->getStatusCode() === 404) {
-								return false;
-							} else {
-								throw $e;
-							}
-						} else {
-							throw $e;
-						}
-					}
+                    $client = \OC::$server->getHTTPClientService()->newClient();
+                    try {
+                        $response = $client->get($downloadUrl, [
+                            'headers' => $headers,
+                            'stream' => true,
+                        ]);
+                    } catch (RequestException $e) {
+                        if (!is_null($e->getResponse())) {
+                            if ($e->getResponse()->getStatusCode() === 404) {
+                                return false;
+                            } else {
+                                throw $e;
+                            }
+                        } else {
+                            throw $e;
+                        }
+                    }
 
-					$handle = $response->getBody();
-					return RetryWrapper::wrap($handle);
-				} catch (\Exception $exception) {
-					\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-					return false;
-				}
-			case 'w':
-			case 'wb':
-			case 'a':
-			case 'ab':
-			case 'r+':
-			case 'w+':
-			case 'wb+':
-			case 'a+':
-			case 'x':
-			case 'x+':
-			case 'c':
-			case 'c+':
-				if (strrpos($path, '.') !== false) {
-					$ext = substr($path, strrpos($path, '.'));
-				} else {
-					$ext = '';
-				}
-				$tmpFile = \OCP\Files::tmpFile($ext);
-				\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
-				if ($this->file_exists($path)) {
-					$source = $this->fopen($path, 'r');
-					file_put_contents($tmpFile, $source);
-				}
-				self::$tempFiles[$tmpFile] = $path;
-				return fopen('close://'.$tmpFile, $mode);
-		}
-		return false;
-	}
+                    $handle = $response->getBody();
+                    return RetryWrapper::wrap($handle);
+                } catch (\Exception $exception) {
+                    \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+                    return false;
+                }
+            case 'w':
+            case 'wb':
+            case 'a':
+            case 'ab':
+            case 'r+':
+            case 'w+':
+            case 'wb+':
+            case 'a+':
+            case 'x':
+            case 'x+':
+            case 'c':
+            case 'c+':
+                if (strrpos($path, '.') !== false) {
+                    $ext = substr($path, strrpos($path, '.'));
+                } else {
+                    $ext = '';
+                }
+                $tmpFile = \OCP\Files::tmpFile($ext);
+                \OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
+                if ($this->file_exists($path)) {
+                    $source = $this->fopen($path, 'r');
+                    file_put_contents($tmpFile, $source);
+                }
+                self::$tempFiles[$tmpFile] = $path;
+                return fopen('close://'.$tmpFile, $mode);
+        }
+        return false;
+    }
 
-	public function writeBack($tmpFile) {
-		if (isset(self::$tempFiles[$tmpFile])) {
-			$handle = fopen($tmpFile, 'r');
-			try {
-				$this->dropbox->putFile(self::$tempFiles[$tmpFile], $handle);
-				unlink($tmpFile);
-				$this->deleteMetaData(self::$tempFiles[$tmpFile]);
-			} catch (\Exception $exception) {
-				\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-			}
-		}
-	}
+    public function writeBack($tmpFile) {
+        if (isset(self::$tempFiles[$tmpFile])) {
+            $handle = fopen($tmpFile, 'r');
+            try {
+                $this->dropbox->putFile(self::$tempFiles[$tmpFile], $handle);
+                unlink($tmpFile);
+                $this->deleteMetaData(self::$tempFiles[$tmpFile]);
+            } catch (\Exception $exception) {
+                \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+            }
+        }
+    }
 
-	public function free_space($path) {
-		try {
-			$info = $this->dropbox->getAccountInfo();
-			return $info['quota_info']['quota'] - $info['quota_info']['normal'];
-		} catch (\Exception $exception) {
-			\OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-	}
+    public function free_space($path) {
+        try {
+            $info = $this->dropbox->getAccountInfo();
+            return $info['quota_info']['quota'] - $info['quota_info']['normal'];
+        } catch (\Exception $exception) {
+            \OCP\Util::writeLog('files_external', $exception->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+    }
 
-	public function touch($path, $mtime = null) {
-		if ($this->file_exists($path)) {
-			return false;
-		} else {
-			$this->file_put_contents($path, '');
-		}
-		return true;
-	}
+    public function touch($path, $mtime = null) {
+        if ($this->file_exists($path)) {
+            return false;
+        } else {
+            $this->file_put_contents($path, '');
+        }
+        return true;
+    }
 
-	/**
-	 * check if curl is installed
-	 */
-	public static function checkDependencies() {
-		return true;
-	}
+    /**
+     * check if curl is installed
+     */
+    public static function checkDependencies() {
+        return true;
+    }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -35,7 +35,7 @@ 
 use Icewind\Streams\RetryWrapper;
 use OCP\Files\StorageNotAvailableException;
 
-require_once __DIR__ . '/../../../3rdparty/Dropbox/autoload.php';
+require_once __DIR__.'/../../../3rdparty/Dropbox/autoload.php';
 
 class Dropbox extends \OC\Files\Storage\Common {
 
@@ -55,7 +55,7 @@ 
 			&& isset($params['token_secret'])
 		) {
 			$this->root = isset($params['root']) ? $params['root'] : '';
-			$this->id = 'dropbox::'.$params['app_key'] . $params['token']. '/' . $this->root;
+			$this->id = 'dropbox::'.$params['app_key'].$params['token'].'/'.$this->root;
 			$this->oauth = new \Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
 			$this->oauth->setToken($params['token'], $params['token_secret']);
 			// note: Dropbox_API connection is lazy
@@ -90,7 +90,7 @@ 
 	 */
 	private function getDropBoxMetaData($path, $list = false) {
 		$path = ltrim($this->root.$path, '/');
-		if ( ! $list && isset($this->metaData[$path])) {
+		if (!$list && isset($this->metaData[$path])) {
 			return $this->metaData[$path];
 		} else {
 			if ($list) {
@@ -145,7 +145,7 @@ 
 		}
 	}
 
-	public function getId(){
+	public function getId() {
 		return $this->id;
 	}
 
@@ -260,7 +260,7 @@ 
 				try {
 					// slashes need to stay
 					$encodedPath = str_replace('%2F', '/', rawurlencode(trim($path, '/')));
-					$downloadUrl = 'https://api-content.dropbox.com/1/files/auto/' . $encodedPath;
+					$downloadUrl = 'https://api-content.dropbox.com/1/files/auto/'.$encodedPath;
 					$headers = $this->oauth->getOAuthHeader($downloadUrl, [], 'GET');
 
 					$client = \OC::$server->getHTTPClientService()->newClient();

apps/files_external/lib/Lib/Storage/SFTP.php

Unused Use Statements -1 removed lines

@@ -32,7 +32,6 @@
  */
 namespace OCA\Files_External\Lib\Storage;
 use Icewind\Streams\IteratorDirectory;
-
 use Icewind\Streams\RetryWrapper;
 use phpseclib\Net\SFTP\Stream;
 

Indentation +424 added lines, -424 removed lines

@@ -42,428 +42,428 @@
 * provide access to SFTP servers.
 */
 class SFTP extends \OC\Files\Storage\Common {
-	private $host;
-	private $user;
-	private $root;
-	private $port = 22;
-
-	private $auth;
-
-	/**
-	 * @var \phpseclib\Net\SFTP
-	 */
-	protected $client;
-
-	/**
-	 * @param string $host protocol://server:port
-	 * @return array [$server, $port]
-	 */
-	private function splitHost($host) {
-		$input = $host;
-		if (strpos($host, '://') === false) {
-			// add a protocol to fix parse_url behavior with ipv6
-			$host = 'http://' . $host;
-		}
-
-		$parsed = parse_url($host);
-		if(is_array($parsed) && isset($parsed['port'])) {
-			return [$parsed['host'], $parsed['port']];
-		} else if (is_array($parsed)) {
-			return [$parsed['host'], 22];
-		} else {
-			return [$input, 22];
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function __construct($params) {
-		// Register sftp://
-		Stream::register();
-
-		$parsedHost =  $this->splitHost($params['host']);
-
-		$this->host = $parsedHost[0];
-		$this->port = $parsedHost[1];
-
-		if (!isset($params['user'])) {
-			throw new \UnexpectedValueException('no authentication parameters specified');
-		}
-		$this->user = $params['user'];
-
-		if (isset($params['public_key_auth'])) {
-			$this->auth = $params['public_key_auth'];
-		} elseif (isset($params['password'])) {
-			$this->auth = $params['password'];
-		} else {
-			throw new \UnexpectedValueException('no authentication parameters specified');
-		}
-
-		$this->root
-			= isset($params['root']) ? $this->cleanPath($params['root']) : '/';
-
-		if ($this->root[0] != '/') {
-			 $this->root = '/' . $this->root;
-		}
-
-		if (substr($this->root, -1, 1) != '/') {
-			$this->root .= '/';
-		}
-	}
-
-	/**
-	 * Returns the connection.
-	 *
-	 * @return \phpseclib\Net\SFTP connected client instance
-	 * @throws \Exception when the connection failed
-	 */
-	public function getConnection() {
-		if (!is_null($this->client)) {
-			return $this->client;
-		}
-
-		$hostKeys = $this->readHostKeys();
-		$this->client = new \phpseclib\Net\SFTP($this->host, $this->port);
-
-		// The SSH Host Key MUST be verified before login().
-		$currentHostKey = $this->client->getServerPublicHostKey();
-		if (array_key_exists($this->host, $hostKeys)) {
-			if ($hostKeys[$this->host] != $currentHostKey) {
-				throw new \Exception('Host public key does not match known key');
-			}
-		} else {
-			$hostKeys[$this->host] = $currentHostKey;
-			$this->writeHostKeys($hostKeys);
-		}
-
-		if (!$this->client->login($this->user, $this->auth)) {
-			throw new \Exception('Login failed');
-		}
-		return $this->client;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function test() {
-		if (
-			!isset($this->host)
-			|| !isset($this->user)
-		) {
-			return false;
-		}
-		return $this->getConnection()->nlist() !== false;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getId(){
-		$id = 'sftp::' . $this->user . '@' . $this->host;
-		if ($this->port !== 22) {
-			$id .= ':' . $this->port;
-		}
-		// note: this will double the root slash,
-		// we should not change it to keep compatible with
-		// old storage ids
-		$id .= '/' . $this->root;
-		return $id;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getHost() {
-		return $this->host;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getRoot() {
-		return $this->root;
-	}
-
-	/**
-	 * @return mixed
-	 */
-	public function getUser() {
-		return $this->user;
-	}
-
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	private function absPath($path) {
-		return $this->root . $this->cleanPath($path);
-	}
-
-	/**
-	 * @return string|false
-	 */
-	private function hostKeysPath() {
-		try {
-			$storage_view = \OCP\Files::getStorage('files_external');
-			if ($storage_view) {
-				return \OC::$server->getConfig()->getSystemValue('datadirectory') .
-					$storage_view->getAbsolutePath('') .
-					'ssh_hostKeys';
-			}
-		} catch (\Exception $e) {
-		}
-		return false;
-	}
-
-	/**
-	 * @param $keys
-	 * @return bool
-	 */
-	protected function writeHostKeys($keys) {
-		try {
-			$keyPath = $this->hostKeysPath();
-			if ($keyPath && file_exists($keyPath)) {
-				$fp = fopen($keyPath, 'w');
-				foreach ($keys as $host => $key) {
-					fwrite($fp, $host . '::' . $key . "\n");
-				}
-				fclose($fp);
-				return true;
-			}
-		} catch (\Exception $e) {
-		}
-		return false;
-	}
-
-	/**
-	 * @return array
-	 */
-	protected function readHostKeys() {
-		try {
-			$keyPath = $this->hostKeysPath();
-			if (file_exists($keyPath)) {
-				$hosts = array();
-				$keys = array();
-				$lines = file($keyPath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-				if ($lines) {
-					foreach ($lines as $line) {
-						$hostKeyArray = explode("::", $line, 2);
-						if (count($hostKeyArray) == 2) {
-							$hosts[] = $hostKeyArray[0];
-							$keys[] = $hostKeyArray[1];
-						}
-					}
-					return array_combine($hosts, $keys);
-				}
-			}
-		} catch (\Exception $e) {
-		}
-		return array();
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function mkdir($path) {
-		try {
-			return $this->getConnection()->mkdir($this->absPath($path));
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function rmdir($path) {
-		try {
-			$result = $this->getConnection()->delete($this->absPath($path), true);
-			// workaround: stray stat cache entry when deleting empty folders
-			// see https://github.com/phpseclib/phpseclib/issues/706
-			$this->getConnection()->clearStatCache();
-			return $result;
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function opendir($path) {
-		try {
-			$list = $this->getConnection()->nlist($this->absPath($path));
-			if ($list === false) {
-				return false;
-			}
-
-			$id = md5('sftp:' . $path);
-			$dirStream = array();
-			foreach($list as $file) {
-				if ($file != '.' && $file != '..') {
-					$dirStream[] = $file;
-				}
-			}
-			return IteratorDirectory::wrap($dirStream);
-		} catch(\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function filetype($path) {
-		try {
-			$stat = $this->getConnection()->stat($this->absPath($path));
-			if ($stat['type'] == NET_SFTP_TYPE_REGULAR) {
-				return 'file';
-			}
-
-			if ($stat['type'] == NET_SFTP_TYPE_DIRECTORY) {
-				return 'dir';
-			}
-		} catch (\Exception $e) {
-
-		}
-		return false;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function file_exists($path) {
-		try {
-			return $this->getConnection()->stat($this->absPath($path)) !== false;
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function unlink($path) {
-		try {
-			return $this->getConnection()->delete($this->absPath($path), true);
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function fopen($path, $mode) {
-		try {
-			$absPath = $this->absPath($path);
-			switch($mode) {
-				case 'r':
-				case 'rb':
-					if ( !$this->file_exists($path)) {
-						return false;
-					}
-				case 'w':
-				case 'wb':
-				case 'a':
-				case 'ab':
-				case 'r+':
-				case 'w+':
-				case 'wb+':
-				case 'a+':
-				case 'x':
-				case 'x+':
-				case 'c':
-				case 'c+':
-					$context = stream_context_create(array('sftp' => array('session' => $this->getConnection())));
-					$handle = fopen($this->constructUrl($path), $mode, false, $context);
-					return RetryWrapper::wrap($handle);
-			}
-		} catch (\Exception $e) {
-		}
-		return false;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function touch($path, $mtime=null) {
-		try {
-			if (!is_null($mtime)) {
-				return false;
-			}
-			if (!$this->file_exists($path)) {
-				$this->getConnection()->put($this->absPath($path), '');
-			} else {
-				return false;
-			}
-		} catch (\Exception $e) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @param string $path
-	 * @param string $target
-	 * @throws \Exception
-	 */
-	public function getFile($path, $target) {
-		$this->getConnection()->get($path, $target);
-	}
-
-	/**
-	 * @param string $path
-	 * @param string $target
-	 * @throws \Exception
-	 */
-	public function uploadFile($path, $target) {
-		$this->getConnection()->put($target, $path, NET_SFTP_LOCAL_FILE);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function rename($source, $target) {
-		try {
-			if ($this->file_exists($target)) {
-				$this->unlink($target);
-			}
-			return $this->getConnection()->rename(
-				$this->absPath($source),
-				$this->absPath($target)
-			);
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function stat($path) {
-		try {
-			$stat = $this->getConnection()->stat($this->absPath($path));
-
-			$mtime = $stat ? $stat['mtime'] : -1;
-			$size = $stat ? $stat['size'] : 0;
-
-			return array('mtime' => $mtime, 'size' => $size, 'ctime' => -1);
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	public function constructUrl($path) {
-		// Do not pass the password here. We want to use the Net_SFTP object
-		// supplied via stream context or fail. We only supply username and
-		// hostname because this might show up in logs (they are not used).
-		$url = 'sftp://' . urlencode($this->user) . '@' . $this->host . ':' . $this->port . $this->root . $path;
-		return $url;
-	}
+    private $host;
+    private $user;
+    private $root;
+    private $port = 22;
+
+    private $auth;
+
+    /**
+     * @var \phpseclib\Net\SFTP
+     */
+    protected $client;
+
+    /**
+     * @param string $host protocol://server:port
+     * @return array [$server, $port]
+     */
+    private function splitHost($host) {
+        $input = $host;
+        if (strpos($host, '://') === false) {
+            // add a protocol to fix parse_url behavior with ipv6
+            $host = 'http://' . $host;
+        }
+
+        $parsed = parse_url($host);
+        if(is_array($parsed) && isset($parsed['port'])) {
+            return [$parsed['host'], $parsed['port']];
+        } else if (is_array($parsed)) {
+            return [$parsed['host'], 22];
+        } else {
+            return [$input, 22];
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct($params) {
+        // Register sftp://
+        Stream::register();
+
+        $parsedHost =  $this->splitHost($params['host']);
+
+        $this->host = $parsedHost[0];
+        $this->port = $parsedHost[1];
+
+        if (!isset($params['user'])) {
+            throw new \UnexpectedValueException('no authentication parameters specified');
+        }
+        $this->user = $params['user'];
+
+        if (isset($params['public_key_auth'])) {
+            $this->auth = $params['public_key_auth'];
+        } elseif (isset($params['password'])) {
+            $this->auth = $params['password'];
+        } else {
+            throw new \UnexpectedValueException('no authentication parameters specified');
+        }
+
+        $this->root
+            = isset($params['root']) ? $this->cleanPath($params['root']) : '/';
+
+        if ($this->root[0] != '/') {
+                $this->root = '/' . $this->root;
+        }
+
+        if (substr($this->root, -1, 1) != '/') {
+            $this->root .= '/';
+        }
+    }
+
+    /**
+     * Returns the connection.
+     *
+     * @return \phpseclib\Net\SFTP connected client instance
+     * @throws \Exception when the connection failed
+     */
+    public function getConnection() {
+        if (!is_null($this->client)) {
+            return $this->client;
+        }
+
+        $hostKeys = $this->readHostKeys();
+        $this->client = new \phpseclib\Net\SFTP($this->host, $this->port);
+
+        // The SSH Host Key MUST be verified before login().
+        $currentHostKey = $this->client->getServerPublicHostKey();
+        if (array_key_exists($this->host, $hostKeys)) {
+            if ($hostKeys[$this->host] != $currentHostKey) {
+                throw new \Exception('Host public key does not match known key');
+            }
+        } else {
+            $hostKeys[$this->host] = $currentHostKey;
+            $this->writeHostKeys($hostKeys);
+        }
+
+        if (!$this->client->login($this->user, $this->auth)) {
+            throw new \Exception('Login failed');
+        }
+        return $this->client;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function test() {
+        if (
+            !isset($this->host)
+            || !isset($this->user)
+        ) {
+            return false;
+        }
+        return $this->getConnection()->nlist() !== false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getId(){
+        $id = 'sftp::' . $this->user . '@' . $this->host;
+        if ($this->port !== 22) {
+            $id .= ':' . $this->port;
+        }
+        // note: this will double the root slash,
+        // we should not change it to keep compatible with
+        // old storage ids
+        $id .= '/' . $this->root;
+        return $id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getHost() {
+        return $this->host;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRoot() {
+        return $this->root;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getUser() {
+        return $this->user;
+    }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    private function absPath($path) {
+        return $this->root . $this->cleanPath($path);
+    }
+
+    /**
+     * @return string|false
+     */
+    private function hostKeysPath() {
+        try {
+            $storage_view = \OCP\Files::getStorage('files_external');
+            if ($storage_view) {
+                return \OC::$server->getConfig()->getSystemValue('datadirectory') .
+                    $storage_view->getAbsolutePath('') .
+                    'ssh_hostKeys';
+            }
+        } catch (\Exception $e) {
+        }
+        return false;
+    }
+
+    /**
+     * @param $keys
+     * @return bool
+     */
+    protected function writeHostKeys($keys) {
+        try {
+            $keyPath = $this->hostKeysPath();
+            if ($keyPath && file_exists($keyPath)) {
+                $fp = fopen($keyPath, 'w');
+                foreach ($keys as $host => $key) {
+                    fwrite($fp, $host . '::' . $key . "\n");
+                }
+                fclose($fp);
+                return true;
+            }
+        } catch (\Exception $e) {
+        }
+        return false;
+    }
+
+    /**
+     * @return array
+     */
+    protected function readHostKeys() {
+        try {
+            $keyPath = $this->hostKeysPath();
+            if (file_exists($keyPath)) {
+                $hosts = array();
+                $keys = array();
+                $lines = file($keyPath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+                if ($lines) {
+                    foreach ($lines as $line) {
+                        $hostKeyArray = explode("::", $line, 2);
+                        if (count($hostKeyArray) == 2) {
+                            $hosts[] = $hostKeyArray[0];
+                            $keys[] = $hostKeyArray[1];
+                        }
+                    }
+                    return array_combine($hosts, $keys);
+                }
+            }
+        } catch (\Exception $e) {
+        }
+        return array();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function mkdir($path) {
+        try {
+            return $this->getConnection()->mkdir($this->absPath($path));
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rmdir($path) {
+        try {
+            $result = $this->getConnection()->delete($this->absPath($path), true);
+            // workaround: stray stat cache entry when deleting empty folders
+            // see https://github.com/phpseclib/phpseclib/issues/706
+            $this->getConnection()->clearStatCache();
+            return $result;
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function opendir($path) {
+        try {
+            $list = $this->getConnection()->nlist($this->absPath($path));
+            if ($list === false) {
+                return false;
+            }
+
+            $id = md5('sftp:' . $path);
+            $dirStream = array();
+            foreach($list as $file) {
+                if ($file != '.' && $file != '..') {
+                    $dirStream[] = $file;
+                }
+            }
+            return IteratorDirectory::wrap($dirStream);
+        } catch(\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function filetype($path) {
+        try {
+            $stat = $this->getConnection()->stat($this->absPath($path));
+            if ($stat['type'] == NET_SFTP_TYPE_REGULAR) {
+                return 'file';
+            }
+
+            if ($stat['type'] == NET_SFTP_TYPE_DIRECTORY) {
+                return 'dir';
+            }
+        } catch (\Exception $e) {
+
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function file_exists($path) {
+        try {
+            return $this->getConnection()->stat($this->absPath($path)) !== false;
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function unlink($path) {
+        try {
+            return $this->getConnection()->delete($this->absPath($path), true);
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function fopen($path, $mode) {
+        try {
+            $absPath = $this->absPath($path);
+            switch($mode) {
+                case 'r':
+                case 'rb':
+                    if ( !$this->file_exists($path)) {
+                        return false;
+                    }
+                case 'w':
+                case 'wb':
+                case 'a':
+                case 'ab':
+                case 'r+':
+                case 'w+':
+                case 'wb+':
+                case 'a+':
+                case 'x':
+                case 'x+':
+                case 'c':
+                case 'c+':
+                    $context = stream_context_create(array('sftp' => array('session' => $this->getConnection())));
+                    $handle = fopen($this->constructUrl($path), $mode, false, $context);
+                    return RetryWrapper::wrap($handle);
+            }
+        } catch (\Exception $e) {
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function touch($path, $mtime=null) {
+        try {
+            if (!is_null($mtime)) {
+                return false;
+            }
+            if (!$this->file_exists($path)) {
+                $this->getConnection()->put($this->absPath($path), '');
+            } else {
+                return false;
+            }
+        } catch (\Exception $e) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * @param string $path
+     * @param string $target
+     * @throws \Exception
+     */
+    public function getFile($path, $target) {
+        $this->getConnection()->get($path, $target);
+    }
+
+    /**
+     * @param string $path
+     * @param string $target
+     * @throws \Exception
+     */
+    public function uploadFile($path, $target) {
+        $this->getConnection()->put($target, $path, NET_SFTP_LOCAL_FILE);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rename($source, $target) {
+        try {
+            if ($this->file_exists($target)) {
+                $this->unlink($target);
+            }
+            return $this->getConnection()->rename(
+                $this->absPath($source),
+                $this->absPath($target)
+            );
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function stat($path) {
+        try {
+            $stat = $this->getConnection()->stat($this->absPath($path));
+
+            $mtime = $stat ? $stat['mtime'] : -1;
+            $size = $stat ? $stat['size'] : 0;
+
+            return array('mtime' => $mtime, 'size' => $size, 'ctime' => -1);
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    public function constructUrl($path) {
+        // Do not pass the password here. We want to use the Net_SFTP object
+        // supplied via stream context or fail. We only supply username and
+        // hostname because this might show up in logs (they are not used).
+        $url = 'sftp://' . urlencode($this->user) . '@' . $this->host . ':' . $this->port . $this->root . $path;
+        return $url;
+    }
 }

Spacing +19 added lines, -19 removed lines

@@ -62,11 +62,11 @@ 
 		$input = $host;
 		if (strpos($host, '://') === false) {
 			// add a protocol to fix parse_url behavior with ipv6
-			$host = 'http://' . $host;
+			$host = 'http://'.$host;
 		}
 
 		$parsed = parse_url($host);
-		if(is_array($parsed) && isset($parsed['port'])) {
+		if (is_array($parsed) && isset($parsed['port'])) {
 			return [$parsed['host'], $parsed['port']];
 		} else if (is_array($parsed)) {
 			return [$parsed['host'], 22];
@@ -82,7 +82,7 @@ 
 		// Register sftp://
 		Stream::register();
 
-		$parsedHost =  $this->splitHost($params['host']);
+		$parsedHost = $this->splitHost($params['host']);
 
 		$this->host = $parsedHost[0];
 		$this->port = $parsedHost[1];
@@ -104,7 +104,7 @@ 
 			= isset($params['root']) ? $this->cleanPath($params['root']) : '/';
 
 		if ($this->root[0] != '/') {
-			 $this->root = '/' . $this->root;
+			 $this->root = '/'.$this->root;
 		}
 
 		if (substr($this->root, -1, 1) != '/') {
@@ -159,15 +159,15 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function getId(){
-		$id = 'sftp::' . $this->user . '@' . $this->host;
+	public function getId() {
+		$id = 'sftp::'.$this->user.'@'.$this->host;
 		if ($this->port !== 22) {
-			$id .= ':' . $this->port;
+			$id .= ':'.$this->port;
 		}
 		// note: this will double the root slash,
 		// we should not change it to keep compatible with
 		// old storage ids
-		$id .= '/' . $this->root;
+		$id .= '/'.$this->root;
 		return $id;
 	}
 
@@ -197,7 +197,7 @@ 
 	 * @return string
 	 */
 	private function absPath($path) {
-		return $this->root . $this->cleanPath($path);
+		return $this->root.$this->cleanPath($path);
 	}
 
 	/**
@@ -207,8 +207,8 @@ 
 		try {
 			$storage_view = \OCP\Files::getStorage('files_external');
 			if ($storage_view) {
-				return \OC::$server->getConfig()->getSystemValue('datadirectory') .
-					$storage_view->getAbsolutePath('') .
+				return \OC::$server->getConfig()->getSystemValue('datadirectory').
+					$storage_view->getAbsolutePath('').
 					'ssh_hostKeys';
 			}
 		} catch (\Exception $e) {
@@ -226,7 +226,7 @@ 
 			if ($keyPath && file_exists($keyPath)) {
 				$fp = fopen($keyPath, 'w');
 				foreach ($keys as $host => $key) {
-					fwrite($fp, $host . '::' . $key . "\n");
+					fwrite($fp, $host.'::'.$key."\n");
 				}
 				fclose($fp);
 				return true;
@@ -298,15 +298,15 @@ 
 				return false;
 			}
 
-			$id = md5('sftp:' . $path);
+			$id = md5('sftp:'.$path);
 			$dirStream = array();
-			foreach($list as $file) {
+			foreach ($list as $file) {
 				if ($file != '.' && $file != '..') {
 					$dirStream[] = $file;
 				}
 			}
 			return IteratorDirectory::wrap($dirStream);
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			return false;
 		}
 	}
@@ -358,10 +358,10 @@ 
 	public function fopen($path, $mode) {
 		try {
 			$absPath = $this->absPath($path);
-			switch($mode) {
+			switch ($mode) {
 				case 'r':
 				case 'rb':
-					if ( !$this->file_exists($path)) {
+					if (!$this->file_exists($path)) {
 						return false;
 					}
 				case 'w':
@@ -388,7 +388,7 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function touch($path, $mtime=null) {
+	public function touch($path, $mtime = null) {
 		try {
 			if (!is_null($mtime)) {
 				return false;
@@ -463,7 +463,7 @@ 
 		// Do not pass the password here. We want to use the Net_SFTP object
 		// supplied via stream context or fail. We only supply username and
 		// hostname because this might show up in logs (they are not used).
-		$url = 'sftp://' . urlencode($this->user) . '@' . $this->host . ':' . $this->port . $this->root . $path;
+		$url = 'sftp://'.urlencode($this->user).'@'.$this->host.':'.$this->port.$this->root.$path;
 		return $url;
 	}
 }

apps/files_sharing/lib/API/Sharees.php

Doc Comments +1 added lines, -1 removed lines

@@ -335,7 +335,7 @@
 	 * split user and remote from federated cloud id
 	 *
 	 * @param string $address federated share address
-	 * @return array [user, remoteURL]
+	 * @return string[] [user, remoteURL]
 	 * @throws \Exception
 	 */
 	public function splitUserRemote($address) {

Indentation +495 added lines, -495 removed lines

@@ -39,499 +39,499 @@
 
 class Sharees {
 
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IManager */
-	protected $contactsManager;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IUserSession */
-	protected $userSession;
-
-	/** @var IRequest */
-	protected $request;
-
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-
-	/** @var ILogger */
-	protected $logger;
-
-	/** @var \OCP\Share\IManager */
-	protected $shareManager;
-
-	/** @var bool */
-	protected $shareWithGroupOnly = false;
-
-	/** @var bool */
-	protected $shareeEnumeration = true;
-
-	/** @var int */
-	protected $offset = 0;
-
-	/** @var int */
-	protected $limit = 10;
-
-	/** @var array */
-	protected $result = [
-		'exact' => [
-			'users' => [],
-			'groups' => [],
-			'remotes' => [],
-		],
-		'users' => [],
-		'groups' => [],
-		'remotes' => [],
-	];
-
-	protected $reachedEndFor = [];
-
-	/**
-	 * @param IGroupManager $groupManager
-	 * @param IUserManager $userManager
-	 * @param IManager $contactsManager
-	 * @param IConfig $config
-	 * @param IUserSession $userSession
-	 * @param IURLGenerator $urlGenerator
-	 * @param IRequest $request
-	 * @param ILogger $logger
-	 * @param \OCP\Share\IManager $shareManager
-	 */
-	public function __construct(IGroupManager $groupManager,
-								IUserManager $userManager,
-								IManager $contactsManager,
-								IConfig $config,
-								IUserSession $userSession,
-								IURLGenerator $urlGenerator,
-								IRequest $request,
-								ILogger $logger,
-								\OCP\Share\IManager $shareManager) {
-		$this->groupManager = $groupManager;
-		$this->userManager = $userManager;
-		$this->contactsManager = $contactsManager;
-		$this->config = $config;
-		$this->userSession = $userSession;
-		$this->urlGenerator = $urlGenerator;
-		$this->request = $request;
-		$this->logger = $logger;
-		$this->shareManager = $shareManager;
-	}
-
-	/**
-	 * @param string $search
-	 */
-	protected function getUsers($search) {
-		$this->result['users'] = $this->result['exact']['users'] = $users = [];
-
-		$userGroups = [];
-		if ($this->shareWithGroupOnly) {
-			// Search in all the groups this user is part of
-			$userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
-			foreach ($userGroups as $userGroup) {
-				$usersTmp = $this->groupManager->displayNamesInGroup($userGroup, $search, $this->limit, $this->offset);
-				foreach ($usersTmp as $uid => $userDisplayName) {
-					$users[$uid] = $userDisplayName;
-				}
-			}
-		} else {
-			// Search in all users
-			$usersTmp = $this->userManager->searchDisplayName($search, $this->limit, $this->offset);
-
-			foreach ($usersTmp as $user) {
-				$users[$user->getUID()] = $user->getDisplayName();
-			}
-		}
-
-		if (!$this->shareeEnumeration || sizeof($users) < $this->limit) {
-			$this->reachedEndFor[] = 'users';
-		}
-
-		$foundUserById = false;
-		foreach ($users as $uid => $userDisplayName) {
-			if (strtolower($uid) === strtolower($search) || strtolower($userDisplayName) === strtolower($search)) {
-				if (strtolower($uid) === strtolower($search)) {
-					$foundUserById = true;
-				}
-				$this->result['exact']['users'][] = [
-					'label' => $userDisplayName,
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_USER,
-						'shareWith' => $uid,
-					],
-				];
-			} else {
-				$this->result['users'][] = [
-					'label' => $userDisplayName,
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_USER,
-						'shareWith' => $uid,
-					],
-				];
-			}
-		}
-
-		if ($this->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($userGroups, $this->groupManager->getUserGroupIds($user));
-					$addUser = !empty($commonGroups);
-				}
-
-				if ($addUser) {
-					array_push($this->result['exact']['users'], [
-						'label' => $user->getDisplayName(),
-						'value' => [
-							'shareType' => Share::SHARE_TYPE_USER,
-							'shareWith' => $user->getUID(),
-						],
-					]);
-				}
-			}
-		}
-
-		if (!$this->shareeEnumeration) {
-			$this->result['users'] = [];
-		}
-	}
-
-	/**
-	 * @param string $search
-	 */
-	protected function getGroups($search) {
-		$this->result['groups'] = $this->result['exact']['groups'] = [];
-
-		$groups = $this->groupManager->search($search, $this->limit, $this->offset);
-		$groups = array_map(function (IGroup $group) { return $group->getGID(); }, $groups);
-
-		if (!$this->shareeEnumeration || sizeof($groups) < $this->limit) {
-			$this->reachedEndFor[] = 'groups';
-		}
-
-		$userGroups =  [];
-		if (!empty($groups) && $this->shareWithGroupOnly) {
-			// Intersect all the groups that match with the groups this user is a member of
-			$userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
-			$userGroups = array_map(function (IGroup $group) { return $group->getGID(); }, $userGroups);
-			$groups = array_intersect($groups, $userGroups);
-		}
-
-		foreach ($groups as $gid) {
-			if (strtolower($gid) === strtolower($search)) {
-				$this->result['exact']['groups'][] = [
-					'label' => $gid,
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_GROUP,
-						'shareWith' => $gid,
-					],
-				];
-			} else {
-				$this->result['groups'][] = [
-					'label' => $gid,
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_GROUP,
-						'shareWith' => $gid,
-					],
-				];
-			}
-		}
-
-		if ($this->offset === 0 && empty($this->result['exact']['groups'])) {
-			// 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
-			$group = $this->groupManager->get($search);
-			if ($group instanceof IGroup && (!$this->shareWithGroupOnly || in_array($group->getGID(), $userGroups))) {
-				array_push($this->result['exact']['groups'], [
-					'label' => $group->getGID(),
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_GROUP,
-						'shareWith' => $group->getGID(),
-					],
-				]);
-			}
-		}
-
-		if (!$this->shareeEnumeration) {
-			$this->result['groups'] = [];
-		}
-	}
-
-	/**
-	 * @param string $search
-	 * @return array possible sharees
-	 */
-	protected function getRemote($search) {
-		$this->result['remotes'] = [];
-
-		// Search in contacts
-		//@todo Pagination missing
-		$addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN']);
-		$foundRemoteById = false;
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['isLocalSystemBook'])) {
-				continue;
-			}
-			if (isset($contact['CLOUD'])) {
-				$cloudIds = $contact['CLOUD'];
-				if (!is_array($cloudIds)) {
-					$cloudIds = [$cloudIds];
-				}
-				foreach ($cloudIds as $cloudId) {
-					list(, $serverUrl) = $this->splitUserRemote($cloudId);
-					if (strtolower($contact['FN']) === strtolower($search) || strtolower($cloudId) === strtolower($search)) {
-						if (strtolower($cloudId) === strtolower($search)) {
-							$foundRemoteById = true;
-						}
-						$this->result['exact']['remotes'][] = [
-							'label' => $contact['FN'],
-							'value' => [
-								'shareType' => Share::SHARE_TYPE_REMOTE,
-								'shareWith' => $cloudId,
-								'server' => $serverUrl,
-							],
-						];
-					} else {
-						$this->result['remotes'][] = [
-							'label' => $contact['FN'],
-							'value' => [
-								'shareType' => Share::SHARE_TYPE_REMOTE,
-								'shareWith' => $cloudId,
-								'server' => $serverUrl,
-							],
-						];
-					}
-				}
-			}
-		}
-
-		if (!$this->shareeEnumeration) {
-			$this->result['remotes'] = [];
-		}
-
-		if (!$foundRemoteById && substr_count($search, '@') >= 1 && $this->offset === 0) {
-			$this->result['exact']['remotes'][] = [
-				'label' => $search,
-				'value' => [
-					'shareType' => Share::SHARE_TYPE_REMOTE,
-					'shareWith' => $search,
-				],
-			];
-		}
-
-		$this->reachedEndFor[] = 'remotes';
-	}
-
-	/**
-	 * split user and remote from federated cloud id
-	 *
-	 * @param string $address federated share address
-	 * @return array [user, remoteURL]
-	 * @throws \Exception
-	 */
-	public function splitUserRemote($address) {
-		if (strpos($address, '@') === false) {
-			throw new \Exception('Invalid Federated Cloud ID');
-		}
-
-		// Find the first character that is not allowed in user names
-		$id = str_replace('\\', '/', $address);
-		$posSlash = strpos($id, '/');
-		$posColon = strpos($id, ':');
-
-		if ($posSlash === false && $posColon === false) {
-			$invalidPos = strlen($id);
-		} else if ($posSlash === false) {
-			$invalidPos = $posColon;
-		} else if ($posColon === false) {
-			$invalidPos = $posSlash;
-		} else {
-			$invalidPos = min($posSlash, $posColon);
-		}
-
-		// Find the last @ before $invalidPos
-		$pos = $lastAtPos = 0;
-		while ($lastAtPos !== false && $lastAtPos <= $invalidPos) {
-			$pos = $lastAtPos;
-			$lastAtPos = strpos($id, '@', $pos + 1);
-		}
-
-		if ($pos !== false) {
-			$user = substr($id, 0, $pos);
-			$remote = substr($id, $pos + 1);
-			$remote = $this->fixRemoteURL($remote);
-			if (!empty($user) && !empty($remote)) {
-				return array($user, $remote);
-			}
-		}
-
-		throw new \Exception('Invalid Federated Cloud ID');
-	}
-
-	/**
-	 * Strips away a potential file names and trailing slashes:
-	 * - http://localhost
-	 * - http://localhost/
-	 * - http://localhost/index.php
-	 * - http://localhost/index.php/s/{shareToken}
-	 *
-	 * all return: http://localhost
-	 *
-	 * @param string $remote
-	 * @return string
-	 */
-	protected function fixRemoteURL($remote) {
-		$remote = str_replace('\\', '/', $remote);
-		if ($fileNamePosition = strpos($remote, '/index.php')) {
-			$remote = substr($remote, 0, $fileNamePosition);
-		}
-		$remote = rtrim($remote, '/');
-
-		return $remote;
-	}
-
-	/**
-	 * @return \OC_OCS_Result
-	 */
-	public function search() {
-		$search = isset($_GET['search']) ? (string) $_GET['search'] : '';
-		$itemType = isset($_GET['itemType']) ? (string) $_GET['itemType'] : null;
-		$page = isset($_GET['page']) ? (int) $_GET['page'] : 1;
-		$perPage = isset($_GET['perPage']) ? (int) $_GET['perPage'] : 200;
-
-		if ($perPage <= 0) {
-			return new \OC_OCS_Result(null, Http::STATUS_BAD_REQUEST, 'Invalid perPage argument');
-		}
-		if ($page <= 0) {
-			return new \OC_OCS_Result(null, Http::STATUS_BAD_REQUEST, 'Invalid page');
-		}
-
-		$shareTypes = [
-			Share::SHARE_TYPE_USER,
-		];
-
-		if ($this->shareManager->allowGroupSharing()) {
-			$shareTypes[] = Share::SHARE_TYPE_GROUP;
-		}
-
-		$shareTypes[] = Share::SHARE_TYPE_REMOTE;
-
-		if (isset($_GET['shareType']) && is_array($_GET['shareType'])) {
-			$shareTypes = array_intersect($shareTypes, $_GET['shareType']);
-			sort($shareTypes);
-
-		} else if (isset($_GET['shareType']) && is_numeric($_GET['shareType'])) {
-			$shareTypes = array_intersect($shareTypes, [(int) $_GET['shareType']]);
-			sort($shareTypes);
-		}
-
-		if (in_array(Share::SHARE_TYPE_REMOTE, $shareTypes) && !$this->isRemoteSharingAllowed($itemType)) {
-			// Remove remote shares from type array, because it is not allowed.
-			$shareTypes = array_diff($shareTypes, [Share::SHARE_TYPE_REMOTE]);
-		}
-
-		$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->limit = (int) $perPage;
-		$this->offset = $perPage * ($page - 1);
-
-		return $this->searchSharees($search, $itemType, $shareTypes, $page, $perPage);
-	}
-
-	/**
-	 * Method to get out the static call for better testing
-	 *
-	 * @param string $itemType
-	 * @return bool
-	 */
-	protected function isRemoteSharingAllowed($itemType) {
-		try {
-			$backend = Share::getBackend($itemType);
-			return $backend->isShareTypeAllowed(Share::SHARE_TYPE_REMOTE);
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Testable search function that does not need globals
-	 *
-	 * @param string $search
-	 * @param string $itemType
-	 * @param array $shareTypes
-	 * @param int $page
-	 * @param int $perPage
-	 * @return \OC_OCS_Result
-	 */
-	protected function searchSharees($search, $itemType, array $shareTypes, $page, $perPage) {
-		// Verify arguments
-		if ($itemType === null) {
-			return new \OC_OCS_Result(null, Http::STATUS_BAD_REQUEST, 'Missing itemType');
-		}
-
-		// Get users
-		if (in_array(Share::SHARE_TYPE_USER, $shareTypes)) {
-			$this->getUsers($search);
-		}
-
-		// Get groups
-		if (in_array(Share::SHARE_TYPE_GROUP, $shareTypes)) {
-			$this->getGroups($search);
-		}
-
-		// Get remote
-		if (in_array(Share::SHARE_TYPE_REMOTE, $shareTypes)) {
-			$this->getRemote($search);
-		}
-
-		$response = new \OC_OCS_Result($this->result);
-		$response->setItemsPerPage($perPage);
-
-		if (sizeof($this->reachedEndFor) < 3) {
-			$response->addHeader('Link', $this->getPaginationLink($page, [
-				'search' => $search,
-				'itemType' => $itemType,
-				'shareType' => $shareTypes,
-				'perPage' => $perPage,
-			]));
-		}
-
-		return $response;
-	}
-
-	/**
-	 * Generates a bunch of pagination links for the current page
-	 *
-	 * @param int $page Current page
-	 * @param array $params Parameters for the URL
-	 * @return string
-	 */
-	protected function getPaginationLink($page, array $params) {
-		if ($this->isV2()) {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees') . '?';
-		} else {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
-		}
-		$params['page'] = $page + 1;
-		$link = '<' . $url . http_build_query($params) . '>; rel="next"';
-
-		return $link;
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function isV2() {
-		return $this->request->getScriptName() === '/ocs/v2.php';
-	}
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IManager */
+    protected $contactsManager;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IUserSession */
+    protected $userSession;
+
+    /** @var IRequest */
+    protected $request;
+
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+
+    /** @var ILogger */
+    protected $logger;
+
+    /** @var \OCP\Share\IManager */
+    protected $shareManager;
+
+    /** @var bool */
+    protected $shareWithGroupOnly = false;
+
+    /** @var bool */
+    protected $shareeEnumeration = true;
+
+    /** @var int */
+    protected $offset = 0;
+
+    /** @var int */
+    protected $limit = 10;
+
+    /** @var array */
+    protected $result = [
+        'exact' => [
+            'users' => [],
+            'groups' => [],
+            'remotes' => [],
+        ],
+        'users' => [],
+        'groups' => [],
+        'remotes' => [],
+    ];
+
+    protected $reachedEndFor = [];
+
+    /**
+     * @param IGroupManager $groupManager
+     * @param IUserManager $userManager
+     * @param IManager $contactsManager
+     * @param IConfig $config
+     * @param IUserSession $userSession
+     * @param IURLGenerator $urlGenerator
+     * @param IRequest $request
+     * @param ILogger $logger
+     * @param \OCP\Share\IManager $shareManager
+     */
+    public function __construct(IGroupManager $groupManager,
+                                IUserManager $userManager,
+                                IManager $contactsManager,
+                                IConfig $config,
+                                IUserSession $userSession,
+                                IURLGenerator $urlGenerator,
+                                IRequest $request,
+                                ILogger $logger,
+                                \OCP\Share\IManager $shareManager) {
+        $this->groupManager = $groupManager;
+        $this->userManager = $userManager;
+        $this->contactsManager = $contactsManager;
+        $this->config = $config;
+        $this->userSession = $userSession;
+        $this->urlGenerator = $urlGenerator;
+        $this->request = $request;
+        $this->logger = $logger;
+        $this->shareManager = $shareManager;
+    }
+
+    /**
+     * @param string $search
+     */
+    protected function getUsers($search) {
+        $this->result['users'] = $this->result['exact']['users'] = $users = [];
+
+        $userGroups = [];
+        if ($this->shareWithGroupOnly) {
+            // Search in all the groups this user is part of
+            $userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
+            foreach ($userGroups as $userGroup) {
+                $usersTmp = $this->groupManager->displayNamesInGroup($userGroup, $search, $this->limit, $this->offset);
+                foreach ($usersTmp as $uid => $userDisplayName) {
+                    $users[$uid] = $userDisplayName;
+                }
+            }
+        } else {
+            // Search in all users
+            $usersTmp = $this->userManager->searchDisplayName($search, $this->limit, $this->offset);
+
+            foreach ($usersTmp as $user) {
+                $users[$user->getUID()] = $user->getDisplayName();
+            }
+        }
+
+        if (!$this->shareeEnumeration || sizeof($users) < $this->limit) {
+            $this->reachedEndFor[] = 'users';
+        }
+
+        $foundUserById = false;
+        foreach ($users as $uid => $userDisplayName) {
+            if (strtolower($uid) === strtolower($search) || strtolower($userDisplayName) === strtolower($search)) {
+                if (strtolower($uid) === strtolower($search)) {
+                    $foundUserById = true;
+                }
+                $this->result['exact']['users'][] = [
+                    'label' => $userDisplayName,
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_USER,
+                        'shareWith' => $uid,
+                    ],
+                ];
+            } else {
+                $this->result['users'][] = [
+                    'label' => $userDisplayName,
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_USER,
+                        'shareWith' => $uid,
+                    ],
+                ];
+            }
+        }
+
+        if ($this->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($userGroups, $this->groupManager->getUserGroupIds($user));
+                    $addUser = !empty($commonGroups);
+                }
+
+                if ($addUser) {
+                    array_push($this->result['exact']['users'], [
+                        'label' => $user->getDisplayName(),
+                        'value' => [
+                            'shareType' => Share::SHARE_TYPE_USER,
+                            'shareWith' => $user->getUID(),
+                        ],
+                    ]);
+                }
+            }
+        }
+
+        if (!$this->shareeEnumeration) {
+            $this->result['users'] = [];
+        }
+    }
+
+    /**
+     * @param string $search
+     */
+    protected function getGroups($search) {
+        $this->result['groups'] = $this->result['exact']['groups'] = [];
+
+        $groups = $this->groupManager->search($search, $this->limit, $this->offset);
+        $groups = array_map(function (IGroup $group) { return $group->getGID(); }, $groups);
+
+        if (!$this->shareeEnumeration || sizeof($groups) < $this->limit) {
+            $this->reachedEndFor[] = 'groups';
+        }
+
+        $userGroups =  [];
+        if (!empty($groups) && $this->shareWithGroupOnly) {
+            // Intersect all the groups that match with the groups this user is a member of
+            $userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
+            $userGroups = array_map(function (IGroup $group) { return $group->getGID(); }, $userGroups);
+            $groups = array_intersect($groups, $userGroups);
+        }
+
+        foreach ($groups as $gid) {
+            if (strtolower($gid) === strtolower($search)) {
+                $this->result['exact']['groups'][] = [
+                    'label' => $gid,
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_GROUP,
+                        'shareWith' => $gid,
+                    ],
+                ];
+            } else {
+                $this->result['groups'][] = [
+                    'label' => $gid,
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_GROUP,
+                        'shareWith' => $gid,
+                    ],
+                ];
+            }
+        }
+
+        if ($this->offset === 0 && empty($this->result['exact']['groups'])) {
+            // 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
+            $group = $this->groupManager->get($search);
+            if ($group instanceof IGroup && (!$this->shareWithGroupOnly || in_array($group->getGID(), $userGroups))) {
+                array_push($this->result['exact']['groups'], [
+                    'label' => $group->getGID(),
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_GROUP,
+                        'shareWith' => $group->getGID(),
+                    ],
+                ]);
+            }
+        }
+
+        if (!$this->shareeEnumeration) {
+            $this->result['groups'] = [];
+        }
+    }
+
+    /**
+     * @param string $search
+     * @return array possible sharees
+     */
+    protected function getRemote($search) {
+        $this->result['remotes'] = [];
+
+        // Search in contacts
+        //@todo Pagination missing
+        $addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN']);
+        $foundRemoteById = false;
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['isLocalSystemBook'])) {
+                continue;
+            }
+            if (isset($contact['CLOUD'])) {
+                $cloudIds = $contact['CLOUD'];
+                if (!is_array($cloudIds)) {
+                    $cloudIds = [$cloudIds];
+                }
+                foreach ($cloudIds as $cloudId) {
+                    list(, $serverUrl) = $this->splitUserRemote($cloudId);
+                    if (strtolower($contact['FN']) === strtolower($search) || strtolower($cloudId) === strtolower($search)) {
+                        if (strtolower($cloudId) === strtolower($search)) {
+                            $foundRemoteById = true;
+                        }
+                        $this->result['exact']['remotes'][] = [
+                            'label' => $contact['FN'],
+                            'value' => [
+                                'shareType' => Share::SHARE_TYPE_REMOTE,
+                                'shareWith' => $cloudId,
+                                'server' => $serverUrl,
+                            ],
+                        ];
+                    } else {
+                        $this->result['remotes'][] = [
+                            'label' => $contact['FN'],
+                            'value' => [
+                                'shareType' => Share::SHARE_TYPE_REMOTE,
+                                'shareWith' => $cloudId,
+                                'server' => $serverUrl,
+                            ],
+                        ];
+                    }
+                }
+            }
+        }
+
+        if (!$this->shareeEnumeration) {
+            $this->result['remotes'] = [];
+        }
+
+        if (!$foundRemoteById && substr_count($search, '@') >= 1 && $this->offset === 0) {
+            $this->result['exact']['remotes'][] = [
+                'label' => $search,
+                'value' => [
+                    'shareType' => Share::SHARE_TYPE_REMOTE,
+                    'shareWith' => $search,
+                ],
+            ];
+        }
+
+        $this->reachedEndFor[] = 'remotes';
+    }
+
+    /**
+     * split user and remote from federated cloud id
+     *
+     * @param string $address federated share address
+     * @return array [user, remoteURL]
+     * @throws \Exception
+     */
+    public function splitUserRemote($address) {
+        if (strpos($address, '@') === false) {
+            throw new \Exception('Invalid Federated Cloud ID');
+        }
+
+        // Find the first character that is not allowed in user names
+        $id = str_replace('\\', '/', $address);
+        $posSlash = strpos($id, '/');
+        $posColon = strpos($id, ':');
+
+        if ($posSlash === false && $posColon === false) {
+            $invalidPos = strlen($id);
+        } else if ($posSlash === false) {
+            $invalidPos = $posColon;
+        } else if ($posColon === false) {
+            $invalidPos = $posSlash;
+        } else {
+            $invalidPos = min($posSlash, $posColon);
+        }
+
+        // Find the last @ before $invalidPos
+        $pos = $lastAtPos = 0;
+        while ($lastAtPos !== false && $lastAtPos <= $invalidPos) {
+            $pos = $lastAtPos;
+            $lastAtPos = strpos($id, '@', $pos + 1);
+        }
+
+        if ($pos !== false) {
+            $user = substr($id, 0, $pos);
+            $remote = substr($id, $pos + 1);
+            $remote = $this->fixRemoteURL($remote);
+            if (!empty($user) && !empty($remote)) {
+                return array($user, $remote);
+            }
+        }
+
+        throw new \Exception('Invalid Federated Cloud ID');
+    }
+
+    /**
+     * Strips away a potential file names and trailing slashes:
+     * - http://localhost
+     * - http://localhost/
+     * - http://localhost/index.php
+     * - http://localhost/index.php/s/{shareToken}
+     *
+     * all return: http://localhost
+     *
+     * @param string $remote
+     * @return string
+     */
+    protected function fixRemoteURL($remote) {
+        $remote = str_replace('\\', '/', $remote);
+        if ($fileNamePosition = strpos($remote, '/index.php')) {
+            $remote = substr($remote, 0, $fileNamePosition);
+        }
+        $remote = rtrim($remote, '/');
+
+        return $remote;
+    }
+
+    /**
+     * @return \OC_OCS_Result
+     */
+    public function search() {
+        $search = isset($_GET['search']) ? (string) $_GET['search'] : '';
+        $itemType = isset($_GET['itemType']) ? (string) $_GET['itemType'] : null;
+        $page = isset($_GET['page']) ? (int) $_GET['page'] : 1;
+        $perPage = isset($_GET['perPage']) ? (int) $_GET['perPage'] : 200;
+
+        if ($perPage <= 0) {
+            return new \OC_OCS_Result(null, Http::STATUS_BAD_REQUEST, 'Invalid perPage argument');
+        }
+        if ($page <= 0) {
+            return new \OC_OCS_Result(null, Http::STATUS_BAD_REQUEST, 'Invalid page');
+        }
+
+        $shareTypes = [
+            Share::SHARE_TYPE_USER,
+        ];
+
+        if ($this->shareManager->allowGroupSharing()) {
+            $shareTypes[] = Share::SHARE_TYPE_GROUP;
+        }
+
+        $shareTypes[] = Share::SHARE_TYPE_REMOTE;
+
+        if (isset($_GET['shareType']) && is_array($_GET['shareType'])) {
+            $shareTypes = array_intersect($shareTypes, $_GET['shareType']);
+            sort($shareTypes);
+
+        } else if (isset($_GET['shareType']) && is_numeric($_GET['shareType'])) {
+            $shareTypes = array_intersect($shareTypes, [(int) $_GET['shareType']]);
+            sort($shareTypes);
+        }
+
+        if (in_array(Share::SHARE_TYPE_REMOTE, $shareTypes) && !$this->isRemoteSharingAllowed($itemType)) {
+            // Remove remote shares from type array, because it is not allowed.
+            $shareTypes = array_diff($shareTypes, [Share::SHARE_TYPE_REMOTE]);
+        }
+
+        $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->limit = (int) $perPage;
+        $this->offset = $perPage * ($page - 1);
+
+        return $this->searchSharees($search, $itemType, $shareTypes, $page, $perPage);
+    }
+
+    /**
+     * Method to get out the static call for better testing
+     *
+     * @param string $itemType
+     * @return bool
+     */
+    protected function isRemoteSharingAllowed($itemType) {
+        try {
+            $backend = Share::getBackend($itemType);
+            return $backend->isShareTypeAllowed(Share::SHARE_TYPE_REMOTE);
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Testable search function that does not need globals
+     *
+     * @param string $search
+     * @param string $itemType
+     * @param array $shareTypes
+     * @param int $page
+     * @param int $perPage
+     * @return \OC_OCS_Result
+     */
+    protected function searchSharees($search, $itemType, array $shareTypes, $page, $perPage) {
+        // Verify arguments
+        if ($itemType === null) {
+            return new \OC_OCS_Result(null, Http::STATUS_BAD_REQUEST, 'Missing itemType');
+        }
+
+        // Get users
+        if (in_array(Share::SHARE_TYPE_USER, $shareTypes)) {
+            $this->getUsers($search);
+        }
+
+        // Get groups
+        if (in_array(Share::SHARE_TYPE_GROUP, $shareTypes)) {
+            $this->getGroups($search);
+        }
+
+        // Get remote
+        if (in_array(Share::SHARE_TYPE_REMOTE, $shareTypes)) {
+            $this->getRemote($search);
+        }
+
+        $response = new \OC_OCS_Result($this->result);
+        $response->setItemsPerPage($perPage);
+
+        if (sizeof($this->reachedEndFor) < 3) {
+            $response->addHeader('Link', $this->getPaginationLink($page, [
+                'search' => $search,
+                'itemType' => $itemType,
+                'shareType' => $shareTypes,
+                'perPage' => $perPage,
+            ]));
+        }
+
+        return $response;
+    }
+
+    /**
+     * Generates a bunch of pagination links for the current page
+     *
+     * @param int $page Current page
+     * @param array $params Parameters for the URL
+     * @return string
+     */
+    protected function getPaginationLink($page, array $params) {
+        if ($this->isV2()) {
+            $url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees') . '?';
+        } else {
+            $url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
+        }
+        $params['page'] = $page + 1;
+        $link = '<' . $url . http_build_query($params) . '>; rel="next"';
+
+        return $link;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isV2() {
+        return $this->request->getScriptName() === '/ocs/v2.php';
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -213,17 +213,17 @@ 
 		$this->result['groups'] = $this->result['exact']['groups'] = [];
 
 		$groups = $this->groupManager->search($search, $this->limit, $this->offset);
-		$groups = array_map(function (IGroup $group) { return $group->getGID(); }, $groups);
+		$groups = array_map(function(IGroup $group) { return $group->getGID(); }, $groups);
 
 		if (!$this->shareeEnumeration || sizeof($groups) < $this->limit) {
 			$this->reachedEndFor[] = 'groups';
 		}
 
-		$userGroups =  [];
+		$userGroups = [];
 		if (!empty($groups) && $this->shareWithGroupOnly) {
 			// Intersect all the groups that match with the groups this user is a member of
 			$userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
-			$userGroups = array_map(function (IGroup $group) { return $group->getGID(); }, $userGroups);
+			$userGroups = array_map(function(IGroup $group) { return $group->getGID(); }, $userGroups);
 			$groups = array_intersect($groups, $userGroups);
 		}
 
@@ -518,12 +518,12 @@ 
 	 */
 	protected function getPaginationLink($page, array $params) {
 		if ($this->isV2()) {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees') . '?';
+			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees').'?';
 		} else {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
+			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees').'?';
 		}
 		$params['page'] = $page + 1;
-		$link = '<' . $url . http_build_query($params) . '>; rel="next"';
+		$link = '<'.$url.http_build_query($params).'>; rel="next"';
 
 		return $link;
 	}

apps/files_sharing/lib/Migration.php

Doc Comments -1 removed lines

@@ -130,7 +130,6 @@
 	/**
 	 * Get $n re-shares from the database
 	 *
-	 * @param int $n The max number of shares to fetch
 	 * @return \Doctrine\DBAL\Driver\Statement
 	 */
 	private function getReShares() {

Spacing +6 added lines, -6 removed lines

@@ -68,7 +68,7 @@ 
 		$stmt = $this->getReShares();
 
 		$owners = [];
-		while($share = $stmt->fetch()) {
+		while ($share = $stmt->fetch()) {
 
 			$this->shareCache[$share['id']] = $share;
 
@@ -131,11 +131,11 @@ 
 	 */
 	private function findOwner($share) {
 		$currentShare = $share;
-		while(!is_null($currentShare['parent'])) {
+		while (!is_null($currentShare['parent'])) {
 			if (isset($this->shareCache[$currentShare['parent']])) {
 				$currentShare = $this->shareCache[$currentShare['parent']];
 			} else {
-				$currentShare = $this->getShare((int)$currentShare['parent']);
+				$currentShare = $this->getShare((int) $currentShare['parent']);
 				$this->shareCache[$currentShare['id']] = $currentShare;
 			}
 		}
@@ -182,7 +182,7 @@ 
 
 		$ordered = [];
 		foreach ($shares as $share) {
-			$ordered[(int)$share['id']] = $share;
+			$ordered[(int) $share['id']] = $share;
 		}
 
 		return $ordered;
@@ -226,7 +226,7 @@ 
 
 		$ordered = [];
 		foreach ($shares as $share) {
-			$ordered[(int)$share['id']] = $share;
+			$ordered[(int) $share['id']] = $share;
 		}
 
 		return $ordered;
@@ -269,7 +269,7 @@ 
 					->set('uid_initiator', $query->createNamedParameter($owner['initiator']));
 
 
-				if ((int)$owner['type'] !== \OCP\Share::SHARE_TYPE_LINK) {
+				if ((int) $owner['type'] !== \OCP\Share::SHARE_TYPE_LINK) {
 					$query->set('parent', $query->createNamedParameter(null));
 				}
 

Indentation +235 added lines, -235 removed lines

@@ -38,240 +38,240 @@
  */
 class Migration {
 
-	/** @var IDBConnection */
-	private $connection;
-
-	/** @var  ICache with all shares we already saw */
-	private $shareCache;
-
-	/** @var string */
-	private $table = 'share';
-
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-
-		// We cache up to 10k share items (~20MB)
-		$this->shareCache = new CappedMemoryCache(10000);
-	}
-
-	/**
-	 * move all re-shares to the owner in order to have a flat list of shares
-	 * upgrade from oC 8.2 to 9.0 with the new sharing
-	 */
-	public function removeReShares() {
-
-		$stmt = $this->getReShares();
-
-		$owners = [];
-		while($share = $stmt->fetch()) {
-
-			$this->shareCache[$share['id']] = $share;
-
-			$owners[$share['id']] = [
-					'owner' => $this->findOwner($share),
-					'initiator' => $share['uid_owner'],
-					'type' => $share['share_type'],
-			];
-
-			if (count($owners) === 1000) {
-				$this->updateOwners($owners);
-				$owners = [];
-			}
-		}
-
-		$stmt->closeCursor();
-
-		if (count($owners)) {
-			$this->updateOwners($owners);
-		}
-	}
-
-	/**
-	 * update all owner information so that all shares have an owner
-	 * and an initiator for the upgrade from oC 8.2 to 9.0 with the new sharing
-	 */
-	public function updateInitiatorInfo() {
-		while (true) {
-			$shares = $this->getMissingInitiator(1000);
-
-			if (empty($shares)) {
-				break;
-			}
-
-			$owners = [];
-			foreach ($shares as $share) {
-				$owners[$share['id']] = [
-					'owner' => $share['uid_owner'],
-					'initiator' => $share['uid_owner'],
-					'type' => $share['share_type'],
-				];
-			}
-			$this->updateOwners($owners);
-		}
-	}
-
-	/**
-	 * find the owner of a re-shared file/folder
-	 *
-	 * @param array $share
-	 * @return array
-	 */
-	private function findOwner($share) {
-		$currentShare = $share;
-		while(!is_null($currentShare['parent'])) {
-			if (isset($this->shareCache[$currentShare['parent']])) {
-				$currentShare = $this->shareCache[$currentShare['parent']];
-			} else {
-				$currentShare = $this->getShare((int)$currentShare['parent']);
-				$this->shareCache[$currentShare['id']] = $currentShare;
-			}
-		}
-
-		return $currentShare['uid_owner'];
-	}
-
-	/**
-	 * Get $n re-shares from the database
-	 *
-	 * @param int $n The max number of shares to fetch
-	 * @return \Doctrine\DBAL\Driver\Statement
-	 */
-	private function getReShares() {
-		$query = $this->connection->getQueryBuilder();
-		$query->select(['id', 'parent', 'uid_owner', 'share_type'])
-			->from($this->table)
-			->where($query->expr()->in(
-				'share_type',
-				$query->createNamedParameter(
-					[
-						\OCP\Share::SHARE_TYPE_USER,
-						\OCP\Share::SHARE_TYPE_GROUP,
-						\OCP\Share::SHARE_TYPE_LINK,
-						\OCP\Share::SHARE_TYPE_REMOTE,
-					],
-					Connection::PARAM_INT_ARRAY
-				)
-			))
-			->andWhere($query->expr()->in(
-				'item_type',
-				$query->createNamedParameter(
-					['file', 'folder'],
-					Connection::PARAM_STR_ARRAY
-				)
-			))
-			->andWhere($query->expr()->isNotNull('parent'))
-			->orderBy('id', 'asc');
-		return $query->execute();
-
-
-		$shares = $result->fetchAll();
-		$result->closeCursor();
-
-		$ordered = [];
-		foreach ($shares as $share) {
-			$ordered[(int)$share['id']] = $share;
-		}
-
-		return $ordered;
-	}
-
-	/**
-	 * Get $n re-shares from the database
-	 *
-	 * @param int $n The max number of shares to fetch
-	 * @return array
-	 */
-	private function getMissingInitiator($n = 1000) {
-		$query = $this->connection->getQueryBuilder();
-		$query->select(['id', 'uid_owner', 'share_type'])
-			->from($this->table)
-			->where($query->expr()->in(
-				'share_type',
-				$query->createNamedParameter(
-					[
-						\OCP\Share::SHARE_TYPE_USER,
-						\OCP\Share::SHARE_TYPE_GROUP,
-						\OCP\Share::SHARE_TYPE_LINK,
-						\OCP\Share::SHARE_TYPE_REMOTE,
-					],
-					Connection::PARAM_INT_ARRAY
-				)
-			))
-			->andWhere($query->expr()->in(
-				'item_type',
-				$query->createNamedParameter(
-					['file', 'folder'],
-					Connection::PARAM_STR_ARRAY
-				)
-			))
-			->andWhere($query->expr()->isNull('uid_initiator'))
-			->orderBy('id', 'asc')
-			->setMaxResults($n);
-		$result = $query->execute();
-		$shares = $result->fetchAll();
-		$result->closeCursor();
-
-		$ordered = [];
-		foreach ($shares as $share) {
-			$ordered[(int)$share['id']] = $share;
-		}
-
-		return $ordered;
-	}
-
-	/**
-	 * get a specific share
-	 *
-	 * @param int $id
-	 * @return array
-	 */
-	private function getShare($id) {
-		$query = $this->connection->getQueryBuilder();
-		$query->select(['id', 'parent', 'uid_owner'])
-			->from($this->table)
-			->where($query->expr()->eq('id', $query->createNamedParameter($id)));
-		$result = $query->execute();
-		$share = $result->fetchAll();
-		$result->closeCursor();
-
-		return $share[0];
-	}
-
-	/**
-	 * update database with the new owners
-	 *
-	 * @param array $owners
-	 * @throws \Exception
-	 */
-	private function updateOwners($owners) {
-
-		$this->connection->beginTransaction();
-
-		try {
-
-			foreach ($owners as $id => $owner) {
-				$query = $this->connection->getQueryBuilder();
-				$query->update($this->table)
-					->set('uid_owner', $query->createNamedParameter($owner['owner']))
-					->set('uid_initiator', $query->createNamedParameter($owner['initiator']));
-
-
-				if ((int)$owner['type'] !== \OCP\Share::SHARE_TYPE_LINK) {
-					$query->set('parent', $query->createNamedParameter(null));
-				}
-
-				$query->where($query->expr()->eq('id', $query->createNamedParameter($id)));
-
-				$query->execute();
-			}
-
-			$this->connection->commit();
-
-		} catch (\Exception $e) {
-			$this->connection->rollBack();
-			throw $e;
-		}
-
-	}
+    /** @var IDBConnection */
+    private $connection;
+
+    /** @var  ICache with all shares we already saw */
+    private $shareCache;
+
+    /** @var string */
+    private $table = 'share';
+
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+
+        // We cache up to 10k share items (~20MB)
+        $this->shareCache = new CappedMemoryCache(10000);
+    }
+
+    /**
+     * move all re-shares to the owner in order to have a flat list of shares
+     * upgrade from oC 8.2 to 9.0 with the new sharing
+     */
+    public function removeReShares() {
+
+        $stmt = $this->getReShares();
+
+        $owners = [];
+        while($share = $stmt->fetch()) {
+
+            $this->shareCache[$share['id']] = $share;
+
+            $owners[$share['id']] = [
+                    'owner' => $this->findOwner($share),
+                    'initiator' => $share['uid_owner'],
+                    'type' => $share['share_type'],
+            ];
+
+            if (count($owners) === 1000) {
+                $this->updateOwners($owners);
+                $owners = [];
+            }
+        }
+
+        $stmt->closeCursor();
+
+        if (count($owners)) {
+            $this->updateOwners($owners);
+        }
+    }
+
+    /**
+     * update all owner information so that all shares have an owner
+     * and an initiator for the upgrade from oC 8.2 to 9.0 with the new sharing
+     */
+    public function updateInitiatorInfo() {
+        while (true) {
+            $shares = $this->getMissingInitiator(1000);
+
+            if (empty($shares)) {
+                break;
+            }
+
+            $owners = [];
+            foreach ($shares as $share) {
+                $owners[$share['id']] = [
+                    'owner' => $share['uid_owner'],
+                    'initiator' => $share['uid_owner'],
+                    'type' => $share['share_type'],
+                ];
+            }
+            $this->updateOwners($owners);
+        }
+    }
+
+    /**
+     * find the owner of a re-shared file/folder
+     *
+     * @param array $share
+     * @return array
+     */
+    private function findOwner($share) {
+        $currentShare = $share;
+        while(!is_null($currentShare['parent'])) {
+            if (isset($this->shareCache[$currentShare['parent']])) {
+                $currentShare = $this->shareCache[$currentShare['parent']];
+            } else {
+                $currentShare = $this->getShare((int)$currentShare['parent']);
+                $this->shareCache[$currentShare['id']] = $currentShare;
+            }
+        }
+
+        return $currentShare['uid_owner'];
+    }
+
+    /**
+     * Get $n re-shares from the database
+     *
+     * @param int $n The max number of shares to fetch
+     * @return \Doctrine\DBAL\Driver\Statement
+     */
+    private function getReShares() {
+        $query = $this->connection->getQueryBuilder();
+        $query->select(['id', 'parent', 'uid_owner', 'share_type'])
+            ->from($this->table)
+            ->where($query->expr()->in(
+                'share_type',
+                $query->createNamedParameter(
+                    [
+                        \OCP\Share::SHARE_TYPE_USER,
+                        \OCP\Share::SHARE_TYPE_GROUP,
+                        \OCP\Share::SHARE_TYPE_LINK,
+                        \OCP\Share::SHARE_TYPE_REMOTE,
+                    ],
+                    Connection::PARAM_INT_ARRAY
+                )
+            ))
+            ->andWhere($query->expr()->in(
+                'item_type',
+                $query->createNamedParameter(
+                    ['file', 'folder'],
+                    Connection::PARAM_STR_ARRAY
+                )
+            ))
+            ->andWhere($query->expr()->isNotNull('parent'))
+            ->orderBy('id', 'asc');
+        return $query->execute();
+
+
+        $shares = $result->fetchAll();
+        $result->closeCursor();
+
+        $ordered = [];
+        foreach ($shares as $share) {
+            $ordered[(int)$share['id']] = $share;
+        }
+
+        return $ordered;
+    }
+
+    /**
+     * Get $n re-shares from the database
+     *
+     * @param int $n The max number of shares to fetch
+     * @return array
+     */
+    private function getMissingInitiator($n = 1000) {
+        $query = $this->connection->getQueryBuilder();
+        $query->select(['id', 'uid_owner', 'share_type'])
+            ->from($this->table)
+            ->where($query->expr()->in(
+                'share_type',
+                $query->createNamedParameter(
+                    [
+                        \OCP\Share::SHARE_TYPE_USER,
+                        \OCP\Share::SHARE_TYPE_GROUP,
+                        \OCP\Share::SHARE_TYPE_LINK,
+                        \OCP\Share::SHARE_TYPE_REMOTE,
+                    ],
+                    Connection::PARAM_INT_ARRAY
+                )
+            ))
+            ->andWhere($query->expr()->in(
+                'item_type',
+                $query->createNamedParameter(
+                    ['file', 'folder'],
+                    Connection::PARAM_STR_ARRAY
+                )
+            ))
+            ->andWhere($query->expr()->isNull('uid_initiator'))
+            ->orderBy('id', 'asc')
+            ->setMaxResults($n);
+        $result = $query->execute();
+        $shares = $result->fetchAll();
+        $result->closeCursor();
+
+        $ordered = [];
+        foreach ($shares as $share) {
+            $ordered[(int)$share['id']] = $share;
+        }
+
+        return $ordered;
+    }
+
+    /**
+     * get a specific share
+     *
+     * @param int $id
+     * @return array
+     */
+    private function getShare($id) {
+        $query = $this->connection->getQueryBuilder();
+        $query->select(['id', 'parent', 'uid_owner'])
+            ->from($this->table)
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id)));
+        $result = $query->execute();
+        $share = $result->fetchAll();
+        $result->closeCursor();
+
+        return $share[0];
+    }
+
+    /**
+     * update database with the new owners
+     *
+     * @param array $owners
+     * @throws \Exception
+     */
+    private function updateOwners($owners) {
+
+        $this->connection->beginTransaction();
+
+        try {
+
+            foreach ($owners as $id => $owner) {
+                $query = $this->connection->getQueryBuilder();
+                $query->update($this->table)
+                    ->set('uid_owner', $query->createNamedParameter($owner['owner']))
+                    ->set('uid_initiator', $query->createNamedParameter($owner['initiator']));
+
+
+                if ((int)$owner['type'] !== \OCP\Share::SHARE_TYPE_LINK) {
+                    $query->set('parent', $query->createNamedParameter(null));
+                }
+
+                $query->where($query->expr()->eq('id', $query->createNamedParameter($id)));
+
+                $query->execute();
+            }
+
+            $this->connection->commit();
+
+        } catch (\Exception $e) {
+            $this->connection->rollBack();
+            throw $e;
+        }
+
+    }
 
 }

apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php

Unused Use Statements -1 removed lines

@@ -23,7 +23,6 @@
 
 namespace OCA\Files_Trashbin\BackgroundJob;
 
-use OCP\IConfig;
 use OCP\IUser;
 use OCP\IUserManager;
 use OCA\Files_Trashbin\AppInfo\Application;

Spacing +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
 		\OC_Util::setupFS($user);
 
 		// Check if this user has a trashbin directory
-		$view = new \OC\Files\View('/' . $user);
+		$view = new \OC\Files\View('/'.$user);
 		if (!$view->is_dir('/files_trashbin/files')) {
 			return false;
 		}

Indentation +62 added lines, -62 removed lines

@@ -34,76 +34,76 @@
 
 class ExpireTrash extends \OC\BackgroundJob\TimedJob {
 
-	/**
-	 * @var Expiration
-	 */
-	private $expiration;
+    /**
+     * @var Expiration
+     */
+    private $expiration;
 	
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
 
-	/**
-	 * @param IUserManager|null $userManager
-	 * @param Expiration|null $expiration
-	 */
-	public function __construct(IUserManager $userManager = null,
-								Expiration $expiration = null) {
-		// Run once per 30 minutes
-		$this->setInterval(60 * 30);
+    /**
+     * @param IUserManager|null $userManager
+     * @param Expiration|null $expiration
+     */
+    public function __construct(IUserManager $userManager = null,
+                                Expiration $expiration = null) {
+        // Run once per 30 minutes
+        $this->setInterval(60 * 30);
 
-		if (is_null($expiration) || is_null($userManager)) {
-			$this->fixDIForJobs();
-		} else {
-			$this->userManager = $userManager;
-			$this->expiration = $expiration;
-		}
-	}
+        if (is_null($expiration) || is_null($userManager)) {
+            $this->fixDIForJobs();
+        } else {
+            $this->userManager = $userManager;
+            $this->expiration = $expiration;
+        }
+    }
 
-	protected function fixDIForJobs() {
-		$application = new Application();
-		$this->userManager = \OC::$server->getUserManager();
-		$this->expiration = $application->getContainer()->query('Expiration');
-	}
+    protected function fixDIForJobs() {
+        $application = new Application();
+        $this->userManager = \OC::$server->getUserManager();
+        $this->expiration = $application->getContainer()->query('Expiration');
+    }
 
-	/**
-	 * @param $argument
-	 * @throws \Exception
-	 */
-	protected function run($argument) {
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
-		if (!$maxAge) {
-			return;
-		}
+    /**
+     * @param $argument
+     * @throws \Exception
+     */
+    protected function run($argument) {
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
+        if (!$maxAge) {
+            return;
+        }
 
-		$this->userManager->callForAllUsers(function(IUser $user) {
-			$uid = $user->getUID();
-			if ($user->getLastLogin() === 0 || !$this->setupFS($uid)) {
-				return;
-			}
-			$dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
-			Trashbin::deleteExpiredFiles($dirContent, $uid);
-		});
+        $this->userManager->callForAllUsers(function(IUser $user) {
+            $uid = $user->getUID();
+            if ($user->getLastLogin() === 0 || !$this->setupFS($uid)) {
+                return;
+            }
+            $dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
+            Trashbin::deleteExpiredFiles($dirContent, $uid);
+        });
 		
-		\OC_Util::tearDownFS();
-	}
+        \OC_Util::tearDownFS();
+    }
 
-	/**
-	 * Act on behalf on trash item owner
-	 * @param string $user
-	 * @return boolean
-	 */
-	protected function setupFS($user) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
+    /**
+     * Act on behalf on trash item owner
+     * @param string $user
+     * @return boolean
+     */
+    protected function setupFS($user) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
 
-		// Check if this user has a trashbin directory
-		$view = new \OC\Files\View('/' . $user);
-		if (!$view->is_dir('/files_trashbin/files')) {
-			return false;
-		}
+        // Check if this user has a trashbin directory
+        $view = new \OC\Files\View('/' . $user);
+        if (!$view->is_dir('/files_trashbin/files')) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

apps/files_trashbin/lib/Storage.php

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 	 * check if it is a file located in data/user/files only files in the
 	 * 'files' directory should be moved to the trash
 	 *
-	 * @param $path
+	 * @param string $path
 	 * @return bool
 	 */
 	protected function shouldMoveToTrash($path){

Indentation +154 added lines, -154 removed lines

@@ -32,159 +32,159 @@
 
 class Storage extends Wrapper {
 
-	private $mountPoint;
-	// remember already deleted files to avoid infinite loops if the trash bin
-	// move files across storages
-	private $deletedFiles = array();
-
-	/**
-	 * Disable trash logic
-	 *
-	 * @var bool
-	 */
-	private static $disableTrash = false;
-
-	/** @var  IUserManager */
-	private $userManager;
-
-	function __construct($parameters, IUserManager $userManager = null) {
-		$this->mountPoint = $parameters['mountPoint'];
-		$this->userManager = $userManager;
-		parent::__construct($parameters);
-	}
-
-	/**
-	 * @internal
-	 */
-	public static function preRenameHook($params) {
-		// in cross-storage cases, a rename is a copy + unlink,
-		// that last unlink must not go to trash
-		self::$disableTrash = true;
-	}
-
-	/**
-	 * @internal
-	 */
-	public static function postRenameHook($params) {
-		self::$disableTrash = false;
-	}
-
-	/**
-	 * Rename path1 to path2 by calling the wrapped storage.
-	 *
-	 * @param string $path1 first path
-	 * @param string $path2 second path
-	 */
-	public function rename($path1, $path2) {
-		$result = $this->storage->rename($path1, $path2);
-		if ($result === false) {
-			// when rename failed, the post_rename hook isn't triggered,
-			// but we still want to reenable the trash logic
-			self::$disableTrash = false;
-		}
-		return $result;
-	}
-
-	/**
-	 * Deletes the given file by moving it into the trashbin.
-	 *
-	 * @param string $path path of file or folder to delete
-	 *
-	 * @return bool true if the operation succeeded, false otherwise
-	 */
-	public function unlink($path) {
-		return $this->doDelete($path, 'unlink');
-	}
-
-	/**
-	 * Deletes the given folder by moving it into the trashbin.
-	 *
-	 * @param string $path path of folder to delete
-	 *
-	 * @return bool true if the operation succeeded, false otherwise
-	 */
-	public function rmdir($path) {
-		return $this->doDelete($path, 'rmdir');
-	}
-
-	/**
-	 * check if it is a file located in data/user/files only files in the
-	 * 'files' directory should be moved to the trash
-	 *
-	 * @param $path
-	 * @return bool
-	 */
-	protected function shouldMoveToTrash($path){
-		$normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path);
-		$parts = explode('/', $normalized);
-		if (count($parts) < 4) {
-			return false;
-		}
-
-		if ($this->userManager->userExists($parts[1]) && $parts[2] == 'files') {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Run the delete operation with the given method
-	 *
-	 * @param string $path path of file or folder to delete
-	 * @param string $method either "unlink" or "rmdir"
-	 *
-	 * @return bool true if the operation succeeded, false otherwise
-	 */
-	private function doDelete($path, $method) {
-		if (self::$disableTrash
-			|| !\OC_App::isEnabled('files_trashbin')
-			|| (pathinfo($path, PATHINFO_EXTENSION) === 'part')
-			|| $this->shouldMoveToTrash($path) === false
-		) {
-			return call_user_func_array([$this->storage, $method], [$path]);
-		}
-
-		// check permissions before we continue, this is especially important for
-		// shared files
-		if (!$this->isDeletable($path)) {
-			return false;
-		}
-
-		$normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path, true, false, true);
-		$result = true;
-		$view = Filesystem::getView();
-		if (!isset($this->deletedFiles[$normalized]) && $view instanceof View) {
-			$this->deletedFiles[$normalized] = $normalized;
-			if ($filesPath = $view->getRelativePath($normalized)) {
-				$filesPath = trim($filesPath, '/');
-				$result = \OCA\Files_Trashbin\Trashbin::move2trash($filesPath);
-				// in cross-storage cases the file will be copied
-				// but not deleted, so we delete it here
-				if ($result) {
-					call_user_func_array([$this->storage, $method], [$path]);
-				}
-			} else {
-				$result = call_user_func_array([$this->storage, $method], [$path]);
-			}
-			unset($this->deletedFiles[$normalized]);
-		} else if ($this->storage->file_exists($path)) {
-			$result = call_user_func_array([$this->storage, $method], [$path]);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Setup the storate wrapper callback
-	 */
-	public static function setupStorage() {
-		\OC\Files\Filesystem::addStorageWrapper('oc_trashbin', function ($mountPoint, $storage) {
-			return new \OCA\Files_Trashbin\Storage(
-				array('storage' => $storage, 'mountPoint' => $mountPoint),
-				\OC::$server->getUserManager()
-			);
-		}, 1);
-	}
+    private $mountPoint;
+    // remember already deleted files to avoid infinite loops if the trash bin
+    // move files across storages
+    private $deletedFiles = array();
+
+    /**
+     * Disable trash logic
+     *
+     * @var bool
+     */
+    private static $disableTrash = false;
+
+    /** @var  IUserManager */
+    private $userManager;
+
+    function __construct($parameters, IUserManager $userManager = null) {
+        $this->mountPoint = $parameters['mountPoint'];
+        $this->userManager = $userManager;
+        parent::__construct($parameters);
+    }
+
+    /**
+     * @internal
+     */
+    public static function preRenameHook($params) {
+        // in cross-storage cases, a rename is a copy + unlink,
+        // that last unlink must not go to trash
+        self::$disableTrash = true;
+    }
+
+    /**
+     * @internal
+     */
+    public static function postRenameHook($params) {
+        self::$disableTrash = false;
+    }
+
+    /**
+     * Rename path1 to path2 by calling the wrapped storage.
+     *
+     * @param string $path1 first path
+     * @param string $path2 second path
+     */
+    public function rename($path1, $path2) {
+        $result = $this->storage->rename($path1, $path2);
+        if ($result === false) {
+            // when rename failed, the post_rename hook isn't triggered,
+            // but we still want to reenable the trash logic
+            self::$disableTrash = false;
+        }
+        return $result;
+    }
+
+    /**
+     * Deletes the given file by moving it into the trashbin.
+     *
+     * @param string $path path of file or folder to delete
+     *
+     * @return bool true if the operation succeeded, false otherwise
+     */
+    public function unlink($path) {
+        return $this->doDelete($path, 'unlink');
+    }
+
+    /**
+     * Deletes the given folder by moving it into the trashbin.
+     *
+     * @param string $path path of folder to delete
+     *
+     * @return bool true if the operation succeeded, false otherwise
+     */
+    public function rmdir($path) {
+        return $this->doDelete($path, 'rmdir');
+    }
+
+    /**
+     * check if it is a file located in data/user/files only files in the
+     * 'files' directory should be moved to the trash
+     *
+     * @param $path
+     * @return bool
+     */
+    protected function shouldMoveToTrash($path){
+        $normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path);
+        $parts = explode('/', $normalized);
+        if (count($parts) < 4) {
+            return false;
+        }
+
+        if ($this->userManager->userExists($parts[1]) && $parts[2] == 'files') {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Run the delete operation with the given method
+     *
+     * @param string $path path of file or folder to delete
+     * @param string $method either "unlink" or "rmdir"
+     *
+     * @return bool true if the operation succeeded, false otherwise
+     */
+    private function doDelete($path, $method) {
+        if (self::$disableTrash
+            || !\OC_App::isEnabled('files_trashbin')
+            || (pathinfo($path, PATHINFO_EXTENSION) === 'part')
+            || $this->shouldMoveToTrash($path) === false
+        ) {
+            return call_user_func_array([$this->storage, $method], [$path]);
+        }
+
+        // check permissions before we continue, this is especially important for
+        // shared files
+        if (!$this->isDeletable($path)) {
+            return false;
+        }
+
+        $normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path, true, false, true);
+        $result = true;
+        $view = Filesystem::getView();
+        if (!isset($this->deletedFiles[$normalized]) && $view instanceof View) {
+            $this->deletedFiles[$normalized] = $normalized;
+            if ($filesPath = $view->getRelativePath($normalized)) {
+                $filesPath = trim($filesPath, '/');
+                $result = \OCA\Files_Trashbin\Trashbin::move2trash($filesPath);
+                // in cross-storage cases the file will be copied
+                // but not deleted, so we delete it here
+                if ($result) {
+                    call_user_func_array([$this->storage, $method], [$path]);
+                }
+            } else {
+                $result = call_user_func_array([$this->storage, $method], [$path]);
+            }
+            unset($this->deletedFiles[$normalized]);
+        } else if ($this->storage->file_exists($path)) {
+            $result = call_user_func_array([$this->storage, $method], [$path]);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Setup the storate wrapper callback
+     */
+    public static function setupStorage() {
+        \OC\Files\Filesystem::addStorageWrapper('oc_trashbin', function ($mountPoint, $storage) {
+            return new \OCA\Files_Trashbin\Storage(
+                array('storage' => $storage, 'mountPoint' => $mountPoint),
+                \OC::$server->getUserManager()
+            );
+        }, 1);
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -114,8 +114,8 @@ 
 	 * @param $path
 	 * @return bool
 	 */
-	protected function shouldMoveToTrash($path){
-		$normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path);
+	protected function shouldMoveToTrash($path) {
+		$normalized = Filesystem::normalizePath($this->mountPoint.'/'.$path);
 		$parts = explode('/', $normalized);
 		if (count($parts) < 4) {
 			return false;
@@ -151,7 +151,7 @@ 
 			return false;
 		}
 
-		$normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path, true, false, true);
+		$normalized = Filesystem::normalizePath($this->mountPoint.'/'.$path, true, false, true);
 		$result = true;
 		$view = Filesystem::getView();
 		if (!isset($this->deletedFiles[$normalized]) && $view instanceof View) {
@@ -179,7 +179,7 @@ 
 	 * Setup the storate wrapper callback
 	 */
 	public static function setupStorage() {
-		\OC\Files\Filesystem::addStorageWrapper('oc_trashbin', function ($mountPoint, $storage) {
+		\OC\Files\Filesystem::addStorageWrapper('oc_trashbin', function($mountPoint, $storage) {
 			return new \OCA\Files_Trashbin\Storage(
 				array('storage' => $storage, 'mountPoint' => $mountPoint),
 				\OC::$server->getUserManager()