nextcloud / server

lib/private/Authentication/LoginCredentials/Store.php

Indentation +79 added lines, -79 removed lines

@@ -37,84 +37,84 @@
 
 class Store implements IStore {
 
-	/** @var ISession */
-	private $session;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IProvider|null */
-	private $tokenProvider;
-
-	/**
-	 * @param ISession $session
-	 * @param ILogger $logger
-	 * @param IProvider $tokenProvider
-	 */
-	public function __construct(ISession $session, ILogger $logger, IProvider $tokenProvider = null) {
-		$this->session = $session;
-		$this->logger = $logger;
-		$this->tokenProvider = $tokenProvider;
-
-		Util::connectHook('OC_User', 'post_login', $this, 'authenticate');
-	}
-
-	/**
-	 * Hook listener on post login
-	 *
-	 * @param array $params
-	 */
-	public function authenticate(array $params) {
-		$this->session->set('login_credentials', json_encode($params));
-	}
-
-	/**
-	 * Replace the session implementation
-	 *
-	 * @param ISession $session
-	 */
-	public function setSession(ISession $session) {
-		$this->session = $session;
-	}
-
-	/**
-	 * @since 12
-	 *
-	 * @return ICredentials the login credentials of the current user
-	 * @throws CredentialsUnavailableException
-	 */
-	public function getLoginCredentials() {
-		if (is_null($this->tokenProvider)) {
-			throw new CredentialsUnavailableException();
-		}
-
-		$trySession = false;
-		try {
-			$sessionId = $this->session->getId();
-			$token = $this->tokenProvider->getToken($sessionId);
-
-			$uid = $token->getUID();
-			$user = $token->getLoginName();
-			$password = $this->tokenProvider->getPassword($token, $sessionId);
-
-			return new Credentials($uid, $user, $password);
-		} catch (SessionNotAvailableException $ex) {
-			$this->logger->debug('could not get login credentials because session is unavailable', ['app' => 'core']);
-		} catch (InvalidTokenException $ex) {
-			$this->logger->debug('could not get login credentials because the token is invalid', ['app' => 'core']);
-			$trySession = true;
-		} catch (PasswordlessTokenException $ex) {
-			$this->logger->debug('could not get login credentials because the token has no password', ['app' => 'core']);
-			$trySession = true;
-		}
-
-		if ($trySession && $this->session->exists('login_credentials')) {
-			$creds = json_decode($this->session->get('login_credentials'));
-			return new Credentials($creds->uid, $creds->uid, $creds->password);
-		}
-
-		// If we reach this line, an exception was thrown.
-		throw new CredentialsUnavailableException();
-	}
+    /** @var ISession */
+    private $session;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var IProvider|null */
+    private $tokenProvider;
+
+    /**
+     * @param ISession $session
+     * @param ILogger $logger
+     * @param IProvider $tokenProvider
+     */
+    public function __construct(ISession $session, ILogger $logger, IProvider $tokenProvider = null) {
+        $this->session = $session;
+        $this->logger = $logger;
+        $this->tokenProvider = $tokenProvider;
+
+        Util::connectHook('OC_User', 'post_login', $this, 'authenticate');
+    }
+
+    /**
+     * Hook listener on post login
+     *
+     * @param array $params
+     */
+    public function authenticate(array $params) {
+        $this->session->set('login_credentials', json_encode($params));
+    }
+
+    /**
+     * Replace the session implementation
+     *
+     * @param ISession $session
+     */
+    public function setSession(ISession $session) {
+        $this->session = $session;
+    }
+
+    /**
+     * @since 12
+     *
+     * @return ICredentials the login credentials of the current user
+     * @throws CredentialsUnavailableException
+     */
+    public function getLoginCredentials() {
+        if (is_null($this->tokenProvider)) {
+            throw new CredentialsUnavailableException();
+        }
+
+        $trySession = false;
+        try {
+            $sessionId = $this->session->getId();
+            $token = $this->tokenProvider->getToken($sessionId);
+
+            $uid = $token->getUID();
+            $user = $token->getLoginName();
+            $password = $this->tokenProvider->getPassword($token, $sessionId);
+
+            return new Credentials($uid, $user, $password);
+        } catch (SessionNotAvailableException $ex) {
+            $this->logger->debug('could not get login credentials because session is unavailable', ['app' => 'core']);
+        } catch (InvalidTokenException $ex) {
+            $this->logger->debug('could not get login credentials because the token is invalid', ['app' => 'core']);
+            $trySession = true;
+        } catch (PasswordlessTokenException $ex) {
+            $this->logger->debug('could not get login credentials because the token has no password', ['app' => 'core']);
+            $trySession = true;
+        }
+
+        if ($trySession && $this->session->exists('login_credentials')) {
+            $creds = json_decode($this->session->get('login_credentials'));
+            return new Credentials($creds->uid, $creds->uid, $creds->password);
+        }
+
+        // If we reach this line, an exception was thrown.
+        throw new CredentialsUnavailableException();
+    }
 
 }

lib/private/Authentication/Token/DefaultTokenCleanupJob.php

Indentation +5 added lines, -5 removed lines

@@ -27,10 +27,10 @@
 
 class DefaultTokenCleanupJob extends Job {
 
-	protected function run($argument) {
-		/* @var $provider IProvider */
-		$provider = OC::$server->query('OC\Authentication\Token\IProvider');
-		$provider->invalidateOldTokens();
-	}
+    protected function run($argument) {
+        /* @var $provider IProvider */
+        $provider = OC::$server->query('OC\Authentication\Token\IProvider');
+        $provider->invalidateOldTokens();
+    }
 
 }

lib/private/Authentication/Token/DefaultToken.php

Indentation +131 added lines, -131 removed lines

@@ -42,135 +42,135 @@
  */
 class DefaultToken extends Entity implements IToken {
 
-	/**
-	 * @var string user UID
-	 */
-	protected $uid;
-
-	/**
-	 * @var string login name used for generating the token
-	 */
-	protected $loginName;
-
-	/**
-	 * @var string encrypted user password
-	 */
-	protected $password;
-
-	/**
-	 * @var string token name (e.g. browser/OS)
-	 */
-	protected $name;
-
-	/**
-	 * @var string
-	 */
-	protected $token;
-
-	/**
-	 * @var int
-	 */
-	protected $type;
-
-	/**
-	 * @var int
-	 */
-	protected $remember;
-
-	/**
-	 * @var int
-	 */
-	protected $lastActivity;
-
-	/**
-	 * @var int
-	 */
-	protected $lastCheck;
-
-	/**
-	 * @var string
-	 */
-	protected $scope;
-
-	public function __construct() {
-		$this->addType('type', 'int');
-		$this->addType('lastActivity', 'int');
-		$this->addType('lastCheck', 'int');
-	}
-
-	public function getId() {
-		return $this->id;
-	}
-
-	public function getUID() {
-		return $this->uid;
-	}
-
-	/**
-	 * Get the login name used when generating the token
-	 *
-	 * @return string
-	 */
-	public function getLoginName() {
-		return parent::getLoginName();
-	}
-
-	/**
-	 * Get the (encrypted) login password
-	 *
-	 * @return string
-	 */
-	public function getPassword() {
-		return parent::getPassword();
-	}
-
-	public function jsonSerialize() {
-		return [
-			'id' => $this->id,
-			'name' => $this->name,
-			'lastActivity' => $this->lastActivity,
-			'type' => $this->type,
-			'scope' => $this->getScopeAsArray()
-		];
-	}
-
-	/**
-	 * Get the timestamp of the last password check
-	 *
-	 * @return int
-	 */
-	public function getLastCheck() {
-		return parent::getLastCheck();
-	}
-
-	/**
-	 * Get the timestamp of the last password check
-	 *
-	 * @param int $time
-	 */
-	public function setLastCheck($time) {
-		return parent::setLastCheck($time);
-	}
-
-	public function getScope() {
-		return parent::getScope();
-	}
-
-	public function getScopeAsArray() {
-		$scope = json_decode($this->getScope(), true);
-		if (!$scope) {
-			return [
-				'filesystem'=> true
-			];
-		}
-		return $scope;
-	}
-
-	public function setScope($scope) {
-		if (is_array($scope)) {
-			parent::setScope(json_encode($scope));
-		} else {
-			parent::setScope((string)$scope);
-		}
-	}
+    /**
+     * @var string user UID
+     */
+    protected $uid;
+
+    /**
+     * @var string login name used for generating the token
+     */
+    protected $loginName;
+
+    /**
+     * @var string encrypted user password
+     */
+    protected $password;
+
+    /**
+     * @var string token name (e.g. browser/OS)
+     */
+    protected $name;
+
+    /**
+     * @var string
+     */
+    protected $token;
+
+    /**
+     * @var int
+     */
+    protected $type;
+
+    /**
+     * @var int
+     */
+    protected $remember;
+
+    /**
+     * @var int
+     */
+    protected $lastActivity;
+
+    /**
+     * @var int
+     */
+    protected $lastCheck;
+
+    /**
+     * @var string
+     */
+    protected $scope;
+
+    public function __construct() {
+        $this->addType('type', 'int');
+        $this->addType('lastActivity', 'int');
+        $this->addType('lastCheck', 'int');
+    }
+
+    public function getId() {
+        return $this->id;
+    }
+
+    public function getUID() {
+        return $this->uid;
+    }
+
+    /**
+     * Get the login name used when generating the token
+     *
+     * @return string
+     */
+    public function getLoginName() {
+        return parent::getLoginName();
+    }
+
+    /**
+     * Get the (encrypted) login password
+     *
+     * @return string
+     */
+    public function getPassword() {
+        return parent::getPassword();
+    }
+
+    public function jsonSerialize() {
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'lastActivity' => $this->lastActivity,
+            'type' => $this->type,
+            'scope' => $this->getScopeAsArray()
+        ];
+    }
+
+    /**
+     * Get the timestamp of the last password check
+     *
+     * @return int
+     */
+    public function getLastCheck() {
+        return parent::getLastCheck();
+    }
+
+    /**
+     * Get the timestamp of the last password check
+     *
+     * @param int $time
+     */
+    public function setLastCheck($time) {
+        return parent::setLastCheck($time);
+    }
+
+    public function getScope() {
+        return parent::getScope();
+    }
+
+    public function getScopeAsArray() {
+        $scope = json_decode($this->getScope(), true);
+        if (!$scope) {
+            return [
+                'filesystem'=> true
+            ];
+        }
+        return $scope;
+    }
+
+    public function setScope($scope) {
+        if (is_array($scope)) {
+            parent::setScope(json_encode($scope));
+        } else {
+            parent::setScope((string)$scope);
+        }
+    }
 }

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/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/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 [];
+    }
 }