nextcloud / server

apps/files_external/lib/Lib/StorageModifierTrait.php

Indentation +21 added lines, -21 removed lines

@@ -43,28 +43,28 @@
  */
 trait StorageModifierTrait {
 
-	/**
-	 * Modify a StorageConfig parameters
-	 *
-	 * @param StorageConfig $storage
-	 * @param IUser $user User the storage is being used as
-	 * @throws InsufficientDataForMeaningfulAnswerException
-	 * @throws StorageNotAvailableException
-	 */
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
-	}
+    /**
+     * Modify a StorageConfig parameters
+     *
+     * @param StorageConfig $storage
+     * @param IUser $user User the storage is being used as
+     * @throws InsufficientDataForMeaningfulAnswerException
+     * @throws StorageNotAvailableException
+     */
+    public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
+    }
 
-	/**
-	 * Wrap a Storage if necessary
-	 *
-	 * @param Storage $storage
-	 * @return Storage
-	 * @throws InsufficientDataForMeaningfulAnswerException
-	 * @throws StorageNotAvailableException
-	 */
-	public function wrapStorage(Storage $storage) {
-		return $storage;
-	}
+    /**
+     * Wrap a Storage if necessary
+     *
+     * @param Storage $storage
+     * @return Storage
+     * @throws InsufficientDataForMeaningfulAnswerException
+     * @throws StorageNotAvailableException
+     */
+    public function wrapStorage(Storage $storage) {
+        return $storage;
+    }
 
 }
 

apps/files_external/lib/Lib/Notify/SMBNotifyHandler.php

Indentation +109 added lines, -109 removed lines

@@ -29,122 +29,122 @@
 use OCP\Files\Notify\INotifyHandler;
 
 class SMBNotifyHandler implements INotifyHandler {
-	/**
-	 * @var \Icewind\SMB\INotifyHandler
-	 */
-	private $shareNotifyHandler;
+    /**
+     * @var \Icewind\SMB\INotifyHandler
+     */
+    private $shareNotifyHandler;
 
-	/**
-	 * @var string
-	 */
-	private $root;
+    /**
+     * @var string
+     */
+    private $root;
 
-	private $oldRenamePath = null;
+    private $oldRenamePath = null;
 
-	/**
-	 * SMBNotifyHandler constructor.
-	 *
-	 * @param \Icewind\SMB\INotifyHandler $shareNotifyHandler
-	 * @param string $root
-	 */
-	public function __construct(\Icewind\SMB\INotifyHandler $shareNotifyHandler, $root) {
-		$this->shareNotifyHandler = $shareNotifyHandler;
-		$this->root = $root;
-	}
+    /**
+     * SMBNotifyHandler constructor.
+     *
+     * @param \Icewind\SMB\INotifyHandler $shareNotifyHandler
+     * @param string $root
+     */
+    public function __construct(\Icewind\SMB\INotifyHandler $shareNotifyHandler, $root) {
+        $this->shareNotifyHandler = $shareNotifyHandler;
+        $this->root = $root;
+    }
 
-	private function relativePath($fullPath) {
-		if ($fullPath === $this->root) {
-			return '';
-		} else if (substr($fullPath, 0, strlen($this->root)) === $this->root) {
-			return substr($fullPath, strlen($this->root));
-		} else {
-			return null;
-		}
-	}
+    private function relativePath($fullPath) {
+        if ($fullPath === $this->root) {
+            return '';
+        } else if (substr($fullPath, 0, strlen($this->root)) === $this->root) {
+            return substr($fullPath, strlen($this->root));
+        } else {
+            return null;
+        }
+    }
 
-	public function listen(callable $callback) {
-		$oldRenamePath = null;
-		$this->shareNotifyHandler->listen(function (\Icewind\SMB\Change $shareChange) use ($callback) {
-			$change = $this->mapChange($shareChange);
-			if (!is_null($change)) {
-				return $callback($change);
-			} else {
-				return true;
-			}
-		});
-	}
+    public function listen(callable $callback) {
+        $oldRenamePath = null;
+        $this->shareNotifyHandler->listen(function (\Icewind\SMB\Change $shareChange) use ($callback) {
+            $change = $this->mapChange($shareChange);
+            if (!is_null($change)) {
+                return $callback($change);
+            } else {
+                return true;
+            }
+        });
+    }
 
-	/**
-	 * Get all changes detected since the start of the notify process or the last call to getChanges
-	 *
-	 * @return IChange[]
-	 */
-	public function getChanges() {
-		$shareChanges = $this->shareNotifyHandler->getChanges();
-		$changes = [];
-		foreach ($shareChanges as $shareChange) {
-			$change = $this->mapChange($shareChange);
-			if ($change) {
-				$changes[] = $change;
-			}
-		}
-		return $changes;
-	}
+    /**
+     * Get all changes detected since the start of the notify process or the last call to getChanges
+     *
+     * @return IChange[]
+     */
+    public function getChanges() {
+        $shareChanges = $this->shareNotifyHandler->getChanges();
+        $changes = [];
+        foreach ($shareChanges as $shareChange) {
+            $change = $this->mapChange($shareChange);
+            if ($change) {
+                $changes[] = $change;
+            }
+        }
+        return $changes;
+    }
 
-	/**
-	 * Stop listening for changes
-	 *
-	 * Note that any pending changes will be discarded
-	 */
-	public function stop() {
-		$this->shareNotifyHandler->stop();
-	}
+    /**
+     * Stop listening for changes
+     *
+     * Note that any pending changes will be discarded
+     */
+    public function stop() {
+        $this->shareNotifyHandler->stop();
+    }
 
-	/**
-	 * @param \Icewind\SMB\Change $change
-	 * @return IChange|null
-	 */
-	private function mapChange(\Icewind\SMB\Change $change) {
-		$path = $this->relativePath($change->getPath());
-		if (is_null($path)) {
-			return null;
-		}
-		if ($change->getCode() === \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_OLD) {
-			$this->oldRenamePath = $path;
-			return null;
-		}
-		$type = $this->mapNotifyType($change->getCode());
-		if (is_null($type)) {
-			return null;
-		}
-		if ($type === IChange::RENAMED) {
-			if (!is_null($this->oldRenamePath)) {
-				$result = new RenameChange($type, $this->oldRenamePath, $path);
-				$this->oldRenamePath = null;
-			} else {
-				$result = null;
-			}
-		} else {
-			$result = new Change($type, $path);
-		}
-		return $result;
-	}
+    /**
+     * @param \Icewind\SMB\Change $change
+     * @return IChange|null
+     */
+    private function mapChange(\Icewind\SMB\Change $change) {
+        $path = $this->relativePath($change->getPath());
+        if (is_null($path)) {
+            return null;
+        }
+        if ($change->getCode() === \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_OLD) {
+            $this->oldRenamePath = $path;
+            return null;
+        }
+        $type = $this->mapNotifyType($change->getCode());
+        if (is_null($type)) {
+            return null;
+        }
+        if ($type === IChange::RENAMED) {
+            if (!is_null($this->oldRenamePath)) {
+                $result = new RenameChange($type, $this->oldRenamePath, $path);
+                $this->oldRenamePath = null;
+            } else {
+                $result = null;
+            }
+        } else {
+            $result = new Change($type, $path);
+        }
+        return $result;
+    }
 
-	private function mapNotifyType($smbType) {
-		switch ($smbType) {
-			case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED:
-				return IChange::ADDED;
-			case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED:
-				return IChange::REMOVED;
-			case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED:
-			case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED_STREAM:
-			case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED_STREAM:
-			case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED_STREAM:
-				return IChange::MODIFIED;
-			case \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_NEW:
-				return IChange::RENAMED;
-			default:
-				return null;
-		}
-	}
+    private function mapNotifyType($smbType) {
+        switch ($smbType) {
+            case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED:
+                return IChange::ADDED;
+            case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED:
+                return IChange::REMOVED;
+            case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED:
+            case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED_STREAM:
+            case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED_STREAM:
+            case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED_STREAM:
+                return IChange::MODIFIED;
+            case \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_NEW:
+                return IChange::RENAMED;
+            default:
+                return null;
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 
 	public function listen(callable $callback) {
 		$oldRenamePath = null;
-		$this->shareNotifyHandler->listen(function (\Icewind\SMB\Change $shareChange) use ($callback) {
+		$this->shareNotifyHandler->listen(function(\Icewind\SMB\Change $shareChange) use ($callback) {
 			$change = $this->mapChange($shareChange);
 			if (!is_null($change)) {
 				return $callback($change);

apps/files_external/lib/Lib/StorageConfig.php

Indentation +394 added lines, -394 removed lines

@@ -35,398 +35,398 @@
  * External storage configuration
  */
 class StorageConfig implements \JsonSerializable {
-	const MOUNT_TYPE_ADMIN = 1;
-	const MOUNT_TYPE_PERSONAl = 2;
-
-	/**
-	 * Storage config id
-	 *
-	 * @var int
-	 */
-	private $id;
-
-	/**
-	 * Backend
-	 *
-	 * @var Backend
-	 */
-	private $backend;
-
-	/**
-	 * Authentication mechanism
-	 *
-	 * @var AuthMechanism
-	 */
-	private $authMechanism;
-
-	/**
-	 * Backend options
-	 *
-	 * @var array
-	 */
-	private $backendOptions = [];
-
-	/**
-	 * Mount point path, relative to the user's "files" folder
-	 *
-	 * @var string
-	 */
-	private $mountPoint;
-
-	/**
-	 * Storage status
-	 *
-	 * @var int
-	 */
-	private $status;
-
-	/**
-	 * Status message
-	 *
-	 * @var string
-	 */
-	private $statusMessage;
-
-	/**
-	 * Priority
-	 *
-	 * @var int
-	 */
-	private $priority;
-
-	/**
-	 * List of users who have access to this storage
-	 *
-	 * @var array
-	 */
-	private $applicableUsers = [];
-
-	/**
-	 * List of groups that have access to this storage
-	 *
-	 * @var array
-	 */
-	private $applicableGroups = [];
-
-	/**
-	 * Mount-specific options
-	 *
-	 * @var array
-	 */
-	private $mountOptions = [];
-
-	/**
-	 * Whether it's a personal or admin mount
-	 *
-	 * @var int
-	 */
-	private $type;
-
-	/**
-	 * Creates a storage config
-	 *
-	 * @param int|null $id config id or null for a new config
-	 */
-	public function __construct($id = null) {
-		$this->id = $id;
-		$this->mountOptions['enable_sharing'] = false;
-	}
-
-	/**
-	 * Returns the configuration id
-	 *
-	 * @return int
-	 */
-	public function getId() {
-		return $this->id;
-	}
-
-	/**
-	 * Sets the configuration id
-	 *
-	 * @param int $id configuration id
-	 */
-	public function setId($id) {
-		$this->id = $id;
-	}
-
-	/**
-	 * Returns mount point path relative to the user's
-	 * "files" folder.
-	 *
-	 * @return string path
-	 */
-	public function getMountPoint() {
-		return $this->mountPoint;
-	}
-
-	/**
-	 * Sets mount point path relative to the user's
-	 * "files" folder.
-	 * The path will be normalized.
-	 *
-	 * @param string $mountPoint path
-	 */
-	public function setMountPoint($mountPoint) {
-		$this->mountPoint = \OC\Files\Filesystem::normalizePath($mountPoint);
-	}
-
-	/**
-	 * @return Backend
-	 */
-	public function getBackend() {
-		return $this->backend;
-	}
-
-	/**
-	 * @param Backend $backend
-	 */
-	public function setBackend(Backend $backend) {
-		$this->backend= $backend;
-	}
-
-	/**
-	 * @return AuthMechanism
-	 */
-	public function getAuthMechanism() {
-		return $this->authMechanism;
-	}
-
-	/**
-	 * @param AuthMechanism $authMechanism
-	 */
-	public function setAuthMechanism(AuthMechanism $authMechanism) {
-		$this->authMechanism = $authMechanism;
-	}
-
-	/**
-	 * Returns the external storage backend-specific options
-	 *
-	 * @return array backend options
-	 */
-	public function getBackendOptions() {
-		return $this->backendOptions;
-	}
-
-	/**
-	 * Sets the external storage backend-specific options
-	 *
-	 * @param array $backendOptions backend options
-	 */
-	public function setBackendOptions($backendOptions) {
-		if($this->getBackend() instanceof  Backend) {
-			$parameters = $this->getBackend()->getParameters();
-			foreach($backendOptions as $key => $value) {
-				if(isset($parameters[$key])) {
-					switch ($parameters[$key]->getType()) {
-						case \OCA\Files_External\Lib\DefinitionParameter::VALUE_BOOLEAN:
-							$value = (bool)$value;
-							break;
-					}
-					$backendOptions[$key] = $value;
-				}
-			}
-		}
-
-		$this->backendOptions = $backendOptions;
-	}
-
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function getBackendOption($key) {
-		if (isset($this->backendOptions[$key])) {
-			return $this->backendOptions[$key];
-		}
-		return null;
-	}
-
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 */
-	public function setBackendOption($key, $value) {
-		$this->backendOptions[$key] = $value;
-	}
-
-	/**
-	 * Returns the mount priority
-	 *
-	 * @return int priority
-	 */
-	public function getPriority() {
-		return $this->priority;
-	}
-
-	/**
-	 * Sets the mount priotity
-	 *
-	 * @param int $priority priority
-	 */
-	public function setPriority($priority) {
-		$this->priority = $priority;
-	}
-
-	/**
-	 * Returns the users for which to mount this storage
-	 *
-	 * @return array applicable users
-	 */
-	public function getApplicableUsers() {
-		return $this->applicableUsers;
-	}
-
-	/**
-	 * Sets the users for which to mount this storage
-	 *
-	 * @param array|null $applicableUsers applicable users
-	 */
-	public function setApplicableUsers($applicableUsers) {
-		if (is_null($applicableUsers)) {
-			$applicableUsers = [];
-		}
-		$this->applicableUsers = $applicableUsers;
-	}
-
-	/**
-	 * Returns the groups for which to mount this storage
-	 *
-	 * @return array applicable groups
-	 */
-	public function getApplicableGroups() {
-		return $this->applicableGroups;
-	}
-
-	/**
-	 * Sets the groups for which to mount this storage
-	 *
-	 * @param array|null $applicableGroups applicable groups
-	 */
-	public function setApplicableGroups($applicableGroups) {
-		if (is_null($applicableGroups)) {
-			$applicableGroups = [];
-		}
-		$this->applicableGroups = $applicableGroups;
-	}
-
-	/**
-	 * Returns the mount-specific options
-	 *
-	 * @return array mount specific options
-	 */
-	public function getMountOptions() {
-		return $this->mountOptions;
-	}
-
-	/**
-	 * Sets the mount-specific options
-	 *
-	 * @param array $mountOptions applicable groups
-	 */
-	public function setMountOptions($mountOptions) {
-		if (is_null($mountOptions)) {
-			$mountOptions = [];
-		}
-		$this->mountOptions = $mountOptions;
-	}
-
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function getMountOption($key) {
-		if (isset($this->mountOptions[$key])) {
-			return $this->mountOptions[$key];
-		}
-		return null;
-	}
-
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 */
-	public function setMountOption($key, $value) {
-		$this->mountOptions[$key] = $value;
-	}
-
-	/**
-	 * Gets the storage status, whether the config worked last time
-	 *
-	 * @return int $status status
-	 */
-	public function getStatus() {
-		return $this->status;
-	}
-
-	/**
-	 * Gets the message describing the storage status
-	 *
-	 * @return string|null
-	 */
-	public function getStatusMessage() {
-		return $this->statusMessage;
-	}
-
-	/**
-	 * Sets the storage status, whether the config worked last time
-	 *
-	 * @param int $status status
-	 * @param string|null $message optional message
-	 */
-	public function setStatus($status, $message = null) {
-		$this->status = $status;
-		$this->statusMessage = $message;
-	}
-
-	/**
-	 * @return int self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl
-	 */
-	public function getType() {
-		return $this->type;
-	}
-
-	/**
-	 * @param int $type self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl
-	 */
-	public function setType($type) {
-		$this->type = $type;
-	}
-
-	/**
-	 * Serialize config to JSON
-	 *
-	 * @return array
-	 */
-	public function jsonSerialize() {
-		$result = [];
-		if (!is_null($this->id)) {
-			$result['id'] = $this->id;
-		}
-		$result['mountPoint'] = $this->mountPoint;
-		$result['backend'] = $this->backend->getIdentifier();
-		$result['authMechanism'] = $this->authMechanism->getIdentifier();
-		$result['backendOptions'] = $this->backendOptions;
-		if (!is_null($this->priority)) {
-			$result['priority'] = $this->priority;
-		}
-		if (!empty($this->applicableUsers)) {
-			$result['applicableUsers'] = $this->applicableUsers;
-		}
-		if (!empty($this->applicableGroups)) {
-			$result['applicableGroups'] = $this->applicableGroups;
-		}
-		if (!empty($this->mountOptions)) {
-			$result['mountOptions'] = $this->mountOptions;
-		}
-		if (!is_null($this->status)) {
-			$result['status'] = $this->status;
-		}
-		if (!is_null($this->statusMessage)) {
-			$result['statusMessage'] = $this->statusMessage;
-		}
-		$result['userProvided'] = $this->authMechanism instanceof IUserProvided;
-		$result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal': 'system';
-		return $result;
-	}
+    const MOUNT_TYPE_ADMIN = 1;
+    const MOUNT_TYPE_PERSONAl = 2;
+
+    /**
+     * Storage config id
+     *
+     * @var int
+     */
+    private $id;
+
+    /**
+     * Backend
+     *
+     * @var Backend
+     */
+    private $backend;
+
+    /**
+     * Authentication mechanism
+     *
+     * @var AuthMechanism
+     */
+    private $authMechanism;
+
+    /**
+     * Backend options
+     *
+     * @var array
+     */
+    private $backendOptions = [];
+
+    /**
+     * Mount point path, relative to the user's "files" folder
+     *
+     * @var string
+     */
+    private $mountPoint;
+
+    /**
+     * Storage status
+     *
+     * @var int
+     */
+    private $status;
+
+    /**
+     * Status message
+     *
+     * @var string
+     */
+    private $statusMessage;
+
+    /**
+     * Priority
+     *
+     * @var int
+     */
+    private $priority;
+
+    /**
+     * List of users who have access to this storage
+     *
+     * @var array
+     */
+    private $applicableUsers = [];
+
+    /**
+     * List of groups that have access to this storage
+     *
+     * @var array
+     */
+    private $applicableGroups = [];
+
+    /**
+     * Mount-specific options
+     *
+     * @var array
+     */
+    private $mountOptions = [];
+
+    /**
+     * Whether it's a personal or admin mount
+     *
+     * @var int
+     */
+    private $type;
+
+    /**
+     * Creates a storage config
+     *
+     * @param int|null $id config id or null for a new config
+     */
+    public function __construct($id = null) {
+        $this->id = $id;
+        $this->mountOptions['enable_sharing'] = false;
+    }
+
+    /**
+     * Returns the configuration id
+     *
+     * @return int
+     */
+    public function getId() {
+        return $this->id;
+    }
+
+    /**
+     * Sets the configuration id
+     *
+     * @param int $id configuration id
+     */
+    public function setId($id) {
+        $this->id = $id;
+    }
+
+    /**
+     * Returns mount point path relative to the user's
+     * "files" folder.
+     *
+     * @return string path
+     */
+    public function getMountPoint() {
+        return $this->mountPoint;
+    }
+
+    /**
+     * Sets mount point path relative to the user's
+     * "files" folder.
+     * The path will be normalized.
+     *
+     * @param string $mountPoint path
+     */
+    public function setMountPoint($mountPoint) {
+        $this->mountPoint = \OC\Files\Filesystem::normalizePath($mountPoint);
+    }
+
+    /**
+     * @return Backend
+     */
+    public function getBackend() {
+        return $this->backend;
+    }
+
+    /**
+     * @param Backend $backend
+     */
+    public function setBackend(Backend $backend) {
+        $this->backend= $backend;
+    }
+
+    /**
+     * @return AuthMechanism
+     */
+    public function getAuthMechanism() {
+        return $this->authMechanism;
+    }
+
+    /**
+     * @param AuthMechanism $authMechanism
+     */
+    public function setAuthMechanism(AuthMechanism $authMechanism) {
+        $this->authMechanism = $authMechanism;
+    }
+
+    /**
+     * Returns the external storage backend-specific options
+     *
+     * @return array backend options
+     */
+    public function getBackendOptions() {
+        return $this->backendOptions;
+    }
+
+    /**
+     * Sets the external storage backend-specific options
+     *
+     * @param array $backendOptions backend options
+     */
+    public function setBackendOptions($backendOptions) {
+        if($this->getBackend() instanceof  Backend) {
+            $parameters = $this->getBackend()->getParameters();
+            foreach($backendOptions as $key => $value) {
+                if(isset($parameters[$key])) {
+                    switch ($parameters[$key]->getType()) {
+                        case \OCA\Files_External\Lib\DefinitionParameter::VALUE_BOOLEAN:
+                            $value = (bool)$value;
+                            break;
+                    }
+                    $backendOptions[$key] = $value;
+                }
+            }
+        }
+
+        $this->backendOptions = $backendOptions;
+    }
+
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    public function getBackendOption($key) {
+        if (isset($this->backendOptions[$key])) {
+            return $this->backendOptions[$key];
+        }
+        return null;
+    }
+
+    /**
+     * @param string $key
+     * @param mixed $value
+     */
+    public function setBackendOption($key, $value) {
+        $this->backendOptions[$key] = $value;
+    }
+
+    /**
+     * Returns the mount priority
+     *
+     * @return int priority
+     */
+    public function getPriority() {
+        return $this->priority;
+    }
+
+    /**
+     * Sets the mount priotity
+     *
+     * @param int $priority priority
+     */
+    public function setPriority($priority) {
+        $this->priority = $priority;
+    }
+
+    /**
+     * Returns the users for which to mount this storage
+     *
+     * @return array applicable users
+     */
+    public function getApplicableUsers() {
+        return $this->applicableUsers;
+    }
+
+    /**
+     * Sets the users for which to mount this storage
+     *
+     * @param array|null $applicableUsers applicable users
+     */
+    public function setApplicableUsers($applicableUsers) {
+        if (is_null($applicableUsers)) {
+            $applicableUsers = [];
+        }
+        $this->applicableUsers = $applicableUsers;
+    }
+
+    /**
+     * Returns the groups for which to mount this storage
+     *
+     * @return array applicable groups
+     */
+    public function getApplicableGroups() {
+        return $this->applicableGroups;
+    }
+
+    /**
+     * Sets the groups for which to mount this storage
+     *
+     * @param array|null $applicableGroups applicable groups
+     */
+    public function setApplicableGroups($applicableGroups) {
+        if (is_null($applicableGroups)) {
+            $applicableGroups = [];
+        }
+        $this->applicableGroups = $applicableGroups;
+    }
+
+    /**
+     * Returns the mount-specific options
+     *
+     * @return array mount specific options
+     */
+    public function getMountOptions() {
+        return $this->mountOptions;
+    }
+
+    /**
+     * Sets the mount-specific options
+     *
+     * @param array $mountOptions applicable groups
+     */
+    public function setMountOptions($mountOptions) {
+        if (is_null($mountOptions)) {
+            $mountOptions = [];
+        }
+        $this->mountOptions = $mountOptions;
+    }
+
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    public function getMountOption($key) {
+        if (isset($this->mountOptions[$key])) {
+            return $this->mountOptions[$key];
+        }
+        return null;
+    }
+
+    /**
+     * @param string $key
+     * @param mixed $value
+     */
+    public function setMountOption($key, $value) {
+        $this->mountOptions[$key] = $value;
+    }
+
+    /**
+     * Gets the storage status, whether the config worked last time
+     *
+     * @return int $status status
+     */
+    public function getStatus() {
+        return $this->status;
+    }
+
+    /**
+     * Gets the message describing the storage status
+     *
+     * @return string|null
+     */
+    public function getStatusMessage() {
+        return $this->statusMessage;
+    }
+
+    /**
+     * Sets the storage status, whether the config worked last time
+     *
+     * @param int $status status
+     * @param string|null $message optional message
+     */
+    public function setStatus($status, $message = null) {
+        $this->status = $status;
+        $this->statusMessage = $message;
+    }
+
+    /**
+     * @return int self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl
+     */
+    public function getType() {
+        return $this->type;
+    }
+
+    /**
+     * @param int $type self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl
+     */
+    public function setType($type) {
+        $this->type = $type;
+    }
+
+    /**
+     * Serialize config to JSON
+     *
+     * @return array
+     */
+    public function jsonSerialize() {
+        $result = [];
+        if (!is_null($this->id)) {
+            $result['id'] = $this->id;
+        }
+        $result['mountPoint'] = $this->mountPoint;
+        $result['backend'] = $this->backend->getIdentifier();
+        $result['authMechanism'] = $this->authMechanism->getIdentifier();
+        $result['backendOptions'] = $this->backendOptions;
+        if (!is_null($this->priority)) {
+            $result['priority'] = $this->priority;
+        }
+        if (!empty($this->applicableUsers)) {
+            $result['applicableUsers'] = $this->applicableUsers;
+        }
+        if (!empty($this->applicableGroups)) {
+            $result['applicableGroups'] = $this->applicableGroups;
+        }
+        if (!empty($this->mountOptions)) {
+            $result['mountOptions'] = $this->mountOptions;
+        }
+        if (!is_null($this->status)) {
+            $result['status'] = $this->status;
+        }
+        if (!is_null($this->statusMessage)) {
+            $result['statusMessage'] = $this->statusMessage;
+        }
+        $result['userProvided'] = $this->authMechanism instanceof IUserProvided;
+        $result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal': 'system';
+        return $result;
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -182,7 +182,7 @@ 
 	 * @param Backend $backend
 	 */
 	public function setBackend(Backend $backend) {
-		$this->backend= $backend;
+		$this->backend = $backend;
 	}
 
 	/**
@@ -214,13 +214,13 @@ 
 	 * @param array $backendOptions backend options
 	 */
 	public function setBackendOptions($backendOptions) {
-		if($this->getBackend() instanceof  Backend) {
+		if ($this->getBackend() instanceof  Backend) {
 			$parameters = $this->getBackend()->getParameters();
-			foreach($backendOptions as $key => $value) {
-				if(isset($parameters[$key])) {
+			foreach ($backendOptions as $key => $value) {
+				if (isset($parameters[$key])) {
 					switch ($parameters[$key]->getType()) {
 						case \OCA\Files_External\Lib\DefinitionParameter::VALUE_BOOLEAN:
-							$value = (bool)$value;
+							$value = (bool) $value;
 							break;
 					}
 					$backendOptions[$key] = $value;
@@ -426,7 +426,7 @@ 
 			$result['statusMessage'] = $this->statusMessage;
 		}
 		$result['userProvided'] = $this->authMechanism instanceof IUserProvided;
-		$result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal': 'system';
+		$result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal' : 'system';
 		return $result;
 	}
 }

apps/files_external/lib/Lib/Backend/LegacyBackend.php

Indentation +63 added lines, -63 removed lines

@@ -33,73 +33,73 @@
  */
 class LegacyBackend extends Backend {
 
-	use LegacyDependencyCheckPolyfill {
-		LegacyDependencyCheckPolyfill::checkDependencies as doCheckDependencies;
-	}
+    use LegacyDependencyCheckPolyfill {
+        LegacyDependencyCheckPolyfill::checkDependencies as doCheckDependencies;
+    }
 
-	/** @var bool */
-	protected $hasDependencies = false;
+    /** @var bool */
+    protected $hasDependencies = false;
 
-	/**
-	 * @param string $class
-	 * @param array $definition
-	 * @param Builtin $authMechanism
-	 */
-	public function __construct($class, array $definition, Builtin $authMechanism) {
-		$this
-			->setIdentifier($class)
-			->setStorageClass($class)
-			->setText($definition['backend'])
-			->addAuthScheme(Builtin::SCHEME_BUILTIN)
-			->setLegacyAuthMechanism($authMechanism)
-		;
+    /**
+     * @param string $class
+     * @param array $definition
+     * @param Builtin $authMechanism
+     */
+    public function __construct($class, array $definition, Builtin $authMechanism) {
+        $this
+            ->setIdentifier($class)
+            ->setStorageClass($class)
+            ->setText($definition['backend'])
+            ->addAuthScheme(Builtin::SCHEME_BUILTIN)
+            ->setLegacyAuthMechanism($authMechanism)
+        ;
 
-		foreach ($definition['configuration'] as $name => $placeholder) {
-			$flags = DefinitionParameter::FLAG_NONE;
-			$type = DefinitionParameter::VALUE_TEXT;
-			if ($placeholder[0] === '&') {
-				$flags = DefinitionParameter::FLAG_OPTIONAL;
-				$placeholder = substr($placeholder, 1);
-			}
-			switch ($placeholder[0]) {
-			case '!':
-				$type = DefinitionParameter::VALUE_BOOLEAN;
-				$placeholder = substr($placeholder, 1);
-				break;
-			case '*':
-				$type = DefinitionParameter::VALUE_PASSWORD;
-				$placeholder = substr($placeholder, 1);
-				break;
-			case '#':
-				$type = DefinitionParameter::VALUE_HIDDEN;
-				$placeholder = substr($placeholder, 1);
-				break;
-			}
-			$this->addParameter((new DefinitionParameter($name, $placeholder))
-				->setType($type)
-				->setFlags($flags)
-			);
-		}
+        foreach ($definition['configuration'] as $name => $placeholder) {
+            $flags = DefinitionParameter::FLAG_NONE;
+            $type = DefinitionParameter::VALUE_TEXT;
+            if ($placeholder[0] === '&') {
+                $flags = DefinitionParameter::FLAG_OPTIONAL;
+                $placeholder = substr($placeholder, 1);
+            }
+            switch ($placeholder[0]) {
+            case '!':
+                $type = DefinitionParameter::VALUE_BOOLEAN;
+                $placeholder = substr($placeholder, 1);
+                break;
+            case '*':
+                $type = DefinitionParameter::VALUE_PASSWORD;
+                $placeholder = substr($placeholder, 1);
+                break;
+            case '#':
+                $type = DefinitionParameter::VALUE_HIDDEN;
+                $placeholder = substr($placeholder, 1);
+                break;
+            }
+            $this->addParameter((new DefinitionParameter($name, $placeholder))
+                ->setType($type)
+                ->setFlags($flags)
+            );
+        }
 
-		if (isset($definition['priority'])) {
-			$this->setPriority($definition['priority']);
-		}
-		if (isset($definition['custom'])) {
-			$this->addCustomJs($definition['custom']);
-		}
-		if (isset($definition['has_dependencies']) && $definition['has_dependencies']) {
-			$this->hasDependencies = true;
-		}
-	}
+        if (isset($definition['priority'])) {
+            $this->setPriority($definition['priority']);
+        }
+        if (isset($definition['custom'])) {
+            $this->addCustomJs($definition['custom']);
+        }
+        if (isset($definition['has_dependencies']) && $definition['has_dependencies']) {
+            $this->hasDependencies = true;
+        }
+    }
 
-	/**
-	 * @return MissingDependency[]
-	 */
-	public function checkDependencies() {
-		if ($this->hasDependencies) {
-			return $this->doCheckDependencies();
-		}
-		return [];
-	}
+    /**
+     * @return MissingDependency[]
+     */
+    public function checkDependencies() {
+        if ($this->hasDependencies) {
+            return $this->doCheckDependencies();
+        }
+        return [];
+    }
 
 }

Switch Indentation +12 added lines, -12 removed lines

@@ -62,18 +62,18 @@
 				$placeholder = substr($placeholder, 1);
 			}
 			switch ($placeholder[0]) {
-			case '!':
-				$type = DefinitionParameter::VALUE_BOOLEAN;
-				$placeholder = substr($placeholder, 1);
-				break;
-			case '*':
-				$type = DefinitionParameter::VALUE_PASSWORD;
-				$placeholder = substr($placeholder, 1);
-				break;
-			case '#':
-				$type = DefinitionParameter::VALUE_HIDDEN;
-				$placeholder = substr($placeholder, 1);
-				break;
+			    case '!':
+				    $type = DefinitionParameter::VALUE_BOOLEAN;
+				    $placeholder = substr($placeholder, 1);
+				    break;
+			    case '*':
+				    $type = DefinitionParameter::VALUE_PASSWORD;
+				    $placeholder = substr($placeholder, 1);
+				    break;
+			    case '#':
+				    $type = DefinitionParameter::VALUE_HIDDEN;
+				    $placeholder = substr($placeholder, 1);
+				    break;
 			}
 			$this->addParameter((new DefinitionParameter($name, $placeholder))
 				->setType($type)

apps/files_external/lib/Lib/MissingDependency.php

Indentation +30 added lines, -30 removed lines

@@ -27,39 +27,39 @@
  */
 class MissingDependency {
 
-	/** @var string */
-	private $dependency;
+    /** @var string */
+    private $dependency;
 
-	/** @var string|null Custom message */
-	private $message = null;
+    /** @var string|null Custom message */
+    private $message = null;
 
-	/**
-	 * @param string $dependency
-	 */
-	public function __construct($dependency) {
-		$this->dependency = $dependency;
-	}
+    /**
+     * @param string $dependency
+     */
+    public function __construct($dependency) {
+        $this->dependency = $dependency;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getDependency() {
-		return $this->dependency;
-	}
+    /**
+     * @return string
+     */
+    public function getDependency() {
+        return $this->dependency;
+    }
 
-	/**
-	 * @return string|null
-	 */
-	public function getMessage() {
-		return $this->message;
-	}
+    /**
+     * @return string|null
+     */
+    public function getMessage() {
+        return $this->message;
+    }
 
-	/**
-	 * @param string $message
-	 * @return self
-	 */
-	public function setMessage($message) {
-		$this->message = $message;
-		return $this;
-	}
+    /**
+     * @param string $message
+     * @return self
+     */
+    public function setMessage($message) {
+        $this->message = $message;
+        return $this;
+    }
 }

apps/files_external/lib/Lib/DependencyTrait.php

Indentation +8 added lines, -8 removed lines

@@ -29,14 +29,14 @@
  */
 trait DependencyTrait {
 
-	/**
-	 * Check if object is valid for use
-	 *
-	 * @return MissingDependency[] Unsatisfied dependencies
-	 */
-	public function checkDependencies() {
-		return []; // no dependencies by default
-	}
+    /**
+     * Check if object is valid for use
+     *
+     * @return MissingDependency[] Unsatisfied dependencies
+     */
+    public function checkDependencies() {
+        return []; // no dependencies by default
+    }
 
 }
 

apps/systemtags/templates/list.php

Spacing +2 added lines, -2 removed lines

@@ -18,14 +18,14 @@
 		<tr>
 			<th id='headerName' class="hidden column-name">
 				<div id="headerName-container">
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
 				</div>
 			</th>
 			<th id="headerSize" class="hidden column-size">
 				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 			<th id="headerDate" class="hidden column-mtime">
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 		</tr>
 	</thead>

apps/systemtags/lib/Activity/Provider.php

Spacing +1 added lines, -1 removed lines

@@ -279,7 +279,7 @@
 		if ($tagData === null) {
 			list($name, $status) = explode('|||', substr($parameter, 3, -3));
 			$tagData = [
-				'id' => 0,// No way to recover the ID
+				'id' => 0, // No way to recover the ID
 				'name' => $name,
 				'assignable' => $status === 'assignable',
 				'visible' => $status !== 'invisible',

Indentation +335 added lines, -335 removed lines

@@ -34,339 +34,339 @@
 
 class Provider implements IProvider {
 
-	const CREATE_TAG = 'create_tag';
-	const UPDATE_TAG = 'update_tag';
-	const DELETE_TAG = 'delete_tag';
-
-	const ASSIGN_TAG = 'assign_tag';
-	const UNASSIGN_TAG = 'unassign_tag';
-
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var string[] */
-	protected $displayNames = [];
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->userManager = $userManager;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'systemtags') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('systemtags', $language);
-
-		if ($this->activityManager->isFormattingFilteredObject()) {
-			try {
-				return $this->parseShortVersion($event);
-			} catch (\InvalidArgumentException $e) {
-				// Ignore and simply use the long version...
-			}
-		}
-
-		return $this->parseLongVersion($event);
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event) {
-		$parsedParameters = $this->getParameters($event);
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.svg')));
-		}
-
-		if ($event->getSubject() === self::ASSIGN_TAG) {
-			if ($parsedParameters['actor']['id'] === '') {
-				$event->setParsedSubject($this->l->t('System tag %1$s added by the system', [
-						$this->generatePlainSystemTag($parsedParameters['systemtag']),
-					]))
-					->setRichSubject($this->l->t('Added system tag {systemtag}'), [
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			} else if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('Added system tag %1$s', [
-						$this->generatePlainSystemTag($parsedParameters['systemtag']),
-					]))
-					->setRichSubject($this->l->t('Added system tag {systemtag}'), [
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s added system tag %2$s', [
-						$parsedParameters['actor']['name'],
-						$this->generatePlainSystemTag($parsedParameters['systemtag']),
-					]))
-					->setRichSubject($this->l->t('{actor} added system tag {systemtag}'), [
-						'actor' => $parsedParameters['actor'],
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			}
-		} else if ($event->getSubject() === self::UNASSIGN_TAG) {
-			if ($parsedParameters['actor']['id'] === '') {
-				$event->setParsedSubject($this->l->t('System tag %1$s removed by the system', [
-						$this->generatePlainSystemTag($parsedParameters['systemtag']),
-					]))
-					->setRichSubject($this->l->t('Removed system tag {systemtag}'), [
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			} else if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('Removed system tag %1$s', [
-						$this->generatePlainSystemTag($parsedParameters['systemtag']),
-					]))
-					->setRichSubject($this->l->t('Removed system tag {systemtag}'), [
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s removed system tag %2$s', [
-						$parsedParameters['actor']['name'],
-						$this->generatePlainSystemTag($parsedParameters['systemtag']),
-					]))
-					->setRichSubject($this->l->t('{actor} removed system tag {systemtag}'), [
-						'actor' => $parsedParameters['actor'],
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			}
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event) {
-		$parsedParameters = $this->getParameters($event);
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.svg')));
-		}
-
-		if ($event->getSubject() === self::CREATE_TAG) {
-			if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You created system tag %1$s', [
-						$this->generatePlainSystemTag($parsedParameters['systemtag']),
-					]))
-					->setRichSubject($this->l->t('You created system tag {systemtag}'), $parsedParameters);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s created system tag %2$s', [
-						$parsedParameters['actor']['name'],
-						$this->generatePlainSystemTag($parsedParameters['systemtag']),
-					]))
-					->setRichSubject($this->l->t('{actor} created system tag {systemtag}'), $parsedParameters);
-			}
-		} else if ($event->getSubject() === self::DELETE_TAG) {
-			if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You deleted system tag %1$s', [
-						$this->generatePlainSystemTag($parsedParameters['systemtag']),
-					]))
-					->setRichSubject($this->l->t('You deleted system tag {systemtag}'), $parsedParameters);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s deleted system tag %2$s', [
-						$parsedParameters['actor']['name'],
-						$this->generatePlainSystemTag($parsedParameters['systemtag']),
-					]))
-					->setRichSubject($this->l->t('{actor} deleted system tag {systemtag}'), $parsedParameters);
-			}
-		} else if ($event->getSubject() === self::UPDATE_TAG) {
-			if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You updated system tag %2$s to %1$s', [
-						$this->generatePlainSystemTag($parsedParameters['newsystemtag']),
-						$this->generatePlainSystemTag($parsedParameters['oldsystemtag']),
-					]))
-					->setRichSubject($this->l->t('You updated system tag {oldsystemtag} to {newsystemtag}'), $parsedParameters);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s updated system tag %3$s to %2$s', [
-						$parsedParameters['actor']['name'],
-						$this->generatePlainSystemTag($parsedParameters['newsystemtag']),
-						$this->generatePlainSystemTag($parsedParameters['oldsystemtag']),
-					]))
-					->setRichSubject($this->l->t('{actor} updated system tag {oldsystemtag} to {newsystemtag}'), $parsedParameters);
-			}
-		} else if ($event->getSubject() === self::ASSIGN_TAG) {
-			if ($parsedParameters['actor']['id'] === '') {
-				unset($parsedParameters['actor']);
-				$event->setParsedSubject($this->l->t('System tag %2$s was added to %1$s by the system', [
-						$parsedParameters['file']['path'],
-						$this->generatePlainSystemTag($parsedParameters['systemtag']),
-					]))
-					->setRichSubject($this->l->t('System tag {systemtag} was added to {file} by the system'), $parsedParameters);
-			} else if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You added system tag %2$s to %1$s', [
-						$parsedParameters['file']['path'],
-						$this->generatePlainSystemTag($parsedParameters['systemtag']),
-					]))
-					->setRichSubject($this->l->t('You added system tag {systemtag} to {file}'), $parsedParameters);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s added system tag %3$s to %2$s', [
-						$parsedParameters['actor']['name'],
-						$parsedParameters['file']['path'],
-						$this->generatePlainSystemTag($parsedParameters['systemtag']),
-					]))
-					->setRichSubject($this->l->t('{actor} added system tag {systemtag} to {file}'), $parsedParameters);
-			}
-		} else if ($event->getSubject() === self::UNASSIGN_TAG) {
-			if ($parsedParameters['actor']['id'] === '') {
-				unset($parsedParameters['actor']);
-				$event->setParsedSubject($this->l->t('System tag %2$s was removed from %1$s by the system', [
-						$parsedParameters['file']['path'],
-						$this->generatePlainSystemTag($parsedParameters['systemtag']),
-					]))
-					->setRichSubject($this->l->t('System tag {systemtag} was removed from {file} by the system'), $parsedParameters);
-			} else if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You removed system tag %2$s from %1$s', [
-						$parsedParameters['file']['path'],
-						$this->generatePlainSystemTag($parsedParameters['systemtag']),
-					]))
-					->setRichSubject($this->l->t('You removed system tag {systemtag} from {file}'), $parsedParameters);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s removed system tag %3$s from %2$s', [
-						$parsedParameters['actor']['name'],
-						$parsedParameters['file']['path'],
-						$this->generatePlainSystemTag($parsedParameters['systemtag']),
-					]))
-					->setRichSubject($this->l->t('{actor} removed system tag {systemtag} from {file}'), $parsedParameters);
-			}
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		return $event;
-	}
-
-	protected function getParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::CREATE_TAG:
-			case self::DELETE_TAG:
-				return [
-					'actor' => $this->getUserParameter((string) $parameters[0]),
-					'systemtag' => $this->getSystemTagParameter($parameters[1]),
-				];
-			case self::UPDATE_TAG:
-				return [
-					'actor' => $this->getUserParameter((string) $parameters[0]),
-					'newsystemtag' => $this->getSystemTagParameter($parameters[1]),
-					'oldsystemtag' => $this->getSystemTagParameter($parameters[2]),
-				];
-			case self::ASSIGN_TAG:
-			case self::UNASSIGN_TAG:
-				return [
-					'actor' => $this->getUserParameter((string) $parameters[0]),
-					'file' => $this->getFileParameter($event->getObjectId(), $parameters[1]),
-					'systemtag' => $this->getSystemTagParameter($parameters[2]),
-				];
-		}
-		return [];
-	}
-
-	protected function getFileParameter($id, $path) {
-		return [
-			'type' => 'file',
-			'id' => $id,
-			'name' => basename($path),
-			'path' => trim($path, '/'),
-		];
-	}
-
-	protected function getSystemTagParameter($parameter) {
-		$tagData = json_decode($parameter, true);
-		if ($tagData === null) {
-			list($name, $status) = explode('|||', substr($parameter, 3, -3));
-			$tagData = [
-				'id' => 0,// No way to recover the ID
-				'name' => $name,
-				'assignable' => $status === 'assignable',
-				'visible' => $status !== 'invisible',
-			];
-		}
-
-		return [
-			'type' => 'systemtag',
-			'id' => (int) $tagData['id'],
-			'name' => $tagData['name'],
-			'assignable' => $tagData['assignable'] ? '1' : '0',
-			'visibility' => $tagData['visible'] ? '1' : '0',
-		];
-	}
-
-	protected function getUserParameter($uid) {
-		if (!isset($this->displayNames[$uid])) {
-			$this->displayNames[$uid] = $this->getDisplayName($uid);
-		}
-
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->displayNames[$uid],
-		];
-	}
-
-	protected function generatePlainSystemTag(array $parameter) {
-		if ($parameter['assignable'] === '1') {
-			return $parameter['name'];
-		} else if ($parameter['visibility'] === '1') {
-			return $this->l->t('%s (restricted)', $parameter['name']);
-		} else {
-			return $this->l->t('%s (invisible)', $parameter['name']);
-		}
-	}
-
-	/**
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function getDisplayName($uid) {
-		$user = $this->userManager->get($uid);
-		if ($user instanceof IUser) {
-			return $user->getDisplayName();
-		} else {
-			return $uid;
-		}
-	}
+    const CREATE_TAG = 'create_tag';
+    const UPDATE_TAG = 'update_tag';
+    const DELETE_TAG = 'delete_tag';
+
+    const ASSIGN_TAG = 'assign_tag';
+    const UNASSIGN_TAG = 'unassign_tag';
+
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var string[] */
+    protected $displayNames = [];
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IUserManager $userManager
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'systemtags') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('systemtags', $language);
+
+        if ($this->activityManager->isFormattingFilteredObject()) {
+            try {
+                return $this->parseShortVersion($event);
+            } catch (\InvalidArgumentException $e) {
+                // Ignore and simply use the long version...
+            }
+        }
+
+        return $this->parseLongVersion($event);
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event) {
+        $parsedParameters = $this->getParameters($event);
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.svg')));
+        }
+
+        if ($event->getSubject() === self::ASSIGN_TAG) {
+            if ($parsedParameters['actor']['id'] === '') {
+                $event->setParsedSubject($this->l->t('System tag %1$s added by the system', [
+                        $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                    ]))
+                    ->setRichSubject($this->l->t('Added system tag {systemtag}'), [
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            } else if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('Added system tag %1$s', [
+                        $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                    ]))
+                    ->setRichSubject($this->l->t('Added system tag {systemtag}'), [
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s added system tag %2$s', [
+                        $parsedParameters['actor']['name'],
+                        $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                    ]))
+                    ->setRichSubject($this->l->t('{actor} added system tag {systemtag}'), [
+                        'actor' => $parsedParameters['actor'],
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            }
+        } else if ($event->getSubject() === self::UNASSIGN_TAG) {
+            if ($parsedParameters['actor']['id'] === '') {
+                $event->setParsedSubject($this->l->t('System tag %1$s removed by the system', [
+                        $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                    ]))
+                    ->setRichSubject($this->l->t('Removed system tag {systemtag}'), [
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            } else if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('Removed system tag %1$s', [
+                        $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                    ]))
+                    ->setRichSubject($this->l->t('Removed system tag {systemtag}'), [
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s removed system tag %2$s', [
+                        $parsedParameters['actor']['name'],
+                        $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                    ]))
+                    ->setRichSubject($this->l->t('{actor} removed system tag {systemtag}'), [
+                        'actor' => $parsedParameters['actor'],
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            }
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event) {
+        $parsedParameters = $this->getParameters($event);
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.svg')));
+        }
+
+        if ($event->getSubject() === self::CREATE_TAG) {
+            if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You created system tag %1$s', [
+                        $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                    ]))
+                    ->setRichSubject($this->l->t('You created system tag {systemtag}'), $parsedParameters);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s created system tag %2$s', [
+                        $parsedParameters['actor']['name'],
+                        $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                    ]))
+                    ->setRichSubject($this->l->t('{actor} created system tag {systemtag}'), $parsedParameters);
+            }
+        } else if ($event->getSubject() === self::DELETE_TAG) {
+            if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You deleted system tag %1$s', [
+                        $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                    ]))
+                    ->setRichSubject($this->l->t('You deleted system tag {systemtag}'), $parsedParameters);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s deleted system tag %2$s', [
+                        $parsedParameters['actor']['name'],
+                        $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                    ]))
+                    ->setRichSubject($this->l->t('{actor} deleted system tag {systemtag}'), $parsedParameters);
+            }
+        } else if ($event->getSubject() === self::UPDATE_TAG) {
+            if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You updated system tag %2$s to %1$s', [
+                        $this->generatePlainSystemTag($parsedParameters['newsystemtag']),
+                        $this->generatePlainSystemTag($parsedParameters['oldsystemtag']),
+                    ]))
+                    ->setRichSubject($this->l->t('You updated system tag {oldsystemtag} to {newsystemtag}'), $parsedParameters);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s updated system tag %3$s to %2$s', [
+                        $parsedParameters['actor']['name'],
+                        $this->generatePlainSystemTag($parsedParameters['newsystemtag']),
+                        $this->generatePlainSystemTag($parsedParameters['oldsystemtag']),
+                    ]))
+                    ->setRichSubject($this->l->t('{actor} updated system tag {oldsystemtag} to {newsystemtag}'), $parsedParameters);
+            }
+        } else if ($event->getSubject() === self::ASSIGN_TAG) {
+            if ($parsedParameters['actor']['id'] === '') {
+                unset($parsedParameters['actor']);
+                $event->setParsedSubject($this->l->t('System tag %2$s was added to %1$s by the system', [
+                        $parsedParameters['file']['path'],
+                        $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                    ]))
+                    ->setRichSubject($this->l->t('System tag {systemtag} was added to {file} by the system'), $parsedParameters);
+            } else if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You added system tag %2$s to %1$s', [
+                        $parsedParameters['file']['path'],
+                        $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                    ]))
+                    ->setRichSubject($this->l->t('You added system tag {systemtag} to {file}'), $parsedParameters);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s added system tag %3$s to %2$s', [
+                        $parsedParameters['actor']['name'],
+                        $parsedParameters['file']['path'],
+                        $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                    ]))
+                    ->setRichSubject($this->l->t('{actor} added system tag {systemtag} to {file}'), $parsedParameters);
+            }
+        } else if ($event->getSubject() === self::UNASSIGN_TAG) {
+            if ($parsedParameters['actor']['id'] === '') {
+                unset($parsedParameters['actor']);
+                $event->setParsedSubject($this->l->t('System tag %2$s was removed from %1$s by the system', [
+                        $parsedParameters['file']['path'],
+                        $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                    ]))
+                    ->setRichSubject($this->l->t('System tag {systemtag} was removed from {file} by the system'), $parsedParameters);
+            } else if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You removed system tag %2$s from %1$s', [
+                        $parsedParameters['file']['path'],
+                        $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                    ]))
+                    ->setRichSubject($this->l->t('You removed system tag {systemtag} from {file}'), $parsedParameters);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s removed system tag %3$s from %2$s', [
+                        $parsedParameters['actor']['name'],
+                        $parsedParameters['file']['path'],
+                        $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                    ]))
+                    ->setRichSubject($this->l->t('{actor} removed system tag {systemtag} from {file}'), $parsedParameters);
+            }
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        return $event;
+    }
+
+    protected function getParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::CREATE_TAG:
+            case self::DELETE_TAG:
+                return [
+                    'actor' => $this->getUserParameter((string) $parameters[0]),
+                    'systemtag' => $this->getSystemTagParameter($parameters[1]),
+                ];
+            case self::UPDATE_TAG:
+                return [
+                    'actor' => $this->getUserParameter((string) $parameters[0]),
+                    'newsystemtag' => $this->getSystemTagParameter($parameters[1]),
+                    'oldsystemtag' => $this->getSystemTagParameter($parameters[2]),
+                ];
+            case self::ASSIGN_TAG:
+            case self::UNASSIGN_TAG:
+                return [
+                    'actor' => $this->getUserParameter((string) $parameters[0]),
+                    'file' => $this->getFileParameter($event->getObjectId(), $parameters[1]),
+                    'systemtag' => $this->getSystemTagParameter($parameters[2]),
+                ];
+        }
+        return [];
+    }
+
+    protected function getFileParameter($id, $path) {
+        return [
+            'type' => 'file',
+            'id' => $id,
+            'name' => basename($path),
+            'path' => trim($path, '/'),
+        ];
+    }
+
+    protected function getSystemTagParameter($parameter) {
+        $tagData = json_decode($parameter, true);
+        if ($tagData === null) {
+            list($name, $status) = explode('|||', substr($parameter, 3, -3));
+            $tagData = [
+                'id' => 0,// No way to recover the ID
+                'name' => $name,
+                'assignable' => $status === 'assignable',
+                'visible' => $status !== 'invisible',
+            ];
+        }
+
+        return [
+            'type' => 'systemtag',
+            'id' => (int) $tagData['id'],
+            'name' => $tagData['name'],
+            'assignable' => $tagData['assignable'] ? '1' : '0',
+            'visibility' => $tagData['visible'] ? '1' : '0',
+        ];
+    }
+
+    protected function getUserParameter($uid) {
+        if (!isset($this->displayNames[$uid])) {
+            $this->displayNames[$uid] = $this->getDisplayName($uid);
+        }
+
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->displayNames[$uid],
+        ];
+    }
+
+    protected function generatePlainSystemTag(array $parameter) {
+        if ($parameter['assignable'] === '1') {
+            return $parameter['name'];
+        } else if ($parameter['visibility'] === '1') {
+            return $this->l->t('%s (restricted)', $parameter['name']);
+        } else {
+            return $this->l->t('%s (invisible)', $parameter['name']);
+        }
+    }
+
+    /**
+     * @param string $uid
+     * @return string
+     */
+    protected function getDisplayName($uid) {
+        $user = $this->userManager->get($uid);
+        if ($user instanceof IUser) {
+            return $user->getDisplayName();
+        } else {
+            return $uid;
+        }
+    }
 }

apps/systemtags/lib/Activity/Setting.php

Indentation +59 added lines, -59 removed lines

@@ -27,72 +27,72 @@
 
 class Setting implements ISetting {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
+    /**
+     * @param IL10N $l
+     */
+    public function __construct(IL10N $l) {
+        $this->l = $l;
+    }
 
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'systemtags';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'systemtags';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('<strong>System tags</strong> for a file have been modified');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('<strong>System tags</strong> for a file have been modified');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 50;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 50;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function canChangeStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function canChangeStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the mail
-	 * @since 11.0.0
-	 */
-	public function canChangeMail() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the mail
+     * @since 11.0.0
+     */
+    public function canChangeMail() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledMail() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledMail() {
+        return false;
+    }
 }