nextcloud / server

lib/private/Authentication/Token/IProvider.php

Indentation +106 added lines, -106 removed lines

@@ -29,110 +29,110 @@
 interface IProvider {
 
 
-	/**
-	 * Create and persist a new token
-	 *
-	 * @param string $token
-	 * @param string $uid
-	 * @param string $loginName
-	 * @param string|null $password
-	 * @param string $name
-	 * @param int $type token type
-	 * @param int $remember whether the session token should be used for remember-me
-	 * @return IToken
-	 */
-	public function generateToken($token, $uid, $loginName, $password, $name, $type = IToken::TEMPORARY_TOKEN, $remember = IToken::DO_NOT_REMEMBER);
-
-	/**
-	 * Get a token by token id
-	 *
-	 * @param string $tokenId
-	 * @throws InvalidTokenException
-	 * @return IToken
-	 */
-	public function getToken($tokenId);
-
-	/**
-	 * Get a token by token id
-	 *
-	 * @param string $tokenId
-	 * @throws InvalidTokenException
-	 * @return DefaultToken
-	 */
-	public function getTokenById($tokenId);
-
-	/**
-	 * Duplicate an existing session token
-	 *
-	 * @param string $oldSessionId
-	 * @param string $sessionId
-	 * @throws InvalidTokenException
-	 */
-	public function renewSessionToken($oldSessionId, $sessionId);
-
-	/**
-	 * Invalidate (delete) the given session token
-	 *
-	 * @param string $token
-	 */
-	public function invalidateToken($token);
-
-	/**
-	 * Invalidate (delete) the given token
-	 *
-	 * @param IUser $user
-	 * @param int $id
-	 */
-	public function invalidateTokenById(IUser $user, $id);
-
-	/**
-	 * Invalidate (delete) old session tokens
-	 */
-	public function invalidateOldTokens();
-
-	/**
-	 * Save the updated token
-	 *
-	 * @param IToken $token
-	 */
-	public function updateToken(IToken $token);
-
-	/**
-	 * Update token activity timestamp
-	 *
-	 * @param IToken $token
-	 */
-	public function updateTokenActivity(IToken $token);
-
-	/**
-	 * Get all token of a user
-	 *
-	 * The provider may limit the number of result rows in case of an abuse
-	 * where a high number of (session) tokens is generated
-	 *
-	 * @param IUser $user
-	 * @return IToken[]
-	 */
-	public function getTokenByUser(IUser $user);
-
-	/**
-	 * Get the (unencrypted) password of the given token
-	 *
-	 * @param IToken $token
-	 * @param string $tokenId
-	 * @throws InvalidTokenException
-	 * @throws PasswordlessTokenException
-	 * @return string
-	 */
-	public function getPassword(IToken $token, $tokenId);
-
-	/**
-	 * Encrypt and set the password of the given token
-	 *
-	 * @param IToken $token
-	 * @param string $tokenId
-	 * @param string $password
-	 * @throws InvalidTokenException
-	 */
-	public function setPassword(IToken $token, $tokenId, $password);
+    /**
+     * Create and persist a new token
+     *
+     * @param string $token
+     * @param string $uid
+     * @param string $loginName
+     * @param string|null $password
+     * @param string $name
+     * @param int $type token type
+     * @param int $remember whether the session token should be used for remember-me
+     * @return IToken
+     */
+    public function generateToken($token, $uid, $loginName, $password, $name, $type = IToken::TEMPORARY_TOKEN, $remember = IToken::DO_NOT_REMEMBER);
+
+    /**
+     * Get a token by token id
+     *
+     * @param string $tokenId
+     * @throws InvalidTokenException
+     * @return IToken
+     */
+    public function getToken($tokenId);
+
+    /**
+     * Get a token by token id
+     *
+     * @param string $tokenId
+     * @throws InvalidTokenException
+     * @return DefaultToken
+     */
+    public function getTokenById($tokenId);
+
+    /**
+     * Duplicate an existing session token
+     *
+     * @param string $oldSessionId
+     * @param string $sessionId
+     * @throws InvalidTokenException
+     */
+    public function renewSessionToken($oldSessionId, $sessionId);
+
+    /**
+     * Invalidate (delete) the given session token
+     *
+     * @param string $token
+     */
+    public function invalidateToken($token);
+
+    /**
+     * Invalidate (delete) the given token
+     *
+     * @param IUser $user
+     * @param int $id
+     */
+    public function invalidateTokenById(IUser $user, $id);
+
+    /**
+     * Invalidate (delete) old session tokens
+     */
+    public function invalidateOldTokens();
+
+    /**
+     * Save the updated token
+     *
+     * @param IToken $token
+     */
+    public function updateToken(IToken $token);
+
+    /**
+     * Update token activity timestamp
+     *
+     * @param IToken $token
+     */
+    public function updateTokenActivity(IToken $token);
+
+    /**
+     * Get all token of a user
+     *
+     * The provider may limit the number of result rows in case of an abuse
+     * where a high number of (session) tokens is generated
+     *
+     * @param IUser $user
+     * @return IToken[]
+     */
+    public function getTokenByUser(IUser $user);
+
+    /**
+     * Get the (unencrypted) password of the given token
+     *
+     * @param IToken $token
+     * @param string $tokenId
+     * @throws InvalidTokenException
+     * @throws PasswordlessTokenException
+     * @return string
+     */
+    public function getPassword(IToken $token, $tokenId);
+
+    /**
+     * Encrypt and set the password of the given token
+     *
+     * @param IToken $token
+     * @param string $tokenId
+     * @param string $password
+     * @throws InvalidTokenException
+     */
+    public function setPassword(IToken $token, $tokenId, $password);
 }

lib/private/Authentication/Token/IToken.php

Indentation +58 added lines, -58 removed lines

@@ -26,71 +26,71 @@
 
 interface IToken extends JsonSerializable {
 
-	const TEMPORARY_TOKEN = 0;
-	const PERMANENT_TOKEN = 1;
-	const DO_NOT_REMEMBER = 0;
-	const REMEMBER = 1;
+    const TEMPORARY_TOKEN = 0;
+    const PERMANENT_TOKEN = 1;
+    const DO_NOT_REMEMBER = 0;
+    const REMEMBER = 1;
 
-	/**
-	 * Get the token ID
-	 *
-	 * @return int
-	 */
-	public function getId();
+    /**
+     * Get the token ID
+     *
+     * @return int
+     */
+    public function getId();
 
-	/**
-	 * Get the user UID
-	 *
-	 * @return string
-	 */
-	public function getUID();
+    /**
+     * Get the user UID
+     *
+     * @return string
+     */
+    public function getUID();
 
-	/**
-	 * Get the login name used when generating the token
-	 *
-	 * @return string
-	 */
-	public function getLoginName();
+    /**
+     * Get the login name used when generating the token
+     *
+     * @return string
+     */
+    public function getLoginName();
 
-	/**
-	 * Get the (encrypted) login password
-	 *
-	 * @return string
-	 */
-	public function getPassword();
+    /**
+     * Get the (encrypted) login password
+     *
+     * @return string
+     */
+    public function getPassword();
 
-	/**
-	 * Get the timestamp of the last password check
-	 *
-	 * @return int
-	 */
-	public function getLastCheck();
+    /**
+     * Get the timestamp of the last password check
+     *
+     * @return int
+     */
+    public function getLastCheck();
 
-	/**
-	 * Set the timestamp of the last password check
-	 *
-	 * @param int $time
-	 */
-	public function setLastCheck($time);
+    /**
+     * Set the timestamp of the last password check
+     *
+     * @param int $time
+     */
+    public function setLastCheck($time);
 
-	/**
-	 * Get the authentication scope for this token
-	 *
-	 * @return string
-	 */
-	public function getScope();
+    /**
+     * Get the authentication scope for this token
+     *
+     * @return string
+     */
+    public function getScope();
 
-	/**
-	 * Get the authentication scope for this token
-	 *
-	 * @return array
-	 */
-	public function getScopeAsArray();
+    /**
+     * Get the authentication scope for this token
+     *
+     * @return array
+     */
+    public function getScopeAsArray();
 
-	/**
-	 * Set the authentication scope for this token
-	 *
-	 * @param array $scope
-	 */
-	public function setScope($scope);
+    /**
+     * Set the authentication scope for this token
+     *
+     * @param array $scope
+     */
+    public function setScope($scope);
 }

lib/private/RedisFactory.php

Indentation +52 added lines, -52 removed lines

@@ -23,64 +23,64 @@
 namespace OC;
 
 class RedisFactory {
-	/** @var  \Redis */
-	private $instance;
+    /** @var  \Redis */
+    private $instance;
 
-	/** @var  SystemConfig */
-	private $config;
+    /** @var  SystemConfig */
+    private $config;
 
-	/**
-	 * RedisFactory constructor.
-	 *
-	 * @param SystemConfig $config
-	 */
-	public function __construct(SystemConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * RedisFactory constructor.
+     *
+     * @param SystemConfig $config
+     */
+    public function __construct(SystemConfig $config) {
+        $this->config = $config;
+    }
 
-	private function create() {
-		$this->instance = new \Redis();
-		// TODO allow configuring a RedisArray, see https://github.com/nicolasff/phpredis/blob/master/arrays.markdown#redis-arrays
-		$config = $this->config->getValue('redis', array());
-		if (isset($config['host'])) {
-			$host = $config['host'];
-		} else {
-			$host = '127.0.0.1';
-		}
-		if (isset($config['port'])) {
-			$port = $config['port'];
-		} else {
-			$port = 6379;
-		}
-		if (isset($config['timeout'])) {
-			$timeout = $config['timeout'];
-		} else {
-			$timeout = 0.0; // unlimited
-		}
+    private function create() {
+        $this->instance = new \Redis();
+        // TODO allow configuring a RedisArray, see https://github.com/nicolasff/phpredis/blob/master/arrays.markdown#redis-arrays
+        $config = $this->config->getValue('redis', array());
+        if (isset($config['host'])) {
+            $host = $config['host'];
+        } else {
+            $host = '127.0.0.1';
+        }
+        if (isset($config['port'])) {
+            $port = $config['port'];
+        } else {
+            $port = 6379;
+        }
+        if (isset($config['timeout'])) {
+            $timeout = $config['timeout'];
+        } else {
+            $timeout = 0.0; // unlimited
+        }
 
-		$this->instance->connect($host, $port, $timeout);
-		if (isset($config['password']) && $config['password'] !== '') {
-			$this->instance->auth($config['password']);
-		}
+        $this->instance->connect($host, $port, $timeout);
+        if (isset($config['password']) && $config['password'] !== '') {
+            $this->instance->auth($config['password']);
+        }
 
-		if (isset($config['dbindex'])) {
-			$this->instance->select($config['dbindex']);
-		}
-	}
+        if (isset($config['dbindex'])) {
+            $this->instance->select($config['dbindex']);
+        }
+    }
 
-	public function getInstance() {
-		if (!$this->isAvailable()) {
-			throw new \Exception('Redis support is not available');
-		}
-		if (!$this->instance instanceof \Redis) {
-			$this->create();
-		}
+    public function getInstance() {
+        if (!$this->isAvailable()) {
+            throw new \Exception('Redis support is not available');
+        }
+        if (!$this->instance instanceof \Redis) {
+            $this->create();
+        }
 
-		return $this->instance;
-	}
+        return $this->instance;
+    }
 
-	public function isAvailable() {
-		return extension_loaded('redis')
-		&& version_compare(phpversion('redis'), '2.2.5', '>=');
-	}
+    public function isAvailable() {
+        return extension_loaded('redis')
+        && version_compare(phpversion('redis'), '2.2.5', '>=');
+    }
 }

lib/private/LargeFileHelper.php

Indentation +158 added lines, -158 removed lines

@@ -31,172 +31,172 @@
  * Helper class for large files on 32-bit platforms.
  */
 class LargeFileHelper {
-	/**
-	* pow(2, 53) as a base-10 string.
-	* @var string
-	*/
-	const POW_2_53 = '9007199254740992';
+    /**
+     * pow(2, 53) as a base-10 string.
+     * @var string
+     */
+    const POW_2_53 = '9007199254740992';
 
-	/**
-	* pow(2, 53) - 1 as a base-10 string.
-	* @var string
-	*/
-	const POW_2_53_MINUS_1 = '9007199254740991';
+    /**
+     * pow(2, 53) - 1 as a base-10 string.
+     * @var string
+     */
+    const POW_2_53_MINUS_1 = '9007199254740991';
 
-	/**
-	* @brief Checks whether our assumptions hold on the PHP platform we are on.
-	*
-	* @throws \RunTimeException if our assumptions do not hold on the current
-	*                           PHP platform.
-	*/
-	public function __construct() {
-		$pow_2_53 = floatval(self::POW_2_53_MINUS_1) + 1.0;
-		if ($this->formatUnsignedInteger($pow_2_53) !== self::POW_2_53) {
-			throw new \RuntimeException(
-				'This class assumes floats to be double precision or "better".'
-			);
-		}
-	}
+    /**
+     * @brief Checks whether our assumptions hold on the PHP platform we are on.
+     *
+     * @throws \RunTimeException if our assumptions do not hold on the current
+     *                           PHP platform.
+     */
+    public function __construct() {
+        $pow_2_53 = floatval(self::POW_2_53_MINUS_1) + 1.0;
+        if ($this->formatUnsignedInteger($pow_2_53) !== self::POW_2_53) {
+            throw new \RuntimeException(
+                'This class assumes floats to be double precision or "better".'
+            );
+        }
+    }
 
-	/**
-	* @brief Formats a signed integer or float as an unsigned integer base-10
-	*        string. Passed strings will be checked for being base-10.
-	*
-	* @param int|float|string $number Number containing unsigned integer data
-	*
-	* @throws \UnexpectedValueException if $number is not a float, not an int
-	*                                   and not a base-10 string.
-	*
-	* @return string Unsigned integer base-10 string
-	*/
-	public function formatUnsignedInteger($number) {
-		if (is_float($number)) {
-			// Undo the effect of the php.ini setting 'precision'.
-			return number_format($number, 0, '', '');
-		} else if (is_string($number) && ctype_digit($number)) {
-			return $number;
-		} else if (is_int($number)) {
-			// Interpret signed integer as unsigned integer.
-			return sprintf('%u', $number);
-		} else {
-			throw new \UnexpectedValueException(
-				'Expected int, float or base-10 string'
-			);
-		}
-	}
+    /**
+     * @brief Formats a signed integer or float as an unsigned integer base-10
+     *        string. Passed strings will be checked for being base-10.
+     *
+     * @param int|float|string $number Number containing unsigned integer data
+     *
+     * @throws \UnexpectedValueException if $number is not a float, not an int
+     *                                   and not a base-10 string.
+     *
+     * @return string Unsigned integer base-10 string
+     */
+    public function formatUnsignedInteger($number) {
+        if (is_float($number)) {
+            // Undo the effect of the php.ini setting 'precision'.
+            return number_format($number, 0, '', '');
+        } else if (is_string($number) && ctype_digit($number)) {
+            return $number;
+        } else if (is_int($number)) {
+            // Interpret signed integer as unsigned integer.
+            return sprintf('%u', $number);
+        } else {
+            throw new \UnexpectedValueException(
+                'Expected int, float or base-10 string'
+            );
+        }
+    }
 
-	/**
-	* @brief Tries to get the size of a file via various workarounds that
-	*        even work for large files on 32-bit platforms.
-	*
-	* @param string $filename Path to the file.
-	*
-	* @return null|int|float Number of bytes as number (float or int) or
-	*                        null on failure.
-	*/
-	public function getFileSize($filename) {
-		$fileSize = $this->getFileSizeViaCurl($filename);
-		if (!is_null($fileSize)) {
-			return $fileSize;
-		}
-		$fileSize = $this->getFileSizeViaExec($filename);
-		if (!is_null($fileSize)) {
-			return $fileSize;
-		}
-		return $this->getFileSizeNative($filename);
-	}
+    /**
+     * @brief Tries to get the size of a file via various workarounds that
+     *        even work for large files on 32-bit platforms.
+     *
+     * @param string $filename Path to the file.
+     *
+     * @return null|int|float Number of bytes as number (float or int) or
+     *                        null on failure.
+     */
+    public function getFileSize($filename) {
+        $fileSize = $this->getFileSizeViaCurl($filename);
+        if (!is_null($fileSize)) {
+            return $fileSize;
+        }
+        $fileSize = $this->getFileSizeViaExec($filename);
+        if (!is_null($fileSize)) {
+            return $fileSize;
+        }
+        return $this->getFileSizeNative($filename);
+    }
 
-	/**
-	* @brief Tries to get the size of a file via a CURL HEAD request.
-	*
-	* @param string $fileName Path to the file.
-	*
-	* @return null|int|float Number of bytes as number (float or int) or
-	*                        null on failure.
-	*/
-	public function getFileSizeViaCurl($fileName) {
-		if (\OC::$server->getIniWrapper()->getString('open_basedir') === '') {
-			$encodedFileName = rawurlencode($fileName);
-			$ch = curl_init("file://$encodedFileName");
-			curl_setopt($ch, CURLOPT_NOBODY, true);
-			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-			curl_setopt($ch, CURLOPT_HEADER, true);
-			$data = curl_exec($ch);
-			curl_close($ch);
-			if ($data !== false) {
-				$matches = array();
-				preg_match('/Content-Length: (\d+)/', $data, $matches);
-				if (isset($matches[1])) {
-					return 0 + $matches[1];
-				}
-			}
-		}
-		return null;
-	}
+    /**
+     * @brief Tries to get the size of a file via a CURL HEAD request.
+     *
+     * @param string $fileName Path to the file.
+     *
+     * @return null|int|float Number of bytes as number (float or int) or
+     *                        null on failure.
+     */
+    public function getFileSizeViaCurl($fileName) {
+        if (\OC::$server->getIniWrapper()->getString('open_basedir') === '') {
+            $encodedFileName = rawurlencode($fileName);
+            $ch = curl_init("file://$encodedFileName");
+            curl_setopt($ch, CURLOPT_NOBODY, true);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+            curl_setopt($ch, CURLOPT_HEADER, true);
+            $data = curl_exec($ch);
+            curl_close($ch);
+            if ($data !== false) {
+                $matches = array();
+                preg_match('/Content-Length: (\d+)/', $data, $matches);
+                if (isset($matches[1])) {
+                    return 0 + $matches[1];
+                }
+            }
+        }
+        return null;
+    }
 
-	/**
-	* @brief Tries to get the size of a file via an exec() call.
-	*
-	* @param string $filename Path to the file.
-	*
-	* @return null|int|float Number of bytes as number (float or int) or
-	*                        null on failure.
-	*/
-	public function getFileSizeViaExec($filename) {
-		if (\OC_Helper::is_function_enabled('exec')) {
-			$os = strtolower(php_uname('s'));
-			$arg = escapeshellarg($filename);
-			$result = null;
-			if (strpos($os, 'linux') !== false) {
-				$result = $this->exec("stat -c %s $arg");
-			} else if (strpos($os, 'bsd') !== false || strpos($os, 'darwin') !== false) {
-				$result = $this->exec("stat -f %z $arg");
-			}
-			return $result;
-		}
-		return null;
-	}
+    /**
+     * @brief Tries to get the size of a file via an exec() call.
+     *
+     * @param string $filename Path to the file.
+     *
+     * @return null|int|float Number of bytes as number (float or int) or
+     *                        null on failure.
+     */
+    public function getFileSizeViaExec($filename) {
+        if (\OC_Helper::is_function_enabled('exec')) {
+            $os = strtolower(php_uname('s'));
+            $arg = escapeshellarg($filename);
+            $result = null;
+            if (strpos($os, 'linux') !== false) {
+                $result = $this->exec("stat -c %s $arg");
+            } else if (strpos($os, 'bsd') !== false || strpos($os, 'darwin') !== false) {
+                $result = $this->exec("stat -f %z $arg");
+            }
+            return $result;
+        }
+        return null;
+    }
 
-	/**
-	* @brief Gets the size of a file via a filesize() call and converts
-	*        negative signed int to positive float. As the result of filesize()
-	*        will wrap around after a file size of 2^32 bytes = 4 GiB, this
-	*        should only be used as a last resort.
-	*
-	* @param string $filename Path to the file.
-	*
-	* @return int|float Number of bytes as number (float or int).
-	*/
-	public function getFileSizeNative($filename) {
-		$result = filesize($filename);
-		if ($result < 0) {
-			// For file sizes between 2 GiB and 4 GiB, filesize() will return a
-			// negative int, as the PHP data type int is signed. Interpret the
-			// returned int as an unsigned integer and put it into a float.
-			return (float) sprintf('%u', $result);
-		}
-		return $result;
-	}
+    /**
+     * @brief Gets the size of a file via a filesize() call and converts
+     *        negative signed int to positive float. As the result of filesize()
+     *        will wrap around after a file size of 2^32 bytes = 4 GiB, this
+     *        should only be used as a last resort.
+     *
+     * @param string $filename Path to the file.
+     *
+     * @return int|float Number of bytes as number (float or int).
+     */
+    public function getFileSizeNative($filename) {
+        $result = filesize($filename);
+        if ($result < 0) {
+            // For file sizes between 2 GiB and 4 GiB, filesize() will return a
+            // negative int, as the PHP data type int is signed. Interpret the
+            // returned int as an unsigned integer and put it into a float.
+            return (float) sprintf('%u', $result);
+        }
+        return $result;
+    }
 
-	/**
-	 * Returns the current mtime for $fullPath
-	 *
-	 * @param string $fullPath
-	 * @return int
-	 */
-	public function getFileMtime($fullPath) {
-		if (\OC_Helper::is_function_enabled('exec')) {
-			$os = strtolower(php_uname('s'));
-			if (strpos($os, 'linux') !== false) {
-				return $this->exec('stat -c %Y ' . escapeshellarg($fullPath));
-			}
-		}
+    /**
+     * Returns the current mtime for $fullPath
+     *
+     * @param string $fullPath
+     * @return int
+     */
+    public function getFileMtime($fullPath) {
+        if (\OC_Helper::is_function_enabled('exec')) {
+            $os = strtolower(php_uname('s'));
+            if (strpos($os, 'linux') !== false) {
+                return $this->exec('stat -c %Y ' . escapeshellarg($fullPath));
+            }
+        }
 
-		return filemtime($fullPath);
-	}
+        return filemtime($fullPath);
+    }
 
-	protected function exec($cmd) {
-		$result = trim(exec($cmd));
-		return ctype_digit($result) ? 0 + $result : null;
-	}
+    protected function exec($cmd) {
+        $result = trim(exec($cmd));
+        return ctype_digit($result) ? 0 + $result : null;
+    }
 }

lib/private/Console/TimestampFormatter.php

Indentation +67 added lines, -67 removed lines

@@ -28,81 +28,81 @@
 use Symfony\Component\Console\Formatter\OutputFormatterStyleInterface;
 
 class TimestampFormatter implements OutputFormatterInterface {
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/**
-	 * @param IConfig $config
-	 * @param OutputFormatterInterface $formatter
-	 */
-	public function __construct(IConfig $config, OutputFormatterInterface $formatter) {
-		$this->config = $config;
-		$this->formatter = $formatter;
-	}
+    /**
+     * @param IConfig $config
+     * @param OutputFormatterInterface $formatter
+     */
+    public function __construct(IConfig $config, OutputFormatterInterface $formatter) {
+        $this->config = $config;
+        $this->formatter = $formatter;
+    }
 
-	/**
-	 * Sets the decorated flag.
-	 *
-	 * @param bool $decorated Whether to decorate the messages or not
-	 */
-	public function setDecorated($decorated) {
-		$this->formatter->setDecorated($decorated);
-	}
+    /**
+     * Sets the decorated flag.
+     *
+     * @param bool $decorated Whether to decorate the messages or not
+     */
+    public function setDecorated($decorated) {
+        $this->formatter->setDecorated($decorated);
+    }
 
-	/**
-	 * Gets the decorated flag.
-	 *
-	 * @return bool true if the output will decorate messages, false otherwise
-	 */
-	public function isDecorated() {
-		return $this->formatter->isDecorated();
-	}
+    /**
+     * Gets the decorated flag.
+     *
+     * @return bool true if the output will decorate messages, false otherwise
+     */
+    public function isDecorated() {
+        return $this->formatter->isDecorated();
+    }
 
-	/**
-	 * Sets a new style.
-	 *
-	 * @param string $name The style name
-	 * @param OutputFormatterStyleInterface $style The style instance
-	 */
-	public function setStyle($name, OutputFormatterStyleInterface $style) {
-		$this->formatter->setStyle($name, $style);
-	}
+    /**
+     * Sets a new style.
+     *
+     * @param string $name The style name
+     * @param OutputFormatterStyleInterface $style The style instance
+     */
+    public function setStyle($name, OutputFormatterStyleInterface $style) {
+        $this->formatter->setStyle($name, $style);
+    }
 
-	/**
-	 * Checks if output formatter has style with specified name.
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	public function hasStyle($name) {
-		$this->formatter->hasStyle($name);
-	}
+    /**
+     * Checks if output formatter has style with specified name.
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function hasStyle($name) {
+        $this->formatter->hasStyle($name);
+    }
 
-	/**
-	 * Gets style options from style with specified name.
-	 *
-	 * @param string $name
-	 * @return OutputFormatterStyleInterface
-	 */
-	public function getStyle($name) {
-		return $this->formatter->getStyle($name);
-	}
+    /**
+     * Gets style options from style with specified name.
+     *
+     * @param string $name
+     * @return OutputFormatterStyleInterface
+     */
+    public function getStyle($name) {
+        return $this->formatter->getStyle($name);
+    }
 
-	/**
-	 * Formats a message according to the given styles.
-	 *
-	 * @param string $message The message to style
-	 * @return string The styled message, prepended with a timestamp using the
-	 * log timezone and dateformat, e.g. "2015-06-23T17:24:37+02:00"
-	 */
-	public function format($message) {
+    /**
+     * Formats a message according to the given styles.
+     *
+     * @param string $message The message to style
+     * @return string The styled message, prepended with a timestamp using the
+     * log timezone and dateformat, e.g. "2015-06-23T17:24:37+02:00"
+     */
+    public function format($message) {
 
-		$timeZone = $this->config->getSystemValue('logtimezone', 'UTC');
-		$timeZone = $timeZone !== null ? new \DateTimeZone($timeZone) : null;
+        $timeZone = $this->config->getSystemValue('logtimezone', 'UTC');
+        $timeZone = $timeZone !== null ? new \DateTimeZone($timeZone) : null;
 
-		$time = new \DateTime('now', $timeZone);
-		$timestampInfo = $time->format($this->config->getSystemValue('logdateformat', \DateTime::ATOM));
+        $time = new \DateTime('now', $timeZone);
+        $timestampInfo = $time->format($this->config->getSystemValue('logdateformat', \DateTime::ATOM));
 
-		return $timestampInfo . ' ' . $this->formatter->format($message);
-	}
+        return $timestampInfo . ' ' . $this->formatter->format($message);
+    }
 }

lib/private/Tags.php

Indentation +757 added lines, -757 removed lines

@@ -48,761 +48,761 @@
 
 class Tags implements \OCP\ITags {
 
-	/**
-	 * Tags
-	 *
-	 * @var array
-	 */
-	private $tags = array();
-
-	/**
-	 * Used for storing objectid/categoryname pairs while rescanning.
-	 *
-	 * @var array
-	 */
-	private static $relations = array();
-
-	/**
-	 * Type
-	 *
-	 * @var string
-	 */
-	private $type;
-
-	/**
-	 * User
-	 *
-	 * @var string
-	 */
-	private $user;
-
-	/**
-	 * Are we including tags for shared items?
-	 *
-	 * @var bool
-	 */
-	private $includeShared = false;
-
-	/**
-	 * The current user, plus any owners of the items shared with the current
-	 * user, if $this->includeShared === true.
-	 *
-	 * @var array
-	 */
-	private $owners = array();
-
-	/**
-	 * The Mapper we're using to communicate our Tag objects to the database.
-	 *
-	 * @var TagMapper
-	 */
-	private $mapper;
-
-	/**
-	 * The sharing backend for objects of $this->type. Required if
-	 * $this->includeShared === true to determine ownership of items.
-	 *
-	 * @var \OCP\Share_Backend
-	 */
-	private $backend;
-
-	const TAG_TABLE = '*PREFIX*vcategory';
-	const RELATION_TABLE = '*PREFIX*vcategory_to_object';
-
-	const TAG_FAVORITE = '_$!<Favorite>!$_';
-
-	/**
-	* Constructor.
-	*
-	* @param TagMapper $mapper Instance of the TagMapper abstraction layer.
-	* @param string $user The user whose data the object will operate on.
-	* @param string $type The type of items for which tags will be loaded.
-	* @param array $defaultTags Tags that should be created at construction.
-	* @param boolean $includeShared Whether to include tags for items shared with this user by others.
-	*/
-	public function __construct(TagMapper $mapper, $user, $type, $defaultTags = array(), $includeShared = false) {
-		$this->mapper = $mapper;
-		$this->user = $user;
-		$this->type = $type;
-		$this->includeShared = $includeShared;
-		$this->owners = array($this->user);
-		if ($this->includeShared) {
-			$this->owners = array_merge($this->owners, \OC\Share\Share::getSharedItemsOwners($this->user, $this->type, true));
-			$this->backend = \OC\Share\Share::getBackend($this->type);
-		}
-		$this->tags = $this->mapper->loadTags($this->owners, $this->type);
-
-		if(count($defaultTags) > 0 && count($this->tags) === 0) {
-			$this->addMultiple($defaultTags, true);
-		}
-	}
-
-	/**
-	* Check if any tags are saved for this type and user.
-	*
-	* @return boolean.
-	*/
-	public function isEmpty() {
-		return count($this->tags) === 0;
-	}
-
-	/**
-	* Returns an array mapping a given tag's properties to its values:
-	* ['id' => 0, 'name' = 'Tag', 'owner' = 'User', 'type' => 'tagtype']
-	*
-	* @param string $id The ID of the tag that is going to be mapped
-	* @return array|false
-	*/
-	public function getTag($id) {
-		$key = $this->getTagById($id);
-		if ($key !== false) {
-			return $this->tagMap($this->tags[$key]);
-		}
-		return false;
-	}
-
-	/**
-	* Get the tags for a specific user.
-	*
-	* This returns an array with maps containing each tag's properties:
-	* [
-	* 	['id' => 0, 'name' = 'First tag', 'owner' = 'User', 'type' => 'tagtype'],
-	* 	['id' => 1, 'name' = 'Shared tag', 'owner' = 'Other user', 'type' => 'tagtype'],
-	* ]
-	*
-	* @return array
-	*/
-	public function getTags() {
-		if(!count($this->tags)) {
-			return array();
-		}
-
-		usort($this->tags, function($a, $b) {
-			return strnatcasecmp($a->getName(), $b->getName());
-		});
-		$tagMap = array();
-
-		foreach($this->tags as $tag) {
-			if($tag->getName() !== self::TAG_FAVORITE) {
-				$tagMap[] = $this->tagMap($tag);
-			}
-		}
-		return $tagMap;
-
-	}
-
-	/**
-	* Return only the tags owned by the given user, omitting any tags shared
-	* by other users.
-	*
-	* @param string $user The user whose tags are to be checked.
-	* @return array An array of Tag objects.
-	*/
-	public function getTagsForUser($user) {
-		return array_filter($this->tags,
-			function($tag) use($user) {
-				return $tag->getOwner() === $user;
-			}
-		);
-	}
-
-	/**
-	 * Get the list of tags for the given ids.
-	 *
-	 * @param array $objIds array of object ids
-	 * @return array|boolean of tags id as key to array of tag names
-	 * or false if an error occurred
-	 */
-	public function getTagsForObjects(array $objIds) {
-		$entries = array();
-
-		try {
-			$conn = \OC::$server->getDatabaseConnection();
-			$chunks = array_chunk($objIds, 900, false);
-			foreach ($chunks as $chunk) {
-				$result = $conn->executeQuery(
-					'SELECT `category`, `categoryid`, `objid` ' .
-					'FROM `' . self::RELATION_TABLE . '` r, `' . self::TAG_TABLE . '` ' .
-					'WHERE `categoryid` = `id` AND `uid` = ? AND r.`type` = ? AND `objid` IN (?)',
-					array($this->user, $this->type, $chunk),
-					array(null, null, IQueryBuilder::PARAM_INT_ARRAY)
-				);
-				while ($row = $result->fetch()) {
-					$objId = (int)$row['objid'];
-					if (!isset($entries[$objId])) {
-						$entries[$objId] = array();
-					}
-					$entries[$objId][] = $row['category'];
-				}
-				if (\OCP\DB::isError($result)) {
-					\OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage(), \OCP\Util::ERROR);
-					return false;
-				}
-			}
-		} catch(\Exception $e) {
-			\OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
-				\OCP\Util::ERROR);
-			return false;
-		}
-
-		return $entries;
-	}
-
-	/**
-	* Get the a list if items tagged with $tag.
-	*
-	* Throws an exception if the tag could not be found.
-	*
-	* @param string $tag Tag id or name.
-	* @return array|false An array of object ids or false on error.
-	* @throws \Exception
-	*/
-	public function getIdsForTag($tag) {
-		$result = null;
-		$tagId = false;
-		if(is_numeric($tag)) {
-			$tagId = $tag;
-		} elseif(is_string($tag)) {
-			$tag = trim($tag);
-			if($tag === '') {
-				\OCP\Util::writeLog('core', __METHOD__.', Cannot use empty tag names', \OCP\Util::DEBUG);
-				return false;
-			}
-			$tagId = $this->getTagId($tag);
-		}
-
-		if($tagId === false) {
-			$l10n = \OC::$server->getL10N('core');
-			throw new \Exception(
-				$l10n->t('Could not find category "%s"', $tag)
-			);
-		}
-
-		$ids = array();
-		$sql = 'SELECT `objid` FROM `' . self::RELATION_TABLE
-			. '` WHERE `categoryid` = ?';
-
-		try {
-			$stmt = \OCP\DB::prepare($sql);
-			$result = $stmt->execute(array($tagId));
-			if (\OCP\DB::isError($result)) {
-				\OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage(), \OCP\Util::ERROR);
-				return false;
-			}
-		} catch(\Exception $e) {
-			\OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
-				\OCP\Util::ERROR);
-			return false;
-		}
-
-		if(!is_null($result)) {
-			while( $row = $result->fetchRow()) {
-				$id = (int)$row['objid'];
-
-				if ($this->includeShared) {
-					// We have to check if we are really allowed to access the
-					// items that are tagged with $tag. To that end, we ask the
-					// corresponding sharing backend if the item identified by $id
-					// is owned by any of $this->owners.
-					foreach ($this->owners as $owner) {
-						if ($this->backend->isValidSource($id, $owner)) {
-							$ids[] = $id;
-							break;
-						}
-					}
-				} else {
-					$ids[] = $id;
-				}
-			}
-		}
-
-		return $ids;
-	}
-
-	/**
-	* Checks whether a tag is saved for the given user,
-	* disregarding the ones shared with him or her.
-	*
-	* @param string $name The tag name to check for.
-	* @param string $user The user whose tags are to be checked.
-	* @return bool
-	*/
-	public function userHasTag($name, $user) {
-		$key = $this->array_searchi($name, $this->getTagsForUser($user));
-		return ($key !== false) ? $this->tags[$key]->getId() : false;
-	}
-
-	/**
-	* Checks whether a tag is saved for or shared with the current user.
-	*
-	* @param string $name The tag name to check for.
-	* @return bool
-	*/
-	public function hasTag($name) {
-		return $this->getTagId($name) !== false;
-	}
-
-	/**
-	* Add a new tag.
-	*
-	* @param string $name A string with a name of the tag
-	* @return false|int the id of the added tag or false on error.
-	*/
-	public function add($name) {
-		$name = trim($name);
-
-		if($name === '') {
-			\OCP\Util::writeLog('core', __METHOD__.', Cannot add an empty tag', \OCP\Util::DEBUG);
-			return false;
-		}
-		if($this->userHasTag($name, $this->user)) {
-			\OCP\Util::writeLog('core', __METHOD__.', name: ' . $name. ' exists already', \OCP\Util::DEBUG);
-			return false;
-		}
-		try {
-			$tag = new Tag($this->user, $this->type, $name);
-			$tag = $this->mapper->insert($tag);
-			$this->tags[] = $tag;
-		} catch(\Exception $e) {
-			\OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
-				\OCP\Util::ERROR);
-			return false;
-		}
-		\OCP\Util::writeLog('core', __METHOD__.', id: ' . $tag->getId(), \OCP\Util::DEBUG);
-		return $tag->getId();
-	}
-
-	/**
-	* Rename tag.
-	*
-	* @param string|integer $from The name or ID of the existing tag
-	* @param string $to The new name of the tag.
-	* @return bool
-	*/
-	public function rename($from, $to) {
-		$from = trim($from);
-		$to = trim($to);
-
-		if($to === '' || $from === '') {
-			\OCP\Util::writeLog('core', __METHOD__.', Cannot use empty tag names', \OCP\Util::DEBUG);
-			return false;
-		}
-
-		if (is_numeric($from)) {
-			$key = $this->getTagById($from);
-		} else {
-			$key = $this->getTagByName($from);
-		}
-		if($key === false) {
-			\OCP\Util::writeLog('core', __METHOD__.', tag: ' . $from. ' does not exist', \OCP\Util::DEBUG);
-			return false;
-		}
-		$tag = $this->tags[$key];
-
-		if($this->userHasTag($to, $tag->getOwner())) {
-			\OCP\Util::writeLog('core', __METHOD__.', A tag named ' . $to. ' already exists for user ' . $tag->getOwner() . '.', \OCP\Util::DEBUG);
-			return false;
-		}
-
-		try {
-			$tag->setName($to);
-			$this->tags[$key] = $this->mapper->update($tag);
-		} catch(\Exception $e) {
-			\OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
-				\OCP\Util::ERROR);
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	* Add a list of new tags.
-	*
-	* @param string[] $names A string with a name or an array of strings containing
-	* the name(s) of the tag(s) to add.
-	* @param bool $sync When true, save the tags
-	* @param int|null $id int Optional object id to add to this|these tag(s)
-	* @return bool Returns false on error.
-	*/
-	public function addMultiple($names, $sync=false, $id = null) {
-		if(!is_array($names)) {
-			$names = array($names);
-		}
-		$names = array_map('trim', $names);
-		array_filter($names);
-
-		$newones = array();
-		foreach($names as $name) {
-			if(!$this->hasTag($name) && $name !== '') {
-				$newones[] = new Tag($this->user, $this->type, $name);
-			}
-			if(!is_null($id) ) {
-				// Insert $objectid, $categoryid  pairs if not exist.
-				self::$relations[] = array('objid' => $id, 'tag' => $name);
-			}
-		}
-		$this->tags = array_merge($this->tags, $newones);
-		if($sync === true) {
-			$this->save();
-		}
-
-		return true;
-	}
-
-	/**
-	 * Save the list of tags and their object relations
-	 */
-	protected function save() {
-		if(is_array($this->tags)) {
-			foreach($this->tags as $tag) {
-				try {
-					if (!$this->mapper->tagExists($tag)) {
-						$this->mapper->insert($tag);
-					}
-				} catch(\Exception $e) {
-					\OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
-						\OCP\Util::ERROR);
-				}
-			}
-
-			// reload tags to get the proper ids.
-			$this->tags = $this->mapper->loadTags($this->owners, $this->type);
-			\OCP\Util::writeLog('core', __METHOD__.', tags: ' . print_r($this->tags, true),
-				\OCP\Util::DEBUG);
-			// Loop through temporarily cached objectid/tagname pairs
-			// and save relations.
-			$tags = $this->tags;
-			// For some reason this is needed or array_search(i) will return 0..?
-			ksort($tags);
-			foreach(self::$relations as $relation) {
-				$tagId = $this->getTagId($relation['tag']);
-				\OCP\Util::writeLog('core', __METHOD__ . 'catid, ' . $relation['tag'] . ' ' . $tagId, \OCP\Util::DEBUG);
-				if($tagId) {
-					try {
-						\OCP\DB::insertIfNotExist(self::RELATION_TABLE,
-							array(
-								'objid' => $relation['objid'],
-								'categoryid' => $tagId,
-								'type' => $this->type,
-								));
-					} catch(\Exception $e) {
-						\OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
-							\OCP\Util::ERROR);
-					}
-				}
-			}
-			self::$relations = array(); // reset
-		} else {
-			\OCP\Util::writeLog('core', __METHOD__.', $this->tags is not an array! '
-				. print_r($this->tags, true), \OCP\Util::ERROR);
-		}
-	}
-
-	/**
-	* Delete tags and tag/object relations for a user.
-	*
-	* For hooking up on post_deleteUser
-	*
-	* @param array $arguments
-	*/
-	public static function post_deleteUser($arguments) {
-		// Find all objectid/tagId pairs.
-		$result = null;
-		try {
-			$stmt = \OCP\DB::prepare('SELECT `id` FROM `' . self::TAG_TABLE . '` '
-				. 'WHERE `uid` = ?');
-			$result = $stmt->execute(array($arguments['uid']));
-			if (\OCP\DB::isError($result)) {
-				\OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage(), \OCP\Util::ERROR);
-			}
-		} catch(\Exception $e) {
-			\OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
-				\OCP\Util::ERROR);
-		}
-
-		if(!is_null($result)) {
-			try {
-				$stmt = \OCP\DB::prepare('DELETE FROM `' . self::RELATION_TABLE . '` '
-					. 'WHERE `categoryid` = ?');
-				while( $row = $result->fetchRow()) {
-					try {
-						$stmt->execute(array($row['id']));
-					} catch(\Exception $e) {
-						\OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
-							\OCP\Util::ERROR);
-					}
-				}
-			} catch(\Exception $e) {
-				\OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
-					\OCP\Util::ERROR);
-			}
-		}
-		try {
-			$stmt = \OCP\DB::prepare('DELETE FROM `' . self::TAG_TABLE . '` '
-				. 'WHERE `uid` = ?');
-			$result = $stmt->execute(array($arguments['uid']));
-			if (\OCP\DB::isError($result)) {
-				\OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage(), \OCP\Util::ERROR);
-			}
-		} catch(\Exception $e) {
-			\OCP\Util::writeLog('core', __METHOD__ . ', exception: '
-				. $e->getMessage(), \OCP\Util::ERROR);
-		}
-	}
-
-	/**
-	* Delete tag/object relations from the db
-	*
-	* @param array $ids The ids of the objects
-	* @return boolean Returns false on error.
-	*/
-	public function purgeObjects(array $ids) {
-		if(count($ids) === 0) {
-			// job done ;)
-			return true;
-		}
-		$updates = $ids;
-		try {
-			$query = 'DELETE FROM `' . self::RELATION_TABLE . '` ';
-			$query .= 'WHERE `objid` IN (' . str_repeat('?,', count($ids)-1) . '?) ';
-			$query .= 'AND `type`= ?';
-			$updates[] = $this->type;
-			$stmt = \OCP\DB::prepare($query);
-			$result = $stmt->execute($updates);
-			if (\OCP\DB::isError($result)) {
-				\OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage(), \OCP\Util::ERROR);
-				return false;
-			}
-		} catch(\Exception $e) {
-			\OCP\Util::writeLog('core', __METHOD__.', exception: ' . $e->getMessage(),
-				\OCP\Util::ERROR);
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	* Get favorites for an object type
-	*
-	* @return array|false An array of object ids.
-	*/
-	public function getFavorites() {
-		try {
-			return $this->getIdsForTag(self::TAG_FAVORITE);
-		} catch(\Exception $e) {
-			\OCP\Util::writeLog('core', __METHOD__.', exception: ' . $e->getMessage(),
-				\OCP\Util::DEBUG);
-			return array();
-		}
-	}
-
-	/**
-	* Add an object to favorites
-	*
-	* @param int $objid The id of the object
-	* @return boolean
-	*/
-	public function addToFavorites($objid) {
-		if(!$this->userHasTag(self::TAG_FAVORITE, $this->user)) {
-			$this->add(self::TAG_FAVORITE);
-		}
-		return $this->tagAs($objid, self::TAG_FAVORITE);
-	}
-
-	/**
-	* Remove an object from favorites
-	*
-	* @param int $objid The id of the object
-	* @return boolean
-	*/
-	public function removeFromFavorites($objid) {
-		return $this->unTag($objid, self::TAG_FAVORITE);
-	}
-
-	/**
-	* Creates a tag/object relation.
-	*
-	* @param int $objid The id of the object
-	* @param string $tag The id or name of the tag
-	* @return boolean Returns false on error.
-	*/
-	public function tagAs($objid, $tag) {
-		if(is_string($tag) && !is_numeric($tag)) {
-			$tag = trim($tag);
-			if($tag === '') {
-				\OCP\Util::writeLog('core', __METHOD__.', Cannot add an empty tag', \OCP\Util::DEBUG);
-				return false;
-			}
-			if(!$this->hasTag($tag)) {
-				$this->add($tag);
-			}
-			$tagId =  $this->getTagId($tag);
-		} else {
-			$tagId = $tag;
-		}
-		try {
-			\OCP\DB::insertIfNotExist(self::RELATION_TABLE,
-				array(
-					'objid' => $objid,
-					'categoryid' => $tagId,
-					'type' => $this->type,
-				));
-		} catch(\Exception $e) {
-			\OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
-				\OCP\Util::ERROR);
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	* Delete single tag/object relation from the db
-	*
-	* @param int $objid The id of the object
-	* @param string $tag The id or name of the tag
-	* @return boolean
-	*/
-	public function unTag($objid, $tag) {
-		if(is_string($tag) && !is_numeric($tag)) {
-			$tag = trim($tag);
-			if($tag === '') {
-				\OCP\Util::writeLog('core', __METHOD__.', Tag name is empty', \OCP\Util::DEBUG);
-				return false;
-			}
-			$tagId =  $this->getTagId($tag);
-		} else {
-			$tagId = $tag;
-		}
-
-		try {
-			$sql = 'DELETE FROM `' . self::RELATION_TABLE . '` '
-					. 'WHERE `objid` = ? AND `categoryid` = ? AND `type` = ?';
-			$stmt = \OCP\DB::prepare($sql);
-			$stmt->execute(array($objid, $tagId, $this->type));
-		} catch(\Exception $e) {
-			\OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
-				\OCP\Util::ERROR);
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	* Delete tags from the database.
-	*
-	* @param string[]|integer[] $names An array of tags (names or IDs) to delete
-	* @return bool Returns false on error
-	*/
-	public function delete($names) {
-		if(!is_array($names)) {
-			$names = array($names);
-		}
-
-		$names = array_map('trim', $names);
-		array_filter($names);
-
-		\OCP\Util::writeLog('core', __METHOD__ . ', before: '
-			. print_r($this->tags, true), \OCP\Util::DEBUG);
-		foreach($names as $name) {
-			$id = null;
-
-			if (is_numeric($name)) {
-				$key = $this->getTagById($name);
-			} else {
-				$key = $this->getTagByName($name);
-			}
-			if ($key !== false) {
-				$tag = $this->tags[$key];
-				$id = $tag->getId();
-				unset($this->tags[$key]);
-				$this->mapper->delete($tag);
-			} else {
-				\OCP\Util::writeLog('core', __METHOD__ . 'Cannot delete tag ' . $name
-					. ': not found.', \OCP\Util::ERROR);
-			}
-			if(!is_null($id) && $id !== false) {
-				try {
-					$sql = 'DELETE FROM `' . self::RELATION_TABLE . '` '
-							. 'WHERE `categoryid` = ?';
-					$stmt = \OCP\DB::prepare($sql);
-					$result = $stmt->execute(array($id));
-					if (\OCP\DB::isError($result)) {
-						\OCP\Util::writeLog('core',
-							__METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage(),
-							\OCP\Util::ERROR);
-						return false;
-					}
-				} catch(\Exception $e) {
-					\OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
-						\OCP\Util::ERROR);
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	// case-insensitive array_search
-	protected function array_searchi($needle, $haystack, $mem='getName') {
-		if(!is_array($haystack)) {
-			return false;
-		}
-		return array_search(strtolower($needle), array_map(
-			function($tag) use($mem) {
-				return strtolower(call_user_func(array($tag, $mem)));
-			}, $haystack)
-		);
-	}
-
-	/**
-	* Get a tag's ID.
-	*
-	* @param string $name The tag name to look for.
-	* @return string|bool The tag's id or false if no matching tag is found.
-	*/
-	private function getTagId($name) {
-		$key = $this->array_searchi($name, $this->tags);
-		if ($key !== false) {
-			return $this->tags[$key]->getId();
-		}
-		return false;
-	}
-
-	/**
-	* Get a tag by its name.
-	*
-	* @param string $name The tag name.
-	* @return integer|bool The tag object's offset within the $this->tags
-	*                      array or false if it doesn't exist.
-	*/
-	private function getTagByName($name) {
-		return $this->array_searchi($name, $this->tags, 'getName');
-	}
-
-	/**
-	* Get a tag by its ID.
-	*
-	* @param string $id The tag ID to look for.
-	* @return integer|bool The tag object's offset within the $this->tags
-	*                      array or false if it doesn't exist.
-	*/
-	private function getTagById($id) {
-		return $this->array_searchi($id, $this->tags, 'getId');
-	}
-
-	/**
-	* Returns an array mapping a given tag's properties to its values:
-	* ['id' => 0, 'name' = 'Tag', 'owner' = 'User', 'type' => 'tagtype']
-	*
-	* @param Tag $tag The tag that is going to be mapped
-	* @return array
-	*/
-	private function tagMap(Tag $tag) {
-		return array(
-			'id'    => $tag->getId(),
-			'name'  => $tag->getName(),
-			'owner' => $tag->getOwner(),
-			'type'  => $tag->getType()
-		);
-	}
+    /**
+     * Tags
+     *
+     * @var array
+     */
+    private $tags = array();
+
+    /**
+     * Used for storing objectid/categoryname pairs while rescanning.
+     *
+     * @var array
+     */
+    private static $relations = array();
+
+    /**
+     * Type
+     *
+     * @var string
+     */
+    private $type;
+
+    /**
+     * User
+     *
+     * @var string
+     */
+    private $user;
+
+    /**
+     * Are we including tags for shared items?
+     *
+     * @var bool
+     */
+    private $includeShared = false;
+
+    /**
+     * The current user, plus any owners of the items shared with the current
+     * user, if $this->includeShared === true.
+     *
+     * @var array
+     */
+    private $owners = array();
+
+    /**
+     * The Mapper we're using to communicate our Tag objects to the database.
+     *
+     * @var TagMapper
+     */
+    private $mapper;
+
+    /**
+     * The sharing backend for objects of $this->type. Required if
+     * $this->includeShared === true to determine ownership of items.
+     *
+     * @var \OCP\Share_Backend
+     */
+    private $backend;
+
+    const TAG_TABLE = '*PREFIX*vcategory';
+    const RELATION_TABLE = '*PREFIX*vcategory_to_object';
+
+    const TAG_FAVORITE = '_$!<Favorite>!$_';
+
+    /**
+     * Constructor.
+     *
+     * @param TagMapper $mapper Instance of the TagMapper abstraction layer.
+     * @param string $user The user whose data the object will operate on.
+     * @param string $type The type of items for which tags will be loaded.
+     * @param array $defaultTags Tags that should be created at construction.
+     * @param boolean $includeShared Whether to include tags for items shared with this user by others.
+     */
+    public function __construct(TagMapper $mapper, $user, $type, $defaultTags = array(), $includeShared = false) {
+        $this->mapper = $mapper;
+        $this->user = $user;
+        $this->type = $type;
+        $this->includeShared = $includeShared;
+        $this->owners = array($this->user);
+        if ($this->includeShared) {
+            $this->owners = array_merge($this->owners, \OC\Share\Share::getSharedItemsOwners($this->user, $this->type, true));
+            $this->backend = \OC\Share\Share::getBackend($this->type);
+        }
+        $this->tags = $this->mapper->loadTags($this->owners, $this->type);
+
+        if(count($defaultTags) > 0 && count($this->tags) === 0) {
+            $this->addMultiple($defaultTags, true);
+        }
+    }
+
+    /**
+     * Check if any tags are saved for this type and user.
+     *
+     * @return boolean.
+     */
+    public function isEmpty() {
+        return count($this->tags) === 0;
+    }
+
+    /**
+     * Returns an array mapping a given tag's properties to its values:
+     * ['id' => 0, 'name' = 'Tag', 'owner' = 'User', 'type' => 'tagtype']
+     *
+     * @param string $id The ID of the tag that is going to be mapped
+     * @return array|false
+     */
+    public function getTag($id) {
+        $key = $this->getTagById($id);
+        if ($key !== false) {
+            return $this->tagMap($this->tags[$key]);
+        }
+        return false;
+    }
+
+    /**
+     * Get the tags for a specific user.
+     *
+     * This returns an array with maps containing each tag's properties:
+     * [
+     * 	['id' => 0, 'name' = 'First tag', 'owner' = 'User', 'type' => 'tagtype'],
+     * 	['id' => 1, 'name' = 'Shared tag', 'owner' = 'Other user', 'type' => 'tagtype'],
+     * ]
+     *
+     * @return array
+     */
+    public function getTags() {
+        if(!count($this->tags)) {
+            return array();
+        }
+
+        usort($this->tags, function($a, $b) {
+            return strnatcasecmp($a->getName(), $b->getName());
+        });
+        $tagMap = array();
+
+        foreach($this->tags as $tag) {
+            if($tag->getName() !== self::TAG_FAVORITE) {
+                $tagMap[] = $this->tagMap($tag);
+            }
+        }
+        return $tagMap;
+
+    }
+
+    /**
+     * Return only the tags owned by the given user, omitting any tags shared
+     * by other users.
+     *
+     * @param string $user The user whose tags are to be checked.
+     * @return array An array of Tag objects.
+     */
+    public function getTagsForUser($user) {
+        return array_filter($this->tags,
+            function($tag) use($user) {
+                return $tag->getOwner() === $user;
+            }
+        );
+    }
+
+    /**
+     * Get the list of tags for the given ids.
+     *
+     * @param array $objIds array of object ids
+     * @return array|boolean of tags id as key to array of tag names
+     * or false if an error occurred
+     */
+    public function getTagsForObjects(array $objIds) {
+        $entries = array();
+
+        try {
+            $conn = \OC::$server->getDatabaseConnection();
+            $chunks = array_chunk($objIds, 900, false);
+            foreach ($chunks as $chunk) {
+                $result = $conn->executeQuery(
+                    'SELECT `category`, `categoryid`, `objid` ' .
+                    'FROM `' . self::RELATION_TABLE . '` r, `' . self::TAG_TABLE . '` ' .
+                    'WHERE `categoryid` = `id` AND `uid` = ? AND r.`type` = ? AND `objid` IN (?)',
+                    array($this->user, $this->type, $chunk),
+                    array(null, null, IQueryBuilder::PARAM_INT_ARRAY)
+                );
+                while ($row = $result->fetch()) {
+                    $objId = (int)$row['objid'];
+                    if (!isset($entries[$objId])) {
+                        $entries[$objId] = array();
+                    }
+                    $entries[$objId][] = $row['category'];
+                }
+                if (\OCP\DB::isError($result)) {
+                    \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage(), \OCP\Util::ERROR);
+                    return false;
+                }
+            }
+        } catch(\Exception $e) {
+            \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+                \OCP\Util::ERROR);
+            return false;
+        }
+
+        return $entries;
+    }
+
+    /**
+     * Get the a list if items tagged with $tag.
+     *
+     * Throws an exception if the tag could not be found.
+     *
+     * @param string $tag Tag id or name.
+     * @return array|false An array of object ids or false on error.
+     * @throws \Exception
+     */
+    public function getIdsForTag($tag) {
+        $result = null;
+        $tagId = false;
+        if(is_numeric($tag)) {
+            $tagId = $tag;
+        } elseif(is_string($tag)) {
+            $tag = trim($tag);
+            if($tag === '') {
+                \OCP\Util::writeLog('core', __METHOD__.', Cannot use empty tag names', \OCP\Util::DEBUG);
+                return false;
+            }
+            $tagId = $this->getTagId($tag);
+        }
+
+        if($tagId === false) {
+            $l10n = \OC::$server->getL10N('core');
+            throw new \Exception(
+                $l10n->t('Could not find category "%s"', $tag)
+            );
+        }
+
+        $ids = array();
+        $sql = 'SELECT `objid` FROM `' . self::RELATION_TABLE
+            . '` WHERE `categoryid` = ?';
+
+        try {
+            $stmt = \OCP\DB::prepare($sql);
+            $result = $stmt->execute(array($tagId));
+            if (\OCP\DB::isError($result)) {
+                \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage(), \OCP\Util::ERROR);
+                return false;
+            }
+        } catch(\Exception $e) {
+            \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+                \OCP\Util::ERROR);
+            return false;
+        }
+
+        if(!is_null($result)) {
+            while( $row = $result->fetchRow()) {
+                $id = (int)$row['objid'];
+
+                if ($this->includeShared) {
+                    // We have to check if we are really allowed to access the
+                    // items that are tagged with $tag. To that end, we ask the
+                    // corresponding sharing backend if the item identified by $id
+                    // is owned by any of $this->owners.
+                    foreach ($this->owners as $owner) {
+                        if ($this->backend->isValidSource($id, $owner)) {
+                            $ids[] = $id;
+                            break;
+                        }
+                    }
+                } else {
+                    $ids[] = $id;
+                }
+            }
+        }
+
+        return $ids;
+    }
+
+    /**
+     * Checks whether a tag is saved for the given user,
+     * disregarding the ones shared with him or her.
+     *
+     * @param string $name The tag name to check for.
+     * @param string $user The user whose tags are to be checked.
+     * @return bool
+     */
+    public function userHasTag($name, $user) {
+        $key = $this->array_searchi($name, $this->getTagsForUser($user));
+        return ($key !== false) ? $this->tags[$key]->getId() : false;
+    }
+
+    /**
+     * Checks whether a tag is saved for or shared with the current user.
+     *
+     * @param string $name The tag name to check for.
+     * @return bool
+     */
+    public function hasTag($name) {
+        return $this->getTagId($name) !== false;
+    }
+
+    /**
+     * Add a new tag.
+     *
+     * @param string $name A string with a name of the tag
+     * @return false|int the id of the added tag or false on error.
+     */
+    public function add($name) {
+        $name = trim($name);
+
+        if($name === '') {
+            \OCP\Util::writeLog('core', __METHOD__.', Cannot add an empty tag', \OCP\Util::DEBUG);
+            return false;
+        }
+        if($this->userHasTag($name, $this->user)) {
+            \OCP\Util::writeLog('core', __METHOD__.', name: ' . $name. ' exists already', \OCP\Util::DEBUG);
+            return false;
+        }
+        try {
+            $tag = new Tag($this->user, $this->type, $name);
+            $tag = $this->mapper->insert($tag);
+            $this->tags[] = $tag;
+        } catch(\Exception $e) {
+            \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+                \OCP\Util::ERROR);
+            return false;
+        }
+        \OCP\Util::writeLog('core', __METHOD__.', id: ' . $tag->getId(), \OCP\Util::DEBUG);
+        return $tag->getId();
+    }
+
+    /**
+     * Rename tag.
+     *
+     * @param string|integer $from The name or ID of the existing tag
+     * @param string $to The new name of the tag.
+     * @return bool
+     */
+    public function rename($from, $to) {
+        $from = trim($from);
+        $to = trim($to);
+
+        if($to === '' || $from === '') {
+            \OCP\Util::writeLog('core', __METHOD__.', Cannot use empty tag names', \OCP\Util::DEBUG);
+            return false;
+        }
+
+        if (is_numeric($from)) {
+            $key = $this->getTagById($from);
+        } else {
+            $key = $this->getTagByName($from);
+        }
+        if($key === false) {
+            \OCP\Util::writeLog('core', __METHOD__.', tag: ' . $from. ' does not exist', \OCP\Util::DEBUG);
+            return false;
+        }
+        $tag = $this->tags[$key];
+
+        if($this->userHasTag($to, $tag->getOwner())) {
+            \OCP\Util::writeLog('core', __METHOD__.', A tag named ' . $to. ' already exists for user ' . $tag->getOwner() . '.', \OCP\Util::DEBUG);
+            return false;
+        }
+
+        try {
+            $tag->setName($to);
+            $this->tags[$key] = $this->mapper->update($tag);
+        } catch(\Exception $e) {
+            \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+                \OCP\Util::ERROR);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Add a list of new tags.
+     *
+     * @param string[] $names A string with a name or an array of strings containing
+     * the name(s) of the tag(s) to add.
+     * @param bool $sync When true, save the tags
+     * @param int|null $id int Optional object id to add to this|these tag(s)
+     * @return bool Returns false on error.
+     */
+    public function addMultiple($names, $sync=false, $id = null) {
+        if(!is_array($names)) {
+            $names = array($names);
+        }
+        $names = array_map('trim', $names);
+        array_filter($names);
+
+        $newones = array();
+        foreach($names as $name) {
+            if(!$this->hasTag($name) && $name !== '') {
+                $newones[] = new Tag($this->user, $this->type, $name);
+            }
+            if(!is_null($id) ) {
+                // Insert $objectid, $categoryid  pairs if not exist.
+                self::$relations[] = array('objid' => $id, 'tag' => $name);
+            }
+        }
+        $this->tags = array_merge($this->tags, $newones);
+        if($sync === true) {
+            $this->save();
+        }
+
+        return true;
+    }
+
+    /**
+     * Save the list of tags and their object relations
+     */
+    protected function save() {
+        if(is_array($this->tags)) {
+            foreach($this->tags as $tag) {
+                try {
+                    if (!$this->mapper->tagExists($tag)) {
+                        $this->mapper->insert($tag);
+                    }
+                } catch(\Exception $e) {
+                    \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+                        \OCP\Util::ERROR);
+                }
+            }
+
+            // reload tags to get the proper ids.
+            $this->tags = $this->mapper->loadTags($this->owners, $this->type);
+            \OCP\Util::writeLog('core', __METHOD__.', tags: ' . print_r($this->tags, true),
+                \OCP\Util::DEBUG);
+            // Loop through temporarily cached objectid/tagname pairs
+            // and save relations.
+            $tags = $this->tags;
+            // For some reason this is needed or array_search(i) will return 0..?
+            ksort($tags);
+            foreach(self::$relations as $relation) {
+                $tagId = $this->getTagId($relation['tag']);
+                \OCP\Util::writeLog('core', __METHOD__ . 'catid, ' . $relation['tag'] . ' ' . $tagId, \OCP\Util::DEBUG);
+                if($tagId) {
+                    try {
+                        \OCP\DB::insertIfNotExist(self::RELATION_TABLE,
+                            array(
+                                'objid' => $relation['objid'],
+                                'categoryid' => $tagId,
+                                'type' => $this->type,
+                                ));
+                    } catch(\Exception $e) {
+                        \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+                            \OCP\Util::ERROR);
+                    }
+                }
+            }
+            self::$relations = array(); // reset
+        } else {
+            \OCP\Util::writeLog('core', __METHOD__.', $this->tags is not an array! '
+                . print_r($this->tags, true), \OCP\Util::ERROR);
+        }
+    }
+
+    /**
+     * Delete tags and tag/object relations for a user.
+     *
+     * For hooking up on post_deleteUser
+     *
+     * @param array $arguments
+     */
+    public static function post_deleteUser($arguments) {
+        // Find all objectid/tagId pairs.
+        $result = null;
+        try {
+            $stmt = \OCP\DB::prepare('SELECT `id` FROM `' . self::TAG_TABLE . '` '
+                . 'WHERE `uid` = ?');
+            $result = $stmt->execute(array($arguments['uid']));
+            if (\OCP\DB::isError($result)) {
+                \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage(), \OCP\Util::ERROR);
+            }
+        } catch(\Exception $e) {
+            \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+                \OCP\Util::ERROR);
+        }
+
+        if(!is_null($result)) {
+            try {
+                $stmt = \OCP\DB::prepare('DELETE FROM `' . self::RELATION_TABLE . '` '
+                    . 'WHERE `categoryid` = ?');
+                while( $row = $result->fetchRow()) {
+                    try {
+                        $stmt->execute(array($row['id']));
+                    } catch(\Exception $e) {
+                        \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+                            \OCP\Util::ERROR);
+                    }
+                }
+            } catch(\Exception $e) {
+                \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+                    \OCP\Util::ERROR);
+            }
+        }
+        try {
+            $stmt = \OCP\DB::prepare('DELETE FROM `' . self::TAG_TABLE . '` '
+                . 'WHERE `uid` = ?');
+            $result = $stmt->execute(array($arguments['uid']));
+            if (\OCP\DB::isError($result)) {
+                \OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage(), \OCP\Util::ERROR);
+            }
+        } catch(\Exception $e) {
+            \OCP\Util::writeLog('core', __METHOD__ . ', exception: '
+                . $e->getMessage(), \OCP\Util::ERROR);
+        }
+    }
+
+    /**
+     * Delete tag/object relations from the db
+     *
+     * @param array $ids The ids of the objects
+     * @return boolean Returns false on error.
+     */
+    public function purgeObjects(array $ids) {
+        if(count($ids) === 0) {
+            // job done ;)
+            return true;
+        }
+        $updates = $ids;
+        try {
+            $query = 'DELETE FROM `' . self::RELATION_TABLE . '` ';
+            $query .= 'WHERE `objid` IN (' . str_repeat('?,', count($ids)-1) . '?) ';
+            $query .= 'AND `type`= ?';
+            $updates[] = $this->type;
+            $stmt = \OCP\DB::prepare($query);
+            $result = $stmt->execute($updates);
+            if (\OCP\DB::isError($result)) {
+                \OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage(), \OCP\Util::ERROR);
+                return false;
+            }
+        } catch(\Exception $e) {
+            \OCP\Util::writeLog('core', __METHOD__.', exception: ' . $e->getMessage(),
+                \OCP\Util::ERROR);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Get favorites for an object type
+     *
+     * @return array|false An array of object ids.
+     */
+    public function getFavorites() {
+        try {
+            return $this->getIdsForTag(self::TAG_FAVORITE);
+        } catch(\Exception $e) {
+            \OCP\Util::writeLog('core', __METHOD__.', exception: ' . $e->getMessage(),
+                \OCP\Util::DEBUG);
+            return array();
+        }
+    }
+
+    /**
+     * Add an object to favorites
+     *
+     * @param int $objid The id of the object
+     * @return boolean
+     */
+    public function addToFavorites($objid) {
+        if(!$this->userHasTag(self::TAG_FAVORITE, $this->user)) {
+            $this->add(self::TAG_FAVORITE);
+        }
+        return $this->tagAs($objid, self::TAG_FAVORITE);
+    }
+
+    /**
+     * Remove an object from favorites
+     *
+     * @param int $objid The id of the object
+     * @return boolean
+     */
+    public function removeFromFavorites($objid) {
+        return $this->unTag($objid, self::TAG_FAVORITE);
+    }
+
+    /**
+     * Creates a tag/object relation.
+     *
+     * @param int $objid The id of the object
+     * @param string $tag The id or name of the tag
+     * @return boolean Returns false on error.
+     */
+    public function tagAs($objid, $tag) {
+        if(is_string($tag) && !is_numeric($tag)) {
+            $tag = trim($tag);
+            if($tag === '') {
+                \OCP\Util::writeLog('core', __METHOD__.', Cannot add an empty tag', \OCP\Util::DEBUG);
+                return false;
+            }
+            if(!$this->hasTag($tag)) {
+                $this->add($tag);
+            }
+            $tagId =  $this->getTagId($tag);
+        } else {
+            $tagId = $tag;
+        }
+        try {
+            \OCP\DB::insertIfNotExist(self::RELATION_TABLE,
+                array(
+                    'objid' => $objid,
+                    'categoryid' => $tagId,
+                    'type' => $this->type,
+                ));
+        } catch(\Exception $e) {
+            \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+                \OCP\Util::ERROR);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Delete single tag/object relation from the db
+     *
+     * @param int $objid The id of the object
+     * @param string $tag The id or name of the tag
+     * @return boolean
+     */
+    public function unTag($objid, $tag) {
+        if(is_string($tag) && !is_numeric($tag)) {
+            $tag = trim($tag);
+            if($tag === '') {
+                \OCP\Util::writeLog('core', __METHOD__.', Tag name is empty', \OCP\Util::DEBUG);
+                return false;
+            }
+            $tagId =  $this->getTagId($tag);
+        } else {
+            $tagId = $tag;
+        }
+
+        try {
+            $sql = 'DELETE FROM `' . self::RELATION_TABLE . '` '
+                    . 'WHERE `objid` = ? AND `categoryid` = ? AND `type` = ?';
+            $stmt = \OCP\DB::prepare($sql);
+            $stmt->execute(array($objid, $tagId, $this->type));
+        } catch(\Exception $e) {
+            \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+                \OCP\Util::ERROR);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Delete tags from the database.
+     *
+     * @param string[]|integer[] $names An array of tags (names or IDs) to delete
+     * @return bool Returns false on error
+     */
+    public function delete($names) {
+        if(!is_array($names)) {
+            $names = array($names);
+        }
+
+        $names = array_map('trim', $names);
+        array_filter($names);
+
+        \OCP\Util::writeLog('core', __METHOD__ . ', before: '
+            . print_r($this->tags, true), \OCP\Util::DEBUG);
+        foreach($names as $name) {
+            $id = null;
+
+            if (is_numeric($name)) {
+                $key = $this->getTagById($name);
+            } else {
+                $key = $this->getTagByName($name);
+            }
+            if ($key !== false) {
+                $tag = $this->tags[$key];
+                $id = $tag->getId();
+                unset($this->tags[$key]);
+                $this->mapper->delete($tag);
+            } else {
+                \OCP\Util::writeLog('core', __METHOD__ . 'Cannot delete tag ' . $name
+                    . ': not found.', \OCP\Util::ERROR);
+            }
+            if(!is_null($id) && $id !== false) {
+                try {
+                    $sql = 'DELETE FROM `' . self::RELATION_TABLE . '` '
+                            . 'WHERE `categoryid` = ?';
+                    $stmt = \OCP\DB::prepare($sql);
+                    $result = $stmt->execute(array($id));
+                    if (\OCP\DB::isError($result)) {
+                        \OCP\Util::writeLog('core',
+                            __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage(),
+                            \OCP\Util::ERROR);
+                        return false;
+                    }
+                } catch(\Exception $e) {
+                    \OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
+                        \OCP\Util::ERROR);
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    // case-insensitive array_search
+    protected function array_searchi($needle, $haystack, $mem='getName') {
+        if(!is_array($haystack)) {
+            return false;
+        }
+        return array_search(strtolower($needle), array_map(
+            function($tag) use($mem) {
+                return strtolower(call_user_func(array($tag, $mem)));
+            }, $haystack)
+        );
+    }
+
+    /**
+     * Get a tag's ID.
+     *
+     * @param string $name The tag name to look for.
+     * @return string|bool The tag's id or false if no matching tag is found.
+     */
+    private function getTagId($name) {
+        $key = $this->array_searchi($name, $this->tags);
+        if ($key !== false) {
+            return $this->tags[$key]->getId();
+        }
+        return false;
+    }
+
+    /**
+     * Get a tag by its name.
+     *
+     * @param string $name The tag name.
+     * @return integer|bool The tag object's offset within the $this->tags
+     *                      array or false if it doesn't exist.
+     */
+    private function getTagByName($name) {
+        return $this->array_searchi($name, $this->tags, 'getName');
+    }
+
+    /**
+     * Get a tag by its ID.
+     *
+     * @param string $id The tag ID to look for.
+     * @return integer|bool The tag object's offset within the $this->tags
+     *                      array or false if it doesn't exist.
+     */
+    private function getTagById($id) {
+        return $this->array_searchi($id, $this->tags, 'getId');
+    }
+
+    /**
+     * Returns an array mapping a given tag's properties to its values:
+     * ['id' => 0, 'name' = 'Tag', 'owner' = 'User', 'type' => 'tagtype']
+     *
+     * @param Tag $tag The tag that is going to be mapped
+     * @return array
+     */
+    private function tagMap(Tag $tag) {
+        return array(
+            'id'    => $tag->getId(),
+            'name'  => $tag->getName(),
+            'owner' => $tag->getOwner(),
+            'type'  => $tag->getType()
+        );
+    }
 }

lib/private/SubAdmin.php

Indentation +247 added lines, -247 removed lines

@@ -36,253 +36,253 @@
 
 class SubAdmin extends PublicEmitter {
 
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var IDBConnection */
-	private $dbConn;
-
-	/**
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param IDBConnection $dbConn
-	 */
-	public function __construct(IUserManager $userManager,
-	                            IGroupManager $groupManager,
-								IDBConnection $dbConn) {
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->dbConn = $dbConn;
-
-		$this->userManager->listen('\OC\User', 'postDelete', function($user) {
-			$this->post_deleteUser($user);
-		});
-		$this->groupManager->listen('\OC\Group', 'postDelete', function($group) {
-			$this->post_deleteGroup($group);	
-		});
-	}
-
-	/**
-	 * add a SubAdmin
-	 * @param IUser $user user to be SubAdmin
-	 * @param IGroup $group group $user becomes subadmin of
-	 * @return bool
-	 */
-	public function createSubAdmin(IUser $user, IGroup $group) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->insert('group_admin')
-			->values([
-				'gid' => $qb->createNamedParameter($group->getGID()),
-				'uid' => $qb->createNamedParameter($user->getUID())
-			])
-			->execute();
-
-		$this->emit('\OC\SubAdmin', 'postCreateSubAdmin', [$user, $group]);
-		\OC_Hook::emit("OC_SubAdmin", "post_createSubAdmin", ["gid" => $group->getGID()]);
-		return true;
-	}
-
-	/**
-	 * delete a SubAdmin
-	 * @param IUser $user the user that is the SubAdmin
-	 * @param IGroup $group the group
-	 * @return bool
-	 */
-	public function deleteSubAdmin(IUser $user, IGroup $group) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->delete('group_admin')
-			->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
-			->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
-			->execute();
-
-		$this->emit('\OC\SubAdmin', 'postDeleteSubAdmin', [$user, $group]);
-		\OC_Hook::emit("OC_SubAdmin", "post_deleteSubAdmin", ["gid" => $group->getGID()]);
-		return true;
-	}
-
-	/**
-	 * get groups of a SubAdmin
-	 * @param IUser $user the SubAdmin
-	 * @return IGroup[]
-	 */
-	public function getSubAdminsGroups(IUser $user) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$result = $qb->select('gid')
-			->from('group_admin')
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
-			->execute();
-
-		$groups = [];
-		while($row = $result->fetch()) {
-			$group = $this->groupManager->get($row['gid']);
-			if(!is_null($group)) {
-				$groups[] = $group;
-			}
-		}
-		$result->closeCursor();
-
-		return $groups;
-	}
-
-	/**
-	 * get SubAdmins of a group
-	 * @param IGroup $group the group
-	 * @return IUser[]
-	 */
-	public function getGroupsSubAdmins(IGroup $group) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$result = $qb->select('uid')
-			->from('group_admin')
-			->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
-			->execute();
-
-		$users = [];
-		while($row = $result->fetch()) {
-			$user = $this->userManager->get($row['uid']);
-			if(!is_null($user)) {
-				$users[] = $user;
-			}
-		}
-		$result->closeCursor();
-
-		return $users;
-	}
-
-	/**
-	 * get all SubAdmins
-	 * @return array
-	 */
-	public function getAllSubAdmins() {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$result = $qb->select('*')
-			->from('group_admin')
-			->execute();
-
-		$subadmins = [];
-		while($row = $result->fetch()) {
-			$user = $this->userManager->get($row['uid']);
-			$group = $this->groupManager->get($row['gid']);
-			if(!is_null($user) && !is_null($group)) {
-				$subadmins[] = [
-					'user'  => $user,
-					'group' => $group
-				];
-			}
-		}
-		$result->closeCursor();
-
-		return $subadmins;
-	}
-
-	/**
-	 * checks if a user is a SubAdmin of a group
-	 * @param IUser $user 
-	 * @param IGroup $group
-	 * @return bool
-	 */
-	public function isSubAdminOfGroup(IUser $user, IGroup $group) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		/*
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /** @var IDBConnection */
+    private $dbConn;
+
+    /**
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param IDBConnection $dbConn
+     */
+    public function __construct(IUserManager $userManager,
+                                IGroupManager $groupManager,
+                                IDBConnection $dbConn) {
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->dbConn = $dbConn;
+
+        $this->userManager->listen('\OC\User', 'postDelete', function($user) {
+            $this->post_deleteUser($user);
+        });
+        $this->groupManager->listen('\OC\Group', 'postDelete', function($group) {
+            $this->post_deleteGroup($group);	
+        });
+    }
+
+    /**
+     * add a SubAdmin
+     * @param IUser $user user to be SubAdmin
+     * @param IGroup $group group $user becomes subadmin of
+     * @return bool
+     */
+    public function createSubAdmin(IUser $user, IGroup $group) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->insert('group_admin')
+            ->values([
+                'gid' => $qb->createNamedParameter($group->getGID()),
+                'uid' => $qb->createNamedParameter($user->getUID())
+            ])
+            ->execute();
+
+        $this->emit('\OC\SubAdmin', 'postCreateSubAdmin', [$user, $group]);
+        \OC_Hook::emit("OC_SubAdmin", "post_createSubAdmin", ["gid" => $group->getGID()]);
+        return true;
+    }
+
+    /**
+     * delete a SubAdmin
+     * @param IUser $user the user that is the SubAdmin
+     * @param IGroup $group the group
+     * @return bool
+     */
+    public function deleteSubAdmin(IUser $user, IGroup $group) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->delete('group_admin')
+            ->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
+            ->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
+            ->execute();
+
+        $this->emit('\OC\SubAdmin', 'postDeleteSubAdmin', [$user, $group]);
+        \OC_Hook::emit("OC_SubAdmin", "post_deleteSubAdmin", ["gid" => $group->getGID()]);
+        return true;
+    }
+
+    /**
+     * get groups of a SubAdmin
+     * @param IUser $user the SubAdmin
+     * @return IGroup[]
+     */
+    public function getSubAdminsGroups(IUser $user) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $result = $qb->select('gid')
+            ->from('group_admin')
+            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
+            ->execute();
+
+        $groups = [];
+        while($row = $result->fetch()) {
+            $group = $this->groupManager->get($row['gid']);
+            if(!is_null($group)) {
+                $groups[] = $group;
+            }
+        }
+        $result->closeCursor();
+
+        return $groups;
+    }
+
+    /**
+     * get SubAdmins of a group
+     * @param IGroup $group the group
+     * @return IUser[]
+     */
+    public function getGroupsSubAdmins(IGroup $group) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $result = $qb->select('uid')
+            ->from('group_admin')
+            ->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
+            ->execute();
+
+        $users = [];
+        while($row = $result->fetch()) {
+            $user = $this->userManager->get($row['uid']);
+            if(!is_null($user)) {
+                $users[] = $user;
+            }
+        }
+        $result->closeCursor();
+
+        return $users;
+    }
+
+    /**
+     * get all SubAdmins
+     * @return array
+     */
+    public function getAllSubAdmins() {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $result = $qb->select('*')
+            ->from('group_admin')
+            ->execute();
+
+        $subadmins = [];
+        while($row = $result->fetch()) {
+            $user = $this->userManager->get($row['uid']);
+            $group = $this->groupManager->get($row['gid']);
+            if(!is_null($user) && !is_null($group)) {
+                $subadmins[] = [
+                    'user'  => $user,
+                    'group' => $group
+                ];
+            }
+        }
+        $result->closeCursor();
+
+        return $subadmins;
+    }
+
+    /**
+     * checks if a user is a SubAdmin of a group
+     * @param IUser $user 
+     * @param IGroup $group
+     * @return bool
+     */
+    public function isSubAdminOfGroup(IUser $user, IGroup $group) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        /*
 		 * Primary key is ('gid', 'uid') so max 1 result possible here
 		 */
-		$result = $qb->select('*')
-			->from('group_admin')
-			->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
-			->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
-			->execute();
-
-		$fetch =  $result->fetch();
-		$result->closeCursor();
-		$result = !empty($fetch) ? true : false;
-
-		return $result;
-	}
-
-	/**
-	 * checks if a user is a SubAdmin
-	 * @param IUser $user 
-	 * @return bool
-	 */
-	public function isSubAdmin(IUser $user) {
-		// Check if the user is already an admin
-		if ($this->groupManager->isAdmin($user->getUID())) {
-			return true;
-		}
-
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$result = $qb->select('gid')
-			->from('group_admin')
-			->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
-			->setMaxResults(1)
-			->execute();
-
-		$isSubAdmin = $result->fetch();
-		$result->closeCursor();
-
-		$result = $isSubAdmin === false ? false : true;
-
-		return $result;
-	}
-
-	/**
-	 * checks if a user is a accessible by a subadmin
-	 * @param IUser $subadmin
-	 * @param IUser $user
-	 * @return bool
-	 */
-	public function isUserAccessible($subadmin, $user) {
-		if(!$this->isSubAdmin($subadmin)) {
-			return false;
-		}
-		if($this->groupManager->isAdmin($user->getUID())) {
-			return false;
-		}
-		$accessibleGroups = $this->getSubAdminsGroups($subadmin);
-		foreach($accessibleGroups as $accessibleGroup) {
-			if($accessibleGroup->inGroup($user)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * delete all SubAdmins by $user
-	 * @param IUser $user
-	 * @return boolean
-	 */
-	private function post_deleteUser($user) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->delete('group_admin')
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
-			->execute();
-
-		return true;
-	}
-
-	/**
-	 * delete all SubAdmins by $group
-	 * @param IGroup $group
-	 * @return boolean
-	 */
-	private function post_deleteGroup($group) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->delete('group_admin')
-			->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
-			->execute();
-
-		return true;
-	}
+        $result = $qb->select('*')
+            ->from('group_admin')
+            ->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
+            ->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
+            ->execute();
+
+        $fetch =  $result->fetch();
+        $result->closeCursor();
+        $result = !empty($fetch) ? true : false;
+
+        return $result;
+    }
+
+    /**
+     * checks if a user is a SubAdmin
+     * @param IUser $user 
+     * @return bool
+     */
+    public function isSubAdmin(IUser $user) {
+        // Check if the user is already an admin
+        if ($this->groupManager->isAdmin($user->getUID())) {
+            return true;
+        }
+
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $result = $qb->select('gid')
+            ->from('group_admin')
+            ->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
+            ->setMaxResults(1)
+            ->execute();
+
+        $isSubAdmin = $result->fetch();
+        $result->closeCursor();
+
+        $result = $isSubAdmin === false ? false : true;
+
+        return $result;
+    }
+
+    /**
+     * checks if a user is a accessible by a subadmin
+     * @param IUser $subadmin
+     * @param IUser $user
+     * @return bool
+     */
+    public function isUserAccessible($subadmin, $user) {
+        if(!$this->isSubAdmin($subadmin)) {
+            return false;
+        }
+        if($this->groupManager->isAdmin($user->getUID())) {
+            return false;
+        }
+        $accessibleGroups = $this->getSubAdminsGroups($subadmin);
+        foreach($accessibleGroups as $accessibleGroup) {
+            if($accessibleGroup->inGroup($user)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * delete all SubAdmins by $user
+     * @param IUser $user
+     * @return boolean
+     */
+    private function post_deleteUser($user) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->delete('group_admin')
+            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
+            ->execute();
+
+        return true;
+    }
+
+    /**
+     * delete all SubAdmins by $group
+     * @param IGroup $group
+     * @return boolean
+     */
+    private function post_deleteGroup($group) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->delete('group_admin')
+            ->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
+            ->execute();
+
+        return true;
+    }
 }

lib/private/Activity/Event.php

Indentation +515 added lines, -515 removed lines

@@ -30,523 +30,523 @@
 
 class Event implements IEvent {
 
-	/** @var string */
-	protected $app = '';
-	/** @var string */
-	protected $type = '';
-	/** @var string */
-	protected $affectedUser = '';
-	/** @var string */
-	protected $author = '';
-	/** @var int */
-	protected $timestamp = 0;
-	/** @var string */
-	protected $subject = '';
-	/** @var array */
-	protected $subjectParameters = [];
-	/** @var string */
-	protected $subjectParsed;
-	/** @var string */
-	protected $subjectRich;
-	/** @var array */
-	protected $subjectRichParameters;
-	/** @var string */
-	protected $message = '';
-	/** @var array */
-	protected $messageParameters = [];
-	/** @var string */
-	protected $messageParsed;
-	/** @var string */
-	protected $messageRich;
-	/** @var array */
-	protected $messageRichParameters;
-	/** @var string */
-	protected $objectType = '';
-	/** @var int */
-	protected $objectId = 0;
-	/** @var string */
-	protected $objectName = '';
-	/** @var string */
-	protected $link = '';
-	/** @var string */
-	protected $icon = '';
-
-	/** @var IEvent */
-	protected $child = null;
-	/** @var IValidator */
-	protected $richValidator;
-
-	/**
-	 * @param IValidator $richValidator
-	 */
-	public function __construct(IValidator $richValidator) {
-		$this->richValidator = $richValidator;
-	}
-
-	/**
-	 * Set the app of the activity
-	 *
-	 * @param string $app
-	 * @return IEvent
-	 * @throws \InvalidArgumentException if the app id is invalid
-	 * @since 8.2.0
-	 */
-	public function setApp($app) {
-		if (!is_string($app) || $app === '' || isset($app[32])) {
-			throw new \InvalidArgumentException('The given app is invalid');
-		}
-		$this->app = (string) $app;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getApp() {
-		return $this->app;
-	}
-
-	/**
-	 * Set the type of the activity
-	 *
-	 * @param string $type
-	 * @return IEvent
-	 * @throws \InvalidArgumentException if the type is invalid
-	 * @since 8.2.0
-	 */
-	public function setType($type) {
-		if (!is_string($type) || $type === '' || isset($type[255])) {
-			throw new \InvalidArgumentException('The given type is invalid');
-		}
-		$this->type = (string) $type;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getType() {
-		return $this->type;
-	}
-
-	/**
-	 * Set the affected user of the activity
-	 *
-	 * @param string $affectedUser
-	 * @return IEvent
-	 * @throws \InvalidArgumentException if the affected user is invalid
-	 * @since 8.2.0
-	 */
-	public function setAffectedUser($affectedUser) {
-		if (!is_string($affectedUser) || $affectedUser === '' || isset($affectedUser[64])) {
-			throw new \InvalidArgumentException('The given affected user is invalid');
-		}
-		$this->affectedUser = (string) $affectedUser;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getAffectedUser() {
-		return $this->affectedUser;
-	}
-
-	/**
-	 * Set the author of the activity
-	 *
-	 * @param string $author
-	 * @return IEvent
-	 * @throws \InvalidArgumentException if the author is invalid
-	 * @since 8.2.0
-	 */
-	public function setAuthor($author) {
-		if (!is_string($author) || isset($author[64])) {
-			throw new \InvalidArgumentException('The given author user is invalid'. serialize($author));
-		}
-		$this->author = (string) $author;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getAuthor() {
-		return $this->author;
-	}
-
-	/**
-	 * Set the timestamp of the activity
-	 *
-	 * @param int $timestamp
-	 * @return IEvent
-	 * @throws \InvalidArgumentException if the timestamp is invalid
-	 * @since 8.2.0
-	 */
-	public function setTimestamp($timestamp) {
-		if (!is_int($timestamp)) {
-			throw new \InvalidArgumentException('The given timestamp is invalid');
-		}
-		$this->timestamp = (int) $timestamp;
-		return $this;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getTimestamp() {
-		return $this->timestamp;
-	}
-
-	/**
-	 * Set the subject of the activity
-	 *
-	 * @param string $subject
-	 * @param array $parameters
-	 * @return IEvent
-	 * @throws \InvalidArgumentException if the subject or parameters are invalid
-	 * @since 8.2.0
-	 */
-	public function setSubject($subject, array $parameters = []) {
-		if (!is_string($subject) || isset($subject[255])) {
-			throw new \InvalidArgumentException('The given subject is invalid');
-		}
-		$this->subject = (string) $subject;
-		$this->subjectParameters = $parameters;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getSubject() {
-		return $this->subject;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getSubjectParameters() {
-		return $this->subjectParameters;
-	}
-
-	/**
-	 * @param string $subject
-	 * @return $this
-	 * @throws \InvalidArgumentException if the subject is invalid
-	 * @since 11.0.0
-	 */
-	public function setParsedSubject($subject) {
-		if (!is_string($subject) || $subject === '') {
-			throw new \InvalidArgumentException('The given parsed subject is invalid');
-		}
-		$this->subjectParsed = $subject;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 11.0.0
-	 */
-	public function getParsedSubject() {
-		return $this->subjectParsed;
-	}
-
-	/**
-	 * @param string $subject
-	 * @param array $parameters
-	 * @return $this
-	 * @throws \InvalidArgumentException if the subject or parameters are invalid
-	 * @since 11.0.0
-	 */
-	public function setRichSubject($subject, array $parameters = []) {
-		if (!is_string($subject) || $subject === '') {
-			throw new \InvalidArgumentException('The given parsed subject is invalid');
-		}
-		$this->subjectRich = $subject;
-
-		if (!is_array($parameters)) {
-			throw new \InvalidArgumentException('The given subject parameters are invalid');
-		}
-		$this->subjectRichParameters = $parameters;
-
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 11.0.0
-	 */
-	public function getRichSubject() {
-		return $this->subjectRich;
-	}
-
-	/**
-	 * @return array[]
-	 * @since 11.0.0
-	 */
-	public function getRichSubjectParameters() {
-		return $this->subjectRichParameters;
-	}
-
-	/**
-	 * Set the message of the activity
-	 *
-	 * @param string $message
-	 * @param array $parameters
-	 * @return IEvent
-	 * @throws \InvalidArgumentException if the message or parameters are invalid
-	 * @since 8.2.0
-	 */
-	public function setMessage($message, array $parameters = []) {
-		if (!is_string($message) || isset($message[255])) {
-			throw new \InvalidArgumentException('The given message is invalid');
-		}
-		$this->message = (string) $message;
-		$this->messageParameters = $parameters;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getMessage() {
-		return $this->message;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getMessageParameters() {
-		return $this->messageParameters;
-	}
-
-	/**
-	 * @param string $message
-	 * @return $this
-	 * @throws \InvalidArgumentException if the message is invalid
-	 * @since 11.0.0
-	 */
-	public function setParsedMessage($message) {
-		if (!is_string($message)) {
-			throw new \InvalidArgumentException('The given parsed message is invalid');
-		}
-		$this->messageParsed = $message;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 11.0.0
-	 */
-	public function getParsedMessage() {
-		return $this->messageParsed;
-	}
-
-	/**
-	 * @param string $message
-	 * @param array $parameters
-	 * @return $this
-	 * @throws \InvalidArgumentException if the subject or parameters are invalid
-	 * @since 11.0.0
-	 */
-	public function setRichMessage($message, array $parameters = []) {
-		if (!is_string($message)) {
-			throw new \InvalidArgumentException('The given parsed message is invalid');
-		}
-		$this->messageRich = $message;
-
-		if (!is_array($parameters)) {
-			throw new \InvalidArgumentException('The given message parameters are invalid');
-		}
-		$this->messageRichParameters = $parameters;
-
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 11.0.0
-	 */
-	public function getRichMessage() {
-		return $this->messageRich;
-	}
-
-	/**
-	 * @return array[]
-	 * @since 11.0.0
-	 */
-	public function getRichMessageParameters() {
-		return $this->messageRichParameters;
-	}
-
-	/**
-	 * Set the object of the activity
-	 *
-	 * @param string $objectType
-	 * @param int $objectId
-	 * @param string $objectName
-	 * @return IEvent
-	 * @throws \InvalidArgumentException if the object is invalid
-	 * @since 8.2.0
-	 */
-	public function setObject($objectType, $objectId, $objectName = '') {
-		if (!is_string($objectType) || isset($objectType[255])) {
-			throw new \InvalidArgumentException('The given object type is invalid');
-		}
-		if (!is_int($objectId)) {
-			throw new \InvalidArgumentException('The given object id is invalid');
-		}
-		if (!is_string($objectName) || isset($objectName[4000])) {
-			throw new \InvalidArgumentException('The given object name is invalid');
-		}
-		$this->objectType = (string) $objectType;
-		$this->objectId = (int) $objectId;
-		$this->objectName = (string) $objectName;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getObjectType() {
-		return $this->objectType;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getObjectId() {
-		return $this->objectId;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getObjectName() {
-		return $this->objectName;
-	}
-
-	/**
-	 * Set the link of the activity
-	 *
-	 * @param string $link
-	 * @return IEvent
-	 * @throws \InvalidArgumentException if the link is invalid
-	 * @since 8.2.0
-	 */
-	public function setLink($link) {
-		if (!is_string($link) || isset($link[4000])) {
-			throw new \InvalidArgumentException('The given link is invalid');
-		}
-		$this->link = (string) $link;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getLink() {
-		return $this->link;
-	}
-
-	/**
-	 * @param string $icon
-	 * @return $this
-	 * @throws \InvalidArgumentException if the icon is invalid
-	 * @since 11.0.0
-	 */
-	public function setIcon($icon) {
-		if (!is_string($icon) || isset($icon[4000])) {
-			throw new \InvalidArgumentException('The given icon is invalid');
-		}
-		$this->icon = $icon;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 11.0.0
-	 */
-	public function getIcon() {
-		return $this->icon;
-	}
-
-	/**
-	 * @param IEvent $child
-	 * @since 11.0.0
-	 */
-	public function setChildEvent(IEvent $child) {
-		$this->child = $child;
-	}
-
-	/**
-	 * @return IEvent|null
-	 * @since 11.0.0
-	 */
-	public function getChildEvent() {
-		return $this->child;
-	}
-
-	/**
-	 * @return bool
-	 * @since 8.2.0
-	 */
-	public function isValid() {
-		return
-			$this->isValidCommon()
-			&&
-			$this->getSubject() !== ''
-		;
-	}
-
-	/**
-	 * @return bool
-	 * @since 8.2.0
-	 */
-	public function isValidParsed() {
-		if ($this->getRichSubject() !== '' || !empty($this->getRichSubjectParameters())) {
-			try {
-				$this->richValidator->validate($this->getRichSubject(), $this->getRichSubjectParameters());
-			} catch (InvalidObjectExeption $e) {
-				return false;
-			}
-		}
-
-		if ($this->getRichMessage() !== '' || !empty($this->getRichMessageParameters())) {
-			try {
-				$this->richValidator->validate($this->getRichMessage(), $this->getRichMessageParameters());
-			} catch (InvalidObjectExeption $e) {
-				return false;
-			}
-		}
-
-		return
-			$this->isValidCommon()
-			&&
-			$this->getParsedSubject() !== ''
-		;
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function isValidCommon() {
-		return
-			$this->getApp() !== ''
-			&&
-			$this->getType() !== ''
-			&&
-			$this->getAffectedUser() !== ''
-			&&
-			$this->getTimestamp() !== 0
-			/**
-			 * Disabled for BC with old activities
+    /** @var string */
+    protected $app = '';
+    /** @var string */
+    protected $type = '';
+    /** @var string */
+    protected $affectedUser = '';
+    /** @var string */
+    protected $author = '';
+    /** @var int */
+    protected $timestamp = 0;
+    /** @var string */
+    protected $subject = '';
+    /** @var array */
+    protected $subjectParameters = [];
+    /** @var string */
+    protected $subjectParsed;
+    /** @var string */
+    protected $subjectRich;
+    /** @var array */
+    protected $subjectRichParameters;
+    /** @var string */
+    protected $message = '';
+    /** @var array */
+    protected $messageParameters = [];
+    /** @var string */
+    protected $messageParsed;
+    /** @var string */
+    protected $messageRich;
+    /** @var array */
+    protected $messageRichParameters;
+    /** @var string */
+    protected $objectType = '';
+    /** @var int */
+    protected $objectId = 0;
+    /** @var string */
+    protected $objectName = '';
+    /** @var string */
+    protected $link = '';
+    /** @var string */
+    protected $icon = '';
+
+    /** @var IEvent */
+    protected $child = null;
+    /** @var IValidator */
+    protected $richValidator;
+
+    /**
+     * @param IValidator $richValidator
+     */
+    public function __construct(IValidator $richValidator) {
+        $this->richValidator = $richValidator;
+    }
+
+    /**
+     * Set the app of the activity
+     *
+     * @param string $app
+     * @return IEvent
+     * @throws \InvalidArgumentException if the app id is invalid
+     * @since 8.2.0
+     */
+    public function setApp($app) {
+        if (!is_string($app) || $app === '' || isset($app[32])) {
+            throw new \InvalidArgumentException('The given app is invalid');
+        }
+        $this->app = (string) $app;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getApp() {
+        return $this->app;
+    }
+
+    /**
+     * Set the type of the activity
+     *
+     * @param string $type
+     * @return IEvent
+     * @throws \InvalidArgumentException if the type is invalid
+     * @since 8.2.0
+     */
+    public function setType($type) {
+        if (!is_string($type) || $type === '' || isset($type[255])) {
+            throw new \InvalidArgumentException('The given type is invalid');
+        }
+        $this->type = (string) $type;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType() {
+        return $this->type;
+    }
+
+    /**
+     * Set the affected user of the activity
+     *
+     * @param string $affectedUser
+     * @return IEvent
+     * @throws \InvalidArgumentException if the affected user is invalid
+     * @since 8.2.0
+     */
+    public function setAffectedUser($affectedUser) {
+        if (!is_string($affectedUser) || $affectedUser === '' || isset($affectedUser[64])) {
+            throw new \InvalidArgumentException('The given affected user is invalid');
+        }
+        $this->affectedUser = (string) $affectedUser;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAffectedUser() {
+        return $this->affectedUser;
+    }
+
+    /**
+     * Set the author of the activity
+     *
+     * @param string $author
+     * @return IEvent
+     * @throws \InvalidArgumentException if the author is invalid
+     * @since 8.2.0
+     */
+    public function setAuthor($author) {
+        if (!is_string($author) || isset($author[64])) {
+            throw new \InvalidArgumentException('The given author user is invalid'. serialize($author));
+        }
+        $this->author = (string) $author;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAuthor() {
+        return $this->author;
+    }
+
+    /**
+     * Set the timestamp of the activity
+     *
+     * @param int $timestamp
+     * @return IEvent
+     * @throws \InvalidArgumentException if the timestamp is invalid
+     * @since 8.2.0
+     */
+    public function setTimestamp($timestamp) {
+        if (!is_int($timestamp)) {
+            throw new \InvalidArgumentException('The given timestamp is invalid');
+        }
+        $this->timestamp = (int) $timestamp;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getTimestamp() {
+        return $this->timestamp;
+    }
+
+    /**
+     * Set the subject of the activity
+     *
+     * @param string $subject
+     * @param array $parameters
+     * @return IEvent
+     * @throws \InvalidArgumentException if the subject or parameters are invalid
+     * @since 8.2.0
+     */
+    public function setSubject($subject, array $parameters = []) {
+        if (!is_string($subject) || isset($subject[255])) {
+            throw new \InvalidArgumentException('The given subject is invalid');
+        }
+        $this->subject = (string) $subject;
+        $this->subjectParameters = $parameters;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSubject() {
+        return $this->subject;
+    }
+
+    /**
+     * @return array
+     */
+    public function getSubjectParameters() {
+        return $this->subjectParameters;
+    }
+
+    /**
+     * @param string $subject
+     * @return $this
+     * @throws \InvalidArgumentException if the subject is invalid
+     * @since 11.0.0
+     */
+    public function setParsedSubject($subject) {
+        if (!is_string($subject) || $subject === '') {
+            throw new \InvalidArgumentException('The given parsed subject is invalid');
+        }
+        $this->subjectParsed = $subject;
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 11.0.0
+     */
+    public function getParsedSubject() {
+        return $this->subjectParsed;
+    }
+
+    /**
+     * @param string $subject
+     * @param array $parameters
+     * @return $this
+     * @throws \InvalidArgumentException if the subject or parameters are invalid
+     * @since 11.0.0
+     */
+    public function setRichSubject($subject, array $parameters = []) {
+        if (!is_string($subject) || $subject === '') {
+            throw new \InvalidArgumentException('The given parsed subject is invalid');
+        }
+        $this->subjectRich = $subject;
+
+        if (!is_array($parameters)) {
+            throw new \InvalidArgumentException('The given subject parameters are invalid');
+        }
+        $this->subjectRichParameters = $parameters;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 11.0.0
+     */
+    public function getRichSubject() {
+        return $this->subjectRich;
+    }
+
+    /**
+     * @return array[]
+     * @since 11.0.0
+     */
+    public function getRichSubjectParameters() {
+        return $this->subjectRichParameters;
+    }
+
+    /**
+     * Set the message of the activity
+     *
+     * @param string $message
+     * @param array $parameters
+     * @return IEvent
+     * @throws \InvalidArgumentException if the message or parameters are invalid
+     * @since 8.2.0
+     */
+    public function setMessage($message, array $parameters = []) {
+        if (!is_string($message) || isset($message[255])) {
+            throw new \InvalidArgumentException('The given message is invalid');
+        }
+        $this->message = (string) $message;
+        $this->messageParameters = $parameters;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMessage() {
+        return $this->message;
+    }
+
+    /**
+     * @return array
+     */
+    public function getMessageParameters() {
+        return $this->messageParameters;
+    }
+
+    /**
+     * @param string $message
+     * @return $this
+     * @throws \InvalidArgumentException if the message is invalid
+     * @since 11.0.0
+     */
+    public function setParsedMessage($message) {
+        if (!is_string($message)) {
+            throw new \InvalidArgumentException('The given parsed message is invalid');
+        }
+        $this->messageParsed = $message;
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 11.0.0
+     */
+    public function getParsedMessage() {
+        return $this->messageParsed;
+    }
+
+    /**
+     * @param string $message
+     * @param array $parameters
+     * @return $this
+     * @throws \InvalidArgumentException if the subject or parameters are invalid
+     * @since 11.0.0
+     */
+    public function setRichMessage($message, array $parameters = []) {
+        if (!is_string($message)) {
+            throw new \InvalidArgumentException('The given parsed message is invalid');
+        }
+        $this->messageRich = $message;
+
+        if (!is_array($parameters)) {
+            throw new \InvalidArgumentException('The given message parameters are invalid');
+        }
+        $this->messageRichParameters = $parameters;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 11.0.0
+     */
+    public function getRichMessage() {
+        return $this->messageRich;
+    }
+
+    /**
+     * @return array[]
+     * @since 11.0.0
+     */
+    public function getRichMessageParameters() {
+        return $this->messageRichParameters;
+    }
+
+    /**
+     * Set the object of the activity
+     *
+     * @param string $objectType
+     * @param int $objectId
+     * @param string $objectName
+     * @return IEvent
+     * @throws \InvalidArgumentException if the object is invalid
+     * @since 8.2.0
+     */
+    public function setObject($objectType, $objectId, $objectName = '') {
+        if (!is_string($objectType) || isset($objectType[255])) {
+            throw new \InvalidArgumentException('The given object type is invalid');
+        }
+        if (!is_int($objectId)) {
+            throw new \InvalidArgumentException('The given object id is invalid');
+        }
+        if (!is_string($objectName) || isset($objectName[4000])) {
+            throw new \InvalidArgumentException('The given object name is invalid');
+        }
+        $this->objectType = (string) $objectType;
+        $this->objectId = (int) $objectId;
+        $this->objectName = (string) $objectName;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getObjectType() {
+        return $this->objectType;
+    }
+
+    /**
+     * @return string
+     */
+    public function getObjectId() {
+        return $this->objectId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getObjectName() {
+        return $this->objectName;
+    }
+
+    /**
+     * Set the link of the activity
+     *
+     * @param string $link
+     * @return IEvent
+     * @throws \InvalidArgumentException if the link is invalid
+     * @since 8.2.0
+     */
+    public function setLink($link) {
+        if (!is_string($link) || isset($link[4000])) {
+            throw new \InvalidArgumentException('The given link is invalid');
+        }
+        $this->link = (string) $link;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getLink() {
+        return $this->link;
+    }
+
+    /**
+     * @param string $icon
+     * @return $this
+     * @throws \InvalidArgumentException if the icon is invalid
+     * @since 11.0.0
+     */
+    public function setIcon($icon) {
+        if (!is_string($icon) || isset($icon[4000])) {
+            throw new \InvalidArgumentException('The given icon is invalid');
+        }
+        $this->icon = $icon;
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 11.0.0
+     */
+    public function getIcon() {
+        return $this->icon;
+    }
+
+    /**
+     * @param IEvent $child
+     * @since 11.0.0
+     */
+    public function setChildEvent(IEvent $child) {
+        $this->child = $child;
+    }
+
+    /**
+     * @return IEvent|null
+     * @since 11.0.0
+     */
+    public function getChildEvent() {
+        return $this->child;
+    }
+
+    /**
+     * @return bool
+     * @since 8.2.0
+     */
+    public function isValid() {
+        return
+            $this->isValidCommon()
+            &&
+            $this->getSubject() !== ''
+        ;
+    }
+
+    /**
+     * @return bool
+     * @since 8.2.0
+     */
+    public function isValidParsed() {
+        if ($this->getRichSubject() !== '' || !empty($this->getRichSubjectParameters())) {
+            try {
+                $this->richValidator->validate($this->getRichSubject(), $this->getRichSubjectParameters());
+            } catch (InvalidObjectExeption $e) {
+                return false;
+            }
+        }
+
+        if ($this->getRichMessage() !== '' || !empty($this->getRichMessageParameters())) {
+            try {
+                $this->richValidator->validate($this->getRichMessage(), $this->getRichMessageParameters());
+            } catch (InvalidObjectExeption $e) {
+                return false;
+            }
+        }
+
+        return
+            $this->isValidCommon()
+            &&
+            $this->getParsedSubject() !== ''
+        ;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isValidCommon() {
+        return
+            $this->getApp() !== ''
+            &&
+            $this->getType() !== ''
+            &&
+            $this->getAffectedUser() !== ''
+            &&
+            $this->getTimestamp() !== 0
+            /**
+             * Disabled for BC with old activities
 			&&
 			$this->getObjectType() !== ''
 			&&
 			$this->getObjectId() !== 0
-			 */
-		;
-	}
+             */
+        ;
+    }
 }

lib/private/Activity/LegacyFilter.php

Indentation +71 added lines, -71 removed lines

@@ -26,83 +26,83 @@
 
 class LegacyFilter implements IFilter {
 
-	/** @var IManager */
-	protected $manager;
-	/** @var string */
-	protected $identifier;
-	/** @var string */
-	protected $name;
-	/** @var bool */
-	protected $isTopFilter;
+    /** @var IManager */
+    protected $manager;
+    /** @var string */
+    protected $identifier;
+    /** @var string */
+    protected $name;
+    /** @var bool */
+    protected $isTopFilter;
 
-	/**
-	 * LegacySetting constructor.
-	 *
-	 * @param IManager $manager
-	 * @param string $identifier
-	 * @param string $name
-	 * @param bool $isTopFilter
-	 */
-	public function __construct(IManager $manager,
-								$identifier,
-								$name,
-								$isTopFilter) {
-		$this->manager = $manager;
-		$this->identifier = $identifier;
-		$this->name = $name;
-		$this->isTopFilter = $isTopFilter;
-	}
+    /**
+     * LegacySetting constructor.
+     *
+     * @param IManager $manager
+     * @param string $identifier
+     * @param string $name
+     * @param bool $isTopFilter
+     */
+    public function __construct(IManager $manager,
+                                $identifier,
+                                $name,
+                                $isTopFilter) {
+        $this->manager = $manager;
+        $this->identifier = $identifier;
+        $this->name = $name;
+        $this->isTopFilter = $isTopFilter;
+    }
 
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return $this->identifier;
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return $this->identifier;
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->name;
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->name;
+    }
 
-	/**
-	 * @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 $this->isTopFilter ? 40 : 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 $this->isTopFilter ? 40 : 50;
+    }
 
-	/**
-	 * @return string Full URL to an icon, empty string when none is given
-	 * @since 11.0.0
-	 */
-	public function getIcon() {
-		// Old API was CSS class, so we can not use this...
-		return '';
-	}
+    /**
+     * @return string Full URL to an icon, empty string when none is given
+     * @since 11.0.0
+     */
+    public function getIcon() {
+        // Old API was CSS class, so we can not use this...
+        return '';
+    }
 
-	/**
-	 * @param string[] $types
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function filterTypes(array $types) {
-		return $this->manager->filterNotificationTypes($types, $this->getIdentifier());
-	}
+    /**
+     * @param string[] $types
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function filterTypes(array $types) {
+        return $this->manager->filterNotificationTypes($types, $this->getIdentifier());
+    }
 
-	/**
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function allowedApps() {
-		return [];
-	}
+    /**
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function allowedApps() {
+        return [];
+    }
 }