nextcloud / server

lib/public/SystemTag/ISystemTagObjectMapper.php

Indentation +93 added lines, -93 removed lines

@@ -30,102 +30,102 @@
  */
 interface ISystemTagObjectMapper {
 
-	/**
-	 * Get a list of tag ids for the given object ids.
-	 *
-	 * This returns an array that maps object id to tag ids
-	 * [
-	 *   1 => array('id1', 'id2'),
-	 *   2 => array('id3', 'id2'),
-	 *   3 => array('id5'),
-	 *   4 => array()
-	 * ]
-	 *
-	 * Untagged objects will have an empty array associated.
-	 *
-	 * @param string|array $objIds object ids
-	 * @param string $objectType object type
-	 *
-	 * @return array with object id as key and an array
-	 * of tag ids as value
-	 *
-	 * @since 9.0.0
-	 */
-	public function getTagIdsForObjects($objIds, $objectType);
+    /**
+     * Get a list of tag ids for the given object ids.
+     *
+     * This returns an array that maps object id to tag ids
+     * [
+     *   1 => array('id1', 'id2'),
+     *   2 => array('id3', 'id2'),
+     *   3 => array('id5'),
+     *   4 => array()
+     * ]
+     *
+     * Untagged objects will have an empty array associated.
+     *
+     * @param string|array $objIds object ids
+     * @param string $objectType object type
+     *
+     * @return array with object id as key and an array
+     * of tag ids as value
+     *
+     * @since 9.0.0
+     */
+    public function getTagIdsForObjects($objIds, $objectType);
 
-	/**
-	 * Get a list of objects tagged with $tagIds.
-	 *
-	 * @param string|array $tagIds Tag id or array of tag ids.
-	 * @param string $objectType object type
-	 * @param int $limit Count of object ids you want to get
-	 * @param string $offset The last object id you already received
-	 *
-	 * @return string[] array of object ids or empty array if none found
-	 *
-	 * @throws \OCP\SystemTag\TagNotFoundException if at least one of the
-	 * given tags does not exist
-	 * @throws \InvalidArgumentException When a limit is specified together with
-	 * multiple tag ids
-	 *
-	 * @since 9.0.0
-	 */
-	public function getObjectIdsForTags($tagIds, $objectType, $limit = 0, $offset = '');
+    /**
+     * Get a list of objects tagged with $tagIds.
+     *
+     * @param string|array $tagIds Tag id or array of tag ids.
+     * @param string $objectType object type
+     * @param int $limit Count of object ids you want to get
+     * @param string $offset The last object id you already received
+     *
+     * @return string[] array of object ids or empty array if none found
+     *
+     * @throws \OCP\SystemTag\TagNotFoundException if at least one of the
+     * given tags does not exist
+     * @throws \InvalidArgumentException When a limit is specified together with
+     * multiple tag ids
+     *
+     * @since 9.0.0
+     */
+    public function getObjectIdsForTags($tagIds, $objectType, $limit = 0, $offset = '');
 
-	/**
-	 * Assign the given tags to the given object.
-	 *
-	 * If at least one of the given tag ids doesn't exist, none of the tags
-	 * will be assigned.
-	 *
-	 * If the relationship already existed, fail silently.
-	 *
-	 * @param string $objId object id
-	 * @param string $objectType object type
-	 * @param string|array $tagIds tag id or array of tag ids to assign
-	 *
-	 * @throws \OCP\SystemTag\TagNotFoundException if at least one of the
-	 * given tags does not exist
-	 *
-	 * @since 9.0.0
-	 */
-	public function assignTags($objId, $objectType, $tagIds);
+    /**
+     * Assign the given tags to the given object.
+     *
+     * If at least one of the given tag ids doesn't exist, none of the tags
+     * will be assigned.
+     *
+     * If the relationship already existed, fail silently.
+     *
+     * @param string $objId object id
+     * @param string $objectType object type
+     * @param string|array $tagIds tag id or array of tag ids to assign
+     *
+     * @throws \OCP\SystemTag\TagNotFoundException if at least one of the
+     * given tags does not exist
+     *
+     * @since 9.0.0
+     */
+    public function assignTags($objId, $objectType, $tagIds);
 
-	/**
-	 * Unassign the given tags from the given object.
-	 *
-	 * If at least one of the given tag ids doesn't exist, none of the tags
-	 * will be unassigned.
-	 *
-	 * If the relationship did not exist in the first place, fail silently.
-	 *
-	 * @param string $objId object id
-	 * @param string $objectType object type
-	 * @param string|array $tagIds tag id or array of tag ids to unassign
-	 *
-	 * @throws \OCP\SystemTag\TagNotFoundException if at least one of the
-	 * given tags does not exist
-	 *
-	 * @since 9.0.0
-	 */
-	public function unassignTags($objId, $objectType, $tagIds);
+    /**
+     * Unassign the given tags from the given object.
+     *
+     * If at least one of the given tag ids doesn't exist, none of the tags
+     * will be unassigned.
+     *
+     * If the relationship did not exist in the first place, fail silently.
+     *
+     * @param string $objId object id
+     * @param string $objectType object type
+     * @param string|array $tagIds tag id or array of tag ids to unassign
+     *
+     * @throws \OCP\SystemTag\TagNotFoundException if at least one of the
+     * given tags does not exist
+     *
+     * @since 9.0.0
+     */
+    public function unassignTags($objId, $objectType, $tagIds);
 
-	/**
-	 * Checks whether the given objects have the given tag.
-	 *
-	 * @param string|array $objIds object ids
-	 * @param string $objectType object type
-	 * @param string $tagId tag id to check
-	 * @param bool $all true to check that ALL objects have the tag assigned,
-	 * false to check that at least ONE object has the tag.
-	 *
-	 * @return bool true if the condition set by $all is matched, false
-	 * otherwise
-	 *
-	 * @throws \OCP\SystemTag\TagNotFoundException if the tag does not exist
-	 *
-	 * @since 9.0.0
-	 */
-	public function haveTag($objIds, $objectType, $tagId, $all = true);
+    /**
+     * Checks whether the given objects have the given tag.
+     *
+     * @param string|array $objIds object ids
+     * @param string $objectType object type
+     * @param string $tagId tag id to check
+     * @param bool $all true to check that ALL objects have the tag assigned,
+     * false to check that at least ONE object has the tag.
+     *
+     * @return bool true if the condition set by $all is matched, false
+     * otherwise
+     *
+     * @throws \OCP\SystemTag\TagNotFoundException if the tag does not exist
+     *
+     * @since 9.0.0
+     */
+    public function haveTag($objIds, $objectType, $tagId, $all = true);
 
 }

lib/public/SystemTag/SystemTagsEntityEvent.php

Indentation +37 added lines, -37 removed lines

@@ -32,46 +32,46 @@
  */
 class SystemTagsEntityEvent extends Event {
 
-	const EVENT_ENTITY = 'OCP\SystemTag\ISystemTagManager::registerEntity';
+    const EVENT_ENTITY = 'OCP\SystemTag\ISystemTagManager::registerEntity';
 
-	/** @var string */
-	protected $event;
-	/** @var \Closure[] */
-	protected $collections;
+    /** @var string */
+    protected $event;
+    /** @var \Closure[] */
+    protected $collections;
 
-	/**
-	 * SystemTagsEntityEvent constructor.
-	 *
-	 * @param string $event
-	 * @since 9.1.0
-	 */
-	public function __construct($event) {
-		$this->event = $event;
-		$this->collections = [];
-	}
+    /**
+     * SystemTagsEntityEvent constructor.
+     *
+     * @param string $event
+     * @since 9.1.0
+     */
+    public function __construct($event) {
+        $this->event = $event;
+        $this->collections = [];
+    }
 
-	/**
-	 * @param string $name
-	 * @param \Closure $entityExistsFunction The closure should take one
-	 *                 argument, which is the id of the entity, that tags
-	 *                 should be handled for. The return should then be bool,
-	 *                 depending on whether tags are allowed (true) or not.
-	 * @throws \OutOfBoundsException when the entity name is already taken
-	 * @since 9.1.0
-	 */
-	public function addEntityCollection($name, \Closure $entityExistsFunction) {
-		if (isset($this->collections[$name])) {
-			throw new \OutOfBoundsException('Duplicate entity name "' . $name . '"');
-		}
+    /**
+     * @param string $name
+     * @param \Closure $entityExistsFunction The closure should take one
+     *                 argument, which is the id of the entity, that tags
+     *                 should be handled for. The return should then be bool,
+     *                 depending on whether tags are allowed (true) or not.
+     * @throws \OutOfBoundsException when the entity name is already taken
+     * @since 9.1.0
+     */
+    public function addEntityCollection($name, \Closure $entityExistsFunction) {
+        if (isset($this->collections[$name])) {
+            throw new \OutOfBoundsException('Duplicate entity name "' . $name . '"');
+        }
 
-		$this->collections[$name] = $entityExistsFunction;
-	}
+        $this->collections[$name] = $entityExistsFunction;
+    }
 
-	/**
-	 * @return \Closure[]
-	 * @since 9.1.0
-	 */
-	public function getEntityCollections() {
-		return $this->collections;
-	}
+    /**
+     * @return \Closure[]
+     * @since 9.1.0
+     */
+    public function getEntityCollections() {
+        return $this->collections;
+    }
 }

lib/public/SystemTag/ISystemTagManager.php

Indentation +120 added lines, -120 removed lines

@@ -33,133 +33,133 @@
  */
 interface ISystemTagManager {
 
-	/**
-	 * Returns the tag objects matching the given tag ids.
-	 *
-	 * @param array|string $tagIds id or array of unique ids of the tag to retrieve
-	 *
-	 * @return \OCP\SystemTag\ISystemTag[] array of system tags with tag id as key
-	 *
-	 * @throws \InvalidArgumentException if at least one given tag ids is invalid (string instead of integer, etc.)
-	 * @throws \OCP\SystemTag\TagNotFoundException if at least one given tag ids did no exist
-	 * 			The message contains a json_encoded array of the ids that could not be found
-	 *
-	 * @since 9.0.0
-	 */
-	public function getTagsByIds($tagIds);
+    /**
+     * Returns the tag objects matching the given tag ids.
+     *
+     * @param array|string $tagIds id or array of unique ids of the tag to retrieve
+     *
+     * @return \OCP\SystemTag\ISystemTag[] array of system tags with tag id as key
+     *
+     * @throws \InvalidArgumentException if at least one given tag ids is invalid (string instead of integer, etc.)
+     * @throws \OCP\SystemTag\TagNotFoundException if at least one given tag ids did no exist
+     * 			The message contains a json_encoded array of the ids that could not be found
+     *
+     * @since 9.0.0
+     */
+    public function getTagsByIds($tagIds);
 
-	/**
-	 * Returns the tag object matching the given attributes.
-	 *
-	 * @param string $tagName tag name
-	 * @param bool $userVisible whether the tag is visible by users
-	 * @param bool $userAssignable whether the tag is assignable by users
-	 *
-	 * @return \OCP\SystemTag\ISystemTag system tag
-	 *
-	 * @throws \OCP\SystemTag\TagNotFoundException if tag does not exist
-	 *
-	 * @since 9.0.0
-	 */
-	public function getTag($tagName, $userVisible, $userAssignable);
+    /**
+     * Returns the tag object matching the given attributes.
+     *
+     * @param string $tagName tag name
+     * @param bool $userVisible whether the tag is visible by users
+     * @param bool $userAssignable whether the tag is assignable by users
+     *
+     * @return \OCP\SystemTag\ISystemTag system tag
+     *
+     * @throws \OCP\SystemTag\TagNotFoundException if tag does not exist
+     *
+     * @since 9.0.0
+     */
+    public function getTag($tagName, $userVisible, $userAssignable);
 
-	/**
-	 * Creates the tag object using the given attributes.
-	 *
-	 * @param string $tagName tag name
-	 * @param bool $userVisible whether the tag is visible by users
-	 * @param bool $userAssignable whether the tag is assignable by users
-	 *
-	 * @return \OCP\SystemTag\ISystemTag system tag
-	 *
-	 * @throws \OCP\SystemTag\TagAlreadyExistsException if tag already exists
-	 *
-	 * @since 9.0.0
-	 */
-	public function createTag($tagName, $userVisible, $userAssignable);
+    /**
+     * Creates the tag object using the given attributes.
+     *
+     * @param string $tagName tag name
+     * @param bool $userVisible whether the tag is visible by users
+     * @param bool $userAssignable whether the tag is assignable by users
+     *
+     * @return \OCP\SystemTag\ISystemTag system tag
+     *
+     * @throws \OCP\SystemTag\TagAlreadyExistsException if tag already exists
+     *
+     * @since 9.0.0
+     */
+    public function createTag($tagName, $userVisible, $userAssignable);
 
-	/**
-	 * Returns all known tags, optionally filtered by visibility.
-	 *
-	 * @param bool|null $visibilityFilter filter by visibility if non-null
-	 * @param string $nameSearchPattern optional search pattern for the tag name
-	 *
-	 * @return \OCP\SystemTag\ISystemTag[] array of system tags or empty array if none found
-	 *
-	 * @since 9.0.0
-	 */
-	public function getAllTags($visibilityFilter = null, $nameSearchPattern = null);
+    /**
+     * Returns all known tags, optionally filtered by visibility.
+     *
+     * @param bool|null $visibilityFilter filter by visibility if non-null
+     * @param string $nameSearchPattern optional search pattern for the tag name
+     *
+     * @return \OCP\SystemTag\ISystemTag[] array of system tags or empty array if none found
+     *
+     * @since 9.0.0
+     */
+    public function getAllTags($visibilityFilter = null, $nameSearchPattern = null);
 
-	/**
-	 * Updates the given tag
-	 *
-	 * @param string $tagId tag id
-	 * @param string $newName the new tag name
-	 * @param bool $userVisible whether the tag is visible by users
-	 * @param bool $userAssignable whether the tag is assignable by users
-	 *
-	 * @throws \OCP\SystemTag\TagNotFoundException if tag with the given id does not exist
-	 * @throws \OCP\SystemTag\TagAlreadyExistsException if there is already another tag
-	 * with the same attributes
-	 *
-	 * @since 9.0.0
-	 */
-	public function updateTag($tagId, $newName, $userVisible, $userAssignable);
+    /**
+     * Updates the given tag
+     *
+     * @param string $tagId tag id
+     * @param string $newName the new tag name
+     * @param bool $userVisible whether the tag is visible by users
+     * @param bool $userAssignable whether the tag is assignable by users
+     *
+     * @throws \OCP\SystemTag\TagNotFoundException if tag with the given id does not exist
+     * @throws \OCP\SystemTag\TagAlreadyExistsException if there is already another tag
+     * with the same attributes
+     *
+     * @since 9.0.0
+     */
+    public function updateTag($tagId, $newName, $userVisible, $userAssignable);
 
-	/**
-	 * Delete the given tags from the database and all their relationships.
-	 *
-	 * @param string|array $tagIds array of tag ids
-	 *
-	 * @throws \OCP\SystemTag\TagNotFoundException if at least one tag did not exist
-	 *
-	 * @since 9.0.0
-	 */
-	public function deleteTags($tagIds);
+    /**
+     * Delete the given tags from the database and all their relationships.
+     *
+     * @param string|array $tagIds array of tag ids
+     *
+     * @throws \OCP\SystemTag\TagNotFoundException if at least one tag did not exist
+     *
+     * @since 9.0.0
+     */
+    public function deleteTags($tagIds);
 
-	/**
-	 * Checks whether the given user is allowed to assign/unassign the tag with the
-	 * given id.
-	 *
-	 * @param ISystemTag $tag tag to check permission for
-	 * @param IUser $user user to check permission for
-	 *
-	 * @return true if the user is allowed to assign/unassign the tag, false otherwise
-	 *
-	 * @since 9.1.0
-	 */
-	public function canUserAssignTag(ISystemTag $tag, IUser $user);
+    /**
+     * Checks whether the given user is allowed to assign/unassign the tag with the
+     * given id.
+     *
+     * @param ISystemTag $tag tag to check permission for
+     * @param IUser $user user to check permission for
+     *
+     * @return true if the user is allowed to assign/unassign the tag, false otherwise
+     *
+     * @since 9.1.0
+     */
+    public function canUserAssignTag(ISystemTag $tag, IUser $user);
 
-	/**
-	 * Checks whether the given user is allowed to see the tag with the given id.
-	 *
-	 * @param ISystemTag $tag tag to check permission for
-	 * @param IUser $user user to check permission for
-	 *
-	 * @return true if the user can see the tag, false otherwise
-	 *
-	 * @since 9.1.0
-	 */
-	public function canUserSeeTag(ISystemTag $tag, IUser $userId);
+    /**
+     * Checks whether the given user is allowed to see the tag with the given id.
+     *
+     * @param ISystemTag $tag tag to check permission for
+     * @param IUser $user user to check permission for
+     *
+     * @return true if the user can see the tag, false otherwise
+     *
+     * @since 9.1.0
+     */
+    public function canUserSeeTag(ISystemTag $tag, IUser $userId);
 
-	/**
-	 * Set groups that can assign a given tag.
-	 *
-	 * @param ISystemTag $tag tag for group assignment
-	 * @param string[] $groupIds group ids of groups that can assign/unassign the tag
-	 *
-	 * @since 9.1.0
-	 */
-	public function setTagGroups(ISystemTag $tag, $groupIds);
+    /**
+     * Set groups that can assign a given tag.
+     *
+     * @param ISystemTag $tag tag for group assignment
+     * @param string[] $groupIds group ids of groups that can assign/unassign the tag
+     *
+     * @since 9.1.0
+     */
+    public function setTagGroups(ISystemTag $tag, $groupIds);
 
-	/**
-	 * Get groups that can assign a given tag.
-	 *
-	 * @param ISystemTag $tag tag for group assignment
-	 *
-	 * @return string[] group ids of groups that can assign/unassign the tag
-	 *
-	 * @since 9.1.0
-	 */
-	public function getTagGroups(ISystemTag $tag);
+    /**
+     * Get groups that can assign a given tag.
+     *
+     * @param ISystemTag $tag tag for group assignment
+     *
+     * @return string[] group ids of groups that can assign/unassign the tag
+     *
+     * @since 9.1.0
+     */
+    public function getTagGroups(ISystemTag $tag);
 }

lib/private/Authentication/LoginCredentials/Credentials.php

Indentation +34 added lines, -34 removed lines

@@ -28,45 +28,45 @@
 
 class Credentials implements ICredentials {
 
-	/** @var string */
-	private $uid;
+    /** @var string */
+    private $uid;
 
-	/** @var string */
-	private $loginName;
+    /** @var string */
+    private $loginName;
 
-	/** @var string */
-	private $password;
+    /** @var string */
+    private $password;
 
-	/**
-	 * @param string $uid
-	 * @param string $loginName
-	 * @param string $password
-	 */
-	public function __construct($uid, $loginName, $password) {
-		$this->uid = $uid;
-		$this->loginName = $loginName;
-		$this->password = $password;
-	}
+    /**
+     * @param string $uid
+     * @param string $loginName
+     * @param string $password
+     */
+    public function __construct($uid, $loginName, $password) {
+        $this->uid = $uid;
+        $this->loginName = $loginName;
+        $this->password = $password;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getUID() {
-		return $this->uid;
-	}
+    /**
+     * @return string
+     */
+    public function getUID() {
+        return $this->uid;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getLoginName() {
-		return $this->loginName;
-	}
+    /**
+     * @return string
+     */
+    public function getLoginName() {
+        return $this->loginName;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getPassword() {
-		return $this->password;
-	}
+    /**
+     * @return string
+     */
+    public function getPassword() {
+        return $this->password;
+    }
 
 }

lib/private/Authentication/LoginCredentials/Store.php

Indentation +79 added lines, -79 removed lines

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

lib/private/Authentication/Token/DefaultTokenCleanupJob.php

Indentation +5 added lines, -5 removed lines

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

lib/private/Authentication/Token/DefaultToken.php

Indentation +131 added lines, -131 removed lines

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

lib/private/Authentication/Token/IToken.php

Indentation +58 added lines, -58 removed lines

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

lib/private/LargeFileHelper.php

Indentation +158 added lines, -158 removed lines

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