nextcloud / server

lib/private/Files/Node/HookConnector.php

Indentation +198 added lines, -198 removed lines

@@ -47,202 +47,202 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 class HookConnector {
-	/** @var IRootFolder */
-	private $root;
-
-	/** @var View */
-	private $view;
-
-	/** @var FileInfo[] */
-	private $deleteMetaCache = [];
-
-	/** @var EventDispatcherInterface */
-	private $legacyDispatcher;
-
-	/** @var IEventDispatcher */
-	private $dispatcher;
-
-	/**
-	 * HookConnector constructor.
-	 *
-	 * @param Root $root
-	 * @param View $view
-	 */
-	public function __construct(
-		IRootFolder $root,
-		View $view,
-		EventDispatcherInterface $legacyDispatcher,
-		IEventDispatcher $dispatcher) {
-		$this->root = $root;
-		$this->view = $view;
-		$this->legacyDispatcher = $legacyDispatcher;
-		$this->dispatcher = $dispatcher;
-	}
-
-	public function viewToNode() {
-		Util::connectHook('OC_Filesystem', 'write', $this, 'write');
-		Util::connectHook('OC_Filesystem', 'post_write', $this, 'postWrite');
-
-		Util::connectHook('OC_Filesystem', 'create', $this, 'create');
-		Util::connectHook('OC_Filesystem', 'post_create', $this, 'postCreate');
-
-		Util::connectHook('OC_Filesystem', 'delete', $this, 'delete');
-		Util::connectHook('OC_Filesystem', 'post_delete', $this, 'postDelete');
-
-		Util::connectHook('OC_Filesystem', 'rename', $this, 'rename');
-		Util::connectHook('OC_Filesystem', 'post_rename', $this, 'postRename');
-
-		Util::connectHook('OC_Filesystem', 'copy', $this, 'copy');
-		Util::connectHook('OC_Filesystem', 'post_copy', $this, 'postCopy');
-
-		Util::connectHook('OC_Filesystem', 'touch', $this, 'touch');
-		Util::connectHook('OC_Filesystem', 'post_touch', $this, 'postTouch');
-
-		Util::connectHook('OC_Filesystem', 'read', $this, 'read');
-	}
-
-	public function write($arguments) {
-		$node = $this->getNodeForPath($arguments['path']);
-		$this->root->emit('\OC\Files', 'preWrite', [$node]);
-		$this->legacyDispatcher->dispatch('\OCP\Files::preWrite', new GenericEvent($node));
-
-		$event = new BeforeNodeWrittenEvent($node);
-		$this->dispatcher->dispatchTyped($event);
-	}
-
-	public function postWrite($arguments) {
-		$node = $this->getNodeForPath($arguments['path']);
-		$this->root->emit('\OC\Files', 'postWrite', [$node]);
-		$this->legacyDispatcher->dispatch('\OCP\Files::postWrite', new GenericEvent($node));
-
-		$event = new NodeWrittenEvent($node);
-		$this->dispatcher->dispatchTyped($event);
-	}
-
-	public function create($arguments) {
-		$node = $this->getNodeForPath($arguments['path']);
-		$this->root->emit('\OC\Files', 'preCreate', [$node]);
-		$this->legacyDispatcher->dispatch('\OCP\Files::preCreate', new GenericEvent($node));
-
-		$event = new BeforeNodeCreatedEvent($node);
-		$this->dispatcher->dispatchTyped($event);
-	}
-
-	public function postCreate($arguments) {
-		$node = $this->getNodeForPath($arguments['path']);
-		$this->root->emit('\OC\Files', 'postCreate', [$node]);
-		$this->legacyDispatcher->dispatch('\OCP\Files::postCreate', new GenericEvent($node));
-
-		$event = new NodeCreatedEvent($node);
-		$this->dispatcher->dispatchTyped($event);
-	}
-
-	public function delete($arguments) {
-		$node = $this->getNodeForPath($arguments['path']);
-		$this->deleteMetaCache[$node->getPath()] = $node->getFileInfo();
-		$this->root->emit('\OC\Files', 'preDelete', [$node]);
-		$this->legacyDispatcher->dispatch('\OCP\Files::preDelete', new GenericEvent($node));
-
-		$event = new BeforeNodeDeletedEvent($node);
-		$this->dispatcher->dispatchTyped($event);
-	}
-
-	public function postDelete($arguments) {
-		$node = $this->getNodeForPath($arguments['path']);
-		unset($this->deleteMetaCache[$node->getPath()]);
-		$this->root->emit('\OC\Files', 'postDelete', [$node]);
-		$this->legacyDispatcher->dispatch('\OCP\Files::postDelete', new GenericEvent($node));
-
-		$event = new NodeDeletedEvent($node);
-		$this->dispatcher->dispatchTyped($event);
-	}
-
-	public function touch($arguments) {
-		$node = $this->getNodeForPath($arguments['path']);
-		$this->root->emit('\OC\Files', 'preTouch', [$node]);
-		$this->legacyDispatcher->dispatch('\OCP\Files::preTouch', new GenericEvent($node));
-
-		$event = new BeforeNodeTouchedEvent($node);
-		$this->dispatcher->dispatchTyped($event);
-	}
-
-	public function postTouch($arguments) {
-		$node = $this->getNodeForPath($arguments['path']);
-		$this->root->emit('\OC\Files', 'postTouch', [$node]);
-		$this->legacyDispatcher->dispatch('\OCP\Files::postTouch', new GenericEvent($node));
-
-		$event = new NodeTouchedEvent($node);
-		$this->dispatcher->dispatchTyped($event);
-	}
-
-	public function rename($arguments) {
-		$source = $this->getNodeForPath($arguments['oldpath']);
-		$target = $this->getNodeForPath($arguments['newpath']);
-		$this->root->emit('\OC\Files', 'preRename', [$source, $target]);
-		$this->legacyDispatcher->dispatch('\OCP\Files::preRename', new GenericEvent([$source, $target]));
-
-		$event = new BeforeNodeRenamedEvent($source, $target);
-		$this->dispatcher->dispatchTyped($event);
-	}
-
-	public function postRename($arguments) {
-		$source = $this->getNodeForPath($arguments['oldpath']);
-		$target = $this->getNodeForPath($arguments['newpath']);
-		$this->root->emit('\OC\Files', 'postRename', [$source, $target]);
-		$this->legacyDispatcher->dispatch('\OCP\Files::postRename', new GenericEvent([$source, $target]));
-
-		$event = new NodeRenamedEvent($source, $target);
-		$this->dispatcher->dispatchTyped($event);
-	}
-
-	public function copy($arguments) {
-		$source = $this->getNodeForPath($arguments['oldpath']);
-		$target = $this->getNodeForPath($arguments['newpath']);
-		$this->root->emit('\OC\Files', 'preCopy', [$source, $target]);
-		$this->legacyDispatcher->dispatch('\OCP\Files::preCopy', new GenericEvent([$source, $target]));
-
-		$event = new BeforeNodeCopiedEvent($source, $target);
-		$this->dispatcher->dispatchTyped($event);
-	}
-
-	public function postCopy($arguments) {
-		$source = $this->getNodeForPath($arguments['oldpath']);
-		$target = $this->getNodeForPath($arguments['newpath']);
-		$this->root->emit('\OC\Files', 'postCopy', [$source, $target]);
-		$this->legacyDispatcher->dispatch('\OCP\Files::postCopy', new GenericEvent([$source, $target]));
-
-		$event = new NodeCopiedEvent($source, $target);
-		$this->dispatcher->dispatchTyped($event);
-	}
-
-	public function read($arguments) {
-		$node = $this->getNodeForPath($arguments['path']);
-		$this->root->emit('\OC\Files', 'read', [$node]);
-		$this->legacyDispatcher->dispatch('\OCP\Files::read', new GenericEvent([$node]));
-
-		$event = new BeforeNodeReadEvent($node);
-		$this->dispatcher->dispatchTyped($event);
-	}
-
-	private function getNodeForPath($path) {
-		$info = Filesystem::getView()->getFileInfo($path);
-		if (!$info) {
-			$fullPath = Filesystem::getView()->getAbsolutePath($path);
-			if (isset($this->deleteMetaCache[$fullPath])) {
-				$info = $this->deleteMetaCache[$fullPath];
-			} else {
-				$info = null;
-			}
-			if (Filesystem::is_dir($path)) {
-				return new NonExistingFolder($this->root, $this->view, $fullPath, $info);
-			} else {
-				return new NonExistingFile($this->root, $this->view, $fullPath, $info);
-			}
-		}
-		if ($info->getType() === FileInfo::TYPE_FILE) {
-			return new File($this->root, $this->view, $info->getPath(), $info);
-		} else {
-			return new Folder($this->root, $this->view, $info->getPath(), $info);
-		}
-	}
+    /** @var IRootFolder */
+    private $root;
+
+    /** @var View */
+    private $view;
+
+    /** @var FileInfo[] */
+    private $deleteMetaCache = [];
+
+    /** @var EventDispatcherInterface */
+    private $legacyDispatcher;
+
+    /** @var IEventDispatcher */
+    private $dispatcher;
+
+    /**
+     * HookConnector constructor.
+     *
+     * @param Root $root
+     * @param View $view
+     */
+    public function __construct(
+        IRootFolder $root,
+        View $view,
+        EventDispatcherInterface $legacyDispatcher,
+        IEventDispatcher $dispatcher) {
+        $this->root = $root;
+        $this->view = $view;
+        $this->legacyDispatcher = $legacyDispatcher;
+        $this->dispatcher = $dispatcher;
+    }
+
+    public function viewToNode() {
+        Util::connectHook('OC_Filesystem', 'write', $this, 'write');
+        Util::connectHook('OC_Filesystem', 'post_write', $this, 'postWrite');
+
+        Util::connectHook('OC_Filesystem', 'create', $this, 'create');
+        Util::connectHook('OC_Filesystem', 'post_create', $this, 'postCreate');
+
+        Util::connectHook('OC_Filesystem', 'delete', $this, 'delete');
+        Util::connectHook('OC_Filesystem', 'post_delete', $this, 'postDelete');
+
+        Util::connectHook('OC_Filesystem', 'rename', $this, 'rename');
+        Util::connectHook('OC_Filesystem', 'post_rename', $this, 'postRename');
+
+        Util::connectHook('OC_Filesystem', 'copy', $this, 'copy');
+        Util::connectHook('OC_Filesystem', 'post_copy', $this, 'postCopy');
+
+        Util::connectHook('OC_Filesystem', 'touch', $this, 'touch');
+        Util::connectHook('OC_Filesystem', 'post_touch', $this, 'postTouch');
+
+        Util::connectHook('OC_Filesystem', 'read', $this, 'read');
+    }
+
+    public function write($arguments) {
+        $node = $this->getNodeForPath($arguments['path']);
+        $this->root->emit('\OC\Files', 'preWrite', [$node]);
+        $this->legacyDispatcher->dispatch('\OCP\Files::preWrite', new GenericEvent($node));
+
+        $event = new BeforeNodeWrittenEvent($node);
+        $this->dispatcher->dispatchTyped($event);
+    }
+
+    public function postWrite($arguments) {
+        $node = $this->getNodeForPath($arguments['path']);
+        $this->root->emit('\OC\Files', 'postWrite', [$node]);
+        $this->legacyDispatcher->dispatch('\OCP\Files::postWrite', new GenericEvent($node));
+
+        $event = new NodeWrittenEvent($node);
+        $this->dispatcher->dispatchTyped($event);
+    }
+
+    public function create($arguments) {
+        $node = $this->getNodeForPath($arguments['path']);
+        $this->root->emit('\OC\Files', 'preCreate', [$node]);
+        $this->legacyDispatcher->dispatch('\OCP\Files::preCreate', new GenericEvent($node));
+
+        $event = new BeforeNodeCreatedEvent($node);
+        $this->dispatcher->dispatchTyped($event);
+    }
+
+    public function postCreate($arguments) {
+        $node = $this->getNodeForPath($arguments['path']);
+        $this->root->emit('\OC\Files', 'postCreate', [$node]);
+        $this->legacyDispatcher->dispatch('\OCP\Files::postCreate', new GenericEvent($node));
+
+        $event = new NodeCreatedEvent($node);
+        $this->dispatcher->dispatchTyped($event);
+    }
+
+    public function delete($arguments) {
+        $node = $this->getNodeForPath($arguments['path']);
+        $this->deleteMetaCache[$node->getPath()] = $node->getFileInfo();
+        $this->root->emit('\OC\Files', 'preDelete', [$node]);
+        $this->legacyDispatcher->dispatch('\OCP\Files::preDelete', new GenericEvent($node));
+
+        $event = new BeforeNodeDeletedEvent($node);
+        $this->dispatcher->dispatchTyped($event);
+    }
+
+    public function postDelete($arguments) {
+        $node = $this->getNodeForPath($arguments['path']);
+        unset($this->deleteMetaCache[$node->getPath()]);
+        $this->root->emit('\OC\Files', 'postDelete', [$node]);
+        $this->legacyDispatcher->dispatch('\OCP\Files::postDelete', new GenericEvent($node));
+
+        $event = new NodeDeletedEvent($node);
+        $this->dispatcher->dispatchTyped($event);
+    }
+
+    public function touch($arguments) {
+        $node = $this->getNodeForPath($arguments['path']);
+        $this->root->emit('\OC\Files', 'preTouch', [$node]);
+        $this->legacyDispatcher->dispatch('\OCP\Files::preTouch', new GenericEvent($node));
+
+        $event = new BeforeNodeTouchedEvent($node);
+        $this->dispatcher->dispatchTyped($event);
+    }
+
+    public function postTouch($arguments) {
+        $node = $this->getNodeForPath($arguments['path']);
+        $this->root->emit('\OC\Files', 'postTouch', [$node]);
+        $this->legacyDispatcher->dispatch('\OCP\Files::postTouch', new GenericEvent($node));
+
+        $event = new NodeTouchedEvent($node);
+        $this->dispatcher->dispatchTyped($event);
+    }
+
+    public function rename($arguments) {
+        $source = $this->getNodeForPath($arguments['oldpath']);
+        $target = $this->getNodeForPath($arguments['newpath']);
+        $this->root->emit('\OC\Files', 'preRename', [$source, $target]);
+        $this->legacyDispatcher->dispatch('\OCP\Files::preRename', new GenericEvent([$source, $target]));
+
+        $event = new BeforeNodeRenamedEvent($source, $target);
+        $this->dispatcher->dispatchTyped($event);
+    }
+
+    public function postRename($arguments) {
+        $source = $this->getNodeForPath($arguments['oldpath']);
+        $target = $this->getNodeForPath($arguments['newpath']);
+        $this->root->emit('\OC\Files', 'postRename', [$source, $target]);
+        $this->legacyDispatcher->dispatch('\OCP\Files::postRename', new GenericEvent([$source, $target]));
+
+        $event = new NodeRenamedEvent($source, $target);
+        $this->dispatcher->dispatchTyped($event);
+    }
+
+    public function copy($arguments) {
+        $source = $this->getNodeForPath($arguments['oldpath']);
+        $target = $this->getNodeForPath($arguments['newpath']);
+        $this->root->emit('\OC\Files', 'preCopy', [$source, $target]);
+        $this->legacyDispatcher->dispatch('\OCP\Files::preCopy', new GenericEvent([$source, $target]));
+
+        $event = new BeforeNodeCopiedEvent($source, $target);
+        $this->dispatcher->dispatchTyped($event);
+    }
+
+    public function postCopy($arguments) {
+        $source = $this->getNodeForPath($arguments['oldpath']);
+        $target = $this->getNodeForPath($arguments['newpath']);
+        $this->root->emit('\OC\Files', 'postCopy', [$source, $target]);
+        $this->legacyDispatcher->dispatch('\OCP\Files::postCopy', new GenericEvent([$source, $target]));
+
+        $event = new NodeCopiedEvent($source, $target);
+        $this->dispatcher->dispatchTyped($event);
+    }
+
+    public function read($arguments) {
+        $node = $this->getNodeForPath($arguments['path']);
+        $this->root->emit('\OC\Files', 'read', [$node]);
+        $this->legacyDispatcher->dispatch('\OCP\Files::read', new GenericEvent([$node]));
+
+        $event = new BeforeNodeReadEvent($node);
+        $this->dispatcher->dispatchTyped($event);
+    }
+
+    private function getNodeForPath($path) {
+        $info = Filesystem::getView()->getFileInfo($path);
+        if (!$info) {
+            $fullPath = Filesystem::getView()->getAbsolutePath($path);
+            if (isset($this->deleteMetaCache[$fullPath])) {
+                $info = $this->deleteMetaCache[$fullPath];
+            } else {
+                $info = null;
+            }
+            if (Filesystem::is_dir($path)) {
+                return new NonExistingFolder($this->root, $this->view, $fullPath, $info);
+            } else {
+                return new NonExistingFile($this->root, $this->view, $fullPath, $info);
+            }
+        }
+        if ($info->getType() === FileInfo::TYPE_FILE) {
+            return new File($this->root, $this->view, $info->getPath(), $info);
+        } else {
+            return new Folder($this->root, $this->view, $info->getPath(), $info);
+        }
+    }
 }

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

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
 		if (isset($context[$name])) {
 			$context = $context[$name];
 		} else {
-			throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
+			throw new \BadMethodCallException('Invalid context, "'.$name.'" options not set');
 		}
 		if (isset($context['session']) and $context['session'] instanceof \phpseclib\Net\SFTP) {
 			$this->sftp = $context['session'];
@@ -82,7 +82,7 @@ 
 
 	public function stream_open($path, $mode, $options, &$opened_path) {
 		[, $path] = explode('://', $path);
-		$path = '/' . ltrim($path);
+		$path = '/'.ltrim($path);
 		$path = str_replace('//', '/', $path);
 
 		$this->loadContext('sftp');

Indentation +151 added lines, -151 removed lines

@@ -30,155 +30,155 @@
 use phpseclib\Net\SSH2;
 
 class SFTPWriteStream implements File {
-	/** @var resource */
-	public $context;
-
-	/** @var \phpseclib\Net\SFTP */
-	private $sftp;
-
-	/** @var string */
-	private $handle;
-
-	/** @var int */
-	private $internalPosition = 0;
-
-	/** @var int */
-	private $writePosition = 0;
-
-	/** @var bool */
-	private $eof = false;
-
-	private $buffer = '';
-
-	public static function register($protocol = 'sftpwrite') {
-		if (in_array($protocol, stream_get_wrappers(), true)) {
-			return false;
-		}
-		return stream_wrapper_register($protocol, get_called_class());
-	}
-
-	/**
-	 * Load the source from the stream context and return the context options
-	 *
-	 * @param string $name
-	 * @throws \BadMethodCallException
-	 */
-	protected function loadContext($name) {
-		$context = stream_context_get_options($this->context);
-		if (isset($context[$name])) {
-			$context = $context[$name];
-		} else {
-			throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
-		}
-		if (isset($context['session']) and $context['session'] instanceof \phpseclib\Net\SFTP) {
-			$this->sftp = $context['session'];
-		} else {
-			throw new \BadMethodCallException('Invalid context, session not set');
-		}
-		return $context;
-	}
-
-	public function stream_open($path, $mode, $options, &$opened_path) {
-		[, $path] = explode('://', $path);
-		$path = '/' . ltrim($path);
-		$path = str_replace('//', '/', $path);
-
-		$this->loadContext('sftp');
-
-		if (!($this->sftp->bitmap & SSH2::MASK_LOGIN)) {
-			return false;
-		}
-
-		$remote_file = $this->sftp->_realpath($path);
-		if ($remote_file === false) {
-			return false;
-		}
-
-		$packet = pack('Na*N2', strlen($remote_file), $remote_file, NET_SFTP_OPEN_WRITE | NET_SFTP_OPEN_CREATE | NET_SFTP_OPEN_TRUNCATE, 0);
-		if (!$this->sftp->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
-			return false;
-		}
-
-		$response = $this->sftp->_get_sftp_packet();
-		switch ($this->sftp->packet_type) {
-			case NET_SFTP_HANDLE:
-				$this->handle = substr($response, 4);
-				break;
-			case NET_SFTP_STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-				$this->sftp->_logError($response);
-				return false;
-			default:
-				user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
-				return false;
-		}
-
-		return true;
-	}
-
-	public function stream_seek($offset, $whence = SEEK_SET) {
-		return false;
-	}
-
-	public function stream_tell() {
-		return $this->writePosition;
-	}
-
-	public function stream_read($count) {
-		return false;
-	}
-
-	public function stream_write($data) {
-		$written = strlen($data);
-		$this->writePosition += $written;
-
-		$this->buffer .= $data;
-
-		if (strlen($this->buffer) > 64 * 1024) {
-			if (!$this->stream_flush()) {
-				return false;
-			}
-		}
-
-		return $written;
-	}
-
-	public function stream_set_option($option, $arg1, $arg2) {
-		return false;
-	}
-
-	public function stream_truncate($size) {
-		return false;
-	}
-
-	public function stream_stat() {
-		return false;
-	}
-
-	public function stream_lock($operation) {
-		return false;
-	}
-
-	public function stream_flush() {
-		$size = strlen($this->buffer);
-		$packet = pack('Na*N3a*', strlen($this->handle), $this->handle, $this->internalPosition / 4294967296, $this->internalPosition, $size, $this->buffer);
-		if (!$this->sftp->_send_sftp_packet(NET_SFTP_WRITE, $packet)) {
-			return false;
-		}
-		$this->internalPosition += $size;
-		$this->buffer = '';
-
-		return $this->sftp->_read_put_responses(1);
-	}
-
-	public function stream_eof() {
-		return $this->eof;
-	}
-
-	public function stream_close() {
-		$this->stream_flush();
-		if (!$this->sftp->_close_handle($this->handle)) {
-			return false;
-		}
-		return true;
-	}
+    /** @var resource */
+    public $context;
+
+    /** @var \phpseclib\Net\SFTP */
+    private $sftp;
+
+    /** @var string */
+    private $handle;
+
+    /** @var int */
+    private $internalPosition = 0;
+
+    /** @var int */
+    private $writePosition = 0;
+
+    /** @var bool */
+    private $eof = false;
+
+    private $buffer = '';
+
+    public static function register($protocol = 'sftpwrite') {
+        if (in_array($protocol, stream_get_wrappers(), true)) {
+            return false;
+        }
+        return stream_wrapper_register($protocol, get_called_class());
+    }
+
+    /**
+     * Load the source from the stream context and return the context options
+     *
+     * @param string $name
+     * @throws \BadMethodCallException
+     */
+    protected function loadContext($name) {
+        $context = stream_context_get_options($this->context);
+        if (isset($context[$name])) {
+            $context = $context[$name];
+        } else {
+            throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
+        }
+        if (isset($context['session']) and $context['session'] instanceof \phpseclib\Net\SFTP) {
+            $this->sftp = $context['session'];
+        } else {
+            throw new \BadMethodCallException('Invalid context, session not set');
+        }
+        return $context;
+    }
+
+    public function stream_open($path, $mode, $options, &$opened_path) {
+        [, $path] = explode('://', $path);
+        $path = '/' . ltrim($path);
+        $path = str_replace('//', '/', $path);
+
+        $this->loadContext('sftp');
+
+        if (!($this->sftp->bitmap & SSH2::MASK_LOGIN)) {
+            return false;
+        }
+
+        $remote_file = $this->sftp->_realpath($path);
+        if ($remote_file === false) {
+            return false;
+        }
+
+        $packet = pack('Na*N2', strlen($remote_file), $remote_file, NET_SFTP_OPEN_WRITE | NET_SFTP_OPEN_CREATE | NET_SFTP_OPEN_TRUNCATE, 0);
+        if (!$this->sftp->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
+            return false;
+        }
+
+        $response = $this->sftp->_get_sftp_packet();
+        switch ($this->sftp->packet_type) {
+            case NET_SFTP_HANDLE:
+                $this->handle = substr($response, 4);
+                break;
+            case NET_SFTP_STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
+                $this->sftp->_logError($response);
+                return false;
+            default:
+                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
+                return false;
+        }
+
+        return true;
+    }
+
+    public function stream_seek($offset, $whence = SEEK_SET) {
+        return false;
+    }
+
+    public function stream_tell() {
+        return $this->writePosition;
+    }
+
+    public function stream_read($count) {
+        return false;
+    }
+
+    public function stream_write($data) {
+        $written = strlen($data);
+        $this->writePosition += $written;
+
+        $this->buffer .= $data;
+
+        if (strlen($this->buffer) > 64 * 1024) {
+            if (!$this->stream_flush()) {
+                return false;
+            }
+        }
+
+        return $written;
+    }
+
+    public function stream_set_option($option, $arg1, $arg2) {
+        return false;
+    }
+
+    public function stream_truncate($size) {
+        return false;
+    }
+
+    public function stream_stat() {
+        return false;
+    }
+
+    public function stream_lock($operation) {
+        return false;
+    }
+
+    public function stream_flush() {
+        $size = strlen($this->buffer);
+        $packet = pack('Na*N3a*', strlen($this->handle), $this->handle, $this->internalPosition / 4294967296, $this->internalPosition, $size, $this->buffer);
+        if (!$this->sftp->_send_sftp_packet(NET_SFTP_WRITE, $packet)) {
+            return false;
+        }
+        $this->internalPosition += $size;
+        $this->buffer = '';
+
+        return $this->sftp->_read_put_responses(1);
+    }
+
+    public function stream_eof() {
+        return $this->eof;
+    }
+
+    public function stream_close() {
+        $this->stream_flush();
+        if (!$this->sftp->_close_handle($this->handle)) {
+            return false;
+        }
+        return true;
+    }
 }

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

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
 		if (isset($context[$name])) {
 			$context = $context[$name];
 		} else {
-			throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
+			throw new \BadMethodCallException('Invalid context, "'.$name.'" options not set');
 		}
 		if (isset($context['session']) and $context['session'] instanceof \phpseclib\Net\SFTP) {
 			$this->sftp = $context['session'];
@@ -82,7 +82,7 @@ 
 
 	public function stream_open($path, $mode, $options, &$opened_path) {
 		[, $path] = explode('://', $path);
-		$path = '/' . ltrim($path);
+		$path = '/'.ltrim($path);
 		$path = str_replace('//', '/', $path);
 
 		$this->loadContext('sftp');

Indentation +170 added lines, -170 removed lines

@@ -30,174 +30,174 @@
 use phpseclib\Net\SSH2;
 
 class SFTPReadStream implements File {
-	/** @var resource */
-	public $context;
-
-	/** @var \phpseclib\Net\SFTP */
-	private $sftp;
-
-	/** @var string */
-	private $handle;
-
-	/** @var int */
-	private $internalPosition = 0;
-
-	/** @var int */
-	private $readPosition = 0;
-
-	/** @var bool */
-	private $eof = false;
-
-	private $buffer = '';
-
-	public static function register($protocol = 'sftpread') {
-		if (in_array($protocol, stream_get_wrappers(), true)) {
-			return false;
-		}
-		return stream_wrapper_register($protocol, get_called_class());
-	}
-
-	/**
-	 * Load the source from the stream context and return the context options
-	 *
-	 * @param string $name
-	 * @throws \BadMethodCallException
-	 */
-	protected function loadContext($name) {
-		$context = stream_context_get_options($this->context);
-		if (isset($context[$name])) {
-			$context = $context[$name];
-		} else {
-			throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
-		}
-		if (isset($context['session']) and $context['session'] instanceof \phpseclib\Net\SFTP) {
-			$this->sftp = $context['session'];
-		} else {
-			throw new \BadMethodCallException('Invalid context, session not set');
-		}
-		return $context;
-	}
-
-	public function stream_open($path, $mode, $options, &$opened_path) {
-		[, $path] = explode('://', $path);
-		$path = '/' . ltrim($path);
-		$path = str_replace('//', '/', $path);
-
-		$this->loadContext('sftp');
-
-		if (!($this->sftp->bitmap & SSH2::MASK_LOGIN)) {
-			return false;
-		}
-
-		$remote_file = $this->sftp->_realpath($path);
-		if ($remote_file === false) {
-			return false;
-		}
-
-		$packet = pack('Na*N2', strlen($remote_file), $remote_file, NET_SFTP_OPEN_READ, 0);
-		if (!$this->sftp->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
-			return false;
-		}
-
-		$response = $this->sftp->_get_sftp_packet();
-		switch ($this->sftp->packet_type) {
-			case NET_SFTP_HANDLE:
-				$this->handle = substr($response, 4);
-				break;
-			case NET_SFTP_STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-				$this->sftp->_logError($response);
-				return false;
-			default:
-				user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
-				return false;
-		}
-
-		$this->request_chunk(256 * 1024);
-
-		return true;
-	}
-
-	public function stream_seek($offset, $whence = SEEK_SET) {
-		return false;
-	}
-
-	public function stream_tell() {
-		return $this->readPosition;
-	}
-
-	public function stream_read($count) {
-		if (!$this->eof && strlen($this->buffer) < $count) {
-			$chunk = $this->read_chunk();
-			$this->buffer .= $chunk;
-			if (!$this->eof) {
-				$this->request_chunk(256 * 1024);
-			}
-		}
-
-		$data = substr($this->buffer, 0, $count);
-		$this->buffer = substr($this->buffer, $count);
-		$this->readPosition += strlen($data);
-
-		return $data;
-	}
-
-	private function request_chunk($size) {
-		$packet = pack('Na*N3', strlen($this->handle), $this->handle, $this->internalPosition / 4294967296, $this->internalPosition, $size);
-		return $this->sftp->_send_sftp_packet(NET_SFTP_READ, $packet);
-	}
-
-	private function read_chunk() {
-		$response = $this->sftp->_get_sftp_packet();
-
-		switch ($this->sftp->packet_type) {
-			case NET_SFTP_DATA:
-				$temp = substr($response, 4);
-				$len = strlen($temp);
-				$this->internalPosition += $len;
-				return $temp;
-			case NET_SFTP_STATUS:
-				[1 => $status] = unpack('N', substr($response, 0, 4));
-				if ($status == NET_SFTP_STATUS_EOF) {
-					$this->eof = true;
-				}
-				return '';
-			default:
-				return '';
-		}
-	}
-
-	public function stream_write($data) {
-		return false;
-	}
-
-	public function stream_set_option($option, $arg1, $arg2) {
-		return false;
-	}
-
-	public function stream_truncate($size) {
-		return false;
-	}
-
-	public function stream_stat() {
-		return false;
-	}
-
-	public function stream_lock($operation) {
-		return false;
-	}
-
-	public function stream_flush() {
-		return false;
-	}
-
-	public function stream_eof() {
-		return $this->eof;
-	}
-
-	public function stream_close() {
-		if (!$this->sftp->_close_handle($this->handle)) {
-			return false;
-		}
-		return true;
-	}
+    /** @var resource */
+    public $context;
+
+    /** @var \phpseclib\Net\SFTP */
+    private $sftp;
+
+    /** @var string */
+    private $handle;
+
+    /** @var int */
+    private $internalPosition = 0;
+
+    /** @var int */
+    private $readPosition = 0;
+
+    /** @var bool */
+    private $eof = false;
+
+    private $buffer = '';
+
+    public static function register($protocol = 'sftpread') {
+        if (in_array($protocol, stream_get_wrappers(), true)) {
+            return false;
+        }
+        return stream_wrapper_register($protocol, get_called_class());
+    }
+
+    /**
+     * Load the source from the stream context and return the context options
+     *
+     * @param string $name
+     * @throws \BadMethodCallException
+     */
+    protected function loadContext($name) {
+        $context = stream_context_get_options($this->context);
+        if (isset($context[$name])) {
+            $context = $context[$name];
+        } else {
+            throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
+        }
+        if (isset($context['session']) and $context['session'] instanceof \phpseclib\Net\SFTP) {
+            $this->sftp = $context['session'];
+        } else {
+            throw new \BadMethodCallException('Invalid context, session not set');
+        }
+        return $context;
+    }
+
+    public function stream_open($path, $mode, $options, &$opened_path) {
+        [, $path] = explode('://', $path);
+        $path = '/' . ltrim($path);
+        $path = str_replace('//', '/', $path);
+
+        $this->loadContext('sftp');
+
+        if (!($this->sftp->bitmap & SSH2::MASK_LOGIN)) {
+            return false;
+        }
+
+        $remote_file = $this->sftp->_realpath($path);
+        if ($remote_file === false) {
+            return false;
+        }
+
+        $packet = pack('Na*N2', strlen($remote_file), $remote_file, NET_SFTP_OPEN_READ, 0);
+        if (!$this->sftp->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
+            return false;
+        }
+
+        $response = $this->sftp->_get_sftp_packet();
+        switch ($this->sftp->packet_type) {
+            case NET_SFTP_HANDLE:
+                $this->handle = substr($response, 4);
+                break;
+            case NET_SFTP_STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
+                $this->sftp->_logError($response);
+                return false;
+            default:
+                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
+                return false;
+        }
+
+        $this->request_chunk(256 * 1024);
+
+        return true;
+    }
+
+    public function stream_seek($offset, $whence = SEEK_SET) {
+        return false;
+    }
+
+    public function stream_tell() {
+        return $this->readPosition;
+    }
+
+    public function stream_read($count) {
+        if (!$this->eof && strlen($this->buffer) < $count) {
+            $chunk = $this->read_chunk();
+            $this->buffer .= $chunk;
+            if (!$this->eof) {
+                $this->request_chunk(256 * 1024);
+            }
+        }
+
+        $data = substr($this->buffer, 0, $count);
+        $this->buffer = substr($this->buffer, $count);
+        $this->readPosition += strlen($data);
+
+        return $data;
+    }
+
+    private function request_chunk($size) {
+        $packet = pack('Na*N3', strlen($this->handle), $this->handle, $this->internalPosition / 4294967296, $this->internalPosition, $size);
+        return $this->sftp->_send_sftp_packet(NET_SFTP_READ, $packet);
+    }
+
+    private function read_chunk() {
+        $response = $this->sftp->_get_sftp_packet();
+
+        switch ($this->sftp->packet_type) {
+            case NET_SFTP_DATA:
+                $temp = substr($response, 4);
+                $len = strlen($temp);
+                $this->internalPosition += $len;
+                return $temp;
+            case NET_SFTP_STATUS:
+                [1 => $status] = unpack('N', substr($response, 0, 4));
+                if ($status == NET_SFTP_STATUS_EOF) {
+                    $this->eof = true;
+                }
+                return '';
+            default:
+                return '';
+        }
+    }
+
+    public function stream_write($data) {
+        return false;
+    }
+
+    public function stream_set_option($option, $arg1, $arg2) {
+        return false;
+    }
+
+    public function stream_truncate($size) {
+        return false;
+    }
+
+    public function stream_stat() {
+        return false;
+    }
+
+    public function stream_lock($operation) {
+        return false;
+    }
+
+    public function stream_flush() {
+        return false;
+    }
+
+    public function stream_eof() {
+        return $this->eof;
+    }
+
+    public function stream_close() {
+        if (!$this->sftp->_close_handle($this->handle)) {
+            return false;
+        }
+        return true;
+    }
 }

apps/dav/lib/Connector/Sabre/PropfindCompressionPlugin.php

Indentation +35 added lines, -35 removed lines

@@ -31,44 +31,44 @@
 
 class PropfindCompressionPlugin extends ServerPlugin {
 
-	/**
-	 * Reference to main server object
-	 *
-	 * @var Server
-	 */
-	private $server;
+    /**
+     * Reference to main server object
+     *
+     * @var Server
+     */
+    private $server;
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by \Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
-		$this->server->on('afterMethod:PROPFIND', [$this, 'compressResponse'], 100);
-	}
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by \Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param \Sabre\DAV\Server $server
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
+        $this->server->on('afterMethod:PROPFIND', [$this, 'compressResponse'], 100);
+    }
 
-	public function compressResponse(Request $request, Response $response) {
-		$header = $request->getHeader('Accept-Encoding');
+    public function compressResponse(Request $request, Response $response) {
+        $header = $request->getHeader('Accept-Encoding');
 
-		if ($header === null) {
-			return $response;
-		}
+        if ($header === null) {
+            return $response;
+        }
 
-		if (strpos($header, 'gzip') !== false) {
-			$body = $response->getBody();
-			if (is_string($body)) {
-				$response->setHeader('Content-Encoding', 'gzip');
-				$response->setBody(gzencode($body));
-			}
-		}
+        if (strpos($header, 'gzip') !== false) {
+            $body = $response->getBody();
+            if (is_string($body)) {
+                $response->setHeader('Content-Encoding', 'gzip');
+                $response->setBody(gzencode($body));
+            }
+        }
 
-		return $response;
-	}
+        return $response;
+    }
 }

apps/comments/lib/Listener/CommentsEntityEventListener.php

Indentation +10 added lines, -10 removed lines

@@ -30,15 +30,15 @@
 use OCP\EventDispatcher\IEventListener;
 
 class CommentsEntityEventListener implements IEventListener {
-	public function handle(Event $event): void {
-		if (!($event instanceof CommentsEntityEvent)) {
-			// Unrelated
-			return;
-		}
+    public function handle(Event $event): void {
+        if (!($event instanceof CommentsEntityEvent)) {
+            // Unrelated
+            return;
+        }
 
-		$event->addEntityCollection('files', function ($name) {
-			$nodes = \OC::$server->getUserFolder()->getById((int)$name);
-			return !empty($nodes);
-		});
-	}
+        $event->addEntityCollection('files', function ($name) {
+            $nodes = \OC::$server->getUserFolder()->getById((int)$name);
+            return !empty($nodes);
+        });
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -36,8 +36,8 @@
 			return;
 		}
 
-		$event->addEntityCollection('files', function ($name) {
-			$nodes = \OC::$server->getUserFolder()->getById((int)$name);
+		$event->addEntityCollection('files', function($name) {
+			$nodes = \OC::$server->getUserFolder()->getById((int) $name);
 			return !empty($nodes);
 		});
 	}

apps/settings/lib/Controller/WebAuthnController.php

Indentation +77 added lines, -77 removed lines

@@ -38,81 +38,81 @@
 use Webauthn\PublicKeyCredentialCreationOptions;
 
 class WebAuthnController extends Controller {
-	private const WEBAUTHN_REGISTRATION = 'webauthn_registration';
-
-	/** @var Manager */
-	private $manager;
-
-	/** @var IUserSession */
-	private $userSession;
-	/**
-	 * @var ISession
-	 */
-	private $session;
-	/**
-	 * @var ILogger
-	 */
-	private $logger;
-
-	public function __construct(IRequest $request, ILogger $logger, Manager $webAuthnManager, IUserSession $userSession, ISession $session) {
-		parent::__construct(Application::APP_ID, $request);
-
-		$this->manager = $webAuthnManager;
-		$this->userSession = $userSession;
-		$this->session = $session;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 * @PasswordConfirmationRequired
-	 * @UseSession
-	 * @NoCSRFRequired
-	 */
-	public function startRegistration(): JSONResponse {
-		$this->logger->debug('Starting WebAuthn registration');
-
-		$credentialOptions = $this->manager->startRegistration($this->userSession->getUser(), $this->request->getServerHost());
-
-		// Set this in the session since we need it on finish
-		$this->session->set(self::WEBAUTHN_REGISTRATION, $credentialOptions);
-
-		return new JSONResponse($credentialOptions);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 * @PasswordConfirmationRequired
-	 * @UseSession
-	 */
-	public function finishRegistration(string $name, string $data): JSONResponse {
-		$this->logger->debug('Finishing WebAuthn registration');
-
-		if (!$this->session->exists(self::WEBAUTHN_REGISTRATION)) {
-			$this->logger->debug('Trying to finish WebAuthn registration without session data');
-			return new JSONResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		// Obtain the publicKeyCredentialOptions from when we started the registration
-		$publicKeyCredentialCreationOptions = PublicKeyCredentialCreationOptions::createFromArray($this->session->get(self::WEBAUTHN_REGISTRATION));
-
-		$this->session->remove(self::WEBAUTHN_REGISTRATION);
-
-		return new JSONResponse($this->manager->finishRegister($publicKeyCredentialCreationOptions, $name, $data));
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 * @PasswordConfirmationRequired
-	 */
-	public function deleteRegistration(int $id): JSONResponse {
-		$this->logger->debug('Finishing WebAuthn registration');
-
-		$this->manager->deleteRegistration($this->userSession->getUser(), $id);
-
-		return new JSONResponse([]);
-	}
+    private const WEBAUTHN_REGISTRATION = 'webauthn_registration';
+
+    /** @var Manager */
+    private $manager;
+
+    /** @var IUserSession */
+    private $userSession;
+    /**
+     * @var ISession
+     */
+    private $session;
+    /**
+     * @var ILogger
+     */
+    private $logger;
+
+    public function __construct(IRequest $request, ILogger $logger, Manager $webAuthnManager, IUserSession $userSession, ISession $session) {
+        parent::__construct(Application::APP_ID, $request);
+
+        $this->manager = $webAuthnManager;
+        $this->userSession = $userSession;
+        $this->session = $session;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     * @PasswordConfirmationRequired
+     * @UseSession
+     * @NoCSRFRequired
+     */
+    public function startRegistration(): JSONResponse {
+        $this->logger->debug('Starting WebAuthn registration');
+
+        $credentialOptions = $this->manager->startRegistration($this->userSession->getUser(), $this->request->getServerHost());
+
+        // Set this in the session since we need it on finish
+        $this->session->set(self::WEBAUTHN_REGISTRATION, $credentialOptions);
+
+        return new JSONResponse($credentialOptions);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     * @PasswordConfirmationRequired
+     * @UseSession
+     */
+    public function finishRegistration(string $name, string $data): JSONResponse {
+        $this->logger->debug('Finishing WebAuthn registration');
+
+        if (!$this->session->exists(self::WEBAUTHN_REGISTRATION)) {
+            $this->logger->debug('Trying to finish WebAuthn registration without session data');
+            return new JSONResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        // Obtain the publicKeyCredentialOptions from when we started the registration
+        $publicKeyCredentialCreationOptions = PublicKeyCredentialCreationOptions::createFromArray($this->session->get(self::WEBAUTHN_REGISTRATION));
+
+        $this->session->remove(self::WEBAUTHN_REGISTRATION);
+
+        return new JSONResponse($this->manager->finishRegister($publicKeyCredentialCreationOptions, $name, $data));
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     * @PasswordConfirmationRequired
+     */
+    public function deleteRegistration(int $id): JSONResponse {
+        $this->logger->debug('Finishing WebAuthn registration');
+
+        $this->manager->deleteRegistration($this->userSession->getUser(), $id);
+
+        return new JSONResponse([]);
+    }
 }

lib/private/Federation/CloudFederationShare.php

Indentation +302 added lines, -302 removed lines

@@ -27,331 +27,331 @@
 use OCP\Share\IShare;
 
 class CloudFederationShare implements ICloudFederationShare {
-	private $share = [
-		'shareWith' => '',
-		'shareType' => '',
-		'name' => '',
-		'resourceType' => '',
-		'description' => '',
-		'providerId' => '',
-		'owner' => '',
-		'ownerDisplayName' => '',
-		'sharedBy' => '',
-		'sharedByDisplayName' => '',
-		'protocol' => []
-	];
+    private $share = [
+        'shareWith' => '',
+        'shareType' => '',
+        'name' => '',
+        'resourceType' => '',
+        'description' => '',
+        'providerId' => '',
+        'owner' => '',
+        'ownerDisplayName' => '',
+        'sharedBy' => '',
+        'sharedByDisplayName' => '',
+        'protocol' => []
+    ];
 
-	/**
-	 * get a CloudFederationShare Object to prepare a share you want to send
-	 *
-	 * @param string $shareWith
-	 * @param string $name resource name (e.g. document.odt)
-	 * @param string $description share description (optional)
-	 * @param string $providerId resource UID on the provider side
-	 * @param string $owner provider specific UID of the user who owns the resource
-	 * @param string $ownerDisplayName display name of the user who shared the item
-	 * @param string $sharedBy provider specific UID of the user who shared the resource
-	 * @param string $sharedByDisplayName display name of the user who shared the resource
-	 * @param string $shareType ('group' or 'user' share)
-	 * @param string $resourceType ('file', 'calendar',...)
-	 * @param string $sharedSecret
-	 */
-	public function __construct($shareWith = '',
-								$name = '',
-								$description = '',
-								$providerId = '',
-								$owner = '',
-								$ownerDisplayName = '',
-								$sharedBy = '',
-								$sharedByDisplayName = '',
-								$shareType = '',
-								$resourceType = '',
-								$sharedSecret = ''
-	) {
-		$this->setShareWith($shareWith);
-		$this->setResourceName($name);
-		$this->setDescription($description);
-		$this->setProviderId($providerId);
-		$this->setOwner($owner);
-		$this->setOwnerDisplayName($ownerDisplayName);
-		$this->setSharedBy($sharedBy);
-		$this->setSharedByDisplayName($sharedByDisplayName);
-		$this->setProtocol([
-			'name' => 'webdav',
-			'options' => [
-				'sharedSecret' => $sharedSecret,
-				'permissions' => '{http://open-cloud-mesh.org/ns}share-permissions'
-			]
-		]);
-		$this->setShareType($shareType);
-		$this->setResourceType($resourceType);
-	}
+    /**
+     * get a CloudFederationShare Object to prepare a share you want to send
+     *
+     * @param string $shareWith
+     * @param string $name resource name (e.g. document.odt)
+     * @param string $description share description (optional)
+     * @param string $providerId resource UID on the provider side
+     * @param string $owner provider specific UID of the user who owns the resource
+     * @param string $ownerDisplayName display name of the user who shared the item
+     * @param string $sharedBy provider specific UID of the user who shared the resource
+     * @param string $sharedByDisplayName display name of the user who shared the resource
+     * @param string $shareType ('group' or 'user' share)
+     * @param string $resourceType ('file', 'calendar',...)
+     * @param string $sharedSecret
+     */
+    public function __construct($shareWith = '',
+                                $name = '',
+                                $description = '',
+                                $providerId = '',
+                                $owner = '',
+                                $ownerDisplayName = '',
+                                $sharedBy = '',
+                                $sharedByDisplayName = '',
+                                $shareType = '',
+                                $resourceType = '',
+                                $sharedSecret = ''
+    ) {
+        $this->setShareWith($shareWith);
+        $this->setResourceName($name);
+        $this->setDescription($description);
+        $this->setProviderId($providerId);
+        $this->setOwner($owner);
+        $this->setOwnerDisplayName($ownerDisplayName);
+        $this->setSharedBy($sharedBy);
+        $this->setSharedByDisplayName($sharedByDisplayName);
+        $this->setProtocol([
+            'name' => 'webdav',
+            'options' => [
+                'sharedSecret' => $sharedSecret,
+                'permissions' => '{http://open-cloud-mesh.org/ns}share-permissions'
+            ]
+        ]);
+        $this->setShareType($shareType);
+        $this->setResourceType($resourceType);
+    }
 
-	/**
-	 * set uid of the recipient
-	 *
-	 * @param string $user
-	 *
-	 * @since 14.0.0
-	 */
-	public function setShareWith($user) {
-		$this->share['shareWith'] = $user;
-	}
+    /**
+     * set uid of the recipient
+     *
+     * @param string $user
+     *
+     * @since 14.0.0
+     */
+    public function setShareWith($user) {
+        $this->share['shareWith'] = $user;
+    }
 
-	/**
-	 * set resource name (e.g. document.odt)
-	 *
-	 * @param string $name
-	 *
-	 * @since 14.0.0
-	 */
-	public function setResourceName($name) {
-		$this->share['name'] = $name;
-	}
+    /**
+     * set resource name (e.g. document.odt)
+     *
+     * @param string $name
+     *
+     * @since 14.0.0
+     */
+    public function setResourceName($name) {
+        $this->share['name'] = $name;
+    }
 
-	/**
-	 * set resource type (e.g. file, calendar, contact,...)
-	 *
-	 * @param string $resourceType
-	 *
-	 * @since 14.0.0
-	 */
-	public function setResourceType($resourceType) {
-		$this->share['resourceType'] = $resourceType;
-	}
+    /**
+     * set resource type (e.g. file, calendar, contact,...)
+     *
+     * @param string $resourceType
+     *
+     * @since 14.0.0
+     */
+    public function setResourceType($resourceType) {
+        $this->share['resourceType'] = $resourceType;
+    }
 
-	/**
-	 * set resource description (optional)
-	 *
-	 * @param string $description
-	 *
-	 * @since 14.0.0
-	 */
-	public function setDescription($description) {
-		$this->share['description'] = $description;
-	}
+    /**
+     * set resource description (optional)
+     *
+     * @param string $description
+     *
+     * @since 14.0.0
+     */
+    public function setDescription($description) {
+        $this->share['description'] = $description;
+    }
 
-	/**
-	 * set provider ID (e.g. file ID)
-	 *
-	 * @param string $providerId
-	 *
-	 * @since 14.0.0
-	 */
-	public function setProviderId($providerId) {
-		$this->share['providerId'] = $providerId;
-	}
+    /**
+     * set provider ID (e.g. file ID)
+     *
+     * @param string $providerId
+     *
+     * @since 14.0.0
+     */
+    public function setProviderId($providerId) {
+        $this->share['providerId'] = $providerId;
+    }
 
-	/**
-	 * set owner UID
-	 *
-	 * @param string $owner
-	 *
-	 * @since 14.0.0
-	 */
-	public function setOwner($owner) {
-		$this->share['owner'] = $owner;
-	}
+    /**
+     * set owner UID
+     *
+     * @param string $owner
+     *
+     * @since 14.0.0
+     */
+    public function setOwner($owner) {
+        $this->share['owner'] = $owner;
+    }
 
-	/**
-	 * set owner display name
-	 *
-	 * @param string $ownerDisplayName
-	 *
-	 * @since 14.0.0
-	 */
-	public function setOwnerDisplayName($ownerDisplayName) {
-		$this->share['ownerDisplayName'] = $ownerDisplayName;
-	}
+    /**
+     * set owner display name
+     *
+     * @param string $ownerDisplayName
+     *
+     * @since 14.0.0
+     */
+    public function setOwnerDisplayName($ownerDisplayName) {
+        $this->share['ownerDisplayName'] = $ownerDisplayName;
+    }
 
-	/**
-	 * set UID of the user who sends the share
-	 *
-	 * @param string $sharedBy
-	 *
-	 * @since 14.0.0
-	 */
-	public function setSharedBy($sharedBy) {
-		$this->share['sharedBy'] = $sharedBy;
-	}
+    /**
+     * set UID of the user who sends the share
+     *
+     * @param string $sharedBy
+     *
+     * @since 14.0.0
+     */
+    public function setSharedBy($sharedBy) {
+        $this->share['sharedBy'] = $sharedBy;
+    }
 
-	/**
-	 * set display name of the user who sends the share
-	 *
-	 * @param $sharedByDisplayName
-	 *
-	 * @since 14.0.0
-	 */
-	public function setSharedByDisplayName($sharedByDisplayName) {
-		$this->share['sharedByDisplayName'] = $sharedByDisplayName;
-	}
+    /**
+     * set display name of the user who sends the share
+     *
+     * @param $sharedByDisplayName
+     *
+     * @since 14.0.0
+     */
+    public function setSharedByDisplayName($sharedByDisplayName) {
+        $this->share['sharedByDisplayName'] = $sharedByDisplayName;
+    }
 
-	/**
-	 * set protocol specification
-	 *
-	 * @param array $protocol
-	 *
-	 * @since 14.0.0
-	 */
-	public function setProtocol(array $protocol) {
-		$this->share['protocol'] = $protocol;
-	}
+    /**
+     * set protocol specification
+     *
+     * @param array $protocol
+     *
+     * @since 14.0.0
+     */
+    public function setProtocol(array $protocol) {
+        $this->share['protocol'] = $protocol;
+    }
 
-	/**
-	 * share type (group or user)
-	 *
-	 * @param string $shareType
-	 *
-	 * @since 14.0.0
-	 */
-	public function setShareType($shareType) {
-		if ($shareType === 'group' || $shareType === IShare::TYPE_REMOTE_GROUP) {
-			$this->share['shareType'] = 'group';
-		} else {
-			$this->share['shareType'] = 'user';
-		}
-	}
+    /**
+     * share type (group or user)
+     *
+     * @param string $shareType
+     *
+     * @since 14.0.0
+     */
+    public function setShareType($shareType) {
+        if ($shareType === 'group' || $shareType === IShare::TYPE_REMOTE_GROUP) {
+            $this->share['shareType'] = 'group';
+        } else {
+            $this->share['shareType'] = 'user';
+        }
+    }
 
-	/**
-	 * get the whole share, ready to send out
-	 *
-	 * @return array
-	 *
-	 * @since 14.0.0
-	 */
-	public function getShare() {
-		return $this->share;
-	}
+    /**
+     * get the whole share, ready to send out
+     *
+     * @return array
+     *
+     * @since 14.0.0
+     */
+    public function getShare() {
+        return $this->share;
+    }
 
-	/**
-	 * get uid of the recipient
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getShareWith() {
-		return $this->share['shareWith'];
-	}
+    /**
+     * get uid of the recipient
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getShareWith() {
+        return $this->share['shareWith'];
+    }
 
-	/**
-	 * get resource name (e.g. file, calendar, contact,...)
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getResourceName() {
-		return $this->share['name'];
-	}
+    /**
+     * get resource name (e.g. file, calendar, contact,...)
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getResourceName() {
+        return $this->share['name'];
+    }
 
-	/**
-	 * get resource type (e.g. file, calendar, contact,...)
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getResourceType() {
-		return $this->share['resourceType'];
-	}
+    /**
+     * get resource type (e.g. file, calendar, contact,...)
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getResourceType() {
+        return $this->share['resourceType'];
+    }
 
-	/**
-	 * get resource description (optional)
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getDescription() {
-		return $this->share['description'];
-	}
+    /**
+     * get resource description (optional)
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getDescription() {
+        return $this->share['description'];
+    }
 
-	/**
-	 * get provider ID (e.g. file ID)
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getProviderId() {
-		return $this->share['providerId'];
-	}
+    /**
+     * get provider ID (e.g. file ID)
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getProviderId() {
+        return $this->share['providerId'];
+    }
 
-	/**
-	 * get owner UID
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getOwner() {
-		return $this->share['owner'];
-	}
+    /**
+     * get owner UID
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getOwner() {
+        return $this->share['owner'];
+    }
 
-	/**
-	 * get owner display name
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getOwnerDisplayName() {
-		return $this->share['ownerDisplayName'];
-	}
+    /**
+     * get owner display name
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getOwnerDisplayName() {
+        return $this->share['ownerDisplayName'];
+    }
 
-	/**
-	 * get UID of the user who sends the share
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getSharedBy() {
-		return $this->share['sharedBy'];
-	}
+    /**
+     * get UID of the user who sends the share
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getSharedBy() {
+        return $this->share['sharedBy'];
+    }
 
-	/**
-	 * get display name of the user who sends the share
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getSharedByDisplayName() {
-		return $this->share['sharedByDisplayName'];
-	}
+    /**
+     * get display name of the user who sends the share
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getSharedByDisplayName() {
+        return $this->share['sharedByDisplayName'];
+    }
 
-	/**
-	 * get share type (group or user)
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getShareType() {
-		return $this->share['shareType'];
-	}
+    /**
+     * get share type (group or user)
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getShareType() {
+        return $this->share['shareType'];
+    }
 
-	/**
-	 * get share Secret
-	 *
-	 * @return string
-	 *
-	 * @since 14.0.0
-	 */
-	public function getShareSecret() {
-		return $this->share['protocol']['options']['sharedSecret'];
-	}
+    /**
+     * get share Secret
+     *
+     * @return string
+     *
+     * @since 14.0.0
+     */
+    public function getShareSecret() {
+        return $this->share['protocol']['options']['sharedSecret'];
+    }
 
-	/**
-	 * get protocol specification
-	 *
-	 * @return array
-	 *
-	 * @since 14.0.0
-	 */
-	public function getProtocol() {
-		return $this->share['protocol'];
-	}
+    /**
+     * get protocol specification
+     *
+     * @return array
+     *
+     * @since 14.0.0
+     */
+    public function getProtocol() {
+        return $this->share['protocol'];
+    }
 }

apps/files_sharing/lib/Migration/SetPasswordColumn.php

Indentation +46 added lines, -46 removed lines

@@ -36,60 +36,60 @@
  */
 class SetPasswordColumn implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $connection;
+    /** @var IDBConnection */
+    private $connection;
 
-	/** @var  IConfig */
-	private $config;
+    /** @var  IConfig */
+    private $config;
 
 
-	public function __construct(IDBConnection $connection, IConfig $config) {
-		$this->connection = $connection;
-		$this->config = $config;
-	}
+    public function __construct(IDBConnection $connection, IConfig $config) {
+        $this->connection = $connection;
+        $this->config = $config;
+    }
 
-	/**
-	 * Returns the step's name
-	 *
-	 * @return string
-	 * @since 9.1.0
-	 */
-	public function getName() {
-		return 'Copy the share password into the dedicated column';
-	}
+    /**
+     * Returns the step's name
+     *
+     * @return string
+     * @since 9.1.0
+     */
+    public function getName() {
+        return 'Copy the share password into the dedicated column';
+    }
 
-	/**
-	 * @param IOutput $output
-	 */
-	public function run(IOutput $output) {
-		if (!$this->shouldRun()) {
-			return;
-		}
+    /**
+     * @param IOutput $output
+     */
+    public function run(IOutput $output) {
+        if (!$this->shouldRun()) {
+            return;
+        }
 
-		$query = $this->connection->getQueryBuilder();
-		$query
-			->update('share')
-			->set('password', 'share_with')
-			->where($query->expr()->eq('share_type', $query->createNamedParameter(IShare::TYPE_LINK)))
-			->andWhere($query->expr()->isNotNull('share_with'));
-		$result = $query->execute();
+        $query = $this->connection->getQueryBuilder();
+        $query
+            ->update('share')
+            ->set('password', 'share_with')
+            ->where($query->expr()->eq('share_type', $query->createNamedParameter(IShare::TYPE_LINK)))
+            ->andWhere($query->expr()->isNotNull('share_with'));
+        $result = $query->execute();
 
-		if ($result === 0) {
-			// No link updated, no need to run the second query
-			return;
-		}
+        if ($result === 0) {
+            // No link updated, no need to run the second query
+            return;
+        }
 
-		$clearQuery = $this->connection->getQueryBuilder();
-		$clearQuery
-			->update('share')
-			->set('share_with', $clearQuery->createNamedParameter(null))
-			->where($clearQuery->expr()->eq('share_type', $clearQuery->createNamedParameter(IShare::TYPE_LINK)));
+        $clearQuery = $this->connection->getQueryBuilder();
+        $clearQuery
+            ->update('share')
+            ->set('share_with', $clearQuery->createNamedParameter(null))
+            ->where($clearQuery->expr()->eq('share_type', $clearQuery->createNamedParameter(IShare::TYPE_LINK)));
 
-		$clearQuery->execute();
-	}
+        $clearQuery->execute();
+    }
 
-	protected function shouldRun() {
-		$appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0');
-		return version_compare($appVersion, '1.4.0', '<');
-	}
+    protected function shouldRun() {
+        $appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0');
+        return version_compare($appVersion, '1.4.0', '<');
+    }
 }

apps/files_sharing/lib/Migration/OwncloudGuestShareType.php

Indentation +35 added lines, -35 removed lines

@@ -37,46 +37,46 @@
  */
 class OwncloudGuestShareType implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $connection;
+    /** @var IDBConnection */
+    private $connection;
 
-	/** @var  IConfig */
-	private $config;
+    /** @var  IConfig */
+    private $config;
 
 
-	public function __construct(IDBConnection $connection, IConfig $config) {
-		$this->connection = $connection;
-		$this->config = $config;
-	}
+    public function __construct(IDBConnection $connection, IConfig $config) {
+        $this->connection = $connection;
+        $this->config = $config;
+    }
 
-	/**
-	 * Returns the step's name
-	 *
-	 * @return string
-	 * @since 9.1.0
-	 */
-	public function getName() {
-		return 'Fix the share type of guest shares when migrating from ownCloud';
-	}
+    /**
+     * Returns the step's name
+     *
+     * @return string
+     * @since 9.1.0
+     */
+    public function getName() {
+        return 'Fix the share type of guest shares when migrating from ownCloud';
+    }
 
-	/**
-	 * @param IOutput $output
-	 */
-	public function run(IOutput $output) {
-		if (!$this->shouldRun()) {
-			return;
-		}
+    /**
+     * @param IOutput $output
+     */
+    public function run(IOutput $output) {
+        if (!$this->shouldRun()) {
+            return;
+        }
 
-		$query = $this->connection->getQueryBuilder();
-		$query->update('share')
-			->set('share_type',  $query->createNamedParameter(IShare::TYPE_GUEST))
-			->where($query->expr()->eq('share_type', $query->createNamedParameter(IShare::TYPE_EMAIL)));
-		$query->execute();
-	}
+        $query = $this->connection->getQueryBuilder();
+        $query->update('share')
+            ->set('share_type',  $query->createNamedParameter(IShare::TYPE_GUEST))
+            ->where($query->expr()->eq('share_type', $query->createNamedParameter(IShare::TYPE_EMAIL)));
+        $query->execute();
+    }
 
-	protected function shouldRun() {
-		$appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0');
-		return $appVersion === '0.10.0' ||
-			$this->config->getAppValue('core', 'vendor', '') === 'owncloud';
-	}
+    protected function shouldRun() {
+        $appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0');
+        return $appVersion === '0.10.0' ||
+            $this->config->getAppValue('core', 'vendor', '') === 'owncloud';
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 
 		$query = $this->connection->getQueryBuilder();
 		$query->update('share')
-			->set('share_type',  $query->createNamedParameter(IShare::TYPE_GUEST))
+			->set('share_type', $query->createNamedParameter(IShare::TYPE_GUEST))
 			->where($query->expr()->eq('share_type', $query->createNamedParameter(IShare::TYPE_EMAIL)));
 		$query->execute();
 	}