nextcloud / server

apps/workflowengine/lib/Check/AbstractStringCheck.php

Indentation +81 added lines, -81 removed lines

@@ -28,94 +28,94 @@
 
 abstract class AbstractStringCheck implements ICheck {
 
-	/** @var array[] Nested array: [Pattern => [ActualValue => Regex Result]] */
-	protected $matches;
+    /** @var array[] Nested array: [Pattern => [ActualValue => Regex Result]] */
+    protected $matches;
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
+    /**
+     * @param IL10N $l
+     */
+    public function __construct(IL10N $l) {
+        $this->l = $l;
+    }
 
-	/**
-	 * @param IStorage $storage
-	 * @param string $path
-	 */
-	public function setFileInfo(IStorage $storage, $path) {
-		// Nothing changes here with a different path
-	}
+    /**
+     * @param IStorage $storage
+     * @param string $path
+     */
+    public function setFileInfo(IStorage $storage, $path) {
+        // Nothing changes here with a different path
+    }
 
-	/**
-	 * @return string
-	 */
-	abstract protected function getActualValue();
+    /**
+     * @return string
+     */
+    abstract protected function getActualValue();
 
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @return bool
-	 */
-	public function executeCheck($operator, $value)  {
-		$actualValue = $this->getActualValue();
-		return $this->executeStringCheck($operator, $value, $actualValue);
-	}
+    /**
+     * @param string $operator
+     * @param string $value
+     * @return bool
+     */
+    public function executeCheck($operator, $value)  {
+        $actualValue = $this->getActualValue();
+        return $this->executeStringCheck($operator, $value, $actualValue);
+    }
 
-	/**
-	 * @param string $operator
-	 * @param string $checkValue
-	 * @param string $actualValue
-	 * @return bool
-	 */
-	protected function executeStringCheck($operator, $checkValue, $actualValue) {
-		if ($operator === 'is') {
-			return $checkValue === $actualValue;
-		} else if ($operator === '!is') {
-			return $checkValue !== $actualValue;
-		} else {
-			$match = $this->match($checkValue, $actualValue);
-			if ($operator === 'matches') {
-				return $match === 1;
-			} else {
-				return $match === 0;
-			}
-		}
-	}
+    /**
+     * @param string $operator
+     * @param string $checkValue
+     * @param string $actualValue
+     * @return bool
+     */
+    protected function executeStringCheck($operator, $checkValue, $actualValue) {
+        if ($operator === 'is') {
+            return $checkValue === $actualValue;
+        } else if ($operator === '!is') {
+            return $checkValue !== $actualValue;
+        } else {
+            $match = $this->match($checkValue, $actualValue);
+            if ($operator === 'matches') {
+                return $match === 1;
+            } else {
+                return $match === 0;
+            }
+        }
+    }
 
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @throws \UnexpectedValueException
-	 */
-	public function validateCheck($operator, $value) {
-		if (!in_array($operator, ['is', '!is', 'matches', '!matches'])) {
-			throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
-		}
+    /**
+     * @param string $operator
+     * @param string $value
+     * @throws \UnexpectedValueException
+     */
+    public function validateCheck($operator, $value) {
+        if (!in_array($operator, ['is', '!is', 'matches', '!matches'])) {
+            throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
+        }
 
-		if (in_array($operator, ['matches', '!matches']) &&
-			  @preg_match($value, null) === false) {
-			throw new \UnexpectedValueException($this->l->t('The given regular expression is invalid'), 2);
-		}
-	}
+        if (in_array($operator, ['matches', '!matches']) &&
+              @preg_match($value, null) === false) {
+            throw new \UnexpectedValueException($this->l->t('The given regular expression is invalid'), 2);
+        }
+    }
 
-	/**
-	 * @param string $pattern
-	 * @param string $subject
-	 * @return int|bool
-	 */
-	protected function match($pattern, $subject) {
-		$patternHash = md5($pattern);
-		$subjectHash = md5($subject);
-		if (isset($this->matches[$patternHash][$subjectHash])) {
-			return $this->matches[$patternHash][$subjectHash];
-		}
-		if (!isset($this->matches[$patternHash])) {
-			$this->matches[$patternHash] = [];
-		}
-		$this->matches[$patternHash][$subjectHash] = preg_match($pattern, $subject);
-		return $this->matches[$patternHash][$subjectHash];
-	}
+    /**
+     * @param string $pattern
+     * @param string $subject
+     * @return int|bool
+     */
+    protected function match($pattern, $subject) {
+        $patternHash = md5($pattern);
+        $subjectHash = md5($subject);
+        if (isset($this->matches[$patternHash][$subjectHash])) {
+            return $this->matches[$patternHash][$subjectHash];
+        }
+        if (!isset($this->matches[$patternHash])) {
+            $this->matches[$patternHash] = [];
+        }
+        $this->matches[$patternHash][$subjectHash] = preg_match($pattern, $subject);
+        return $this->matches[$patternHash][$subjectHash];
+    }
 }

apps/workflowengine/lib/Check/RequestTime.php

Indentation +97 added lines, -97 removed lines

@@ -29,101 +29,101 @@
 
 class RequestTime implements ICheck {
 
-	const REGEX_TIME = '([0-1][0-9]|2[0-3]):([0-5][0-9])';
-	const REGEX_TIMEZONE = '([a-zA-Z]+(?:\\/[a-zA-Z\-\_]+)+)';
-
-	/** @var bool[] */
-	protected $cachedResults;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var ITimeFactory */
-	protected $timeFactory;
-
-	/**
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(IL10N $l, ITimeFactory $timeFactory) {
-		$this->l = $l;
-		$this->timeFactory = $timeFactory;
-	}
-
-	/**
-	 * @param IStorage $storage
-	 * @param string $path
-	 */
-	public function setFileInfo(IStorage $storage, $path) {
-		// A different path doesn't change time, so nothing to do here.
-	}
-
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @return bool
-	 */
-	public function executeCheck($operator, $value) {
-		$valueHash = md5($value);
-
-		if (isset($this->cachedResults[$valueHash])) {
-			return $this->cachedResults[$valueHash];
-		}
-
-		$timestamp = $this->timeFactory->getTime();
-
-		$values = json_decode($value, true);
-		$timestamp1 = $this->getTimestamp($timestamp, $values[0]);
-		$timestamp2 = $this->getTimestamp($timestamp, $values[1]);
-
-		if ($timestamp1 < $timestamp2) {
-			$in = $timestamp1 <= $timestamp && $timestamp <= $timestamp2;
-		} else {
-			$in = $timestamp1 <= $timestamp || $timestamp <= $timestamp2;
-		}
-
-		return ($operator === 'in') ? $in : !$in;
-	}
-
-	/**
-	 * @param int $currentTimestamp
-	 * @param string $value Format: "H:i e"
-	 * @return int
-	 */
-	protected function getTimestamp($currentTimestamp, $value) {
-		list($time1, $timezone1) = explode(' ', $value);
-		list($hour1, $minute1) = explode(':', $time1);
-		$date1 = new \DateTime('now', new \DateTimeZone($timezone1));
-		$date1->setTimestamp($currentTimestamp);
-		$date1->setTime($hour1, $minute1);
-
-		return $date1->getTimestamp();
-	}
-
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @throws \UnexpectedValueException
-	 */
-	public function validateCheck($operator, $value) {
-		if (!in_array($operator, ['in', '!in'])) {
-			throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
-		}
-
-		$regexValue = '\"' . self::REGEX_TIME . ' ' . self::REGEX_TIMEZONE . '\"';
-		$result = preg_match('/^\[' . $regexValue . ',' . $regexValue . '\]$/', $value, $matches);
-		if (!$result) {
-			throw new \UnexpectedValueException($this->l->t('The given time span is invalid'), 2);
-		}
-
-		$values = json_decode($value, true);
-		$time1 = \DateTime::createFromFormat('H:i e', $values[0]);
-		if ($time1 === false) {
-			throw new \UnexpectedValueException($this->l->t('The given start time is invalid'), 3);
-		}
-
-		$time2 = \DateTime::createFromFormat('H:i e', $values[1]);
-		if ($time2 === false) {
-			throw new \UnexpectedValueException($this->l->t('The given end time is invalid'), 4);
-		}
-	}
+    const REGEX_TIME = '([0-1][0-9]|2[0-3]):([0-5][0-9])';
+    const REGEX_TIMEZONE = '([a-zA-Z]+(?:\\/[a-zA-Z\-\_]+)+)';
+
+    /** @var bool[] */
+    protected $cachedResults;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var ITimeFactory */
+    protected $timeFactory;
+
+    /**
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(IL10N $l, ITimeFactory $timeFactory) {
+        $this->l = $l;
+        $this->timeFactory = $timeFactory;
+    }
+
+    /**
+     * @param IStorage $storage
+     * @param string $path
+     */
+    public function setFileInfo(IStorage $storage, $path) {
+        // A different path doesn't change time, so nothing to do here.
+    }
+
+    /**
+     * @param string $operator
+     * @param string $value
+     * @return bool
+     */
+    public function executeCheck($operator, $value) {
+        $valueHash = md5($value);
+
+        if (isset($this->cachedResults[$valueHash])) {
+            return $this->cachedResults[$valueHash];
+        }
+
+        $timestamp = $this->timeFactory->getTime();
+
+        $values = json_decode($value, true);
+        $timestamp1 = $this->getTimestamp($timestamp, $values[0]);
+        $timestamp2 = $this->getTimestamp($timestamp, $values[1]);
+
+        if ($timestamp1 < $timestamp2) {
+            $in = $timestamp1 <= $timestamp && $timestamp <= $timestamp2;
+        } else {
+            $in = $timestamp1 <= $timestamp || $timestamp <= $timestamp2;
+        }
+
+        return ($operator === 'in') ? $in : !$in;
+    }
+
+    /**
+     * @param int $currentTimestamp
+     * @param string $value Format: "H:i e"
+     * @return int
+     */
+    protected function getTimestamp($currentTimestamp, $value) {
+        list($time1, $timezone1) = explode(' ', $value);
+        list($hour1, $minute1) = explode(':', $time1);
+        $date1 = new \DateTime('now', new \DateTimeZone($timezone1));
+        $date1->setTimestamp($currentTimestamp);
+        $date1->setTime($hour1, $minute1);
+
+        return $date1->getTimestamp();
+    }
+
+    /**
+     * @param string $operator
+     * @param string $value
+     * @throws \UnexpectedValueException
+     */
+    public function validateCheck($operator, $value) {
+        if (!in_array($operator, ['in', '!in'])) {
+            throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
+        }
+
+        $regexValue = '\"' . self::REGEX_TIME . ' ' . self::REGEX_TIMEZONE . '\"';
+        $result = preg_match('/^\[' . $regexValue . ',' . $regexValue . '\]$/', $value, $matches);
+        if (!$result) {
+            throw new \UnexpectedValueException($this->l->t('The given time span is invalid'), 2);
+        }
+
+        $values = json_decode($value, true);
+        $time1 = \DateTime::createFromFormat('H:i e', $values[0]);
+        if ($time1 === false) {
+            throw new \UnexpectedValueException($this->l->t('The given start time is invalid'), 3);
+        }
+
+        $time2 = \DateTime::createFromFormat('H:i e', $values[1]);
+        if ($time2 === false) {
+            throw new \UnexpectedValueException($this->l->t('The given end time is invalid'), 4);
+        }
+    }
 }

apps/workflowengine/lib/Check/UserGroupMembership.php

Indentation +80 added lines, -80 removed lines

@@ -31,84 +31,84 @@
 
 class UserGroupMembership implements ICheck {
 
-	/** @var string */
-	protected $cachedUser;
-
-	/** @var string[] */
-	protected $cachedGroupMemberships;
-
-	/** @var IUserSession */
-	protected $userSession;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var IL10N */
-	protected $l;
-
-	/**
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 * @param IL10N $l
-	 */
-	public function __construct(IUserSession $userSession, IGroupManager $groupManager, IL10N $l) {
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->l = $l;
-	}
-
-	/**
-	 * @param IStorage $storage
-	 * @param string $path
-	 */
-	public function setFileInfo(IStorage $storage, $path) {
-		// A different path doesn't change group memberships, so nothing to do here.
-	}
-
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @return bool
-	 */
-	public function executeCheck($operator, $value) {
-		$user = $this->userSession->getUser();
-
-		if ($user instanceof IUser) {
-			$groupIds = $this->getUserGroups($user);
-			return ($operator === 'is') === in_array($value, $groupIds);
-		} else {
-			return $operator !== 'is';
-		}
-	}
-
-
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @throws \UnexpectedValueException
-	 */
-	public function validateCheck($operator, $value) {
-		if (!in_array($operator, ['is', '!is'])) {
-			throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
-		}
-
-		if (!$this->groupManager->groupExists($value)) {
-			throw new \UnexpectedValueException($this->l->t('The given group does not exist'), 2);
-		}
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return string[]
-	 */
-	protected function getUserGroups(IUser $user) {
-		$uid = $user->getUID();
-
-		if ($this->cachedUser !== $uid) {
-			$this->cachedUser = $uid;
-			$this->cachedGroupMemberships = $this->groupManager->getUserGroupIds($user);
-		}
-
-		return $this->cachedGroupMemberships;
-	}
+    /** @var string */
+    protected $cachedUser;
+
+    /** @var string[] */
+    protected $cachedGroupMemberships;
+
+    /** @var IUserSession */
+    protected $userSession;
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var IL10N */
+    protected $l;
+
+    /**
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     * @param IL10N $l
+     */
+    public function __construct(IUserSession $userSession, IGroupManager $groupManager, IL10N $l) {
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->l = $l;
+    }
+
+    /**
+     * @param IStorage $storage
+     * @param string $path
+     */
+    public function setFileInfo(IStorage $storage, $path) {
+        // A different path doesn't change group memberships, so nothing to do here.
+    }
+
+    /**
+     * @param string $operator
+     * @param string $value
+     * @return bool
+     */
+    public function executeCheck($operator, $value) {
+        $user = $this->userSession->getUser();
+
+        if ($user instanceof IUser) {
+            $groupIds = $this->getUserGroups($user);
+            return ($operator === 'is') === in_array($value, $groupIds);
+        } else {
+            return $operator !== 'is';
+        }
+    }
+
+
+    /**
+     * @param string $operator
+     * @param string $value
+     * @throws \UnexpectedValueException
+     */
+    public function validateCheck($operator, $value) {
+        if (!in_array($operator, ['is', '!is'])) {
+            throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
+        }
+
+        if (!$this->groupManager->groupExists($value)) {
+            throw new \UnexpectedValueException($this->l->t('The given group does not exist'), 2);
+        }
+    }
+
+    /**
+     * @param IUser $user
+     * @return string[]
+     */
+    protected function getUserGroups(IUser $user) {
+        $uid = $user->getUID();
+
+        if ($this->cachedUser !== $uid) {
+            $this->cachedUser = $uid;
+            $this->cachedGroupMemberships = $this->groupManager->getUserGroupIds($user);
+        }
+
+        return $this->cachedGroupMemberships;
+    }
 }

apps/workflowengine/lib/Check/RequestURL.php

Indentation +55 added lines, -55 removed lines

@@ -27,66 +27,66 @@
 
 class RequestURL extends AbstractStringCheck {
 
-	/** @var string */
-	protected $url;
+    /** @var string */
+    protected $url;
 
-	/** @var IRequest */
-	protected $request;
+    /** @var IRequest */
+    protected $request;
 
-	/**
-	 * @param IL10N $l
-	 * @param IRequest $request
-	 */
-	public function __construct(IL10N $l, IRequest $request) {
-		parent::__construct($l);
-		$this->request = $request;
-	}
+    /**
+     * @param IL10N $l
+     * @param IRequest $request
+     */
+    public function __construct(IL10N $l, IRequest $request) {
+        parent::__construct($l);
+        $this->request = $request;
+    }
 
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @return bool
-	 */
-	public function executeCheck($operator, $value)  {
-		$actualValue = $this->getActualValue();
-		if (in_array($operator, ['is', '!is'])) {
-			switch ($value) {
-				case 'webdav':
-					if ($operator === 'is') {
-						return $this->isWebDAVRequest();
-					} else {
-						return !$this->isWebDAVRequest();
-					}
-			}
-		}
-		return $this->executeStringCheck($operator, $value, $actualValue);
-	}
+    /**
+     * @param string $operator
+     * @param string $value
+     * @return bool
+     */
+    public function executeCheck($operator, $value)  {
+        $actualValue = $this->getActualValue();
+        if (in_array($operator, ['is', '!is'])) {
+            switch ($value) {
+                case 'webdav':
+                    if ($operator === 'is') {
+                        return $this->isWebDAVRequest();
+                    } else {
+                        return !$this->isWebDAVRequest();
+                    }
+            }
+        }
+        return $this->executeStringCheck($operator, $value, $actualValue);
+    }
 
-	/**
-	 * @return string
-	 */
-	protected function getActualValue() {
-		if ($this->url !== null) {
-			return $this->url;
-		}
+    /**
+     * @return string
+     */
+    protected function getActualValue() {
+        if ($this->url !== null) {
+            return $this->url;
+        }
 
-		$this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + ://
-		$this->url .= $this->request->getServerHost();// E.g. localhost
-		$this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php
-		$this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile
+        $this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + ://
+        $this->url .= $this->request->getServerHost();// E.g. localhost
+        $this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php
+        $this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile
 
-		return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile
-	}
+        return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile
+    }
 
-	/**
-	 * @return bool
-	 */
-	protected function isWebDAVRequest() {
-		return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
-			$this->request->getPathInfo() === '/webdav' ||
-			strpos($this->request->getPathInfo(), '/webdav/') === 0 ||
-			$this->request->getPathInfo() === '/dav/files' ||
-			strpos($this->request->getPathInfo(), '/dav/files/') === 0
-		);
-	}
+    /**
+     * @return bool
+     */
+    protected function isWebDAVRequest() {
+        return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
+            $this->request->getPathInfo() === '/webdav' ||
+            strpos($this->request->getPathInfo(), '/webdav/') === 0 ||
+            $this->request->getPathInfo() === '/dav/files' ||
+            strpos($this->request->getPathInfo(), '/dav/files/') === 0
+        );
+    }
 }

apps/workflowengine/appinfo/routes.php

Indentation +7 added lines, -7 removed lines

@@ -20,11 +20,11 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'flowOperations#getOperations', 'url' => '/operations', 'verb' => 'GET'],
-		['name' => 'flowOperations#addOperation', 'url' => '/operations', 'verb' => 'POST'],
-		['name' => 'flowOperations#updateOperation', 'url' => '/operations/{id}', 'verb' => 'PUT'],
-		['name' => 'flowOperations#deleteOperation', 'url' => '/operations/{id}', 'verb' => 'DELETE'],
-		['name' => 'requestTime#getTimezones', 'url' => '/timezones', 'verb' => 'GET'],
-	]
+    'routes' => [
+        ['name' => 'flowOperations#getOperations', 'url' => '/operations', 'verb' => 'GET'],
+        ['name' => 'flowOperations#addOperation', 'url' => '/operations', 'verb' => 'POST'],
+        ['name' => 'flowOperations#updateOperation', 'url' => '/operations/{id}', 'verb' => 'PUT'],
+        ['name' => 'flowOperations#deleteOperation', 'url' => '/operations/{id}', 'verb' => 'DELETE'],
+        ['name' => 'requestTime#getTimezones', 'url' => '/timezones', 'verb' => 'GET'],
+    ]
 ];

apps/testing/lib/AlternativeHomeUserBackend.php

Indentation +18 added lines, -18 removed lines

@@ -34,23 +34,23 @@
  *	]
  */
 class AlternativeHomeUserBackend extends \OC\User\Database {
-	public function __construct() {
-		parent::__construct();
-	}
-	/**
-	 * get the user's home directory
-	 * @param string $uid the username
-	 * @return string|false
-	 */
-	public function getHome($uid) {
-		if ($this->userExists($uid)) {
-			// workaround to avoid killing the admin
-			if ($uid !== 'admin') {
-				$uid = md5($uid);
-			}
-			return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $uid;
-		}
+    public function __construct() {
+        parent::__construct();
+    }
+    /**
+     * get the user's home directory
+     * @param string $uid the username
+     * @return string|false
+     */
+    public function getHome($uid) {
+        if ($this->userExists($uid)) {
+            // workaround to avoid killing the admin
+            if ($uid !== 'admin') {
+                $uid = md5($uid);
+            }
+            return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $uid;
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

apps/federatedfilesharing/lib/Notifier.php

Indentation +193 added lines, -193 removed lines

@@ -34,197 +34,197 @@
 use OCP\Notification\INotifier;
 
 class Notifier implements INotifier {
-	/** @var IFactory */
-	protected $factory;
-	/** @var IManager */
-	protected $contactsManager;
-	/** @var IURLGenerator */
-	protected $url;
-	/** @var array */
-	protected $federatedContacts;
-	/** @var ICloudIdManager */
-	protected $cloudIdManager;
-
-	/**
-	 * @param IFactory $factory
-	 * @param IManager $contactsManager
-	 * @param IURLGenerator $url
-	 * @param ICloudIdManager $cloudIdManager
-	 */
-	public function __construct(IFactory $factory, IManager $contactsManager, IURLGenerator $url, ICloudIdManager $cloudIdManager) {
-		$this->factory = $factory;
-		$this->contactsManager = $contactsManager;
-		$this->url = $url;
-		$this->cloudIdManager = $cloudIdManager;
-	}
-
-	/**
-	 * @param INotification $notification
-	 * @param string $languageCode The code of the language that should be used to prepare the notification
-	 * @return INotification
-	 * @throws \InvalidArgumentException
-	 */
-	public function prepare(INotification $notification, $languageCode) {
-		if ($notification->getApp() !== 'files_sharing') {
-			// Not my app => throw
-			throw new \InvalidArgumentException();
-		}
-
-		// Read the language from the notification
-		$l = $this->factory->get('files_sharing', $languageCode);
-
-		switch ($notification->getSubject()) {
-			// Deal with known subjects
-			case 'remote_share':
-				$notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-
-				$params = $notification->getSubjectParameters();
-				if ($params[0] !== $params[1] && $params[1] !== null) {
-					$notification->setParsedSubject(
-						$l->t('You received "%3$s" as a remote share from %1$s (on behalf of %2$s)', $params)
-					);
-					$notification->setRichSubject(
-						$l->t('You received {share} as a remote share from {user} (on behalf of {behalf})'),
-						[
-							'share' => [
-								'type' => 'pending-federated-share',
-								'id' => $notification->getObjectId(),
-								'name' => $params[2],
-							],
-							'user' => $this->createRemoteUser($params[0]),
-							'behalf' => $this->createRemoteUser($params[1]),
-						]
-					);
-				} else {
-					$notification->setParsedSubject(
-						$l->t('You received "%3$s" as a remote share from %1$s', $params)
-					);
-					$notification->setRichSubject(
-						$l->t('You received {share} as a remote share from {user}'),
-						[
-							'share' => [
-								'type' => 'pending-federated-share',
-								'id' => $notification->getObjectId(),
-								'name' => $params[2],
-							],
-							'user' => $this->createRemoteUser($params[0]),
-						]
-					);
-				}
-
-				// Deal with the actions for a known subject
-				foreach ($notification->getActions() as $action) {
-					switch ($action->getLabel()) {
-						case 'accept':
-							$action->setParsedLabel(
-								(string) $l->t('Accept')
-							)
-							->setPrimary(true);
-							break;
-
-						case 'decline':
-							$action->setParsedLabel(
-								(string) $l->t('Decline')
-							);
-							break;
-					}
-
-					$notification->addParsedAction($action);
-				}
-				return $notification;
-
-			default:
-				// Unknown subject => Unknown notification => throw
-				throw new \InvalidArgumentException();
-		}
-	}
-
-	/**
-	 * @param string $cloudId
-	 * @return array
-	 */
-	protected function createRemoteUser($cloudId) {
-		$displayName = $cloudId;
-		try {
-			$resolvedId = $this->cloudIdManager->resolveCloudId($cloudId);
-			$displayName = $this->getDisplayName($resolvedId);
-			$user = $resolvedId->getUser();
-			$server = $resolvedId->getRemote();
-		} catch (HintException $e) {
-			$user = $cloudId;
-			$server = '';
-		}
-
-		return [
-			'type' => 'user',
-			'id' => $user,
-			'name' => $displayName,
-			'server' => $server,
-		];
-	}
-
-	/**
-	 * Try to find the user in the contacts
-	 *
-	 * @param ICloudId $cloudId
-	 * @return string
-	 */
-	protected function getDisplayName(ICloudId $cloudId) {
-		$server = $cloudId->getRemote();
-		$user = $cloudId->getUser();
-		if (strpos($server, 'http://') === 0) {
-			$server = substr($server, strlen('http://'));
-		} else if (strpos($server, 'https://') === 0) {
-			$server = substr($server, strlen('https://'));
-		}
-
-		try {
-			return $this->getDisplayNameFromContact($cloudId->getId());
-		} catch (\OutOfBoundsException $e) {
-		}
-
-		try {
-			$this->getDisplayNameFromContact($user . '@http://' . $server);
-		} catch (\OutOfBoundsException $e) {
-		}
-
-		try {
-			$this->getDisplayNameFromContact($user . '@https://' . $server);
-		} catch (\OutOfBoundsException $e) {
-		}
-
-		return $cloudId->getId();
-	}
-
-	/**
-	 * Try to find the user in the contacts
-	 *
-	 * @param string $federatedCloudId
-	 * @return string
-	 * @throws \OutOfBoundsException when there is no contact for the id
-	 */
-	protected function getDisplayNameFromContact($federatedCloudId) {
-		if (isset($this->federatedContacts[$federatedCloudId])) {
-			if ($this->federatedContacts[$federatedCloudId] !== '') {
-				return $this->federatedContacts[$federatedCloudId];
-			} else {
-				throw new \OutOfBoundsException('No contact found for federated cloud id');
-			}
-		}
-
-		$addressBookEntries = $this->contactsManager->search($federatedCloudId, ['CLOUD']);
-		foreach ($addressBookEntries as $entry) {
-			if (isset($entry['CLOUD'])) {
-				foreach ($entry['CLOUD'] as $cloudID) {
-					if ($cloudID === $federatedCloudId) {
-						$this->federatedContacts[$federatedCloudId] = $entry['FN'];
-						return $entry['FN'];
-					}
-				}
-			}
-		}
-
-		$this->federatedContacts[$federatedCloudId] = '';
-		throw new \OutOfBoundsException('No contact found for federated cloud id');
-	}
+    /** @var IFactory */
+    protected $factory;
+    /** @var IManager */
+    protected $contactsManager;
+    /** @var IURLGenerator */
+    protected $url;
+    /** @var array */
+    protected $federatedContacts;
+    /** @var ICloudIdManager */
+    protected $cloudIdManager;
+
+    /**
+     * @param IFactory $factory
+     * @param IManager $contactsManager
+     * @param IURLGenerator $url
+     * @param ICloudIdManager $cloudIdManager
+     */
+    public function __construct(IFactory $factory, IManager $contactsManager, IURLGenerator $url, ICloudIdManager $cloudIdManager) {
+        $this->factory = $factory;
+        $this->contactsManager = $contactsManager;
+        $this->url = $url;
+        $this->cloudIdManager = $cloudIdManager;
+    }
+
+    /**
+     * @param INotification $notification
+     * @param string $languageCode The code of the language that should be used to prepare the notification
+     * @return INotification
+     * @throws \InvalidArgumentException
+     */
+    public function prepare(INotification $notification, $languageCode) {
+        if ($notification->getApp() !== 'files_sharing') {
+            // Not my app => throw
+            throw new \InvalidArgumentException();
+        }
+
+        // Read the language from the notification
+        $l = $this->factory->get('files_sharing', $languageCode);
+
+        switch ($notification->getSubject()) {
+            // Deal with known subjects
+            case 'remote_share':
+                $notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+
+                $params = $notification->getSubjectParameters();
+                if ($params[0] !== $params[1] && $params[1] !== null) {
+                    $notification->setParsedSubject(
+                        $l->t('You received "%3$s" as a remote share from %1$s (on behalf of %2$s)', $params)
+                    );
+                    $notification->setRichSubject(
+                        $l->t('You received {share} as a remote share from {user} (on behalf of {behalf})'),
+                        [
+                            'share' => [
+                                'type' => 'pending-federated-share',
+                                'id' => $notification->getObjectId(),
+                                'name' => $params[2],
+                            ],
+                            'user' => $this->createRemoteUser($params[0]),
+                            'behalf' => $this->createRemoteUser($params[1]),
+                        ]
+                    );
+                } else {
+                    $notification->setParsedSubject(
+                        $l->t('You received "%3$s" as a remote share from %1$s', $params)
+                    );
+                    $notification->setRichSubject(
+                        $l->t('You received {share} as a remote share from {user}'),
+                        [
+                            'share' => [
+                                'type' => 'pending-federated-share',
+                                'id' => $notification->getObjectId(),
+                                'name' => $params[2],
+                            ],
+                            'user' => $this->createRemoteUser($params[0]),
+                        ]
+                    );
+                }
+
+                // Deal with the actions for a known subject
+                foreach ($notification->getActions() as $action) {
+                    switch ($action->getLabel()) {
+                        case 'accept':
+                            $action->setParsedLabel(
+                                (string) $l->t('Accept')
+                            )
+                            ->setPrimary(true);
+                            break;
+
+                        case 'decline':
+                            $action->setParsedLabel(
+                                (string) $l->t('Decline')
+                            );
+                            break;
+                    }
+
+                    $notification->addParsedAction($action);
+                }
+                return $notification;
+
+            default:
+                // Unknown subject => Unknown notification => throw
+                throw new \InvalidArgumentException();
+        }
+    }
+
+    /**
+     * @param string $cloudId
+     * @return array
+     */
+    protected function createRemoteUser($cloudId) {
+        $displayName = $cloudId;
+        try {
+            $resolvedId = $this->cloudIdManager->resolveCloudId($cloudId);
+            $displayName = $this->getDisplayName($resolvedId);
+            $user = $resolvedId->getUser();
+            $server = $resolvedId->getRemote();
+        } catch (HintException $e) {
+            $user = $cloudId;
+            $server = '';
+        }
+
+        return [
+            'type' => 'user',
+            'id' => $user,
+            'name' => $displayName,
+            'server' => $server,
+        ];
+    }
+
+    /**
+     * Try to find the user in the contacts
+     *
+     * @param ICloudId $cloudId
+     * @return string
+     */
+    protected function getDisplayName(ICloudId $cloudId) {
+        $server = $cloudId->getRemote();
+        $user = $cloudId->getUser();
+        if (strpos($server, 'http://') === 0) {
+            $server = substr($server, strlen('http://'));
+        } else if (strpos($server, 'https://') === 0) {
+            $server = substr($server, strlen('https://'));
+        }
+
+        try {
+            return $this->getDisplayNameFromContact($cloudId->getId());
+        } catch (\OutOfBoundsException $e) {
+        }
+
+        try {
+            $this->getDisplayNameFromContact($user . '@http://' . $server);
+        } catch (\OutOfBoundsException $e) {
+        }
+
+        try {
+            $this->getDisplayNameFromContact($user . '@https://' . $server);
+        } catch (\OutOfBoundsException $e) {
+        }
+
+        return $cloudId->getId();
+    }
+
+    /**
+     * Try to find the user in the contacts
+     *
+     * @param string $federatedCloudId
+     * @return string
+     * @throws \OutOfBoundsException when there is no contact for the id
+     */
+    protected function getDisplayNameFromContact($federatedCloudId) {
+        if (isset($this->federatedContacts[$federatedCloudId])) {
+            if ($this->federatedContacts[$federatedCloudId] !== '') {
+                return $this->federatedContacts[$federatedCloudId];
+            } else {
+                throw new \OutOfBoundsException('No contact found for federated cloud id');
+            }
+        }
+
+        $addressBookEntries = $this->contactsManager->search($federatedCloudId, ['CLOUD']);
+        foreach ($addressBookEntries as $entry) {
+            if (isset($entry['CLOUD'])) {
+                foreach ($entry['CLOUD'] as $cloudID) {
+                    if ($cloudID === $federatedCloudId) {
+                        $this->federatedContacts[$federatedCloudId] = $entry['FN'];
+                        return $entry['FN'];
+                    }
+                }
+            }
+        }
+
+        $this->federatedContacts[$federatedCloudId] = '';
+        throw new \OutOfBoundsException('No contact found for federated cloud id');
+    }
 }

apps/federatedfilesharing/lib/TokenHandler.php

Indentation +25 added lines, -25 removed lines

@@ -33,30 +33,30 @@
  */
 class TokenHandler {
 
-	const TOKEN_LENGTH = 15;
-
-	/** @var ISecureRandom */
-	private $secureRandom;
-
-	/**
-	 * TokenHandler constructor.
-	 *
-	 * @param ISecureRandom $secureRandom
-	 */
-	public function __construct(ISecureRandom $secureRandom) {
-		$this->secureRandom = $secureRandom;
-	}
-
-	/**
-	 * generate to token used to authenticate federated shares
-	 *
-	 * @return string
-	 */
-	public function generateToken() {
-		$token = $this->secureRandom->generate(
-			self::TOKEN_LENGTH,
-			ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
-		return $token;
-	}
+    const TOKEN_LENGTH = 15;
+
+    /** @var ISecureRandom */
+    private $secureRandom;
+
+    /**
+     * TokenHandler constructor.
+     *
+     * @param ISecureRandom $secureRandom
+     */
+    public function __construct(ISecureRandom $secureRandom) {
+        $this->secureRandom = $secureRandom;
+    }
+
+    /**
+     * generate to token used to authenticate federated shares
+     *
+     * @return string
+     */
+    public function generateToken() {
+        $token = $this->secureRandom->generate(
+            self::TOKEN_LENGTH,
+            ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
+        return $token;
+    }
 
 }

apps/federation/templates/settings-admin.php

Indentation +4 added lines, -4 removed lines

@@ -28,10 +28,10 @@
 				<?php if((int)$trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
 					<span class="status success"></span>
 				<?php
-				} elseif(
-					(int)$trustedServer['status'] === TrustedServers::STATUS_PENDING ||
-					(int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
-				) { ?>
+                } elseif(
+                    (int)$trustedServer['status'] === TrustedServers::STATUS_PENDING ||
+                    (int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
+                ) { ?>
 					<span class="status indeterminate"></span>
 				<?php } else {?>
 					<span class="status error"></span>