nextcloud / server

lib/public/Util.php

Indentation +499 added lines, -499 removed lines

@@ -57,505 +57,505 @@
  * @since 4.0.0
  */
 class Util {
-	/**
-	 * @deprecated 14.0.0 use \OCP\ILogger::DEBUG
-	 */
-	const DEBUG=0;
-	/**
-	 * @deprecated 14.0.0 use \OCP\ILogger::INFO
-	 */
-	const INFO=1;
-	/**
-	 * @deprecated 14.0.0 use \OCP\ILogger::WARN
-	 */
-	const WARN=2;
-	/**
-	 * @deprecated 14.0.0 use \OCP\ILogger::ERROR
-	 */
-	const ERROR=3;
-	/**
-	 * @deprecated 14.0.0 use \OCP\ILogger::FATAL
-	 */
-	const FATAL=4;
-
-	/** \OCP\Share\IManager */
-	private static $shareManager;
-
-	/**
-	 * get the current installed version of ownCloud
-	 * @return array
-	 * @since 4.0.0
-	 */
-	public static function getVersion() {
-		return \OC_Util::getVersion();
-	}
+    /**
+     * @deprecated 14.0.0 use \OCP\ILogger::DEBUG
+     */
+    const DEBUG=0;
+    /**
+     * @deprecated 14.0.0 use \OCP\ILogger::INFO
+     */
+    const INFO=1;
+    /**
+     * @deprecated 14.0.0 use \OCP\ILogger::WARN
+     */
+    const WARN=2;
+    /**
+     * @deprecated 14.0.0 use \OCP\ILogger::ERROR
+     */
+    const ERROR=3;
+    /**
+     * @deprecated 14.0.0 use \OCP\ILogger::FATAL
+     */
+    const FATAL=4;
+
+    /** \OCP\Share\IManager */
+    private static $shareManager;
+
+    /**
+     * get the current installed version of ownCloud
+     * @return array
+     * @since 4.0.0
+     */
+    public static function getVersion() {
+        return \OC_Util::getVersion();
+    }
 	
-	/**
-	 * Set current update channel
-	 * @param string $channel
-	 * @since 8.1.0
-	 */
-	public static function setChannel($channel) {
-		\OC::$server->getConfig()->setSystemValue('updater.release.channel', $channel);
-	}
+    /**
+     * Set current update channel
+     * @param string $channel
+     * @since 8.1.0
+     */
+    public static function setChannel($channel) {
+        \OC::$server->getConfig()->setSystemValue('updater.release.channel', $channel);
+    }
 	
-	/**
-	 * Get current update channel
-	 * @return string
-	 * @since 8.1.0
-	 */
-	public static function getChannel() {
-		return \OC_Util::getChannel();
-	}
-
-	/**
-	 * write a message in the log
-	 * @param string $app
-	 * @param string $message
-	 * @param int $level
-	 * @since 4.0.0
-	 * @deprecated 13.0.0 use log of \OCP\ILogger
-	 */
-	public static function writeLog( $app, $message, $level ) {
-		$context = ['app' => $app];
-		\OC::$server->getLogger()->log($level, $message, $context);
-	}
-
-	/**
-	 * write exception into the log
-	 * @param string $app app name
-	 * @param \Exception $ex exception to log
-	 * @param int $level log level, defaults to \OCP\Util::FATAL
-	 * @since ....0.0 - parameter $level was added in 7.0.0
-	 * @deprecated 8.2.0 use logException of \OCP\ILogger
-	 */
-	public static function logException( $app, \Exception $ex, $level = ILogger::FATAL) {
-		\OC::$server->getLogger()->logException($ex, ['app' => $app]);
-	}
-
-	/**
-	 * check if sharing is disabled for the current user
-	 *
-	 * @return boolean
-	 * @since 7.0.0
-	 * @deprecated 9.1.0 Use \OC::$server->getShareManager()->sharingDisabledForUser
-	 */
-	public static function isSharingDisabledForUser() {
-		if (self::$shareManager === null) {
-			self::$shareManager = \OC::$server->getShareManager();
-		}
-
-		$user = \OC::$server->getUserSession()->getUser();
-		if ($user !== null) {
-			$user = $user->getUID();
-		}
-
-		return self::$shareManager->sharingDisabledForUser($user);
-	}
-
-	/**
-	 * get l10n object
-	 * @param string $application
-	 * @param string|null $language
-	 * @return \OCP\IL10N
-	 * @since 6.0.0 - parameter $language was added in 8.0.0
-	 */
-	public static function getL10N($application, $language = null) {
-		return \OC::$server->getL10N($application, $language);
-	}
-
-	/**
-	 * add a css file
-	 * @param string $application
-	 * @param string $file
-	 * @since 4.0.0
-	 */
-	public static function addStyle( $application, $file = null ) {
-		\OC_Util::addStyle( $application, $file );
-	}
-
-	/**
-	 * add a javascript file
-	 * @param string $application
-	 * @param string $file
-	 * @since 4.0.0
-	 */
-	public static function addScript( $application, $file = null ) {
-		\OC_Util::addScript( $application, $file );
-	}
-
-	/**
-	 * Add a translation JS file
-	 * @param string $application application id
-	 * @param string $languageCode language code, defaults to the current locale
-	 * @since 8.0.0
-	 */
-	public static function addTranslations($application, $languageCode = null) {
-		\OC_Util::addTranslations($application, $languageCode);
-	}
-
-	/**
-	 * Add a custom element to the header
-	 * If $text is null then the element will be written as empty element.
-	 * So use "" to get a closing tag.
-	 * @param string $tag tag name of the element
-	 * @param array $attributes array of attributes for the element
-	 * @param string $text the text content for the element
-	 * @since 4.0.0
-	 */
-	public static function addHeader($tag, $attributes, $text=null) {
-		\OC_Util::addHeader($tag, $attributes, $text);
-	}
-
-	/**
-	 * Creates an absolute url to the given app and file.
-	 * @param string $app app
-	 * @param string $file file
-	 * @param array $args array with param=>value, will be appended to the returned url
-	 * 	The value of $args will be urlencoded
-	 * @return string the url
-	 * @since 4.0.0 - parameter $args was added in 4.5.0
-	 */
-	public static function linkToAbsolute( $app, $file, $args = array() ) {
-		$urlGenerator = \OC::$server->getURLGenerator();
-		return $urlGenerator->getAbsoluteURL(
-			$urlGenerator->linkTo($app, $file, $args)
-		);
-	}
-
-	/**
-	 * Creates an absolute url for remote use.
-	 * @param string $service id
-	 * @return string the url
-	 * @since 4.0.0
-	 */
-	public static function linkToRemote( $service ) {
-		$urlGenerator = \OC::$server->getURLGenerator();
-		$remoteBase = $urlGenerator->linkTo('', 'remote.php') . '/' . $service;
-		return $urlGenerator->getAbsoluteURL(
-			$remoteBase . (($service[strlen($service) - 1] != '/') ? '/' : '')
-		);
-	}
-
-	/**
-	 * Creates an absolute url for public use
-	 * @param string $service id
-	 * @return string the url
-	 * @since 4.5.0
-	 */
-	public static function linkToPublic($service) {
-		return \OC_Helper::linkToPublic($service);
-	}
-
-	/**
-	 * Returns the server host name without an eventual port number
-	 * @return string the server hostname
-	 * @since 5.0.0
-	 */
-	public static function getServerHostName() {
-		$host_name = \OC::$server->getRequest()->getServerHost();
-		// strip away port number (if existing)
-		$colon_pos = strpos($host_name, ':');
-		if ($colon_pos != FALSE) {
-			$host_name = substr($host_name, 0, $colon_pos);
-		}
-		return $host_name;
-	}
-
-	/**
-	 * Returns the default email address
-	 * @param string $user_part the user part of the address
-	 * @return string the default email address
-	 *
-	 * Assembles a default email address (using the server hostname
-	 * and the given user part, and returns it
-	 * Example: when given lostpassword-noreply as $user_part param,
-	 *     and is currently accessed via http(s)://example.com/,
-	 *     it would return 'lostpassword-noreply@example.com'
-	 *
-	 * If the configuration value 'mail_from_address' is set in
-	 * config.php, this value will override the $user_part that
-	 * is passed to this function
-	 * @since 5.0.0
-	 */
-	public static function getDefaultEmailAddress($user_part) {
-		$config = \OC::$server->getConfig();
-		$user_part = $config->getSystemValue('mail_from_address', $user_part);
-		$host_name = self::getServerHostName();
-		$host_name = $config->getSystemValue('mail_domain', $host_name);
-		$defaultEmailAddress = $user_part.'@'.$host_name;
-
-		$mailer = \OC::$server->getMailer();
-		if ($mailer->validateMailAddress($defaultEmailAddress)) {
-			return $defaultEmailAddress;
-		}
-
-		// in case we cannot build a valid email address from the hostname let's fallback to 'localhost.localdomain'
-		return $user_part.'@localhost.localdomain';
-	}
-
-	/**
-	 * Make a human file size (2048 to 2 kB)
-	 * @param int $bytes file size in bytes
-	 * @return string a human readable file size
-	 * @since 4.0.0
-	 */
-	public static function humanFileSize($bytes) {
-		return \OC_Helper::humanFileSize($bytes);
-	}
-
-	/**
-	 * Make a computer file size (2 kB to 2048)
-	 * @param string $str file size in a fancy format
-	 * @return float a file size in bytes
-	 *
-	 * Inspired by: http://www.php.net/manual/en/function.filesize.php#92418
-	 * @since 4.0.0
-	 */
-	public static function computerFileSize($str) {
-		return \OC_Helper::computerFileSize($str);
-	}
-
-	/**
-	 * connects a function to a hook
-	 *
-	 * @param string $signalClass class name of emitter
-	 * @param string $signalName name of signal
-	 * @param string|object $slotClass class name of slot
-	 * @param string $slotName name of slot
-	 * @return bool
-	 *
-	 * This function makes it very easy to connect to use hooks.
-	 *
-	 * TODO: write example
-	 * @since 4.0.0
-	 */
-	static public function connectHook($signalClass, $signalName, $slotClass, $slotName) {
-		return \OC_Hook::connect($signalClass, $signalName, $slotClass, $slotName);
-	}
-
-	/**
-	 * Emits a signal. To get data from the slot use references!
-	 * @param string $signalclass class name of emitter
-	 * @param string $signalname name of signal
-	 * @param array $params default: array() array with additional data
-	 * @return bool true if slots exists or false if not
-	 *
-	 * TODO: write example
-	 * @since 4.0.0
-	 */
-	static public function emitHook($signalclass, $signalname, $params = array()) {
-		return \OC_Hook::emit($signalclass, $signalname, $params);
-	}
-
-	/**
-	 * Cached encrypted CSRF token. Some static unit-tests of ownCloud compare
-	 * multiple OC_Template elements which invoke `callRegister`. If the value
-	 * would not be cached these unit-tests would fail.
-	 * @var string
-	 */
-	private static $token = '';
-
-	/**
-	 * Register an get/post call. This is important to prevent CSRF attacks
-	 * @since 4.5.0
-	 */
-	public static function callRegister() {
-		if(self::$token === '') {
-			self::$token = \OC::$server->getCsrfTokenManager()->getToken()->getEncryptedValue();
-		}
-		return self::$token;
-	}
-
-	/**
-	 * Check an ajax get/post call if the request token is valid. exit if not.
-	 * @since 4.5.0
-	 * @deprecated 9.0.0 Use annotations based on the app framework.
-	 */
-	public static function callCheck() {
-		if(!\OC::$server->getRequest()->passesStrictCookieCheck()) {
-			header('Location: '.\OC::$WEBROOT);
-			exit();
-		}
-
-		if (!\OC::$server->getRequest()->passesCSRFCheck()) {
-			exit();
-		}
-	}
-
-	/**
-	 * Used to sanitize HTML
-	 *
-	 * This function is used to sanitize HTML and should be applied on any
-	 * string or array of strings before displaying it on a web page.
-	 *
-	 * @param string|array $value
-	 * @return string|array an array of sanitized strings or a single sanitized string, depends on the input parameter.
-	 * @since 4.5.0
-	 */
-	public static function sanitizeHTML($value) {
-		return \OC_Util::sanitizeHTML($value);
-	}
-
-	/**
-	 * Public function to encode url parameters
-	 *
-	 * This function is used to encode path to file before output.
-	 * Encoding is done according to RFC 3986 with one exception:
-	 * Character '/' is preserved as is.
-	 *
-	 * @param string $component part of URI to encode
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public static function encodePath($component) {
-		return \OC_Util::encodePath($component);
-	}
-
-	/**
-	 * Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
-	 *
-	 * @param array $input The array to work on
-	 * @param int $case Either MB_CASE_UPPER or MB_CASE_LOWER (default)
-	 * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8
-	 * @return array
-	 * @since 4.5.0
-	 */
-	public static function mb_array_change_key_case($input, $case = MB_CASE_LOWER, $encoding = 'UTF-8') {
-		return \OC_Helper::mb_array_change_key_case($input, $case, $encoding);
-	}
-
-	/**
-	 * replaces a copy of string delimited by the start and (optionally) length parameters with the string given in replacement.
-	 *
-	 * @param string $string The input string. Opposite to the PHP build-in function does not accept an array.
-	 * @param string $replacement The replacement string.
-	 * @param int $start If start is positive, the replacing will begin at the start'th offset into string. If start is negative, the replacing will begin at the start'th character from the end of string.
-	 * @param int $length Length of the part to be replaced
-	 * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8
-	 * @return string
-	 * @since 4.5.0
-	 * @deprecated 8.2.0 Use substr_replace() instead.
-	 */
-	public static function mb_substr_replace($string, $replacement, $start, $length = null, $encoding = 'UTF-8') {
-		return substr_replace($string, $replacement, $start, $length);
-	}
-
-	/**
-	 * Replace all occurrences of the search string with the replacement string
-	 *
-	 * @param string $search The value being searched for, otherwise known as the needle. String.
-	 * @param string $replace The replacement string.
-	 * @param string $subject The string or array being searched and replaced on, otherwise known as the haystack.
-	 * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8
-	 * @param int $count If passed, this will be set to the number of replacements performed.
-	 * @return string
-	 * @since 4.5.0
-	 * @deprecated 8.2.0 Use str_replace() instead.
-	 */
-	public static function mb_str_replace($search, $replace, $subject, $encoding = 'UTF-8', &$count = null) {
-		return str_replace($search, $replace, $subject, $count);
-	}
-
-	/**
-	 * performs a search in a nested array
-	 *
-	 * @param array $haystack the array to be searched
-	 * @param string $needle the search string
-	 * @param mixed $index optional, only search this key name
-	 * @return mixed the key of the matching field, otherwise false
-	 * @since 4.5.0
-	 */
-	public static function recursiveArraySearch($haystack, $needle, $index = null) {
-		return \OC_Helper::recursiveArraySearch($haystack, $needle, $index);
-	}
-
-	/**
-	 * calculates the maximum upload size respecting system settings, free space and user quota
-	 *
-	 * @param string $dir the current folder where the user currently operates
-	 * @param int $free the number of bytes free on the storage holding $dir, if not set this will be received from the storage directly
-	 * @return int number of bytes representing
-	 * @since 5.0.0
-	 */
-	public static function maxUploadFilesize($dir, $free = null) {
-		return \OC_Helper::maxUploadFilesize($dir, $free);
-	}
-
-	/**
-	 * Calculate free space left within user quota
-	 * @param string $dir the current folder where the user currently operates
-	 * @return int number of bytes representing
-	 * @since 7.0.0
-	 */
-	public static function freeSpace($dir) {
-		return \OC_Helper::freeSpace($dir);
-	}
-
-	/**
-	 * Calculate PHP upload limit
-	 *
-	 * @return int number of bytes representing
-	 * @since 7.0.0
-	 */
-	public static function uploadLimit() {
-		return \OC_Helper::uploadLimit();
-	}
-
-	/**
-	 * Returns whether the given file name is valid
-	 * @param string $file file name to check
-	 * @return bool true if the file name is valid, false otherwise
-	 * @deprecated 8.1.0 use \OC\Files\View::verifyPath()
-	 * @since 7.0.0
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function isValidFileName($file) {
-		return \OC_Util::isValidFileName($file);
-	}
-
-	/**
-	 * Compare two strings to provide a natural sort
-	 * @param string $a first string to compare
-	 * @param string $b second string to compare
-	 * @return int -1 if $b comes before $a, 1 if $a comes before $b
-	 * or 0 if the strings are identical
-	 * @since 7.0.0
-	 */
-	public static function naturalSortCompare($a, $b) {
-		return \OC\NaturalSort::getInstance()->compare($a, $b);
-	}
-
-	/**
-	 * check if a password is required for each public link
-	 * @return boolean
-	 * @since 7.0.0
-	 */
-	public static function isPublicLinkPasswordRequired() {
-		return \OC_Util::isPublicLinkPasswordRequired();
-	}
-
-	/**
-	 * check if share API enforces a default expire date
-	 * @return boolean
-	 * @since 8.0.0
-	 */
-	public static function isDefaultExpireDateEnforced() {
-		return \OC_Util::isDefaultExpireDateEnforced();
-	}
-
-	protected static $needUpgradeCache = null;
-
-	/**
-	 * Checks whether the current version needs upgrade.
-	 *
-	 * @return bool true if upgrade is needed, false otherwise
-	 * @since 7.0.0
-	 */
-	public static function needUpgrade() {
-		if (!isset(self::$needUpgradeCache)) {
-			self::$needUpgradeCache=\OC_Util::needUpgrade(\OC::$server->getSystemConfig());
-		}		
-		return self::$needUpgradeCache;
-	}
+    /**
+     * Get current update channel
+     * @return string
+     * @since 8.1.0
+     */
+    public static function getChannel() {
+        return \OC_Util::getChannel();
+    }
+
+    /**
+     * write a message in the log
+     * @param string $app
+     * @param string $message
+     * @param int $level
+     * @since 4.0.0
+     * @deprecated 13.0.0 use log of \OCP\ILogger
+     */
+    public static function writeLog( $app, $message, $level ) {
+        $context = ['app' => $app];
+        \OC::$server->getLogger()->log($level, $message, $context);
+    }
+
+    /**
+     * write exception into the log
+     * @param string $app app name
+     * @param \Exception $ex exception to log
+     * @param int $level log level, defaults to \OCP\Util::FATAL
+     * @since ....0.0 - parameter $level was added in 7.0.0
+     * @deprecated 8.2.0 use logException of \OCP\ILogger
+     */
+    public static function logException( $app, \Exception $ex, $level = ILogger::FATAL) {
+        \OC::$server->getLogger()->logException($ex, ['app' => $app]);
+    }
+
+    /**
+     * check if sharing is disabled for the current user
+     *
+     * @return boolean
+     * @since 7.0.0
+     * @deprecated 9.1.0 Use \OC::$server->getShareManager()->sharingDisabledForUser
+     */
+    public static function isSharingDisabledForUser() {
+        if (self::$shareManager === null) {
+            self::$shareManager = \OC::$server->getShareManager();
+        }
+
+        $user = \OC::$server->getUserSession()->getUser();
+        if ($user !== null) {
+            $user = $user->getUID();
+        }
+
+        return self::$shareManager->sharingDisabledForUser($user);
+    }
+
+    /**
+     * get l10n object
+     * @param string $application
+     * @param string|null $language
+     * @return \OCP\IL10N
+     * @since 6.0.0 - parameter $language was added in 8.0.0
+     */
+    public static function getL10N($application, $language = null) {
+        return \OC::$server->getL10N($application, $language);
+    }
+
+    /**
+     * add a css file
+     * @param string $application
+     * @param string $file
+     * @since 4.0.0
+     */
+    public static function addStyle( $application, $file = null ) {
+        \OC_Util::addStyle( $application, $file );
+    }
+
+    /**
+     * add a javascript file
+     * @param string $application
+     * @param string $file
+     * @since 4.0.0
+     */
+    public static function addScript( $application, $file = null ) {
+        \OC_Util::addScript( $application, $file );
+    }
+
+    /**
+     * Add a translation JS file
+     * @param string $application application id
+     * @param string $languageCode language code, defaults to the current locale
+     * @since 8.0.0
+     */
+    public static function addTranslations($application, $languageCode = null) {
+        \OC_Util::addTranslations($application, $languageCode);
+    }
+
+    /**
+     * Add a custom element to the header
+     * If $text is null then the element will be written as empty element.
+     * So use "" to get a closing tag.
+     * @param string $tag tag name of the element
+     * @param array $attributes array of attributes for the element
+     * @param string $text the text content for the element
+     * @since 4.0.0
+     */
+    public static function addHeader($tag, $attributes, $text=null) {
+        \OC_Util::addHeader($tag, $attributes, $text);
+    }
+
+    /**
+     * Creates an absolute url to the given app and file.
+     * @param string $app app
+     * @param string $file file
+     * @param array $args array with param=>value, will be appended to the returned url
+     * 	The value of $args will be urlencoded
+     * @return string the url
+     * @since 4.0.0 - parameter $args was added in 4.5.0
+     */
+    public static function linkToAbsolute( $app, $file, $args = array() ) {
+        $urlGenerator = \OC::$server->getURLGenerator();
+        return $urlGenerator->getAbsoluteURL(
+            $urlGenerator->linkTo($app, $file, $args)
+        );
+    }
+
+    /**
+     * Creates an absolute url for remote use.
+     * @param string $service id
+     * @return string the url
+     * @since 4.0.0
+     */
+    public static function linkToRemote( $service ) {
+        $urlGenerator = \OC::$server->getURLGenerator();
+        $remoteBase = $urlGenerator->linkTo('', 'remote.php') . '/' . $service;
+        return $urlGenerator->getAbsoluteURL(
+            $remoteBase . (($service[strlen($service) - 1] != '/') ? '/' : '')
+        );
+    }
+
+    /**
+     * Creates an absolute url for public use
+     * @param string $service id
+     * @return string the url
+     * @since 4.5.0
+     */
+    public static function linkToPublic($service) {
+        return \OC_Helper::linkToPublic($service);
+    }
+
+    /**
+     * Returns the server host name without an eventual port number
+     * @return string the server hostname
+     * @since 5.0.0
+     */
+    public static function getServerHostName() {
+        $host_name = \OC::$server->getRequest()->getServerHost();
+        // strip away port number (if existing)
+        $colon_pos = strpos($host_name, ':');
+        if ($colon_pos != FALSE) {
+            $host_name = substr($host_name, 0, $colon_pos);
+        }
+        return $host_name;
+    }
+
+    /**
+     * Returns the default email address
+     * @param string $user_part the user part of the address
+     * @return string the default email address
+     *
+     * Assembles a default email address (using the server hostname
+     * and the given user part, and returns it
+     * Example: when given lostpassword-noreply as $user_part param,
+     *     and is currently accessed via http(s)://example.com/,
+     *     it would return 'lostpassword-noreply@example.com'
+     *
+     * If the configuration value 'mail_from_address' is set in
+     * config.php, this value will override the $user_part that
+     * is passed to this function
+     * @since 5.0.0
+     */
+    public static function getDefaultEmailAddress($user_part) {
+        $config = \OC::$server->getConfig();
+        $user_part = $config->getSystemValue('mail_from_address', $user_part);
+        $host_name = self::getServerHostName();
+        $host_name = $config->getSystemValue('mail_domain', $host_name);
+        $defaultEmailAddress = $user_part.'@'.$host_name;
+
+        $mailer = \OC::$server->getMailer();
+        if ($mailer->validateMailAddress($defaultEmailAddress)) {
+            return $defaultEmailAddress;
+        }
+
+        // in case we cannot build a valid email address from the hostname let's fallback to 'localhost.localdomain'
+        return $user_part.'@localhost.localdomain';
+    }
+
+    /**
+     * Make a human file size (2048 to 2 kB)
+     * @param int $bytes file size in bytes
+     * @return string a human readable file size
+     * @since 4.0.0
+     */
+    public static function humanFileSize($bytes) {
+        return \OC_Helper::humanFileSize($bytes);
+    }
+
+    /**
+     * Make a computer file size (2 kB to 2048)
+     * @param string $str file size in a fancy format
+     * @return float a file size in bytes
+     *
+     * Inspired by: http://www.php.net/manual/en/function.filesize.php#92418
+     * @since 4.0.0
+     */
+    public static function computerFileSize($str) {
+        return \OC_Helper::computerFileSize($str);
+    }
+
+    /**
+     * connects a function to a hook
+     *
+     * @param string $signalClass class name of emitter
+     * @param string $signalName name of signal
+     * @param string|object $slotClass class name of slot
+     * @param string $slotName name of slot
+     * @return bool
+     *
+     * This function makes it very easy to connect to use hooks.
+     *
+     * TODO: write example
+     * @since 4.0.0
+     */
+    static public function connectHook($signalClass, $signalName, $slotClass, $slotName) {
+        return \OC_Hook::connect($signalClass, $signalName, $slotClass, $slotName);
+    }
+
+    /**
+     * Emits a signal. To get data from the slot use references!
+     * @param string $signalclass class name of emitter
+     * @param string $signalname name of signal
+     * @param array $params default: array() array with additional data
+     * @return bool true if slots exists or false if not
+     *
+     * TODO: write example
+     * @since 4.0.0
+     */
+    static public function emitHook($signalclass, $signalname, $params = array()) {
+        return \OC_Hook::emit($signalclass, $signalname, $params);
+    }
+
+    /**
+     * Cached encrypted CSRF token. Some static unit-tests of ownCloud compare
+     * multiple OC_Template elements which invoke `callRegister`. If the value
+     * would not be cached these unit-tests would fail.
+     * @var string
+     */
+    private static $token = '';
+
+    /**
+     * Register an get/post call. This is important to prevent CSRF attacks
+     * @since 4.5.0
+     */
+    public static function callRegister() {
+        if(self::$token === '') {
+            self::$token = \OC::$server->getCsrfTokenManager()->getToken()->getEncryptedValue();
+        }
+        return self::$token;
+    }
+
+    /**
+     * Check an ajax get/post call if the request token is valid. exit if not.
+     * @since 4.5.0
+     * @deprecated 9.0.0 Use annotations based on the app framework.
+     */
+    public static function callCheck() {
+        if(!\OC::$server->getRequest()->passesStrictCookieCheck()) {
+            header('Location: '.\OC::$WEBROOT);
+            exit();
+        }
+
+        if (!\OC::$server->getRequest()->passesCSRFCheck()) {
+            exit();
+        }
+    }
+
+    /**
+     * Used to sanitize HTML
+     *
+     * This function is used to sanitize HTML and should be applied on any
+     * string or array of strings before displaying it on a web page.
+     *
+     * @param string|array $value
+     * @return string|array an array of sanitized strings or a single sanitized string, depends on the input parameter.
+     * @since 4.5.0
+     */
+    public static function sanitizeHTML($value) {
+        return \OC_Util::sanitizeHTML($value);
+    }
+
+    /**
+     * Public function to encode url parameters
+     *
+     * This function is used to encode path to file before output.
+     * Encoding is done according to RFC 3986 with one exception:
+     * Character '/' is preserved as is.
+     *
+     * @param string $component part of URI to encode
+     * @return string
+     * @since 6.0.0
+     */
+    public static function encodePath($component) {
+        return \OC_Util::encodePath($component);
+    }
+
+    /**
+     * Returns an array with all keys from input lowercased or uppercased. Numbered indices are left as is.
+     *
+     * @param array $input The array to work on
+     * @param int $case Either MB_CASE_UPPER or MB_CASE_LOWER (default)
+     * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8
+     * @return array
+     * @since 4.5.0
+     */
+    public static function mb_array_change_key_case($input, $case = MB_CASE_LOWER, $encoding = 'UTF-8') {
+        return \OC_Helper::mb_array_change_key_case($input, $case, $encoding);
+    }
+
+    /**
+     * replaces a copy of string delimited by the start and (optionally) length parameters with the string given in replacement.
+     *
+     * @param string $string The input string. Opposite to the PHP build-in function does not accept an array.
+     * @param string $replacement The replacement string.
+     * @param int $start If start is positive, the replacing will begin at the start'th offset into string. If start is negative, the replacing will begin at the start'th character from the end of string.
+     * @param int $length Length of the part to be replaced
+     * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8
+     * @return string
+     * @since 4.5.0
+     * @deprecated 8.2.0 Use substr_replace() instead.
+     */
+    public static function mb_substr_replace($string, $replacement, $start, $length = null, $encoding = 'UTF-8') {
+        return substr_replace($string, $replacement, $start, $length);
+    }
+
+    /**
+     * Replace all occurrences of the search string with the replacement string
+     *
+     * @param string $search The value being searched for, otherwise known as the needle. String.
+     * @param string $replace The replacement string.
+     * @param string $subject The string or array being searched and replaced on, otherwise known as the haystack.
+     * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8
+     * @param int $count If passed, this will be set to the number of replacements performed.
+     * @return string
+     * @since 4.5.0
+     * @deprecated 8.2.0 Use str_replace() instead.
+     */
+    public static function mb_str_replace($search, $replace, $subject, $encoding = 'UTF-8', &$count = null) {
+        return str_replace($search, $replace, $subject, $count);
+    }
+
+    /**
+     * performs a search in a nested array
+     *
+     * @param array $haystack the array to be searched
+     * @param string $needle the search string
+     * @param mixed $index optional, only search this key name
+     * @return mixed the key of the matching field, otherwise false
+     * @since 4.5.0
+     */
+    public static function recursiveArraySearch($haystack, $needle, $index = null) {
+        return \OC_Helper::recursiveArraySearch($haystack, $needle, $index);
+    }
+
+    /**
+     * calculates the maximum upload size respecting system settings, free space and user quota
+     *
+     * @param string $dir the current folder where the user currently operates
+     * @param int $free the number of bytes free on the storage holding $dir, if not set this will be received from the storage directly
+     * @return int number of bytes representing
+     * @since 5.0.0
+     */
+    public static function maxUploadFilesize($dir, $free = null) {
+        return \OC_Helper::maxUploadFilesize($dir, $free);
+    }
+
+    /**
+     * Calculate free space left within user quota
+     * @param string $dir the current folder where the user currently operates
+     * @return int number of bytes representing
+     * @since 7.0.0
+     */
+    public static function freeSpace($dir) {
+        return \OC_Helper::freeSpace($dir);
+    }
+
+    /**
+     * Calculate PHP upload limit
+     *
+     * @return int number of bytes representing
+     * @since 7.0.0
+     */
+    public static function uploadLimit() {
+        return \OC_Helper::uploadLimit();
+    }
+
+    /**
+     * Returns whether the given file name is valid
+     * @param string $file file name to check
+     * @return bool true if the file name is valid, false otherwise
+     * @deprecated 8.1.0 use \OC\Files\View::verifyPath()
+     * @since 7.0.0
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function isValidFileName($file) {
+        return \OC_Util::isValidFileName($file);
+    }
+
+    /**
+     * Compare two strings to provide a natural sort
+     * @param string $a first string to compare
+     * @param string $b second string to compare
+     * @return int -1 if $b comes before $a, 1 if $a comes before $b
+     * or 0 if the strings are identical
+     * @since 7.0.0
+     */
+    public static function naturalSortCompare($a, $b) {
+        return \OC\NaturalSort::getInstance()->compare($a, $b);
+    }
+
+    /**
+     * check if a password is required for each public link
+     * @return boolean
+     * @since 7.0.0
+     */
+    public static function isPublicLinkPasswordRequired() {
+        return \OC_Util::isPublicLinkPasswordRequired();
+    }
+
+    /**
+     * check if share API enforces a default expire date
+     * @return boolean
+     * @since 8.0.0
+     */
+    public static function isDefaultExpireDateEnforced() {
+        return \OC_Util::isDefaultExpireDateEnforced();
+    }
+
+    protected static $needUpgradeCache = null;
+
+    /**
+     * Checks whether the current version needs upgrade.
+     *
+     * @return bool true if upgrade is needed, false otherwise
+     * @since 7.0.0
+     */
+    public static function needUpgrade() {
+        if (!isset(self::$needUpgradeCache)) {
+            self::$needUpgradeCache=\OC_Util::needUpgrade(\OC::$server->getSystemConfig());
+        }		
+        return self::$needUpgradeCache;
+    }
 }

lib/public/ILogger.php

Indentation +120 added lines, -120 removed lines

@@ -36,134 +36,134 @@
  * https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md#3-psrlogloggerinterface
  */
 interface ILogger {
-	/**
-	 * @since 14.0.0
-	 */
-	const DEBUG=0;
-	/**
-	 * @since 14.0.0
-	 */
-	const INFO=1;
-	/**
-	 * @since 14.0.0
-	 */
-	const WARN=2;
-	/**
-	 * @since 14.0.0
-	 */
-	const ERROR=3;
-	/**
-	 * @since 14.0.0
-	 */
-	const FATAL=4;
+    /**
+     * @since 14.0.0
+     */
+    const DEBUG=0;
+    /**
+     * @since 14.0.0
+     */
+    const INFO=1;
+    /**
+     * @since 14.0.0
+     */
+    const WARN=2;
+    /**
+     * @since 14.0.0
+     */
+    const ERROR=3;
+    /**
+     * @since 14.0.0
+     */
+    const FATAL=4;
 
-	/**
-	 * System is unusable.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 */
-	public function emergency(string $message, array $context = []);
+    /**
+     * System is unusable.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     */
+    public function emergency(string $message, array $context = []);
 
-	/**
-	 * Action must be taken immediately.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 */
-	public function alert(string $message, array $context = []);
+    /**
+     * Action must be taken immediately.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     */
+    public function alert(string $message, array $context = []);
 
-	/**
-	 * Critical conditions.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 */
-	public function critical(string $message, array $context = []);
+    /**
+     * Critical conditions.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     */
+    public function critical(string $message, array $context = []);
 
-	/**
-	 * Runtime errors that do not require immediate action but should typically
-	 * be logged and monitored.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 */
-	public function error(string $message, array $context = []);
+    /**
+     * Runtime errors that do not require immediate action but should typically
+     * be logged and monitored.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     */
+    public function error(string $message, array $context = []);
 
-	/**
-	 * Exceptional occurrences that are not errors.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 */
-	public function warning(string $message, array $context = []);
+    /**
+     * Exceptional occurrences that are not errors.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     */
+    public function warning(string $message, array $context = []);
 
-	/**
-	 * Normal but significant events.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 */
-	public function notice(string $message, array $context = []);
+    /**
+     * Normal but significant events.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     */
+    public function notice(string $message, array $context = []);
 
-	/**
-	 * Interesting events.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 */
-	public function info(string $message, array $context = []);
+    /**
+     * Interesting events.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     */
+    public function info(string $message, array $context = []);
 
-	/**
-	 * Detailed debug information.
-	 *
-	 * @param string $message
-	 * @param array $context
-	 * @return null
-	 * @since 7.0.0
-	 */
-	public function debug(string $message, array $context = []);
+    /**
+     * Detailed debug information.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     * @since 7.0.0
+     */
+    public function debug(string $message, array $context = []);
 
-	/**
-	 * Logs with an arbitrary level.
-	 *
-	 * @param int $level
-	 * @param string $message
-	 * @param array $context
-	 * @return mixed
-	 * @since 7.0.0
-	 */
-	public function log(int $level, string $message, array $context = []);
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param int $level
+     * @param string $message
+     * @param array $context
+     * @return mixed
+     * @since 7.0.0
+     */
+    public function log(int $level, string $message, array $context = []);
 
-	/**
-	 * Logs an exception very detailed
-	 * An additional message can we written to the log by adding it to the
-	 * context.
-	 *
-	 * <code>
-	 * $logger->logException($ex, [
-	 *     'message' => 'Exception during background job execution'
-	 * ]);
-	 * </code>
-	 *
-	 * @param \Exception|\Throwable $exception
-	 * @param array $context
-	 * @return void
-	 * @since 8.2.0
-	 */
-	public function logException(\Throwable $exception, array $context = []);
+    /**
+     * Logs an exception very detailed
+     * An additional message can we written to the log by adding it to the
+     * context.
+     *
+     * <code>
+     * $logger->logException($ex, [
+     *     'message' => 'Exception during background job execution'
+     * ]);
+     * </code>
+     *
+     * @param \Exception|\Throwable $exception
+     * @param array $context
+     * @return void
+     * @since 8.2.0
+     */
+    public function logException(\Throwable $exception, array $context = []);
 }

settings/ajax/enableapp.php

Indentation +18 added lines, -18 removed lines

@@ -32,30 +32,30 @@
 
 $lastConfirm = (int) \OC::$server->getSession()->get('last-password-confirm');
 if ($lastConfirm < (time() - 30 * 60 + 15)) { // allow 15 seconds delay
-	$l = \OC::$server->getL10N('core');
-	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Password confirmation is required'))));
-	exit();
+    $l = \OC::$server->getL10N('core');
+    OC_JSON::error(array( 'data' => array( 'message' => $l->t('Password confirmation is required'))));
+    exit();
 }
 
 $groups = isset($_POST['groups']) ? (array)$_POST['groups'] : [];
 $appIds = isset($_POST['appIds']) ? (array)$_POST['appIds'] : [];
 
 try {
-	$updateRequired = false;
-	foreach($appIds as $appId) {
-		$app = new OC_App();
-		$appId = OC_App::cleanAppId($appId);
-		$app->enable($appId, $groups);
-		if(\OC_App::shouldUpgrade($appId)) {
-			$updateRequired = true;
-		}
-	}
+    $updateRequired = false;
+    foreach($appIds as $appId) {
+        $app = new OC_App();
+        $appId = OC_App::cleanAppId($appId);
+        $app->enable($appId, $groups);
+        if(\OC_App::shouldUpgrade($appId)) {
+            $updateRequired = true;
+        }
+    }
 
-	OC_JSON::success(['data' => ['update_required' => $updateRequired]]);
+    OC_JSON::success(['data' => ['update_required' => $updateRequired]]);
 } catch (Exception $e) {
-	\OC::$server->getLogger()->logException($e, [
-		'level' => ILogger::DEBUG,
-		'app' => 'core',
-	]);
-	OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
+    \OC::$server->getLogger()->logException($e, [
+        'level' => ILogger::DEBUG,
+        'app' => 'core',
+    ]);
+    OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
 }

settings/Controller/UsersController.php

Indentation +943 added lines, -943 removed lines

@@ -71,948 +71,948 @@
  * @package OC\Settings\Controller
  */
 class UsersController extends Controller {
-	/** @var IL10N */
-	private $l10n;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var bool */
-	private $isAdmin;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IConfig */
-	private $config;
-	/** @var ILogger */
-	private $log;
-	/** @var IMailer */
-	private $mailer;
-	/** @var bool contains the state of the encryption app */
-	private $isEncryptionAppEnabled;
-	/** @var bool contains the state of the admin recovery setting */
-	private $isRestoreEnabled = false;
-	/** @var IAppManager */
-	private $appManager;
-	/** @var IAvatarManager */
-	private $avatarManager;
-	/** @var AccountManager */
-	private $accountManager;
-	/** @var ISecureRandom */
-	private $secureRandom;
-	/** @var NewUserMailHelper */
-	private $newUserMailHelper;
-	/** @var Manager */
-	private $keyManager;
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var IUserMountCache */
-	private $userMountCache;
-
-	/** @var IManager */
-	private $encryptionManager;
-
-	public function __construct(string $appName,
-								IRequest $request,
-								IUserManager $userManager,
-								IGroupManager $groupManager,
-								IUserSession $userSession,
-								IConfig $config,
-								bool $isAdmin,
-								IL10N $l10n,
-								ILogger $log,
-								IMailer $mailer,
-								IURLGenerator $urlGenerator,
-								IAppManager $appManager,
-								IAvatarManager $avatarManager,
-								AccountManager $accountManager,
-								ISecureRandom $secureRandom,
-								NewUserMailHelper $newUserMailHelper,
-								Manager $keyManager,
-								IJobList $jobList,
-								IUserMountCache $userMountCache,
-								IManager $encryptionManager) {
-		parent::__construct($appName, $request);
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->userSession = $userSession;
-		$this->config = $config;
-		$this->isAdmin = $isAdmin;
-		$this->l10n = $l10n;
-		$this->log = $log;
-		$this->mailer = $mailer;
-		$this->appManager = $appManager;
-		$this->avatarManager = $avatarManager;
-		$this->accountManager = $accountManager;
-		$this->secureRandom = $secureRandom;
-		$this->newUserMailHelper = $newUserMailHelper;
-		$this->keyManager = $keyManager;
-		$this->jobList = $jobList;
-		$this->userMountCache = $userMountCache;
-		$this->encryptionManager = $encryptionManager;
-
-		// check for encryption state - TODO see formatUserForIndex
-		$this->isEncryptionAppEnabled = $appManager->isEnabledForUser('encryption');
-		if ($this->isEncryptionAppEnabled) {
-			// putting this directly in empty is possible in PHP 5.5+
-			$result = $config->getAppValue('encryption', 'recoveryAdminEnabled', '0');
-			$this->isRestoreEnabled = !empty($result);
-		}
-	}
-
-	/**
-	 * @param IUser $user
-	 * @param array|null $userGroups
-	 * @return array
-	 */
-	private function formatUserForIndex(IUser $user, array $userGroups = null): array {
-
-		// TODO: eliminate this encryption specific code below and somehow
-		// hook in additional user info from other apps
-
-		// recovery isn't possible if admin or user has it disabled and encryption
-		// is enabled - so we eliminate the else paths in the conditional tree
-		// below
-		$restorePossible = false;
-
-		if ($this->isEncryptionAppEnabled) {
-			if ($this->isRestoreEnabled) {
-				// check for the users recovery setting
-				$recoveryMode = $this->config->getUserValue($user->getUID(), 'encryption', 'recoveryEnabled', '0');
-				// method call inside empty is possible with PHP 5.5+
-				$recoveryModeEnabled = !empty($recoveryMode);
-				if ($recoveryModeEnabled) {
-					// user also has recovery mode enabled
-					$restorePossible = true;
-				}
-			} else {
-				$modules = $this->encryptionManager->getEncryptionModules();
-				$restorePossible = true;
-				foreach ($modules as $id => $module) {
-					/* @var IEncryptionModule $instance */
-					$instance = call_user_func($module['callback']);
-					if ($instance->needDetailedAccessList()) {
-						$restorePossible = false;
-						break;
-					}
-				}
-			}
-		} else {
-			// recovery is possible if encryption is disabled (plain files are
-			// available)
-			$restorePossible = true;
-		}
-
-		$subAdminGroups = $this->groupManager->getSubAdmin()->getSubAdminsGroupsName($user);
-
-		$displayName = $user->getEMailAddress();
-		if (is_null($displayName)) {
-			$displayName = '';
-		}
-
-		$avatarAvailable = false;
-		try {
-			$avatarAvailable = $this->avatarManager->getAvatar($user->getUID())->exists();
-		} catch (\Exception $e) {
-			//No avatar yet
-		}
-
-		return [
-			'name' => $user->getUID(),
-			'displayname' => $user->getDisplayName(),
-			'groups' => empty($userGroups) ? $this->groupManager->getUserGroupNames($user) : $userGroups,
-			'subadmin' => $subAdminGroups,
-			'quota' => $user->getQuota(),
-			'quota_bytes' => Util::computerFileSize($user->getQuota()),
-			'storageLocation' => $user->getHome(),
-			'lastLogin' => $user->getLastLogin() * 1000,
-			'backend' => $user->getBackendClassName(),
-			'email' => $displayName,
-			'isRestoreDisabled' => !$restorePossible,
-			'isAvatarAvailable' => $avatarAvailable,
-			'isEnabled' => $user->isEnabled(),
-		];
-	}
-
-	/**
-	 * @param array $userIDs Array with schema [$uid => $displayName]
-	 * @return IUser[]
-	 */
-	private function getUsersForUID(array $userIDs): array {
-		$users = [];
-		foreach ($userIDs as $uid => $displayName) {
-			$users[$uid] = $this->userManager->get($uid);
-		}
-		return $users;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param int $offset
-	 * @param int $limit
-	 * @param string $gid GID to filter for
-	 * @param string $pattern Pattern to search for in the username
-	 * @param string $backend Backend to filter for (class-name)
-	 * @return DataResponse
-	 *
-	 * TODO: Tidy up and write unit tests - code is mainly static method calls
-	 */
-	public function index(int $offset = 0, int $limit = 10, string $gid = '', string $pattern = '', string $backend = ''): DataResponse {
-		// Remove backends
-		if (!empty($backend)) {
-			$activeBackends = $this->userManager->getBackends();
-			$this->userManager->clearBackends();
-			foreach ($activeBackends as $singleActiveBackend) {
-				if ($backend === get_class($singleActiveBackend)) {
-					$this->userManager->registerBackend($singleActiveBackend);
-					break;
-				}
-			}
-		}
-
-		$userObjects = [];
-		$users = [];
-		if ($this->isAdmin) {
-			if ($gid !== '' && $gid !== '_disabledUsers' && $gid !== '_everyone') {
-				$batch = $this->getUsersForUID($this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset));
-			} else {
-				$batch = $this->userManager->search($pattern, $limit, $offset);
-			}
-
-			foreach ($batch as $user) {
-				if (($gid !== '_disabledUsers' && $user->isEnabled()) ||
-					($gid === '_disabledUsers' && !$user->isEnabled())
-				) {
-					$userObjects[] = $user;
-					$users[] = $this->formatUserForIndex($user);
-				}
-			}
-
-		} else {
-			$subAdminOfGroups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($this->userSession->getUser());
-			// New class returns IGroup[] so convert back
-			$gids = [];
-			foreach ($subAdminOfGroups as $group) {
-				$gids[] = $group->getGID();
-			}
-			$subAdminOfGroups = $gids;
-
-			// Set the $gid parameter to an empty value if the subadmin has no rights to access a specific group
-			if ($gid !== '' && $gid !== '_disabledUsers' && !in_array($gid, $subAdminOfGroups)) {
-				$gid = '';
-			}
-
-			// Batch all groups the user is subadmin of when a group is specified
-			$batch = [];
-			if ($gid !== '' && $gid !== '_disabledUsers' && $gid !== '_everyone') {
-				$batch = $this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset);
-			} else {
-				foreach ($subAdminOfGroups as $group) {
-					$groupUsers = $this->groupManager->displayNamesInGroup($group, $pattern, $limit, $offset);
-
-					foreach ($groupUsers as $uid => $displayName) {
-						$batch[$uid] = $displayName;
-					}
-				}
-			}
-			$batch = $this->getUsersForUID($batch);
-
-			foreach ($batch as $user) {
-				// Only add the groups, this user is a subadmin of
-				$userGroups = array_values(array_intersect(
-					$this->groupManager->getUserGroupIds($user),
-					$subAdminOfGroups
-				));
-				if (($gid !== '_disabledUsers' && $user->isEnabled()) ||
-					($gid === '_disabledUsers' && !$user->isEnabled())
-				) {
-					$userObjects[] = $user;
-					$users[] = $this->formatUserForIndex($user, $userGroups);
-				}
-			}
-		}
-
-		$usedSpace = $this->userMountCache->getUsedSpaceForUsers($userObjects);
-
-		foreach ($users as &$userData) {
-			$userData['size'] = isset($usedSpace[$userData['name']]) ? $usedSpace[$userData['name']] : 0;
-		}
-
-		return new DataResponse($users);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $username
-	 * @param string $password
-	 * @param array $groups
-	 * @param string $email
-	 * @return DataResponse
-	 */
-	public function create(string $username, string $password, array $groups = [], $email = ''): DataResponse {
-		if ($email !== '' && !$this->mailer->validateMailAddress($email)) {
-			return new DataResponse(
-				[
-					'message' => $this->l10n->t('Invalid mail address')
-				],
-				Http::STATUS_UNPROCESSABLE_ENTITY
-			);
-		}
-
-		$currentUser = $this->userSession->getUser();
-
-		if (!$this->isAdmin) {
-			if (!empty($groups)) {
-				foreach ($groups as $key => $group) {
-					$groupObject = $this->groupManager->get($group);
-					if ($groupObject === null) {
-						unset($groups[$key]);
-						continue;
-					}
-
-					if (!$this->groupManager->getSubAdmin()->isSubAdminOfGroup($currentUser, $groupObject)) {
-						unset($groups[$key]);
-					}
-				}
-			}
-
-			if (empty($groups)) {
-				return new DataResponse(
-					[
-						'message' => $this->l10n->t('No valid group selected'),
-					],
-					Http::STATUS_FORBIDDEN
-				);
-			}
-		}
-
-		if ($this->userManager->userExists($username)) {
-			return new DataResponse(
-				[
-					'message' => $this->l10n->t('A user with that name already exists.')
-				],
-				Http::STATUS_CONFLICT
-			);
-		}
-
-		$generatePasswordResetToken = false;
-		if ($password === '') {
-			if ($email === '') {
-				return new DataResponse(
-					[
-						'message' => $this->l10n->t('To send a password link to the user an email address is required.')
-					],
-					Http::STATUS_UNPROCESSABLE_ENTITY
-				);
-			}
-
-			$password = $this->secureRandom->generate(30);
-			// Make sure we pass the password_policy
-			$password .= $this->secureRandom->generate(2, '$!.,;:-~+*[]{}()');
-			$generatePasswordResetToken = true;
-		}
-
-		try {
-			$user = $this->userManager->createUser($username, $password);
-		} catch (\Exception $exception) {
-			$message = $exception->getMessage();
-			if ($exception instanceof HintException && $exception->getHint()) {
-				$message = $exception->getHint();
-			}
-			if (!$message) {
-				$message = $this->l10n->t('Unable to create user.');
-			}
-			return new DataResponse(
-				[
-					'message' => (string)$message,
-				],
-				Http::STATUS_FORBIDDEN
-			);
-		}
-
-		if ($user instanceof IUser) {
-			if ($groups !== null) {
-				foreach ($groups as $groupName) {
-					$group = $this->groupManager->get($groupName);
-
-					if (empty($group)) {
-						$group = $this->groupManager->createGroup($groupName);
-					}
-					$group->addUser($user);
-				}
-			}
-			/**
-			 * Send new user mail only if a mail is set
-			 */
-			if ($email !== '') {
-				$user->setEMailAddress($email);
-				try {
-					$emailTemplate = $this->newUserMailHelper->generateTemplate($user, $generatePasswordResetToken);
-					$this->newUserMailHelper->sendMail($user, $emailTemplate);
-				} catch (\Exception $e) {
-					$this->log->logException($e, [
-						'message' => "Can't send new user mail to $email",
-						'level' => ILogger::ERROR,
-						'app' => 'settings',
-					]);
-				}
-			}
-			// fetch users groups
-			$userGroups = $this->groupManager->getUserGroupNames($user);
-
-			return new DataResponse(
-				$this->formatUserForIndex($user, $userGroups),
-				Http::STATUS_CREATED
-			);
-		}
-
-		return new DataResponse(
-			[
-				'message' => $this->l10n->t('Unable to create user.')
-			],
-			Http::STATUS_FORBIDDEN
-		);
-
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $id
-	 * @return DataResponse
-	 */
-	public function destroy(string $id): DataResponse {
-		$userId = $this->userSession->getUser()->getUID();
-		$user = $this->userManager->get($id);
-
-		if ($userId === $id) {
-			return new DataResponse(
-				[
-					'status' => 'error',
-					'data' => [
-						'message' => $this->l10n->t('Unable to delete user.')
-					]
-				],
-				Http::STATUS_FORBIDDEN
-			);
-		}
-
-		if (!$this->isAdmin && !$this->groupManager->getSubAdmin()->isUserAccessible($this->userSession->getUser(), $user)) {
-			return new DataResponse(
-				[
-					'status' => 'error',
-					'data' => [
-						'message' => $this->l10n->t('Authentication error')
-					]
-				],
-				Http::STATUS_FORBIDDEN
-			);
-		}
-
-		if ($user && $user->delete()) {
-			return new DataResponse(
-				[
-					'status' => 'success',
-					'data' => [
-						'username' => $id
-					]
-				],
-				Http::STATUS_NO_CONTENT
-			);
-		}
-
-		return new DataResponse(
-			[
-				'status' => 'error',
-				'data' => [
-					'message' => $this->l10n->t('Unable to delete user.')
-				]
-			],
-			Http::STATUS_FORBIDDEN
-		);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $id
-	 * @param int $enabled
-	 * @return DataResponse
-	 */
-	public function setEnabled(string $id, int $enabled): DataResponse {
-		$enabled = (bool)$enabled;
-		if ($enabled) {
-			$errorMsgGeneral = $this->l10n->t('Error while enabling user.');
-		} else {
-			$errorMsgGeneral = $this->l10n->t('Error while disabling user.');
-		}
-
-		$userId = $this->userSession->getUser()->getUID();
-		$user = $this->userManager->get($id);
-
-		if ($userId === $id) {
-			return new DataResponse(
-				[
-					'status' => 'error',
-					'data' => [
-						'message' => $errorMsgGeneral
-					]
-				], Http::STATUS_FORBIDDEN
-			);
-		}
-
-		if ($user) {
-			if (!$this->isAdmin && !$this->groupManager->getSubAdmin()->isUserAccessible($this->userSession->getUser(), $user)) {
-				return new DataResponse(
-					[
-						'status' => 'error',
-						'data' => [
-							'message' => $this->l10n->t('Authentication error')
-						]
-					],
-					Http::STATUS_FORBIDDEN
-				);
-			}
-
-			$user->setEnabled($enabled);
-			return new DataResponse(
-				[
-					'status' => 'success',
-					'data' => [
-						'username' => $id,
-						'enabled' => $enabled
-					]
-				]
-			);
-		} else {
-			return new DataResponse(
-				[
-					'status' => 'error',
-					'data' => [
-						'message' => $errorMsgGeneral
-					]
-				],
-				Http::STATUS_FORBIDDEN
-			);
-		}
-
-	}
-
-	/**
-	 * Set the mail address of a user
-	 *
-	 * @NoAdminRequired
-	 * @NoSubadminRequired
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $account
-	 * @param bool $onlyVerificationCode only return verification code without updating the data
-	 * @return DataResponse
-	 */
-	public function getVerificationCode(string $account, bool $onlyVerificationCode): DataResponse {
-
-		$user = $this->userSession->getUser();
-
-		if ($user === null) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		$accountData = $this->accountManager->getUser($user);
-		$cloudId = $user->getCloudId();
-		$message = 'Use my Federated Cloud ID to share with me: ' . $cloudId;
-		$signature = $this->signMessage($user, $message);
-
-		$code = $message . ' ' . $signature;
-		$codeMd5 = $message . ' ' . md5($signature);
-
-		switch ($account) {
-			case 'verify-twitter':
-				$accountData[AccountManager::PROPERTY_TWITTER]['verified'] = AccountManager::VERIFICATION_IN_PROGRESS;
-				$msg = $this->l10n->t('In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):');
-				$code = $codeMd5;
-				$type = AccountManager::PROPERTY_TWITTER;
-				$data = $accountData[AccountManager::PROPERTY_TWITTER]['value'];
-				$accountData[AccountManager::PROPERTY_TWITTER]['signature'] = $signature;
-				break;
-			case 'verify-website':
-				$accountData[AccountManager::PROPERTY_WEBSITE]['verified'] = AccountManager::VERIFICATION_IN_PROGRESS;
-				$msg = $this->l10n->t('In order to verify your Website, store the following content in your web-root at \'.well-known/CloudIdVerificationCode.txt\' (please make sure that the complete text is in one line):');
-				$type = AccountManager::PROPERTY_WEBSITE;
-				$data = $accountData[AccountManager::PROPERTY_WEBSITE]['value'];
-				$accountData[AccountManager::PROPERTY_WEBSITE]['signature'] = $signature;
-				break;
-			default:
-				return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		if ($onlyVerificationCode === false) {
-			$this->accountManager->updateUser($user, $accountData);
-
-			$this->jobList->add(VerifyUserData::class,
-				[
-					'verificationCode' => $code,
-					'data' => $data,
-					'type' => $type,
-					'uid' => $user->getUID(),
-					'try' => 0,
-					'lastRun' => $this->getCurrentTime()
-				]
-			);
-		}
-
-		return new DataResponse(['msg' => $msg, 'code' => $code]);
-	}
-
-	/**
-	 * get current timestamp
-	 *
-	 * @return int
-	 */
-	protected function getCurrentTime(): int {
-		return time();
-	}
-
-	/**
-	 * sign message with users private key
-	 *
-	 * @param IUser $user
-	 * @param string $message
-	 *
-	 * @return string base64 encoded signature
-	 */
-	protected function signMessage(IUser $user, string $message): string {
-		$privateKey = $this->keyManager->getKey($user)->getPrivate();
-		openssl_sign(json_encode($message), $signature, $privateKey, OPENSSL_ALGO_SHA512);
-		return base64_encode($signature);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubadminRequired
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $avatarScope
-	 * @param string $displayname
-	 * @param string $displaynameScope
-	 * @param string $phone
-	 * @param string $phoneScope
-	 * @param string $email
-	 * @param string $emailScope
-	 * @param string $website
-	 * @param string $websiteScope
-	 * @param string $address
-	 * @param string $addressScope
-	 * @param string $twitter
-	 * @param string $twitterScope
-	 * @return DataResponse
-	 */
-	public function setUserSettings($avatarScope,
-									$displayname,
-									$displaynameScope,
-									$phone,
-									$phoneScope,
-									$email,
-									$emailScope,
-									$website,
-									$websiteScope,
-									$address,
-									$addressScope,
-									$twitter,
-									$twitterScope
-	) {
-
-		if (!empty($email) && !$this->mailer->validateMailAddress($email)) {
-			return new DataResponse(
-				[
-					'status' => 'error',
-					'data' => [
-						'message' => $this->l10n->t('Invalid mail address')
-					]
-				],
-				Http::STATUS_UNPROCESSABLE_ENTITY
-			);
-		}
-
-		$user = $this->userSession->getUser();
-
-		$data = $this->accountManager->getUser($user);
-
-		$data[AccountManager::PROPERTY_AVATAR] = ['scope' => $avatarScope];
-		if ($this->config->getSystemValue('allow_user_to_change_display_name', true) !== false) {
-			$data[AccountManager::PROPERTY_DISPLAYNAME] = ['value' => $displayname, 'scope' => $displaynameScope];
-			$data[AccountManager::PROPERTY_EMAIL] = ['value' => $email, 'scope' => $emailScope];
-		}
-
-		if ($this->appManager->isEnabledForUser('federatedfilesharing')) {
-			$federatedFileSharing = new \OCA\FederatedFileSharing\AppInfo\Application();
-			$shareProvider = $federatedFileSharing->getFederatedShareProvider();
-			if ($shareProvider->isLookupServerUploadEnabled()) {
-				$data[AccountManager::PROPERTY_WEBSITE] = ['value' => $website, 'scope' => $websiteScope];
-				$data[AccountManager::PROPERTY_ADDRESS] = ['value' => $address, 'scope' => $addressScope];
-				$data[AccountManager::PROPERTY_PHONE] = ['value' => $phone, 'scope' => $phoneScope];
-				$data[AccountManager::PROPERTY_TWITTER] = ['value' => $twitter, 'scope' => $twitterScope];
-			}
-		}
-
-		try {
-			$this->saveUserSettings($user, $data);
-			return new DataResponse(
-				[
-					'status' => 'success',
-					'data' => [
-						'userId' => $user->getUID(),
-						'avatarScope' => $data[AccountManager::PROPERTY_AVATAR]['scope'],
-						'displayname' => $data[AccountManager::PROPERTY_DISPLAYNAME]['value'],
-						'displaynameScope' => $data[AccountManager::PROPERTY_DISPLAYNAME]['scope'],
-						'email' => $data[AccountManager::PROPERTY_EMAIL]['value'],
-						'emailScope' => $data[AccountManager::PROPERTY_EMAIL]['scope'],
-						'website' => $data[AccountManager::PROPERTY_WEBSITE]['value'],
-						'websiteScope' => $data[AccountManager::PROPERTY_WEBSITE]['scope'],
-						'address' => $data[AccountManager::PROPERTY_ADDRESS]['value'],
-						'addressScope' => $data[AccountManager::PROPERTY_ADDRESS]['scope'],
-						'message' => $this->l10n->t('Settings saved')
-					]
-				],
-				Http::STATUS_OK
-			);
-		} catch (ForbiddenException $e) {
-			return new DataResponse([
-				'status' => 'error',
-				'data' => [
-					'message' => $e->getMessage()
-				],
-			]);
-		}
-
-	}
-
-
-	/**
-	 * update account manager with new user data
-	 *
-	 * @param IUser $user
-	 * @param array $data
-	 * @throws ForbiddenException
-	 */
-	protected function saveUserSettings(IUser $user, array $data) {
-
-		// keep the user back-end up-to-date with the latest display name and email
-		// address
-		$oldDisplayName = $user->getDisplayName();
-		$oldDisplayName = is_null($oldDisplayName) ? '' : $oldDisplayName;
-		if (isset($data[AccountManager::PROPERTY_DISPLAYNAME]['value'])
-			&& $oldDisplayName !== $data[AccountManager::PROPERTY_DISPLAYNAME]['value']
-		) {
-			$result = $user->setDisplayName($data[AccountManager::PROPERTY_DISPLAYNAME]['value']);
-			if ($result === false) {
-				throw new ForbiddenException($this->l10n->t('Unable to change full name'));
-			}
-		}
-
-		$oldEmailAddress = $user->getEMailAddress();
-		$oldEmailAddress = is_null($oldEmailAddress) ? '' : $oldEmailAddress;
-		if (isset($data[AccountManager::PROPERTY_EMAIL]['value'])
-			&& $oldEmailAddress !== $data[AccountManager::PROPERTY_EMAIL]['value']
-		) {
-			// this is the only permission a backend provides and is also used
-			// for the permission of setting a email address
-			if (!$user->canChangeDisplayName()) {
-				throw new ForbiddenException($this->l10n->t('Unable to change email address'));
-			}
-			$user->setEMailAddress($data[AccountManager::PROPERTY_EMAIL]['value']);
-		}
-
-		$this->accountManager->updateUser($user, $data);
-	}
-
-	/**
-	 * Count all unique users visible for the current admin/subadmin.
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @return DataResponse
-	 */
-	public function stats(): DataResponse {
-		$userCount = 0;
-		if ($this->isAdmin) {
-			$countByBackend = $this->userManager->countUsers();
-
-			if (!empty($countByBackend)) {
-				foreach ($countByBackend as $count) {
-					$userCount += $count;
-				}
-			}
-		} else {
-			$groups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($this->userSession->getUser());
-
-			$uniqueUsers = [];
-			foreach ($groups as $group) {
-				foreach ($group->getUsers() as $uid => $displayName) {
-					$uniqueUsers[$uid] = true;
-				}
-			}
-
-			$userCount = count($uniqueUsers);
-		}
-
-		return new DataResponse(
-			[
-				'totalUsers' => $userCount
-			]
-		);
-	}
-
-
-	/**
-	 * Set the displayName of a user
-	 *
-	 * @NoAdminRequired
-	 * @NoSubadminRequired
-	 * @PasswordConfirmationRequired
-	 * @todo merge into saveUserSettings
-	 *
-	 * @param string $username
-	 * @param string $displayName
-	 * @return DataResponse
-	 */
-	public function setDisplayName(string $username, string $displayName) {
-		$currentUser = $this->userSession->getUser();
-		$user = $this->userManager->get($username);
-
-		if ($user === null ||
-			!$user->canChangeDisplayName() ||
-			(
-				!$this->groupManager->isAdmin($currentUser->getUID()) &&
-				!$this->groupManager->getSubAdmin()->isUserAccessible($currentUser, $user) &&
-				$currentUser->getUID() !== $username
-
-			)
-		) {
-			return new DataResponse([
-				'status' => 'error',
-				'data' => [
-					'message' => $this->l10n->t('Authentication error'),
-				],
-			]);
-		}
-
-		$userData = $this->accountManager->getUser($user);
-		$userData[AccountManager::PROPERTY_DISPLAYNAME]['value'] = $displayName;
-
-
-		try {
-			$this->saveUserSettings($user, $userData);
-			return new DataResponse([
-				'status' => 'success',
-				'data' => [
-					'message' => $this->l10n->t('Your full name has been changed.'),
-					'username' => $username,
-					'displayName' => $displayName,
-				],
-			]);
-		} catch (ForbiddenException $e) {
-			return new DataResponse([
-				'status' => 'error',
-				'data' => [
-					'message' => $e->getMessage(),
-					'displayName' => $user->getDisplayName(),
-				],
-			]);
-		}
-	}
-
-	/**
-	 * Set the mail address of a user
-	 *
-	 * @NoAdminRequired
-	 * @NoSubadminRequired
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $id
-	 * @param string $mailAddress
-	 * @return DataResponse
-	 */
-	public function setEMailAddress(string $id, string $mailAddress) {
-		$user = $this->userManager->get($id);
-		if (!$this->isAdmin
-			&& !$this->groupManager->getSubAdmin()->isUserAccessible($this->userSession->getUser(), $user)
-		) {
-			return new DataResponse(
-				[
-					'status' => 'error',
-					'data' => [
-						'message' => $this->l10n->t('Forbidden')
-					]
-				],
-				Http::STATUS_FORBIDDEN
-			);
-		}
-
-		if ($mailAddress !== '' && !$this->mailer->validateMailAddress($mailAddress)) {
-			return new DataResponse(
-				[
-					'status' => 'error',
-					'data' => [
-						'message' => $this->l10n->t('Invalid mail address')
-					]
-				],
-				Http::STATUS_UNPROCESSABLE_ENTITY
-			);
-		}
-
-		if (!$user) {
-			return new DataResponse(
-				[
-					'status' => 'error',
-					'data' => [
-						'message' => $this->l10n->t('Invalid user')
-					]
-				],
-				Http::STATUS_UNPROCESSABLE_ENTITY
-			);
-		}
-		// this is the only permission a backend provides and is also used
-		// for the permission of setting a email address
-		if (!$user->canChangeDisplayName()) {
-			return new DataResponse(
-				[
-					'status' => 'error',
-					'data' => [
-						'message' => $this->l10n->t('Unable to change mail address')
-					]
-				],
-				Http::STATUS_FORBIDDEN
-			);
-		}
-
-		$userData = $this->accountManager->getUser($user);
-		$userData[AccountManager::PROPERTY_EMAIL]['value'] = $mailAddress;
-
-		try {
-			$this->saveUserSettings($user, $userData);
-			return new DataResponse(
-				[
-					'status' => 'success',
-					'data' => [
-						'username' => $id,
-						'mailAddress' => $mailAddress,
-						'message' => $this->l10n->t('Email saved')
-					]
-				],
-				Http::STATUS_OK
-			);
-		} catch (ForbiddenException $e) {
-			return new DataResponse([
-				'status' => 'error',
-				'data' => [
-					'message' => $e->getMessage()
-				],
-			]);
-		}
-	}
+    /** @var IL10N */
+    private $l10n;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var bool */
+    private $isAdmin;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IConfig */
+    private $config;
+    /** @var ILogger */
+    private $log;
+    /** @var IMailer */
+    private $mailer;
+    /** @var bool contains the state of the encryption app */
+    private $isEncryptionAppEnabled;
+    /** @var bool contains the state of the admin recovery setting */
+    private $isRestoreEnabled = false;
+    /** @var IAppManager */
+    private $appManager;
+    /** @var IAvatarManager */
+    private $avatarManager;
+    /** @var AccountManager */
+    private $accountManager;
+    /** @var ISecureRandom */
+    private $secureRandom;
+    /** @var NewUserMailHelper */
+    private $newUserMailHelper;
+    /** @var Manager */
+    private $keyManager;
+    /** @var IJobList */
+    private $jobList;
+
+    /** @var IUserMountCache */
+    private $userMountCache;
+
+    /** @var IManager */
+    private $encryptionManager;
+
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IUserManager $userManager,
+                                IGroupManager $groupManager,
+                                IUserSession $userSession,
+                                IConfig $config,
+                                bool $isAdmin,
+                                IL10N $l10n,
+                                ILogger $log,
+                                IMailer $mailer,
+                                IURLGenerator $urlGenerator,
+                                IAppManager $appManager,
+                                IAvatarManager $avatarManager,
+                                AccountManager $accountManager,
+                                ISecureRandom $secureRandom,
+                                NewUserMailHelper $newUserMailHelper,
+                                Manager $keyManager,
+                                IJobList $jobList,
+                                IUserMountCache $userMountCache,
+                                IManager $encryptionManager) {
+        parent::__construct($appName, $request);
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->userSession = $userSession;
+        $this->config = $config;
+        $this->isAdmin = $isAdmin;
+        $this->l10n = $l10n;
+        $this->log = $log;
+        $this->mailer = $mailer;
+        $this->appManager = $appManager;
+        $this->avatarManager = $avatarManager;
+        $this->accountManager = $accountManager;
+        $this->secureRandom = $secureRandom;
+        $this->newUserMailHelper = $newUserMailHelper;
+        $this->keyManager = $keyManager;
+        $this->jobList = $jobList;
+        $this->userMountCache = $userMountCache;
+        $this->encryptionManager = $encryptionManager;
+
+        // check for encryption state - TODO see formatUserForIndex
+        $this->isEncryptionAppEnabled = $appManager->isEnabledForUser('encryption');
+        if ($this->isEncryptionAppEnabled) {
+            // putting this directly in empty is possible in PHP 5.5+
+            $result = $config->getAppValue('encryption', 'recoveryAdminEnabled', '0');
+            $this->isRestoreEnabled = !empty($result);
+        }
+    }
+
+    /**
+     * @param IUser $user
+     * @param array|null $userGroups
+     * @return array
+     */
+    private function formatUserForIndex(IUser $user, array $userGroups = null): array {
+
+        // TODO: eliminate this encryption specific code below and somehow
+        // hook in additional user info from other apps
+
+        // recovery isn't possible if admin or user has it disabled and encryption
+        // is enabled - so we eliminate the else paths in the conditional tree
+        // below
+        $restorePossible = false;
+
+        if ($this->isEncryptionAppEnabled) {
+            if ($this->isRestoreEnabled) {
+                // check for the users recovery setting
+                $recoveryMode = $this->config->getUserValue($user->getUID(), 'encryption', 'recoveryEnabled', '0');
+                // method call inside empty is possible with PHP 5.5+
+                $recoveryModeEnabled = !empty($recoveryMode);
+                if ($recoveryModeEnabled) {
+                    // user also has recovery mode enabled
+                    $restorePossible = true;
+                }
+            } else {
+                $modules = $this->encryptionManager->getEncryptionModules();
+                $restorePossible = true;
+                foreach ($modules as $id => $module) {
+                    /* @var IEncryptionModule $instance */
+                    $instance = call_user_func($module['callback']);
+                    if ($instance->needDetailedAccessList()) {
+                        $restorePossible = false;
+                        break;
+                    }
+                }
+            }
+        } else {
+            // recovery is possible if encryption is disabled (plain files are
+            // available)
+            $restorePossible = true;
+        }
+
+        $subAdminGroups = $this->groupManager->getSubAdmin()->getSubAdminsGroupsName($user);
+
+        $displayName = $user->getEMailAddress();
+        if (is_null($displayName)) {
+            $displayName = '';
+        }
+
+        $avatarAvailable = false;
+        try {
+            $avatarAvailable = $this->avatarManager->getAvatar($user->getUID())->exists();
+        } catch (\Exception $e) {
+            //No avatar yet
+        }
+
+        return [
+            'name' => $user->getUID(),
+            'displayname' => $user->getDisplayName(),
+            'groups' => empty($userGroups) ? $this->groupManager->getUserGroupNames($user) : $userGroups,
+            'subadmin' => $subAdminGroups,
+            'quota' => $user->getQuota(),
+            'quota_bytes' => Util::computerFileSize($user->getQuota()),
+            'storageLocation' => $user->getHome(),
+            'lastLogin' => $user->getLastLogin() * 1000,
+            'backend' => $user->getBackendClassName(),
+            'email' => $displayName,
+            'isRestoreDisabled' => !$restorePossible,
+            'isAvatarAvailable' => $avatarAvailable,
+            'isEnabled' => $user->isEnabled(),
+        ];
+    }
+
+    /**
+     * @param array $userIDs Array with schema [$uid => $displayName]
+     * @return IUser[]
+     */
+    private function getUsersForUID(array $userIDs): array {
+        $users = [];
+        foreach ($userIDs as $uid => $displayName) {
+            $users[$uid] = $this->userManager->get($uid);
+        }
+        return $users;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param int $offset
+     * @param int $limit
+     * @param string $gid GID to filter for
+     * @param string $pattern Pattern to search for in the username
+     * @param string $backend Backend to filter for (class-name)
+     * @return DataResponse
+     *
+     * TODO: Tidy up and write unit tests - code is mainly static method calls
+     */
+    public function index(int $offset = 0, int $limit = 10, string $gid = '', string $pattern = '', string $backend = ''): DataResponse {
+        // Remove backends
+        if (!empty($backend)) {
+            $activeBackends = $this->userManager->getBackends();
+            $this->userManager->clearBackends();
+            foreach ($activeBackends as $singleActiveBackend) {
+                if ($backend === get_class($singleActiveBackend)) {
+                    $this->userManager->registerBackend($singleActiveBackend);
+                    break;
+                }
+            }
+        }
+
+        $userObjects = [];
+        $users = [];
+        if ($this->isAdmin) {
+            if ($gid !== '' && $gid !== '_disabledUsers' && $gid !== '_everyone') {
+                $batch = $this->getUsersForUID($this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset));
+            } else {
+                $batch = $this->userManager->search($pattern, $limit, $offset);
+            }
+
+            foreach ($batch as $user) {
+                if (($gid !== '_disabledUsers' && $user->isEnabled()) ||
+                    ($gid === '_disabledUsers' && !$user->isEnabled())
+                ) {
+                    $userObjects[] = $user;
+                    $users[] = $this->formatUserForIndex($user);
+                }
+            }
+
+        } else {
+            $subAdminOfGroups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($this->userSession->getUser());
+            // New class returns IGroup[] so convert back
+            $gids = [];
+            foreach ($subAdminOfGroups as $group) {
+                $gids[] = $group->getGID();
+            }
+            $subAdminOfGroups = $gids;
+
+            // Set the $gid parameter to an empty value if the subadmin has no rights to access a specific group
+            if ($gid !== '' && $gid !== '_disabledUsers' && !in_array($gid, $subAdminOfGroups)) {
+                $gid = '';
+            }
+
+            // Batch all groups the user is subadmin of when a group is specified
+            $batch = [];
+            if ($gid !== '' && $gid !== '_disabledUsers' && $gid !== '_everyone') {
+                $batch = $this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset);
+            } else {
+                foreach ($subAdminOfGroups as $group) {
+                    $groupUsers = $this->groupManager->displayNamesInGroup($group, $pattern, $limit, $offset);
+
+                    foreach ($groupUsers as $uid => $displayName) {
+                        $batch[$uid] = $displayName;
+                    }
+                }
+            }
+            $batch = $this->getUsersForUID($batch);
+
+            foreach ($batch as $user) {
+                // Only add the groups, this user is a subadmin of
+                $userGroups = array_values(array_intersect(
+                    $this->groupManager->getUserGroupIds($user),
+                    $subAdminOfGroups
+                ));
+                if (($gid !== '_disabledUsers' && $user->isEnabled()) ||
+                    ($gid === '_disabledUsers' && !$user->isEnabled())
+                ) {
+                    $userObjects[] = $user;
+                    $users[] = $this->formatUserForIndex($user, $userGroups);
+                }
+            }
+        }
+
+        $usedSpace = $this->userMountCache->getUsedSpaceForUsers($userObjects);
+
+        foreach ($users as &$userData) {
+            $userData['size'] = isset($usedSpace[$userData['name']]) ? $usedSpace[$userData['name']] : 0;
+        }
+
+        return new DataResponse($users);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @PasswordConfirmationRequired
+     *
+     * @param string $username
+     * @param string $password
+     * @param array $groups
+     * @param string $email
+     * @return DataResponse
+     */
+    public function create(string $username, string $password, array $groups = [], $email = ''): DataResponse {
+        if ($email !== '' && !$this->mailer->validateMailAddress($email)) {
+            return new DataResponse(
+                [
+                    'message' => $this->l10n->t('Invalid mail address')
+                ],
+                Http::STATUS_UNPROCESSABLE_ENTITY
+            );
+        }
+
+        $currentUser = $this->userSession->getUser();
+
+        if (!$this->isAdmin) {
+            if (!empty($groups)) {
+                foreach ($groups as $key => $group) {
+                    $groupObject = $this->groupManager->get($group);
+                    if ($groupObject === null) {
+                        unset($groups[$key]);
+                        continue;
+                    }
+
+                    if (!$this->groupManager->getSubAdmin()->isSubAdminOfGroup($currentUser, $groupObject)) {
+                        unset($groups[$key]);
+                    }
+                }
+            }
+
+            if (empty($groups)) {
+                return new DataResponse(
+                    [
+                        'message' => $this->l10n->t('No valid group selected'),
+                    ],
+                    Http::STATUS_FORBIDDEN
+                );
+            }
+        }
+
+        if ($this->userManager->userExists($username)) {
+            return new DataResponse(
+                [
+                    'message' => $this->l10n->t('A user with that name already exists.')
+                ],
+                Http::STATUS_CONFLICT
+            );
+        }
+
+        $generatePasswordResetToken = false;
+        if ($password === '') {
+            if ($email === '') {
+                return new DataResponse(
+                    [
+                        'message' => $this->l10n->t('To send a password link to the user an email address is required.')
+                    ],
+                    Http::STATUS_UNPROCESSABLE_ENTITY
+                );
+            }
+
+            $password = $this->secureRandom->generate(30);
+            // Make sure we pass the password_policy
+            $password .= $this->secureRandom->generate(2, '$!.,;:-~+*[]{}()');
+            $generatePasswordResetToken = true;
+        }
+
+        try {
+            $user = $this->userManager->createUser($username, $password);
+        } catch (\Exception $exception) {
+            $message = $exception->getMessage();
+            if ($exception instanceof HintException && $exception->getHint()) {
+                $message = $exception->getHint();
+            }
+            if (!$message) {
+                $message = $this->l10n->t('Unable to create user.');
+            }
+            return new DataResponse(
+                [
+                    'message' => (string)$message,
+                ],
+                Http::STATUS_FORBIDDEN
+            );
+        }
+
+        if ($user instanceof IUser) {
+            if ($groups !== null) {
+                foreach ($groups as $groupName) {
+                    $group = $this->groupManager->get($groupName);
+
+                    if (empty($group)) {
+                        $group = $this->groupManager->createGroup($groupName);
+                    }
+                    $group->addUser($user);
+                }
+            }
+            /**
+             * Send new user mail only if a mail is set
+             */
+            if ($email !== '') {
+                $user->setEMailAddress($email);
+                try {
+                    $emailTemplate = $this->newUserMailHelper->generateTemplate($user, $generatePasswordResetToken);
+                    $this->newUserMailHelper->sendMail($user, $emailTemplate);
+                } catch (\Exception $e) {
+                    $this->log->logException($e, [
+                        'message' => "Can't send new user mail to $email",
+                        'level' => ILogger::ERROR,
+                        'app' => 'settings',
+                    ]);
+                }
+            }
+            // fetch users groups
+            $userGroups = $this->groupManager->getUserGroupNames($user);
+
+            return new DataResponse(
+                $this->formatUserForIndex($user, $userGroups),
+                Http::STATUS_CREATED
+            );
+        }
+
+        return new DataResponse(
+            [
+                'message' => $this->l10n->t('Unable to create user.')
+            ],
+            Http::STATUS_FORBIDDEN
+        );
+
+    }
+
+    /**
+     * @NoAdminRequired
+     * @PasswordConfirmationRequired
+     *
+     * @param string $id
+     * @return DataResponse
+     */
+    public function destroy(string $id): DataResponse {
+        $userId = $this->userSession->getUser()->getUID();
+        $user = $this->userManager->get($id);
+
+        if ($userId === $id) {
+            return new DataResponse(
+                [
+                    'status' => 'error',
+                    'data' => [
+                        'message' => $this->l10n->t('Unable to delete user.')
+                    ]
+                ],
+                Http::STATUS_FORBIDDEN
+            );
+        }
+
+        if (!$this->isAdmin && !$this->groupManager->getSubAdmin()->isUserAccessible($this->userSession->getUser(), $user)) {
+            return new DataResponse(
+                [
+                    'status' => 'error',
+                    'data' => [
+                        'message' => $this->l10n->t('Authentication error')
+                    ]
+                ],
+                Http::STATUS_FORBIDDEN
+            );
+        }
+
+        if ($user && $user->delete()) {
+            return new DataResponse(
+                [
+                    'status' => 'success',
+                    'data' => [
+                        'username' => $id
+                    ]
+                ],
+                Http::STATUS_NO_CONTENT
+            );
+        }
+
+        return new DataResponse(
+            [
+                'status' => 'error',
+                'data' => [
+                    'message' => $this->l10n->t('Unable to delete user.')
+                ]
+            ],
+            Http::STATUS_FORBIDDEN
+        );
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $id
+     * @param int $enabled
+     * @return DataResponse
+     */
+    public function setEnabled(string $id, int $enabled): DataResponse {
+        $enabled = (bool)$enabled;
+        if ($enabled) {
+            $errorMsgGeneral = $this->l10n->t('Error while enabling user.');
+        } else {
+            $errorMsgGeneral = $this->l10n->t('Error while disabling user.');
+        }
+
+        $userId = $this->userSession->getUser()->getUID();
+        $user = $this->userManager->get($id);
+
+        if ($userId === $id) {
+            return new DataResponse(
+                [
+                    'status' => 'error',
+                    'data' => [
+                        'message' => $errorMsgGeneral
+                    ]
+                ], Http::STATUS_FORBIDDEN
+            );
+        }
+
+        if ($user) {
+            if (!$this->isAdmin && !$this->groupManager->getSubAdmin()->isUserAccessible($this->userSession->getUser(), $user)) {
+                return new DataResponse(
+                    [
+                        'status' => 'error',
+                        'data' => [
+                            'message' => $this->l10n->t('Authentication error')
+                        ]
+                    ],
+                    Http::STATUS_FORBIDDEN
+                );
+            }
+
+            $user->setEnabled($enabled);
+            return new DataResponse(
+                [
+                    'status' => 'success',
+                    'data' => [
+                        'username' => $id,
+                        'enabled' => $enabled
+                    ]
+                ]
+            );
+        } else {
+            return new DataResponse(
+                [
+                    'status' => 'error',
+                    'data' => [
+                        'message' => $errorMsgGeneral
+                    ]
+                ],
+                Http::STATUS_FORBIDDEN
+            );
+        }
+
+    }
+
+    /**
+     * Set the mail address of a user
+     *
+     * @NoAdminRequired
+     * @NoSubadminRequired
+     * @PasswordConfirmationRequired
+     *
+     * @param string $account
+     * @param bool $onlyVerificationCode only return verification code without updating the data
+     * @return DataResponse
+     */
+    public function getVerificationCode(string $account, bool $onlyVerificationCode): DataResponse {
+
+        $user = $this->userSession->getUser();
+
+        if ($user === null) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        $accountData = $this->accountManager->getUser($user);
+        $cloudId = $user->getCloudId();
+        $message = 'Use my Federated Cloud ID to share with me: ' . $cloudId;
+        $signature = $this->signMessage($user, $message);
+
+        $code = $message . ' ' . $signature;
+        $codeMd5 = $message . ' ' . md5($signature);
+
+        switch ($account) {
+            case 'verify-twitter':
+                $accountData[AccountManager::PROPERTY_TWITTER]['verified'] = AccountManager::VERIFICATION_IN_PROGRESS;
+                $msg = $this->l10n->t('In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):');
+                $code = $codeMd5;
+                $type = AccountManager::PROPERTY_TWITTER;
+                $data = $accountData[AccountManager::PROPERTY_TWITTER]['value'];
+                $accountData[AccountManager::PROPERTY_TWITTER]['signature'] = $signature;
+                break;
+            case 'verify-website':
+                $accountData[AccountManager::PROPERTY_WEBSITE]['verified'] = AccountManager::VERIFICATION_IN_PROGRESS;
+                $msg = $this->l10n->t('In order to verify your Website, store the following content in your web-root at \'.well-known/CloudIdVerificationCode.txt\' (please make sure that the complete text is in one line):');
+                $type = AccountManager::PROPERTY_WEBSITE;
+                $data = $accountData[AccountManager::PROPERTY_WEBSITE]['value'];
+                $accountData[AccountManager::PROPERTY_WEBSITE]['signature'] = $signature;
+                break;
+            default:
+                return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        if ($onlyVerificationCode === false) {
+            $this->accountManager->updateUser($user, $accountData);
+
+            $this->jobList->add(VerifyUserData::class,
+                [
+                    'verificationCode' => $code,
+                    'data' => $data,
+                    'type' => $type,
+                    'uid' => $user->getUID(),
+                    'try' => 0,
+                    'lastRun' => $this->getCurrentTime()
+                ]
+            );
+        }
+
+        return new DataResponse(['msg' => $msg, 'code' => $code]);
+    }
+
+    /**
+     * get current timestamp
+     *
+     * @return int
+     */
+    protected function getCurrentTime(): int {
+        return time();
+    }
+
+    /**
+     * sign message with users private key
+     *
+     * @param IUser $user
+     * @param string $message
+     *
+     * @return string base64 encoded signature
+     */
+    protected function signMessage(IUser $user, string $message): string {
+        $privateKey = $this->keyManager->getKey($user)->getPrivate();
+        openssl_sign(json_encode($message), $signature, $privateKey, OPENSSL_ALGO_SHA512);
+        return base64_encode($signature);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubadminRequired
+     * @PasswordConfirmationRequired
+     *
+     * @param string $avatarScope
+     * @param string $displayname
+     * @param string $displaynameScope
+     * @param string $phone
+     * @param string $phoneScope
+     * @param string $email
+     * @param string $emailScope
+     * @param string $website
+     * @param string $websiteScope
+     * @param string $address
+     * @param string $addressScope
+     * @param string $twitter
+     * @param string $twitterScope
+     * @return DataResponse
+     */
+    public function setUserSettings($avatarScope,
+                                    $displayname,
+                                    $displaynameScope,
+                                    $phone,
+                                    $phoneScope,
+                                    $email,
+                                    $emailScope,
+                                    $website,
+                                    $websiteScope,
+                                    $address,
+                                    $addressScope,
+                                    $twitter,
+                                    $twitterScope
+    ) {
+
+        if (!empty($email) && !$this->mailer->validateMailAddress($email)) {
+            return new DataResponse(
+                [
+                    'status' => 'error',
+                    'data' => [
+                        'message' => $this->l10n->t('Invalid mail address')
+                    ]
+                ],
+                Http::STATUS_UNPROCESSABLE_ENTITY
+            );
+        }
+
+        $user = $this->userSession->getUser();
+
+        $data = $this->accountManager->getUser($user);
+
+        $data[AccountManager::PROPERTY_AVATAR] = ['scope' => $avatarScope];
+        if ($this->config->getSystemValue('allow_user_to_change_display_name', true) !== false) {
+            $data[AccountManager::PROPERTY_DISPLAYNAME] = ['value' => $displayname, 'scope' => $displaynameScope];
+            $data[AccountManager::PROPERTY_EMAIL] = ['value' => $email, 'scope' => $emailScope];
+        }
+
+        if ($this->appManager->isEnabledForUser('federatedfilesharing')) {
+            $federatedFileSharing = new \OCA\FederatedFileSharing\AppInfo\Application();
+            $shareProvider = $federatedFileSharing->getFederatedShareProvider();
+            if ($shareProvider->isLookupServerUploadEnabled()) {
+                $data[AccountManager::PROPERTY_WEBSITE] = ['value' => $website, 'scope' => $websiteScope];
+                $data[AccountManager::PROPERTY_ADDRESS] = ['value' => $address, 'scope' => $addressScope];
+                $data[AccountManager::PROPERTY_PHONE] = ['value' => $phone, 'scope' => $phoneScope];
+                $data[AccountManager::PROPERTY_TWITTER] = ['value' => $twitter, 'scope' => $twitterScope];
+            }
+        }
+
+        try {
+            $this->saveUserSettings($user, $data);
+            return new DataResponse(
+                [
+                    'status' => 'success',
+                    'data' => [
+                        'userId' => $user->getUID(),
+                        'avatarScope' => $data[AccountManager::PROPERTY_AVATAR]['scope'],
+                        'displayname' => $data[AccountManager::PROPERTY_DISPLAYNAME]['value'],
+                        'displaynameScope' => $data[AccountManager::PROPERTY_DISPLAYNAME]['scope'],
+                        'email' => $data[AccountManager::PROPERTY_EMAIL]['value'],
+                        'emailScope' => $data[AccountManager::PROPERTY_EMAIL]['scope'],
+                        'website' => $data[AccountManager::PROPERTY_WEBSITE]['value'],
+                        'websiteScope' => $data[AccountManager::PROPERTY_WEBSITE]['scope'],
+                        'address' => $data[AccountManager::PROPERTY_ADDRESS]['value'],
+                        'addressScope' => $data[AccountManager::PROPERTY_ADDRESS]['scope'],
+                        'message' => $this->l10n->t('Settings saved')
+                    ]
+                ],
+                Http::STATUS_OK
+            );
+        } catch (ForbiddenException $e) {
+            return new DataResponse([
+                'status' => 'error',
+                'data' => [
+                    'message' => $e->getMessage()
+                ],
+            ]);
+        }
+
+    }
+
+
+    /**
+     * update account manager with new user data
+     *
+     * @param IUser $user
+     * @param array $data
+     * @throws ForbiddenException
+     */
+    protected function saveUserSettings(IUser $user, array $data) {
+
+        // keep the user back-end up-to-date with the latest display name and email
+        // address
+        $oldDisplayName = $user->getDisplayName();
+        $oldDisplayName = is_null($oldDisplayName) ? '' : $oldDisplayName;
+        if (isset($data[AccountManager::PROPERTY_DISPLAYNAME]['value'])
+            && $oldDisplayName !== $data[AccountManager::PROPERTY_DISPLAYNAME]['value']
+        ) {
+            $result = $user->setDisplayName($data[AccountManager::PROPERTY_DISPLAYNAME]['value']);
+            if ($result === false) {
+                throw new ForbiddenException($this->l10n->t('Unable to change full name'));
+            }
+        }
+
+        $oldEmailAddress = $user->getEMailAddress();
+        $oldEmailAddress = is_null($oldEmailAddress) ? '' : $oldEmailAddress;
+        if (isset($data[AccountManager::PROPERTY_EMAIL]['value'])
+            && $oldEmailAddress !== $data[AccountManager::PROPERTY_EMAIL]['value']
+        ) {
+            // this is the only permission a backend provides and is also used
+            // for the permission of setting a email address
+            if (!$user->canChangeDisplayName()) {
+                throw new ForbiddenException($this->l10n->t('Unable to change email address'));
+            }
+            $user->setEMailAddress($data[AccountManager::PROPERTY_EMAIL]['value']);
+        }
+
+        $this->accountManager->updateUser($user, $data);
+    }
+
+    /**
+     * Count all unique users visible for the current admin/subadmin.
+     *
+     * @NoAdminRequired
+     *
+     * @return DataResponse
+     */
+    public function stats(): DataResponse {
+        $userCount = 0;
+        if ($this->isAdmin) {
+            $countByBackend = $this->userManager->countUsers();
+
+            if (!empty($countByBackend)) {
+                foreach ($countByBackend as $count) {
+                    $userCount += $count;
+                }
+            }
+        } else {
+            $groups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($this->userSession->getUser());
+
+            $uniqueUsers = [];
+            foreach ($groups as $group) {
+                foreach ($group->getUsers() as $uid => $displayName) {
+                    $uniqueUsers[$uid] = true;
+                }
+            }
+
+            $userCount = count($uniqueUsers);
+        }
+
+        return new DataResponse(
+            [
+                'totalUsers' => $userCount
+            ]
+        );
+    }
+
+
+    /**
+     * Set the displayName of a user
+     *
+     * @NoAdminRequired
+     * @NoSubadminRequired
+     * @PasswordConfirmationRequired
+     * @todo merge into saveUserSettings
+     *
+     * @param string $username
+     * @param string $displayName
+     * @return DataResponse
+     */
+    public function setDisplayName(string $username, string $displayName) {
+        $currentUser = $this->userSession->getUser();
+        $user = $this->userManager->get($username);
+
+        if ($user === null ||
+            !$user->canChangeDisplayName() ||
+            (
+                !$this->groupManager->isAdmin($currentUser->getUID()) &&
+                !$this->groupManager->getSubAdmin()->isUserAccessible($currentUser, $user) &&
+                $currentUser->getUID() !== $username
+
+            )
+        ) {
+            return new DataResponse([
+                'status' => 'error',
+                'data' => [
+                    'message' => $this->l10n->t('Authentication error'),
+                ],
+            ]);
+        }
+
+        $userData = $this->accountManager->getUser($user);
+        $userData[AccountManager::PROPERTY_DISPLAYNAME]['value'] = $displayName;
+
+
+        try {
+            $this->saveUserSettings($user, $userData);
+            return new DataResponse([
+                'status' => 'success',
+                'data' => [
+                    'message' => $this->l10n->t('Your full name has been changed.'),
+                    'username' => $username,
+                    'displayName' => $displayName,
+                ],
+            ]);
+        } catch (ForbiddenException $e) {
+            return new DataResponse([
+                'status' => 'error',
+                'data' => [
+                    'message' => $e->getMessage(),
+                    'displayName' => $user->getDisplayName(),
+                ],
+            ]);
+        }
+    }
+
+    /**
+     * Set the mail address of a user
+     *
+     * @NoAdminRequired
+     * @NoSubadminRequired
+     * @PasswordConfirmationRequired
+     *
+     * @param string $id
+     * @param string $mailAddress
+     * @return DataResponse
+     */
+    public function setEMailAddress(string $id, string $mailAddress) {
+        $user = $this->userManager->get($id);
+        if (!$this->isAdmin
+            && !$this->groupManager->getSubAdmin()->isUserAccessible($this->userSession->getUser(), $user)
+        ) {
+            return new DataResponse(
+                [
+                    'status' => 'error',
+                    'data' => [
+                        'message' => $this->l10n->t('Forbidden')
+                    ]
+                ],
+                Http::STATUS_FORBIDDEN
+            );
+        }
+
+        if ($mailAddress !== '' && !$this->mailer->validateMailAddress($mailAddress)) {
+            return new DataResponse(
+                [
+                    'status' => 'error',
+                    'data' => [
+                        'message' => $this->l10n->t('Invalid mail address')
+                    ]
+                ],
+                Http::STATUS_UNPROCESSABLE_ENTITY
+            );
+        }
+
+        if (!$user) {
+            return new DataResponse(
+                [
+                    'status' => 'error',
+                    'data' => [
+                        'message' => $this->l10n->t('Invalid user')
+                    ]
+                ],
+                Http::STATUS_UNPROCESSABLE_ENTITY
+            );
+        }
+        // this is the only permission a backend provides and is also used
+        // for the permission of setting a email address
+        if (!$user->canChangeDisplayName()) {
+            return new DataResponse(
+                [
+                    'status' => 'error',
+                    'data' => [
+                        'message' => $this->l10n->t('Unable to change mail address')
+                    ]
+                ],
+                Http::STATUS_FORBIDDEN
+            );
+        }
+
+        $userData = $this->accountManager->getUser($user);
+        $userData[AccountManager::PROPERTY_EMAIL]['value'] = $mailAddress;
+
+        try {
+            $this->saveUserSettings($user, $userData);
+            return new DataResponse(
+                [
+                    'status' => 'success',
+                    'data' => [
+                        'username' => $id,
+                        'mailAddress' => $mailAddress,
+                        'message' => $this->l10n->t('Email saved')
+                    ]
+                ],
+                Http::STATUS_OK
+            );
+        } catch (ForbiddenException $e) {
+            return new DataResponse([
+                'status' => 'error',
+                'data' => [
+                    'message' => $e->getMessage()
+                ],
+            ]);
+        }
+    }
 
 }

lib/private/Log/File.php

Indentation +151 added lines, -151 removed lines

@@ -48,159 +48,159 @@
  */
 
 class File implements IWriter, IFileBased {
-	/** @var string */
-	protected $logFile;
-	/** @var IConfig */
-	private $config;
+    /** @var string */
+    protected $logFile;
+    /** @var IConfig */
+    private $config;
 
-	public function __construct(string $path, string $fallbackPath = '', IConfig $config) {
-		$this->logFile = $path;
-		if (!file_exists($this->logFile)) {
-			if(
-				(
-					!is_writable(dirname($this->logFile))
-					|| !touch($this->logFile)
-				)
-				&& $fallbackPath !== ''
-			) {
-				$this->logFile = $fallbackPath;
-			}
-		}
-		$this->config = $config;
-	}
+    public function __construct(string $path, string $fallbackPath = '', IConfig $config) {
+        $this->logFile = $path;
+        if (!file_exists($this->logFile)) {
+            if(
+                (
+                    !is_writable(dirname($this->logFile))
+                    || !touch($this->logFile)
+                )
+                && $fallbackPath !== ''
+            ) {
+                $this->logFile = $fallbackPath;
+            }
+        }
+        $this->config = $config;
+    }
 
-	/**
-	 * write a message in the log
-	 * @param string $app
-	 * @param string|array $message
-	 * @param int $level
-	 */
-	public function write(string $app, $message, int $level) {
-		// default to ISO8601
-		$format = $this->config->getSystemValue('logdateformat', \DateTime::ATOM);
-		$logTimeZone = $this->config->getSystemValue('logtimezone', 'UTC');
-		try {
-			$timezone = new \DateTimeZone($logTimeZone);
-		} catch (\Exception $e) {
-			$timezone = new \DateTimeZone('UTC');
-		}
-		$time = \DateTime::createFromFormat("U.u", number_format(microtime(true), 4, ".", ""));
-		if ($time === false) {
-			$time = new \DateTime(null, $timezone);
-		} else {
-			// apply timezone if $time is created from UNIX timestamp
-			$time->setTimezone($timezone);
-		}
-		$request = \OC::$server->getRequest();
-		$reqId = $request->getId();
-		$remoteAddr = $request->getRemoteAddress();
-		// remove username/passwords from URLs before writing the to the log file
-		$time = $time->format($format);
-		$url = ($request->getRequestUri() !== '') ? $request->getRequestUri() : '--';
-		$method = is_string($request->getMethod()) ? $request->getMethod() : '--';
-		if($this->config->getSystemValue('installed', false)) {
-			$user = \OC_User::getUser() ? \OC_User::getUser() : '--';
-		} else {
-			$user = '--';
-		}
-		$userAgent = $request->getHeader('User-Agent');
-		if ($userAgent === '') {
-			$userAgent = '--';
-		}
-		$version = $this->config->getSystemValue('version', '');
-		$entry = compact(
-			'reqId',
-			'level',
-			'time',
-			'remoteAddr',
-			'user',
-			'app',
-			'method',
-			'url',
-			'message',
-			'userAgent',
-			'version'
-		);
-		// PHP's json_encode only accept proper UTF-8 strings, loop over all
-		// elements to ensure that they are properly UTF-8 compliant or convert
-		// them manually.
-		foreach($entry as $key => $value) {
-			if(is_string($value)) {
-				$testEncode = json_encode($value);
-				if($testEncode === false) {
-					$entry[$key] = utf8_encode($value);
-				}
-			}
-		}
-		$entry = json_encode($entry, JSON_PARTIAL_OUTPUT_ON_ERROR);
-		$handle = @fopen($this->logFile, 'a');
-		if ((fileperms($this->logFile) & 0777) != 0640) {
-			@chmod($this->logFile, 0640);
-		}
-		if ($handle) {
-			fwrite($handle, $entry."\n");
-			fclose($handle);
-		} else {
-			// Fall back to error_log
-			error_log($entry);
-		}
-		if (php_sapi_name() === 'cli-server') {
-			error_log($message, 4);
-		}
-	}
+    /**
+     * write a message in the log
+     * @param string $app
+     * @param string|array $message
+     * @param int $level
+     */
+    public function write(string $app, $message, int $level) {
+        // default to ISO8601
+        $format = $this->config->getSystemValue('logdateformat', \DateTime::ATOM);
+        $logTimeZone = $this->config->getSystemValue('logtimezone', 'UTC');
+        try {
+            $timezone = new \DateTimeZone($logTimeZone);
+        } catch (\Exception $e) {
+            $timezone = new \DateTimeZone('UTC');
+        }
+        $time = \DateTime::createFromFormat("U.u", number_format(microtime(true), 4, ".", ""));
+        if ($time === false) {
+            $time = new \DateTime(null, $timezone);
+        } else {
+            // apply timezone if $time is created from UNIX timestamp
+            $time->setTimezone($timezone);
+        }
+        $request = \OC::$server->getRequest();
+        $reqId = $request->getId();
+        $remoteAddr = $request->getRemoteAddress();
+        // remove username/passwords from URLs before writing the to the log file
+        $time = $time->format($format);
+        $url = ($request->getRequestUri() !== '') ? $request->getRequestUri() : '--';
+        $method = is_string($request->getMethod()) ? $request->getMethod() : '--';
+        if($this->config->getSystemValue('installed', false)) {
+            $user = \OC_User::getUser() ? \OC_User::getUser() : '--';
+        } else {
+            $user = '--';
+        }
+        $userAgent = $request->getHeader('User-Agent');
+        if ($userAgent === '') {
+            $userAgent = '--';
+        }
+        $version = $this->config->getSystemValue('version', '');
+        $entry = compact(
+            'reqId',
+            'level',
+            'time',
+            'remoteAddr',
+            'user',
+            'app',
+            'method',
+            'url',
+            'message',
+            'userAgent',
+            'version'
+        );
+        // PHP's json_encode only accept proper UTF-8 strings, loop over all
+        // elements to ensure that they are properly UTF-8 compliant or convert
+        // them manually.
+        foreach($entry as $key => $value) {
+            if(is_string($value)) {
+                $testEncode = json_encode($value);
+                if($testEncode === false) {
+                    $entry[$key] = utf8_encode($value);
+                }
+            }
+        }
+        $entry = json_encode($entry, JSON_PARTIAL_OUTPUT_ON_ERROR);
+        $handle = @fopen($this->logFile, 'a');
+        if ((fileperms($this->logFile) & 0777) != 0640) {
+            @chmod($this->logFile, 0640);
+        }
+        if ($handle) {
+            fwrite($handle, $entry."\n");
+            fclose($handle);
+        } else {
+            // Fall back to error_log
+            error_log($entry);
+        }
+        if (php_sapi_name() === 'cli-server') {
+            error_log($message, 4);
+        }
+    }
 
-	/**
-	 * get entries from the log in reverse chronological order
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array
-	 */
-	public function getEntries(int $limit=50, int $offset=0):array {
-		$minLevel = $this->config->getSystemValue("loglevel", ILogger::WARN);
-		$entries = array();
-		$handle = @fopen($this->logFile, 'rb');
-		if ($handle) {
-			fseek($handle, 0, SEEK_END);
-			$pos = ftell($handle);
-			$line = '';
-			$entriesCount = 0;
-			$lines = 0;
-			// Loop through each character of the file looking for new lines
-			while ($pos >= 0 && ($limit === null ||$entriesCount < $limit)) {
-				fseek($handle, $pos);
-				$ch = fgetc($handle);
-				if ($ch == "\n" || $pos == 0) {
-					if ($line != '') {
-						// Add the first character if at the start of the file,
-						// because it doesn't hit the else in the loop
-						if ($pos == 0) {
-							$line = $ch.$line;
-						}
-						$entry = json_decode($line);
-						// Add the line as an entry if it is passed the offset and is equal or above the log level
-						if ($entry->level >= $minLevel) {
-							$lines++;
-							if ($lines > $offset) {
-								$entries[] = $entry;
-								$entriesCount++;
-							}
-						}
-						$line = '';
-					}
-				} else {
-					$line = $ch.$line;
-				}
-				$pos--;
-			}
-			fclose($handle);
-		}
-		return $entries;
-	}
+    /**
+     * get entries from the log in reverse chronological order
+     * @param int $limit
+     * @param int $offset
+     * @return array
+     */
+    public function getEntries(int $limit=50, int $offset=0):array {
+        $minLevel = $this->config->getSystemValue("loglevel", ILogger::WARN);
+        $entries = array();
+        $handle = @fopen($this->logFile, 'rb');
+        if ($handle) {
+            fseek($handle, 0, SEEK_END);
+            $pos = ftell($handle);
+            $line = '';
+            $entriesCount = 0;
+            $lines = 0;
+            // Loop through each character of the file looking for new lines
+            while ($pos >= 0 && ($limit === null ||$entriesCount < $limit)) {
+                fseek($handle, $pos);
+                $ch = fgetc($handle);
+                if ($ch == "\n" || $pos == 0) {
+                    if ($line != '') {
+                        // Add the first character if at the start of the file,
+                        // because it doesn't hit the else in the loop
+                        if ($pos == 0) {
+                            $line = $ch.$line;
+                        }
+                        $entry = json_decode($line);
+                        // Add the line as an entry if it is passed the offset and is equal or above the log level
+                        if ($entry->level >= $minLevel) {
+                            $lines++;
+                            if ($lines > $offset) {
+                                $entries[] = $entry;
+                                $entriesCount++;
+                            }
+                        }
+                        $line = '';
+                    }
+                } else {
+                    $line = $ch.$line;
+                }
+                $pos--;
+            }
+            fclose($handle);
+        }
+        return $entries;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getLogFilePath():string {
-		return $this->logFile;
-	}
+    /**
+     * @return string
+     */
+    public function getLogFilePath():string {
+        return $this->logFile;
+    }
 }

lib/public/Log/IFileBased.php

Indentation +8 added lines, -8 removed lines

@@ -31,13 +31,13 @@
  * @since 14.0.0
  */
 interface IFileBased {
-	/**
-	 * @since 14.0.0
-	 */
-	public function getLogFilePath():string;
+    /**
+     * @since 14.0.0
+     */
+    public function getLogFilePath():string;
 
-	/**
-	 * @since 14.0.0
-	 */
-	public function getEntries(int $limit=50, int $offset=0): array;
+    /**
+     * @since 14.0.0
+     */
+    public function getEntries(int $limit=50, int $offset=0): array;
 }

apps/federation/lib/BackgroundJob/GetSharedSecret.php

Indentation +174 added lines, -174 removed lines

@@ -55,203 +55,203 @@
  */
 class GetSharedSecret extends Job {
 
-	/** @var IClient */
-	private $httpClient;
+    /** @var IClient */
+    private $httpClient;
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/** @var TrustedServers  */
-	private $trustedServers;
+    /** @var TrustedServers  */
+    private $trustedServers;
 
-	/** @var IDiscoveryService  */
-	private $ocsDiscoveryService;
+    /** @var IDiscoveryService  */
+    private $ocsDiscoveryService;
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	/** @var ITimeFactory */
-	private $timeFactory;
+    /** @var ITimeFactory */
+    private $timeFactory;
 
-	/** @var bool */
-	protected $retainJob = false;
+    /** @var bool */
+    protected $retainJob = false;
 
-	private $defaultEndPoint = '/ocs/v2.php/apps/federation/api/v1/shared-secret';
+    private $defaultEndPoint = '/ocs/v2.php/apps/federation/api/v1/shared-secret';
 
-	/** @var  int  30 day = 2592000sec */
-	private $maxLifespan = 2592000;
+    /** @var  int  30 day = 2592000sec */
+    private $maxLifespan = 2592000;
 
-	/**
-	 * RequestSharedSecret constructor.
-	 *
-	 * @param IClientService $httpClientService
-	 * @param IURLGenerator $urlGenerator
-	 * @param IJobList $jobList
-	 * @param TrustedServers $trustedServers
-	 * @param ILogger $logger
-	 * @param IDiscoveryService $ocsDiscoveryService
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(
-		IClientService $httpClientService,
-		IURLGenerator $urlGenerator,
-		IJobList $jobList,
-		TrustedServers $trustedServers,
-		ILogger $logger,
-		IDiscoveryService $ocsDiscoveryService,
-		ITimeFactory $timeFactory
-	) {
-		$this->logger = $logger;
-		$this->httpClient = $httpClientService->newClient();
-		$this->jobList = $jobList;
-		$this->urlGenerator = $urlGenerator;
-		$this->ocsDiscoveryService = $ocsDiscoveryService;
-		$this->trustedServers = $trustedServers;
-		$this->timeFactory = $timeFactory;
-	}
+    /**
+     * RequestSharedSecret constructor.
+     *
+     * @param IClientService $httpClientService
+     * @param IURLGenerator $urlGenerator
+     * @param IJobList $jobList
+     * @param TrustedServers $trustedServers
+     * @param ILogger $logger
+     * @param IDiscoveryService $ocsDiscoveryService
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(
+        IClientService $httpClientService,
+        IURLGenerator $urlGenerator,
+        IJobList $jobList,
+        TrustedServers $trustedServers,
+        ILogger $logger,
+        IDiscoveryService $ocsDiscoveryService,
+        ITimeFactory $timeFactory
+    ) {
+        $this->logger = $logger;
+        $this->httpClient = $httpClientService->newClient();
+        $this->jobList = $jobList;
+        $this->urlGenerator = $urlGenerator;
+        $this->ocsDiscoveryService = $ocsDiscoveryService;
+        $this->trustedServers = $trustedServers;
+        $this->timeFactory = $timeFactory;
+    }
 
-	/**
-	 * run the job, then remove it from the joblist
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger|null $logger
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-		$target = $this->argument['url'];
-		// only execute if target is still in the list of trusted domains
-		if ($this->trustedServers->isTrustedServer($target)) {
-			$this->parentExecute($jobList, $logger);
-		}
+    /**
+     * run the job, then remove it from the joblist
+     *
+     * @param JobList $jobList
+     * @param ILogger|null $logger
+     */
+    public function execute($jobList, ILogger $logger = null) {
+        $target = $this->argument['url'];
+        // only execute if target is still in the list of trusted domains
+        if ($this->trustedServers->isTrustedServer($target)) {
+            $this->parentExecute($jobList, $logger);
+        }
 
-		$jobList->remove($this, $this->argument);
+        $jobList->remove($this, $this->argument);
 
-		if ($this->retainJob) {
-			$this->reAddJob($this->argument);
-		}
-	}
+        if ($this->retainJob) {
+            $this->reAddJob($this->argument);
+        }
+    }
 
-	/**
-	 * call execute() method of parent
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger $logger
-	 */
-	protected function parentExecute($jobList, $logger = null) {
-		parent::execute($jobList, $logger);
-	}
+    /**
+     * call execute() method of parent
+     *
+     * @param JobList $jobList
+     * @param ILogger $logger
+     */
+    protected function parentExecute($jobList, $logger = null) {
+        parent::execute($jobList, $logger);
+    }
 
-	protected function run($argument) {
-		$target = $argument['url'];
-		$created = isset($argument['created']) ? (int)$argument['created'] : $this->timeFactory->getTime();
-		$currentTime = $this->timeFactory->getTime();
-		$source = $this->urlGenerator->getAbsoluteURL('/');
-		$source = rtrim($source, '/');
-		$token = $argument['token'];
+    protected function run($argument) {
+        $target = $argument['url'];
+        $created = isset($argument['created']) ? (int)$argument['created'] : $this->timeFactory->getTime();
+        $currentTime = $this->timeFactory->getTime();
+        $source = $this->urlGenerator->getAbsoluteURL('/');
+        $source = rtrim($source, '/');
+        $token = $argument['token'];
 
-		// kill job after 30 days of trying
-		$deadline = $currentTime - $this->maxLifespan;
-		if ($created < $deadline) {
-			$this->retainJob = false;
-			$this->trustedServers->setServerStatus($target,TrustedServers::STATUS_FAILURE);
-			return;
-		}
+        // kill job after 30 days of trying
+        $deadline = $currentTime - $this->maxLifespan;
+        if ($created < $deadline) {
+            $this->retainJob = false;
+            $this->trustedServers->setServerStatus($target,TrustedServers::STATUS_FAILURE);
+            return;
+        }
 
-		$endPoints = $this->ocsDiscoveryService->discover($target, 'FEDERATED_SHARING');
-		$endPoint = isset($endPoints['shared-secret']) ? $endPoints['shared-secret'] : $this->defaultEndPoint;
+        $endPoints = $this->ocsDiscoveryService->discover($target, 'FEDERATED_SHARING');
+        $endPoint = isset($endPoints['shared-secret']) ? $endPoints['shared-secret'] : $this->defaultEndPoint;
 
-		// make sure that we have a well formatted url
-		$url = rtrim($target, '/') . '/' . trim($endPoint, '/');
+        // make sure that we have a well formatted url
+        $url = rtrim($target, '/') . '/' . trim($endPoint, '/');
 
-		$result = null;
-		try {
-			$result = $this->httpClient->get(
-				$url,
-				[
-					'query' =>
-						[
-							'url' => $source,
-							'token' => $token,
-							'format' => 'json',
-						],
-					'timeout' => 3,
-					'connect_timeout' => 3,
-				]
-			);
+        $result = null;
+        try {
+            $result = $this->httpClient->get(
+                $url,
+                [
+                    'query' =>
+                        [
+                            'url' => $source,
+                            'token' => $token,
+                            'format' => 'json',
+                        ],
+                    'timeout' => 3,
+                    'connect_timeout' => 3,
+                ]
+            );
 
-			$status = $result->getStatusCode();
+            $status = $result->getStatusCode();
 
-		} catch (ClientException $e) {
-			$status = $e->getCode();
-			if ($status === Http::STATUS_FORBIDDEN) {
-				$this->logger->info($target . ' refused to exchange a shared secret with you.', ['app' => 'federation']);
-			} else {
-				$this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage(), ['app' => 'federation']);
-			}
-		} catch (RequestException $e) {
-			$status = -1; // There is no status code if we could not connect
-			$this->logger->logException($e, [
-				'message' => 'Could not connect to ' . $target,
-				'level' => ILogger::INFO,
-				'app' => 'federation',
-			]);
-		} catch (RingException $e) {
-			$status = -1; // There is no status code if we could not connect
-			$this->logger->logException($e, [
-				'message' => 'Could not connect to ' . $target,
-				'level' => ILogger::INFO,
-				'app' => 'federation',
-			]);
-		} catch (\Exception $e) {
-			$status = Http::STATUS_INTERNAL_SERVER_ERROR;
-			$this->logger->logException($e, ['app' => 'federation']);
-		}
+        } catch (ClientException $e) {
+            $status = $e->getCode();
+            if ($status === Http::STATUS_FORBIDDEN) {
+                $this->logger->info($target . ' refused to exchange a shared secret with you.', ['app' => 'federation']);
+            } else {
+                $this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage(), ['app' => 'federation']);
+            }
+        } catch (RequestException $e) {
+            $status = -1; // There is no status code if we could not connect
+            $this->logger->logException($e, [
+                'message' => 'Could not connect to ' . $target,
+                'level' => ILogger::INFO,
+                'app' => 'federation',
+            ]);
+        } catch (RingException $e) {
+            $status = -1; // There is no status code if we could not connect
+            $this->logger->logException($e, [
+                'message' => 'Could not connect to ' . $target,
+                'level' => ILogger::INFO,
+                'app' => 'federation',
+            ]);
+        } catch (\Exception $e) {
+            $status = Http::STATUS_INTERNAL_SERVER_ERROR;
+            $this->logger->logException($e, ['app' => 'federation']);
+        }
 
-		// if we received a unexpected response we try again later
-		if (
-			$status !== Http::STATUS_OK
-			&& $status !== Http::STATUS_FORBIDDEN
-		) {
-			$this->retainJob = true;
-		}
+        // if we received a unexpected response we try again later
+        if (
+            $status !== Http::STATUS_OK
+            && $status !== Http::STATUS_FORBIDDEN
+        ) {
+            $this->retainJob = true;
+        }
 
-		if ($status === Http::STATUS_OK && $result instanceof IResponse) {
-			$body = $result->getBody();
-			$result = json_decode($body, true);
-			if (isset($result['ocs']['data']['sharedSecret'])) {
-				$this->trustedServers->addSharedSecret(
-						$target,
-						$result['ocs']['data']['sharedSecret']
-				);
-			} else {
-				$this->logger->error(
-						'remote server "' . $target . '"" does not return a valid shared secret. Received data: ' . $body,
-						['app' => 'federation']
-				);
-				$this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE);
-			}
-		}
+        if ($status === Http::STATUS_OK && $result instanceof IResponse) {
+            $body = $result->getBody();
+            $result = json_decode($body, true);
+            if (isset($result['ocs']['data']['sharedSecret'])) {
+                $this->trustedServers->addSharedSecret(
+                        $target,
+                        $result['ocs']['data']['sharedSecret']
+                );
+            } else {
+                $this->logger->error(
+                        'remote server "' . $target . '"" does not return a valid shared secret. Received data: ' . $body,
+                        ['app' => 'federation']
+                );
+                $this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE);
+            }
+        }
 
-	}
+    }
 
-	/**
-	 * re-add background job
-	 *
-	 * @param array $argument
-	 */
-	protected function reAddJob(array $argument) {
-		$url = $argument['url'];
-		$created = isset($argument['created']) ? (int)$argument['created'] : $this->timeFactory->getTime();
-		$token = $argument['token'];
-		$this->jobList->add(
-			GetSharedSecret::class,
-			[
-				'url' => $url,
-				'token' => $token,
-				'created' => $created
-			]
-		);
-	}
+    /**
+     * re-add background job
+     *
+     * @param array $argument
+     */
+    protected function reAddJob(array $argument) {
+        $url = $argument['url'];
+        $created = isset($argument['created']) ? (int)$argument['created'] : $this->timeFactory->getTime();
+        $token = $argument['token'];
+        $this->jobList->add(
+            GetSharedSecret::class,
+            [
+                'url' => $url,
+                'token' => $token,
+                'created' => $created
+            ]
+        );
+    }
 }

settings/Controller/LogSettingsController.php

Indentation +22 added lines, -22 removed lines

@@ -39,28 +39,28 @@
  */
 class LogSettingsController extends Controller {
 
-	/** @var ILogger */
-	private $log;
+    /** @var ILogger */
+    private $log;
 
-	public function __construct(string $appName, IRequest $request, ILogger $logger) {
-		parent::__construct($appName, $request);
-		$this->log = $logger;
-	}
+    public function __construct(string $appName, IRequest $request, ILogger $logger) {
+        parent::__construct($appName, $request);
+        $this->log = $logger;
+    }
 
-	/**
-	 * download logfile
-	 *
-	 * @NoCSRFRequired
-	 *
-	 * @return StreamResponse
-	 */
-	public function download() {
-		if(!$this->log instanceof Log) {
-			throw new \UnexpectedValueException('Log file not available');
-		}
-		$resp = new StreamResponse($this->log->getLogPath());
-		$resp->addHeader('Content-Type', 'application/octet-stream');
-		$resp->addHeader('Content-Disposition', 'attachment; filename="nextcloud.log"');
-		return $resp;
-	}
+    /**
+     * download logfile
+     *
+     * @NoCSRFRequired
+     *
+     * @return StreamResponse
+     */
+    public function download() {
+        if(!$this->log instanceof Log) {
+            throw new \UnexpectedValueException('Log file not available');
+        }
+        $resp = new StreamResponse($this->log->getLogPath());
+        $resp->addHeader('Content-Type', 'application/octet-stream');
+        $resp->addHeader('Content-Disposition', 'attachment; filename="nextcloud.log"');
+        return $resp;
+    }
 }

lib/private/Log/Rotate.php

Indentation +11 added lines, -11 removed lines

@@ -33,17 +33,17 @@
  * location and manage that with your own tools.
  */
 class Rotate extends \OC\BackgroundJob\Job {
-	use RotationTrait;
+    use RotationTrait;
 
-	public function run($dummy) {
-		$systemConfig = \OC::$server->getSystemConfig();
-		$this->filePath = $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', \OC::$SERVERROOT . '/data') . '/nextcloud.log');
+    public function run($dummy) {
+        $systemConfig = \OC::$server->getSystemConfig();
+        $this->filePath = $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', \OC::$SERVERROOT . '/data') . '/nextcloud.log');
 
-		$this->maxSize = \OC::$server->getConfig()->getSystemValue('log_rotate_size', 100 * 1024 * 1024);
-		if($this->shouldRotateBySize()) {
-			$rotatedFile = $this->rotate();
-			$msg = 'Log file "'.$this->filePath.'" was over '.$this->maxSize.' bytes, moved to "'.$rotatedFile.'"';
-			\OC::$server->getLogger()->warning($msg, ['app' => Rotate::class]);
-		}
-	}
+        $this->maxSize = \OC::$server->getConfig()->getSystemValue('log_rotate_size', 100 * 1024 * 1024);
+        if($this->shouldRotateBySize()) {
+            $rotatedFile = $this->rotate();
+            $msg = 'Log file "'.$this->filePath.'" was over '.$this->maxSize.' bytes, moved to "'.$rotatedFile.'"';
+            \OC::$server->getLogger()->warning($msg, ['app' => Rotate::class]);
+        }
+    }
 }