nextcloud / server

apps/dav/lib/DAV/CustomPropertiesBackend.php

Indentation +253 added lines, -253 removed lines

@@ -34,258 +34,258 @@
 
 class CustomPropertiesBackend implements BackendInterface {
 
-	/**
-	 * Ignored properties
-	 *
-	 * @var array
-	 */
-	private $ignoredProperties = array(
-		'{DAV:}getcontentlength',
-		'{DAV:}getcontenttype',
-		'{DAV:}getetag',
-		'{DAV:}quota-used-bytes',
-		'{DAV:}quota-available-bytes',
-		'{http://owncloud.org/ns}permissions',
-		'{http://owncloud.org/ns}downloadURL',
-		'{http://owncloud.org/ns}dDC',
-		'{http://owncloud.org/ns}size',
-	);
-
-	/**
-	 * @var Tree
-	 */
-	private $tree;
-
-	/**
-	 * @var IDBConnection
-	 */
-	private $connection;
-
-	/**
-	 * @var string
-	 */
-	private $user;
-
-	/**
-	 * Properties cache
-	 *
-	 * @var array
-	 */
-	private $cache = [];
-
-	/**
-	 * @param Tree $tree node tree
-	 * @param IDBConnection $connection database connection
-	 * @param IUser $user owner of the tree and properties
-	 */
-	public function __construct(
-		Tree $tree,
-		IDBConnection $connection,
-		IUser $user) {
-		$this->tree = $tree;
-		$this->connection = $connection;
-		$this->user = $user->getUID();
-	}
-
-	/**
-	 * Fetches properties for a path.
-	 *
-	 * @param string $path
-	 * @param PropFind $propFind
-	 * @return void
-	 */
-	public function propFind($path, PropFind $propFind) {
-
-		$requestedProps = $propFind->get404Properties();
-
-		// these might appear
-		$requestedProps = array_diff(
-			$requestedProps,
-			$this->ignoredProperties
-		);
-
-		// substr of calendars/ => path is inside the CalDAV component
-		// two '/' => this a calendar (no calendar-home nor calendar object)
-		if (substr($path, 0, 10) === 'calendars/' && substr_count($path, '/') === 2) {
-			$allRequestedProps = $propFind->getRequestedProperties();
-			$customPropertiesForShares = [
-				'{DAV:}displayname',
-				'{urn:ietf:params:xml:ns:caldav}calendar-description',
-				'{urn:ietf:params:xml:ns:caldav}calendar-timezone',
-				'{http://apple.com/ns/ical/}calendar-order',
-				'{http://apple.com/ns/ical/}calendar-color',
-				'{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp',
-			];
-
-			foreach ($customPropertiesForShares as $customPropertyForShares) {
-				if (in_array($customPropertyForShares, $allRequestedProps)) {
-					$requestedProps[] = $customPropertyForShares;
-				}
-			}
-		}
-
-		if (empty($requestedProps)) {
-			return;
-		}
-
-		$props = $this->getProperties($path, $requestedProps);
-		foreach ($props as $propName => $propValue) {
-			$propFind->set($propName, $propValue);
-		}
-	}
-
-	/**
-	 * Updates properties for a path
-	 *
-	 * @param string $path
-	 * @param PropPatch $propPatch
-	 *
-	 * @return void
-	 */
-	public function propPatch($path, PropPatch $propPatch) {
-		$propPatch->handleRemaining(function($changedProps) use ($path) {
-			return $this->updateProperties($path, $changedProps);
-		});
-	}
-
-	/**
-	 * This method is called after a node is deleted.
-	 *
-	 * @param string $path path of node for which to delete properties
-	 */
-	public function delete($path) {
-		$statement = $this->connection->prepare(
-			'DELETE FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ?'
-		);
-		$statement->execute(array($this->user, $path));
-		$statement->closeCursor();
-
-		unset($this->cache[$path]);
-	}
-
-	/**
-	 * This method is called after a successful MOVE
-	 *
-	 * @param string $source
-	 * @param string $destination
-	 *
-	 * @return void
-	 */
-	public function move($source, $destination) {
-		$statement = $this->connection->prepare(
-			'UPDATE `*PREFIX*properties` SET `propertypath` = ?' .
-			' WHERE `userid` = ? AND `propertypath` = ?'
-		);
-		$statement->execute(array($destination, $this->user, $source));
-		$statement->closeCursor();
-	}
-
-	/**
-	 * Returns a list of properties for this nodes.;
-	 * @param string $path
-	 * @param array $requestedProperties requested properties or empty array for "all"
-	 * @return array
-	 * @note The properties list is a list of propertynames the client
-	 * requested, encoded as xmlnamespace#tagName, for example:
-	 * http://www.example.org/namespace#author If the array is empty, all
-	 * properties should be returned
-	 */
-	private function getProperties($path, array $requestedProperties) {
-		if (isset($this->cache[$path])) {
-			return $this->cache[$path];
-		}
-
-		// TODO: chunking if more than 1000 properties
-		$sql = 'SELECT * FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ?';
-
-		$whereValues = array($this->user, $path);
-		$whereTypes = array(null, null);
-
-		if (!empty($requestedProperties)) {
-			// request only a subset
-			$sql .= ' AND `propertyname` in (?)';
-			$whereValues[] = $requestedProperties;
-			$whereTypes[] = \Doctrine\DBAL\Connection::PARAM_STR_ARRAY;
-		}
-
-		$result = $this->connection->executeQuery(
-			$sql,
-			$whereValues,
-			$whereTypes
-		);
-
-		$props = [];
-		while ($row = $result->fetch()) {
-			$props[$row['propertyname']] = $row['propertyvalue'];
-		}
-
-		$result->closeCursor();
-
-		$this->cache[$path] = $props;
-		return $props;
-	}
-
-	/**
-	 * Update properties
-	 *
-	 * @param string $path node for which to update properties
-	 * @param array $properties array of properties to update
-	 *
-	 * @return bool
-	 */
-	private function updateProperties($path, $properties) {
-
-		$deleteStatement = 'DELETE FROM `*PREFIX*properties`' .
-			' WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?';
-
-		$insertStatement = 'INSERT INTO `*PREFIX*properties`' .
-			' (`userid`,`propertypath`,`propertyname`,`propertyvalue`) VALUES(?,?,?,?)';
-
-		$updateStatement = 'UPDATE `*PREFIX*properties` SET `propertyvalue` = ?' .
-			' WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?';
-
-		// TODO: use "insert or update" strategy ?
-		$existing = $this->getProperties($path, array());
-		$this->connection->beginTransaction();
-		foreach ($properties as $propertyName => $propertyValue) {
-			// If it was null, we need to delete the property
-			if (is_null($propertyValue)) {
-				if (array_key_exists($propertyName, $existing)) {
-					$this->connection->executeUpdate($deleteStatement,
-						array(
-							$this->user,
-							$path,
-							$propertyName
-						)
-					);
-				}
-			} else {
-				if (!array_key_exists($propertyName, $existing)) {
-					$this->connection->executeUpdate($insertStatement,
-						array(
-							$this->user,
-							$path,
-							$propertyName,
-							$propertyValue
-						)
-					);
-				} else {
-					$this->connection->executeUpdate($updateStatement,
-						array(
-							$propertyValue,
-							$this->user,
-							$path,
-							$propertyName
-						)
-					);
-				}
-			}
-		}
-
-		$this->connection->commit();
-		unset($this->cache[$path]);
-
-		return true;
-	}
+    /**
+     * Ignored properties
+     *
+     * @var array
+     */
+    private $ignoredProperties = array(
+        '{DAV:}getcontentlength',
+        '{DAV:}getcontenttype',
+        '{DAV:}getetag',
+        '{DAV:}quota-used-bytes',
+        '{DAV:}quota-available-bytes',
+        '{http://owncloud.org/ns}permissions',
+        '{http://owncloud.org/ns}downloadURL',
+        '{http://owncloud.org/ns}dDC',
+        '{http://owncloud.org/ns}size',
+    );
+
+    /**
+     * @var Tree
+     */
+    private $tree;
+
+    /**
+     * @var IDBConnection
+     */
+    private $connection;
+
+    /**
+     * @var string
+     */
+    private $user;
+
+    /**
+     * Properties cache
+     *
+     * @var array
+     */
+    private $cache = [];
+
+    /**
+     * @param Tree $tree node tree
+     * @param IDBConnection $connection database connection
+     * @param IUser $user owner of the tree and properties
+     */
+    public function __construct(
+        Tree $tree,
+        IDBConnection $connection,
+        IUser $user) {
+        $this->tree = $tree;
+        $this->connection = $connection;
+        $this->user = $user->getUID();
+    }
+
+    /**
+     * Fetches properties for a path.
+     *
+     * @param string $path
+     * @param PropFind $propFind
+     * @return void
+     */
+    public function propFind($path, PropFind $propFind) {
+
+        $requestedProps = $propFind->get404Properties();
+
+        // these might appear
+        $requestedProps = array_diff(
+            $requestedProps,
+            $this->ignoredProperties
+        );
+
+        // substr of calendars/ => path is inside the CalDAV component
+        // two '/' => this a calendar (no calendar-home nor calendar object)
+        if (substr($path, 0, 10) === 'calendars/' && substr_count($path, '/') === 2) {
+            $allRequestedProps = $propFind->getRequestedProperties();
+            $customPropertiesForShares = [
+                '{DAV:}displayname',
+                '{urn:ietf:params:xml:ns:caldav}calendar-description',
+                '{urn:ietf:params:xml:ns:caldav}calendar-timezone',
+                '{http://apple.com/ns/ical/}calendar-order',
+                '{http://apple.com/ns/ical/}calendar-color',
+                '{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp',
+            ];
+
+            foreach ($customPropertiesForShares as $customPropertyForShares) {
+                if (in_array($customPropertyForShares, $allRequestedProps)) {
+                    $requestedProps[] = $customPropertyForShares;
+                }
+            }
+        }
+
+        if (empty($requestedProps)) {
+            return;
+        }
+
+        $props = $this->getProperties($path, $requestedProps);
+        foreach ($props as $propName => $propValue) {
+            $propFind->set($propName, $propValue);
+        }
+    }
+
+    /**
+     * Updates properties for a path
+     *
+     * @param string $path
+     * @param PropPatch $propPatch
+     *
+     * @return void
+     */
+    public function propPatch($path, PropPatch $propPatch) {
+        $propPatch->handleRemaining(function($changedProps) use ($path) {
+            return $this->updateProperties($path, $changedProps);
+        });
+    }
+
+    /**
+     * This method is called after a node is deleted.
+     *
+     * @param string $path path of node for which to delete properties
+     */
+    public function delete($path) {
+        $statement = $this->connection->prepare(
+            'DELETE FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ?'
+        );
+        $statement->execute(array($this->user, $path));
+        $statement->closeCursor();
+
+        unset($this->cache[$path]);
+    }
+
+    /**
+     * This method is called after a successful MOVE
+     *
+     * @param string $source
+     * @param string $destination
+     *
+     * @return void
+     */
+    public function move($source, $destination) {
+        $statement = $this->connection->prepare(
+            'UPDATE `*PREFIX*properties` SET `propertypath` = ?' .
+            ' WHERE `userid` = ? AND `propertypath` = ?'
+        );
+        $statement->execute(array($destination, $this->user, $source));
+        $statement->closeCursor();
+    }
+
+    /**
+     * Returns a list of properties for this nodes.;
+     * @param string $path
+     * @param array $requestedProperties requested properties or empty array for "all"
+     * @return array
+     * @note The properties list is a list of propertynames the client
+     * requested, encoded as xmlnamespace#tagName, for example:
+     * http://www.example.org/namespace#author If the array is empty, all
+     * properties should be returned
+     */
+    private function getProperties($path, array $requestedProperties) {
+        if (isset($this->cache[$path])) {
+            return $this->cache[$path];
+        }
+
+        // TODO: chunking if more than 1000 properties
+        $sql = 'SELECT * FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ?';
+
+        $whereValues = array($this->user, $path);
+        $whereTypes = array(null, null);
+
+        if (!empty($requestedProperties)) {
+            // request only a subset
+            $sql .= ' AND `propertyname` in (?)';
+            $whereValues[] = $requestedProperties;
+            $whereTypes[] = \Doctrine\DBAL\Connection::PARAM_STR_ARRAY;
+        }
+
+        $result = $this->connection->executeQuery(
+            $sql,
+            $whereValues,
+            $whereTypes
+        );
+
+        $props = [];
+        while ($row = $result->fetch()) {
+            $props[$row['propertyname']] = $row['propertyvalue'];
+        }
+
+        $result->closeCursor();
+
+        $this->cache[$path] = $props;
+        return $props;
+    }
+
+    /**
+     * Update properties
+     *
+     * @param string $path node for which to update properties
+     * @param array $properties array of properties to update
+     *
+     * @return bool
+     */
+    private function updateProperties($path, $properties) {
+
+        $deleteStatement = 'DELETE FROM `*PREFIX*properties`' .
+            ' WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?';
+
+        $insertStatement = 'INSERT INTO `*PREFIX*properties`' .
+            ' (`userid`,`propertypath`,`propertyname`,`propertyvalue`) VALUES(?,?,?,?)';
+
+        $updateStatement = 'UPDATE `*PREFIX*properties` SET `propertyvalue` = ?' .
+            ' WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?';
+
+        // TODO: use "insert or update" strategy ?
+        $existing = $this->getProperties($path, array());
+        $this->connection->beginTransaction();
+        foreach ($properties as $propertyName => $propertyValue) {
+            // If it was null, we need to delete the property
+            if (is_null($propertyValue)) {
+                if (array_key_exists($propertyName, $existing)) {
+                    $this->connection->executeUpdate($deleteStatement,
+                        array(
+                            $this->user,
+                            $path,
+                            $propertyName
+                        )
+                    );
+                }
+            } else {
+                if (!array_key_exists($propertyName, $existing)) {
+                    $this->connection->executeUpdate($insertStatement,
+                        array(
+                            $this->user,
+                            $path,
+                            $propertyName,
+                            $propertyValue
+                        )
+                    );
+                } else {
+                    $this->connection->executeUpdate($updateStatement,
+                        array(
+                            $propertyValue,
+                            $this->user,
+                            $path,
+                            $propertyName
+                        )
+                    );
+                }
+            }
+        }
+
+        $this->connection->commit();
+        unset($this->cache[$path]);
+
+        return true;
+    }
 
 }

lib/private/Activity/EventMerger.php

Indentation +201 added lines, -201 removed lines

@@ -27,230 +27,230 @@
 
 class EventMerger implements IEventMerger {
 
-	/** @var IL10N */
-	protected $l10n;
+    /** @var IL10N */
+    protected $l10n;
 
-	/**
-	 * @param IL10N $l10n
-	 */
-	public function __construct(IL10N $l10n) {
-		$this->l10n = $l10n;
-	}
+    /**
+     * @param IL10N $l10n
+     */
+    public function __construct(IL10N $l10n) {
+        $this->l10n = $l10n;
+    }
 
-	/**
-	 * Combines two events when possible to have grouping:
-	 *
-	 * Example1: Two events with subject '{user} created {file}' and
-	 * $mergeParameter file with different file and same user will be merged
-	 * to '{user} created {file1} and {file2}' and the childEvent on the return
-	 * will be set, if the events have been merged.
-	 *
-	 * Example2: Two events with subject '{user} created {file}' and
-	 * $mergeParameter file with same file and same user will be merged to
-	 * '{user} created {file1}' and the childEvent on the return will be set, if
-	 * the events have been merged.
-	 *
-	 * The following requirements have to be met, in order to be merged:
-	 * - Both events need to have the same `getApp()`
-	 * - Both events must not have a message `getMessage()`
-	 * - Both events need to have the same subject `getSubject()`
-	 * - Both events need to have the same object type `getObjectType()`
-	 * - The time difference between both events must not be bigger then 3 hours
-	 * - Only up to 5 events can be merged.
-	 * - All parameters apart from such starting with $mergeParameter must be
-	 *   the same for both events.
-	 *
-	 * @param string $mergeParameter
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 */
-	public function mergeEvents($mergeParameter, IEvent $event, IEvent $previousEvent = null) {
-		// No second event => can not combine
-		if (!$previousEvent instanceof IEvent) {
-			return $event;
-		}
+    /**
+     * Combines two events when possible to have grouping:
+     *
+     * Example1: Two events with subject '{user} created {file}' and
+     * $mergeParameter file with different file and same user will be merged
+     * to '{user} created {file1} and {file2}' and the childEvent on the return
+     * will be set, if the events have been merged.
+     *
+     * Example2: Two events with subject '{user} created {file}' and
+     * $mergeParameter file with same file and same user will be merged to
+     * '{user} created {file1}' and the childEvent on the return will be set, if
+     * the events have been merged.
+     *
+     * The following requirements have to be met, in order to be merged:
+     * - Both events need to have the same `getApp()`
+     * - Both events must not have a message `getMessage()`
+     * - Both events need to have the same subject `getSubject()`
+     * - Both events need to have the same object type `getObjectType()`
+     * - The time difference between both events must not be bigger then 3 hours
+     * - Only up to 5 events can be merged.
+     * - All parameters apart from such starting with $mergeParameter must be
+     *   the same for both events.
+     *
+     * @param string $mergeParameter
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     */
+    public function mergeEvents($mergeParameter, IEvent $event, IEvent $previousEvent = null) {
+        // No second event => can not combine
+        if (!$previousEvent instanceof IEvent) {
+            return $event;
+        }
 
-		// Different app => can not combine
-		if ($event->getApp() !== $previousEvent->getApp()) {
-			return $event;
-		}
+        // Different app => can not combine
+        if ($event->getApp() !== $previousEvent->getApp()) {
+            return $event;
+        }
 
-		// Message is set => can not combine
-		if ($event->getMessage() !== '' || $previousEvent->getMessage() !== '') {
-			return $event;
-		}
+        // Message is set => can not combine
+        if ($event->getMessage() !== '' || $previousEvent->getMessage() !== '') {
+            return $event;
+        }
 
-		// Different subject => can not combine
-		if ($event->getSubject() !== $previousEvent->getSubject()) {
-			return $event;
-		}
+        // Different subject => can not combine
+        if ($event->getSubject() !== $previousEvent->getSubject()) {
+            return $event;
+        }
 
-		// Different object type => can not combine
-		if ($event->getObjectType() !== $previousEvent->getObjectType()) {
-			return $event;
-		}
+        // Different object type => can not combine
+        if ($event->getObjectType() !== $previousEvent->getObjectType()) {
+            return $event;
+        }
 
-		// More than 3 hours difference => can not combine
-		if (abs($event->getTimestamp() - $previousEvent->getTimestamp()) > 3 * 60 * 60) {
-			return $event;
-		}
+        // More than 3 hours difference => can not combine
+        if (abs($event->getTimestamp() - $previousEvent->getTimestamp()) > 3 * 60 * 60) {
+            return $event;
+        }
 
-		// Other parameters are not the same => can not combine
-		try {
-			list($combined, $parameters) = $this->combineParameters($mergeParameter, $event, $previousEvent);
-		} catch (\UnexpectedValueException $e) {
-			return $event;
-		}
+        // Other parameters are not the same => can not combine
+        try {
+            list($combined, $parameters) = $this->combineParameters($mergeParameter, $event, $previousEvent);
+        } catch (\UnexpectedValueException $e) {
+            return $event;
+        }
 
-		try {
-			$newSubject = $this->getExtendedSubject($event->getRichSubject(), $mergeParameter, $combined);
-			$parsedSubject = $this->generateParsedSubject($newSubject, $parameters);
+        try {
+            $newSubject = $this->getExtendedSubject($event->getRichSubject(), $mergeParameter, $combined);
+            $parsedSubject = $this->generateParsedSubject($newSubject, $parameters);
 
-			$event->setRichSubject($newSubject, $parameters)
-				->setParsedSubject($parsedSubject)
-				->setChildEvent($previousEvent);
-		} catch (\UnexpectedValueException $e) {
-			return $event;
-		}
+            $event->setRichSubject($newSubject, $parameters)
+                ->setParsedSubject($parsedSubject)
+                ->setChildEvent($previousEvent);
+        } catch (\UnexpectedValueException $e) {
+            return $event;
+        }
 
-		return $event;
-	}
+        return $event;
+    }
 
-	/**
-	 * @param string $mergeParameter
-	 * @param IEvent $event
-	 * @param IEvent $previousEvent
-	 * @return array
-	 * @throws \UnexpectedValueException
-	 */
-	protected function combineParameters($mergeParameter, IEvent $event, IEvent $previousEvent) {
-		$params1 = $event->getRichSubjectParameters();
-		$params2 = $previousEvent->getRichSubjectParameters();
-		$params = [];
+    /**
+     * @param string $mergeParameter
+     * @param IEvent $event
+     * @param IEvent $previousEvent
+     * @return array
+     * @throws \UnexpectedValueException
+     */
+    protected function combineParameters($mergeParameter, IEvent $event, IEvent $previousEvent) {
+        $params1 = $event->getRichSubjectParameters();
+        $params2 = $previousEvent->getRichSubjectParameters();
+        $params = [];
 
-		$combined = 0;
+        $combined = 0;
 
-		// Check that all parameters from $event exist in $previousEvent
-		foreach ($params1 as $key => $parameter) {
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
-				if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
-					$combined++;
-					$params[$mergeParameter . $combined] = $parameter;
-				}
-				continue;
-			}
+        // Check that all parameters from $event exist in $previousEvent
+        foreach ($params1 as $key => $parameter) {
+            if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
+                if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
+                    $combined++;
+                    $params[$mergeParameter . $combined] = $parameter;
+                }
+                continue;
+            }
 
-			if (!isset($params2[$key]) || $params2[$key] !== $parameter) {
-				// Parameter missing on $previousEvent or different => can not combine
-				throw new \UnexpectedValueException();
-			}
+            if (!isset($params2[$key]) || $params2[$key] !== $parameter) {
+                // Parameter missing on $previousEvent or different => can not combine
+                throw new \UnexpectedValueException();
+            }
 
-			$params[$key] = $parameter;
-		}
+            $params[$key] = $parameter;
+        }
 
-		// Check that all parameters from $previousEvent exist in $event
-		foreach ($params2 as $key => $parameter) {
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
-				if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
-					$combined++;
-					$params[$mergeParameter . $combined] = $parameter;
-				}
-				continue;
-			}
+        // Check that all parameters from $previousEvent exist in $event
+        foreach ($params2 as $key => $parameter) {
+            if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
+                if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
+                    $combined++;
+                    $params[$mergeParameter . $combined] = $parameter;
+                }
+                continue;
+            }
 
-			if (!isset($params1[$key]) || $params1[$key] !== $parameter) {
-				// Parameter missing on $event or different => can not combine
-				throw new \UnexpectedValueException();
-			}
+            if (!isset($params1[$key]) || $params1[$key] !== $parameter) {
+                // Parameter missing on $event or different => can not combine
+                throw new \UnexpectedValueException();
+            }
 
-			$params[$key] = $parameter;
-		}
+            $params[$key] = $parameter;
+        }
 
-		return [$combined, $params];
-	}
+        return [$combined, $params];
+    }
 
-	/**
-	 * @param array[] $parameters
-	 * @param string $mergeParameter
-	 * @param array $parameter
-	 * @return bool
-	 */
-	protected function checkParameterAlreadyExits($parameters, $mergeParameter, $parameter) {
-		foreach ($parameters as $key => $param) {
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
-				if ($param === $parameter) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
+    /**
+     * @param array[] $parameters
+     * @param string $mergeParameter
+     * @param array $parameter
+     * @return bool
+     */
+    protected function checkParameterAlreadyExits($parameters, $mergeParameter, $parameter) {
+        foreach ($parameters as $key => $param) {
+            if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
+                if ($param === $parameter) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 
-	/**
-	 * @param string $subject
-	 * @param string $parameter
-	 * @param int $counter
-	 * @return mixed
-	 */
-	protected function getExtendedSubject($subject, $parameter, $counter) {
-		switch ($counter) {
-			case 1:
-				$replacement = '{' . $parameter . '1}';
-				break;
-			case 2:
-				$replacement = $this->l10n->t(
-					'%1$s and %2$s',
-					['{' . $parameter . '2}', '{' . $parameter . '1}']
-				);
-				break;
-			case 3:
-				$replacement = $this->l10n->t(
-					'%1$s, %2$s and %3$s',
-					['{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
-				);
-				break;
-			case 4:
-				$replacement = $this->l10n->t(
-					'%1$s, %2$s, %3$s and %4$s',
-					['{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
-				);
-				break;
-			case 5:
-				$replacement = $this->l10n->t(
-					'%1$s, %2$s, %3$s, %4$s and %5$s',
-					['{' . $parameter . '5}', '{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
-				);
-				break;
-			default:
-				throw new \UnexpectedValueException();
-		}
+    /**
+     * @param string $subject
+     * @param string $parameter
+     * @param int $counter
+     * @return mixed
+     */
+    protected function getExtendedSubject($subject, $parameter, $counter) {
+        switch ($counter) {
+            case 1:
+                $replacement = '{' . $parameter . '1}';
+                break;
+            case 2:
+                $replacement = $this->l10n->t(
+                    '%1$s and %2$s',
+                    ['{' . $parameter . '2}', '{' . $parameter . '1}']
+                );
+                break;
+            case 3:
+                $replacement = $this->l10n->t(
+                    '%1$s, %2$s and %3$s',
+                    ['{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
+                );
+                break;
+            case 4:
+                $replacement = $this->l10n->t(
+                    '%1$s, %2$s, %3$s and %4$s',
+                    ['{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
+                );
+                break;
+            case 5:
+                $replacement = $this->l10n->t(
+                    '%1$s, %2$s, %3$s, %4$s and %5$s',
+                    ['{' . $parameter . '5}', '{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
+                );
+                break;
+            default:
+                throw new \UnexpectedValueException();
+        }
 
-		return str_replace(
-			'{' . $parameter . '}',
-			$replacement,
-			$subject
-		);
-	}
+        return str_replace(
+            '{' . $parameter . '}',
+            $replacement,
+            $subject
+        );
+    }
 
-	/**
-	 * @param string $subject
-	 * @param array[] $parameters
-	 * @return string
-	 */
-	protected function generateParsedSubject($subject, $parameters) {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			if ($parameter['type'] === 'file') {
-				$replacements[] = trim($parameter['path'], '/');
-			} else if (isset($parameter['name'])) {
-				$replacements[] = $parameter['name'];
-			} else {
-				$replacements[] = $parameter['id'];
-			}
-		}
+    /**
+     * @param string $subject
+     * @param array[] $parameters
+     * @return string
+     */
+    protected function generateParsedSubject($subject, $parameters) {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            if ($parameter['type'] === 'file') {
+                $replacements[] = trim($parameter['path'], '/');
+            } else if (isset($parameter['name'])) {
+                $replacements[] = $parameter['name'];
+            } else {
+                $replacements[] = $parameter['id'];
+            }
+        }
 
-		return str_replace($placeholders, $replacements, $subject);
-	}
+        return str_replace($placeholders, $replacements, $subject);
+    }
 }

apps/dav/lib/Avatars/AvatarNode.php

Indentation +59 added lines, -59 removed lines

@@ -27,72 +27,72 @@
 use Sabre\DAV\File;
 
 class AvatarNode extends File {
-	private $ext;
-	private $size;
-	private $avatar;
+    private $ext;
+    private $size;
+    private $avatar;
 
-	/**
-	 * AvatarNode constructor.
-	 *
-	 * @param integer $size
-	 * @param string $ext
-	 * @param IAvatar $avatar
-	 */
-	public function __construct($size, $ext, $avatar) {
-		$this->size = $size;
-		$this->ext = $ext;
-		$this->avatar = $avatar;
-	}
+    /**
+     * AvatarNode constructor.
+     *
+     * @param integer $size
+     * @param string $ext
+     * @param IAvatar $avatar
+     */
+    public function __construct($size, $ext, $avatar) {
+        $this->size = $size;
+        $this->ext = $ext;
+        $this->avatar = $avatar;
+    }
 
-	/**
-	 * Returns the name of the node.
-	 *
-	 * This is used to generate the url.
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return "$this->size.$this->ext";
-	}
+    /**
+     * Returns the name of the node.
+     *
+     * This is used to generate the url.
+     *
+     * @return string
+     */
+    public function getName() {
+        return "$this->size.$this->ext";
+    }
 
-	public function get() {
-		$image = $this->avatar->get($this->size);
-		$res = $image->resource();
+    public function get() {
+        $image = $this->avatar->get($this->size);
+        $res = $image->resource();
 
-		ob_start();
-		if ($this->ext === 'png') {
-			imagepng($res);
-		} else {
-			imagejpeg($res);
-		}
+        ob_start();
+        if ($this->ext === 'png') {
+            imagepng($res);
+        } else {
+            imagejpeg($res);
+        }
 
-		return ob_get_clean();
-	}
+        return ob_get_clean();
+    }
 
-	/**
-	 * Returns the mime-type for a file
-	 *
-	 * If null is returned, we'll assume application/octet-stream
-	 *
-	 * @return string|null
-	 */
-	public function getContentType() {
-		if ($this->ext === 'png') {
-			return 'image/png';
-		}
-		return 'image/jpeg';
-	}
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     *
+     * @return string|null
+     */
+    public function getContentType() {
+        if ($this->ext === 'png') {
+            return 'image/png';
+        }
+        return 'image/jpeg';
+    }
 
-	public function getETag() {
-		return $this->avatar->getFile($this->size)->getEtag();
-	}
+    public function getETag() {
+        return $this->avatar->getFile($this->size)->getEtag();
+    }
 
-	public function getLastModified() {
-		$timestamp = $this->avatar->getFile($this->size)->getMTime();
-		if (!empty($timestamp)) {
-			return (int)$timestamp;
-		}
-		return $timestamp;
+    public function getLastModified() {
+        $timestamp = $this->avatar->getFile($this->size)->getMTime();
+        if (!empty($timestamp)) {
+            return (int)$timestamp;
+        }
+        return $timestamp;
 
-	}
+    }
 }

lib/private/Cache/CappedMemoryCache.php

Indentation +62 added lines, -62 removed lines

@@ -31,66 +31,66 @@
  */
 class CappedMemoryCache implements ICache, \ArrayAccess {
 
-	private $capacity;
-	private $cache = [];
-
-	public function __construct($capacity = 512) {
-		$this->capacity = $capacity;
-	}
-
-	public function hasKey($key) {
-		return isset($this->cache[$key]);
-	}
-
-	public function get($key) {
-		return isset($this->cache[$key]) ? $this->cache[$key] : null;
-	}
-
-	public function set($key, $value, $ttl = 0) {
-		if (is_null($key)) {
-			$this->cache[] = $value;
-		} else {
-			$this->cache[$key] = $value;
-		}
-		$this->garbageCollect();
-	}
-
-	public function remove($key) {
-		unset($this->cache[$key]);
-		return true;
-	}
-
-	public function clear($prefix = '') {
-		$this->cache = [];
-		return true;
-	}
-
-	public function offsetExists($offset) {
-		return $this->hasKey($offset);
-	}
-
-	public function &offsetGet($offset) {
-		return $this->cache[$offset];
-	}
-
-	public function offsetSet($offset, $value) {
-		$this->set($offset, $value);
-	}
-
-	public function offsetUnset($offset) {
-		$this->remove($offset);
-	}
-
-	public function getData() {
-		return $this->cache;
-	}
-
-
-	private function garbageCollect() {
-		while (count($this->cache) > $this->capacity) {
-			reset($this->cache);
-			$key = key($this->cache);
-			$this->remove($key);
-		}
-	}
+    private $capacity;
+    private $cache = [];
+
+    public function __construct($capacity = 512) {
+        $this->capacity = $capacity;
+    }
+
+    public function hasKey($key) {
+        return isset($this->cache[$key]);
+    }
+
+    public function get($key) {
+        return isset($this->cache[$key]) ? $this->cache[$key] : null;
+    }
+
+    public function set($key, $value, $ttl = 0) {
+        if (is_null($key)) {
+            $this->cache[] = $value;
+        } else {
+            $this->cache[$key] = $value;
+        }
+        $this->garbageCollect();
+    }
+
+    public function remove($key) {
+        unset($this->cache[$key]);
+        return true;
+    }
+
+    public function clear($prefix = '') {
+        $this->cache = [];
+        return true;
+    }
+
+    public function offsetExists($offset) {
+        return $this->hasKey($offset);
+    }
+
+    public function &offsetGet($offset) {
+        return $this->cache[$offset];
+    }
+
+    public function offsetSet($offset, $value) {
+        $this->set($offset, $value);
+    }
+
+    public function offsetUnset($offset) {
+        $this->remove($offset);
+    }
+
+    public function getData() {
+        return $this->cache;
+    }
+
+
+    private function garbageCollect() {
+        while (count($this->cache) > $this->capacity) {
+            reset($this->cache);
+            $key = key($this->cache);
+            $this->remove($key);
+        }
+    }
 }

apps/workflowengine/lib/Check/FileSystemTags.php

Indentation +133 added lines, -133 removed lines

@@ -33,137 +33,137 @@
 
 class FileSystemTags implements ICheck {
 
-	/** @var array */
-	protected $fileIds;
-
-	/** @var array */
-	protected $fileSystemTags;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var ISystemTagManager */
-	protected $systemTagManager;
-
-	/** @var ISystemTagObjectMapper */
-	protected $systemTagObjectMapper;
-
-	/** @var IStorage */
-	protected $storage;
-
-	/** @var string */
-	protected $path;
-
-	/**
-	 * @param IL10N $l
-	 * @param ISystemTagManager $systemTagManager
-	 * @param ISystemTagObjectMapper $systemTagObjectMapper
-	 */
-	public function __construct(IL10N $l, ISystemTagManager $systemTagManager, ISystemTagObjectMapper $systemTagObjectMapper) {
-		$this->l = $l;
-		$this->systemTagManager = $systemTagManager;
-		$this->systemTagObjectMapper = $systemTagObjectMapper;
-	}
-
-	/**
-	 * @param IStorage $storage
-	 * @param string $path
-	 */
-	public function setFileInfo(IStorage $storage, $path) {
-		$this->storage = $storage;
-		$this->path = $path;
-	}
-
-	/**
-	 * @param string $operator
-	 * @param string $value
-	 * @return bool
-	 */
-	public function executeCheck($operator, $value) {
-		$systemTags = $this->getSystemTags();
-		return ($operator === 'is') === in_array($value, $systemTags);
-	}
-
-	/**
-	 * @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);
-		}
-
-		try {
-			$this->systemTagManager->getTagsByIds($value);
-		} catch (TagNotFoundException $e) {
-			throw new \UnexpectedValueException($this->l->t('The given tag id is invalid'), 2);
-		} catch (\InvalidArgumentException $e) {
-			throw new \UnexpectedValueException($this->l->t('The given tag id is invalid'), 3);
-		}
-	}
-
-	/**
-	 * Get the ids of the assigned system tags
-	 * @return string[]
-	 */
-	protected function getSystemTags() {
-		$cache = $this->storage->getCache();
-		$fileIds = $this->getFileIds($cache, $this->path, !$this->storage->instanceOfStorage(IHomeStorage::class));
-
-		$systemTags = [];
-		foreach ($fileIds as $i => $fileId) {
-			if (isset($this->fileSystemTags[$fileId])) {
-				$systemTags[] = $this->fileSystemTags[$fileId];
-				unset($fileIds[$i]);
-			}
-		}
-
-		if (!empty($fileIds)) {
-			$mappedSystemTags = $this->systemTagObjectMapper->getTagIdsForObjects($fileIds, 'files');
-			foreach ($mappedSystemTags as $fileId => $fileSystemTags) {
-				$this->fileSystemTags[$fileId] = $fileSystemTags;
-				$systemTags[] = $fileSystemTags;
-			}
-		}
-
-		$systemTags = call_user_func_array('array_merge', $systemTags);
-		$systemTags = array_unique($systemTags);
-		return $systemTags;
-	}
-
-	/**
-	 * Get the file ids of the given path and its parents
-	 * @param ICache $cache
-	 * @param string $path
-	 * @param bool $isExternalStorage
-	 * @return int[]
-	 */
-	protected function getFileIds(ICache $cache, $path, $isExternalStorage) {
-		$cacheId = $cache->getNumericStorageId();
-		if (isset($this->fileIds[$cacheId][$path])) {
-			return $this->fileIds[$cacheId][$path];
-		}
-
-		$parentIds = [];
-		if ($path !== $this->dirname($path)) {
-			$parentIds = $this->getFileIds($cache, $this->dirname($path), $isExternalStorage);
-		} else if (!$isExternalStorage) {
-			return [];
-		}
-
-		$fileId = $cache->getId($path);
-		if ($fileId !== -1) {
-			$parentIds[] = $cache->getId($path);
-		}
-
-		$this->fileIds[$cacheId][$path] = $parentIds;
-
-		return $parentIds;
-	}
-
-	protected function dirname($path) {
-		$dir = dirname($path);
-		return $dir === '.' ? '' : $dir;
-	}
+    /** @var array */
+    protected $fileIds;
+
+    /** @var array */
+    protected $fileSystemTags;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var ISystemTagManager */
+    protected $systemTagManager;
+
+    /** @var ISystemTagObjectMapper */
+    protected $systemTagObjectMapper;
+
+    /** @var IStorage */
+    protected $storage;
+
+    /** @var string */
+    protected $path;
+
+    /**
+     * @param IL10N $l
+     * @param ISystemTagManager $systemTagManager
+     * @param ISystemTagObjectMapper $systemTagObjectMapper
+     */
+    public function __construct(IL10N $l, ISystemTagManager $systemTagManager, ISystemTagObjectMapper $systemTagObjectMapper) {
+        $this->l = $l;
+        $this->systemTagManager = $systemTagManager;
+        $this->systemTagObjectMapper = $systemTagObjectMapper;
+    }
+
+    /**
+     * @param IStorage $storage
+     * @param string $path
+     */
+    public function setFileInfo(IStorage $storage, $path) {
+        $this->storage = $storage;
+        $this->path = $path;
+    }
+
+    /**
+     * @param string $operator
+     * @param string $value
+     * @return bool
+     */
+    public function executeCheck($operator, $value) {
+        $systemTags = $this->getSystemTags();
+        return ($operator === 'is') === in_array($value, $systemTags);
+    }
+
+    /**
+     * @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);
+        }
+
+        try {
+            $this->systemTagManager->getTagsByIds($value);
+        } catch (TagNotFoundException $e) {
+            throw new \UnexpectedValueException($this->l->t('The given tag id is invalid'), 2);
+        } catch (\InvalidArgumentException $e) {
+            throw new \UnexpectedValueException($this->l->t('The given tag id is invalid'), 3);
+        }
+    }
+
+    /**
+     * Get the ids of the assigned system tags
+     * @return string[]
+     */
+    protected function getSystemTags() {
+        $cache = $this->storage->getCache();
+        $fileIds = $this->getFileIds($cache, $this->path, !$this->storage->instanceOfStorage(IHomeStorage::class));
+
+        $systemTags = [];
+        foreach ($fileIds as $i => $fileId) {
+            if (isset($this->fileSystemTags[$fileId])) {
+                $systemTags[] = $this->fileSystemTags[$fileId];
+                unset($fileIds[$i]);
+            }
+        }
+
+        if (!empty($fileIds)) {
+            $mappedSystemTags = $this->systemTagObjectMapper->getTagIdsForObjects($fileIds, 'files');
+            foreach ($mappedSystemTags as $fileId => $fileSystemTags) {
+                $this->fileSystemTags[$fileId] = $fileSystemTags;
+                $systemTags[] = $fileSystemTags;
+            }
+        }
+
+        $systemTags = call_user_func_array('array_merge', $systemTags);
+        $systemTags = array_unique($systemTags);
+        return $systemTags;
+    }
+
+    /**
+     * Get the file ids of the given path and its parents
+     * @param ICache $cache
+     * @param string $path
+     * @param bool $isExternalStorage
+     * @return int[]
+     */
+    protected function getFileIds(ICache $cache, $path, $isExternalStorage) {
+        $cacheId = $cache->getNumericStorageId();
+        if (isset($this->fileIds[$cacheId][$path])) {
+            return $this->fileIds[$cacheId][$path];
+        }
+
+        $parentIds = [];
+        if ($path !== $this->dirname($path)) {
+            $parentIds = $this->getFileIds($cache, $this->dirname($path), $isExternalStorage);
+        } else if (!$isExternalStorage) {
+            return [];
+        }
+
+        $fileId = $cache->getId($path);
+        if ($fileId !== -1) {
+            $parentIds[] = $cache->getId($path);
+        }
+
+        $this->fileIds[$cacheId][$path] = $parentIds;
+
+        return $parentIds;
+    }
+
+    protected function dirname($path) {
+        $dir = dirname($path);
+        return $dir === '.' ? '' : $dir;
+    }
 }

lib/public/Share/IShare.php

Indentation +304 added lines, -304 removed lines

@@ -37,308 +37,308 @@
  */
 interface IShare {
 
-	/**
-	 * Set the internal id of the share
-	 * It is only allowed to set the internal id of a share once.
-	 * Attempts to override the internal id will result in an IllegalIDChangeException
-	 *
-	 * @param string $id
-	 * @return \OCP\Share\IShare
-	 * @throws IllegalIDChangeException
-	 * @throws \InvalidArgumentException
-	 * @since 9.1.0
-	 */
-	public function setId($id);
-
-	/**
-	 * Get the internal id of the share.
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getId();
-
-	/**
-	 * Get the full share id. This is the <providerid>:<internalid>.
-	 * The full id is unique in the system.
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 * @throws \UnexpectedValueException If the fullId could not be constructed
-	 */
-	public function getFullId();
-
-	/**
-	 * Set the provider id of the share
-	 * It is only allowed to set the provider id of a share once.
-	 * Attempts to override the provider id will result in an IllegalIDChangeException
-	 *
-	 * @param string $id
-	 * @return \OCP\Share\IShare
-	 * @throws IllegalIDChangeException
-	 * @throws \InvalidArgumentException
-	 * @since 9.1.0
-	 */
-	public function setProviderId($id);
-
-	/**
-	 * Set the node of the file/folder that is shared
-	 *
-	 * @param Node $node
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setNode(Node $node);
-
-	/**
-	 * Get the node of the file/folder that is shared
-	 *
-	 * @return File|Folder
-	 * @since 9.0.0
-	 * @throws NotFoundException
-	 */
-	public function getNode();
-
-	/**
-	 * Set file id for lazy evaluation of the node
-	 * @param int $fileId
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setNodeId($fileId);
-
-	/**
-	 * Get the fileid of the node of this share
-	 * @return int
-	 * @since 9.0.0
-	 * @throws NotFoundException
-	 */
-	public function getNodeId();
-
-	/**
-	 * Set the type of node (file/folder)
-	 *
-	 * @param string $type
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setNodeType($type);
-
-	/**
-	 * Get the type of node (file/folder)
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 * @throws NotFoundException
-	 */
-	public function getNodeType();
-
-	/**
-	 * Set the shareType
-	 *
-	 * @param int $shareType
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setShareType($shareType);
-
-	/**
-	 * Get the shareType
-	 *
-	 * @return int
-	 * @since 9.0.0
-	 */
-	public function getShareType();
-
-	/**
-	 * Set the receiver of this share.
-	 *
-	 * @param string $sharedWith
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setSharedWith($sharedWith);
-
-	/**
-	 * Get the receiver of this share.
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getSharedWith();
-
-	/**
-	 * Set the permissions.
-	 * See \OCP\Constants::PERMISSION_*
-	 *
-	 * @param int $permissions
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setPermissions($permissions);
-
-	/**
-	 * Get the share permissions
-	 * See \OCP\Constants::PERMISSION_*
-	 *
-	 * @return int
-	 * @since 9.0.0
-	 */
-	public function getPermissions();
-
-	/**
-	 * Set the expiration date
-	 *
-	 * @param null|\DateTime $expireDate
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setExpirationDate($expireDate);
-
-	/**
-	 * Get the expiration date
-	 *
-	 * @return \DateTime
-	 * @since 9.0.0
-	 */
-	public function getExpirationDate();
-
-	/**
-	 * Set the sharer of the path.
-	 *
-	 * @param string $sharedBy
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setSharedBy($sharedBy);
-
-	/**
-	 * Get share sharer
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getSharedBy();
-
-	/**
-	 * Set the original share owner (who owns the path that is shared)
-	 *
-	 * @param string $shareOwner
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setShareOwner($shareOwner);
-
-	/**
-	 * Get the original share owner (who owns the path that is shared)
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getShareOwner();
-
-	/**
-	 * Set the password for this share.
-	 * When the share is passed to the share manager to be created
-	 * or updated the password will be hashed.
-	 *
-	 * @param string $password
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setPassword($password);
-
-	/**
-	 * Get the password of this share.
-	 * If this share is obtained via a shareprovider the password is
-	 * hashed.
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getPassword();
-
-	/**
-	 * Set the public link token.
-	 *
-	 * @param string $token
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setToken($token);
-
-	/**
-	 * Get the public link token.
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getToken();
-
-	/**
-	 * Set the target path of this share relative to the recipients user folder.
-	 *
-	 * @param string $target
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setTarget($target);
-
-	/**
-	 * Get the target path of this share relative to the recipients user folder.
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getTarget();
-
-	/**
-	 * Set the time this share was created
-	 *
-	 * @param \DateTime $shareTime
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setShareTime(\DateTime $shareTime);
-
-	/**
-	 * Get the timestamp this share was created
-	 *
-	 * @return \DateTime
-	 * @since 9.0.0
-	 */
-	public function getShareTime();
-
-	/**
-	 * Set if the recipient is informed by mail about the share.
-	 *
-	 * @param bool $mailSend
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setMailSend($mailSend);
-
-	/**
-	 * Get if the recipient informed by mail about the share.
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function getMailSend();
-
-	/**
-	 * Set the cache entry for the shared node
-	 *
-	 * @param ICacheEntry $entry
-	 * @since 11.0.0
-	 */
-	public function setNodeCacheEntry(ICacheEntry $entry);
-
-	/**
-	 * Get the cache entry for the shared node
-	 *
-	 * @return null|ICacheEntry
-	 * @since 11.0.0
-	 */
-	public function getNodeCacheEntry();
+    /**
+     * Set the internal id of the share
+     * It is only allowed to set the internal id of a share once.
+     * Attempts to override the internal id will result in an IllegalIDChangeException
+     *
+     * @param string $id
+     * @return \OCP\Share\IShare
+     * @throws IllegalIDChangeException
+     * @throws \InvalidArgumentException
+     * @since 9.1.0
+     */
+    public function setId($id);
+
+    /**
+     * Get the internal id of the share.
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getId();
+
+    /**
+     * Get the full share id. This is the <providerid>:<internalid>.
+     * The full id is unique in the system.
+     *
+     * @return string
+     * @since 9.0.0
+     * @throws \UnexpectedValueException If the fullId could not be constructed
+     */
+    public function getFullId();
+
+    /**
+     * Set the provider id of the share
+     * It is only allowed to set the provider id of a share once.
+     * Attempts to override the provider id will result in an IllegalIDChangeException
+     *
+     * @param string $id
+     * @return \OCP\Share\IShare
+     * @throws IllegalIDChangeException
+     * @throws \InvalidArgumentException
+     * @since 9.1.0
+     */
+    public function setProviderId($id);
+
+    /**
+     * Set the node of the file/folder that is shared
+     *
+     * @param Node $node
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setNode(Node $node);
+
+    /**
+     * Get the node of the file/folder that is shared
+     *
+     * @return File|Folder
+     * @since 9.0.0
+     * @throws NotFoundException
+     */
+    public function getNode();
+
+    /**
+     * Set file id for lazy evaluation of the node
+     * @param int $fileId
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setNodeId($fileId);
+
+    /**
+     * Get the fileid of the node of this share
+     * @return int
+     * @since 9.0.0
+     * @throws NotFoundException
+     */
+    public function getNodeId();
+
+    /**
+     * Set the type of node (file/folder)
+     *
+     * @param string $type
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setNodeType($type);
+
+    /**
+     * Get the type of node (file/folder)
+     *
+     * @return string
+     * @since 9.0.0
+     * @throws NotFoundException
+     */
+    public function getNodeType();
+
+    /**
+     * Set the shareType
+     *
+     * @param int $shareType
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setShareType($shareType);
+
+    /**
+     * Get the shareType
+     *
+     * @return int
+     * @since 9.0.0
+     */
+    public function getShareType();
+
+    /**
+     * Set the receiver of this share.
+     *
+     * @param string $sharedWith
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setSharedWith($sharedWith);
+
+    /**
+     * Get the receiver of this share.
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getSharedWith();
+
+    /**
+     * Set the permissions.
+     * See \OCP\Constants::PERMISSION_*
+     *
+     * @param int $permissions
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setPermissions($permissions);
+
+    /**
+     * Get the share permissions
+     * See \OCP\Constants::PERMISSION_*
+     *
+     * @return int
+     * @since 9.0.0
+     */
+    public function getPermissions();
+
+    /**
+     * Set the expiration date
+     *
+     * @param null|\DateTime $expireDate
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setExpirationDate($expireDate);
+
+    /**
+     * Get the expiration date
+     *
+     * @return \DateTime
+     * @since 9.0.0
+     */
+    public function getExpirationDate();
+
+    /**
+     * Set the sharer of the path.
+     *
+     * @param string $sharedBy
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setSharedBy($sharedBy);
+
+    /**
+     * Get share sharer
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getSharedBy();
+
+    /**
+     * Set the original share owner (who owns the path that is shared)
+     *
+     * @param string $shareOwner
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setShareOwner($shareOwner);
+
+    /**
+     * Get the original share owner (who owns the path that is shared)
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getShareOwner();
+
+    /**
+     * Set the password for this share.
+     * When the share is passed to the share manager to be created
+     * or updated the password will be hashed.
+     *
+     * @param string $password
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setPassword($password);
+
+    /**
+     * Get the password of this share.
+     * If this share is obtained via a shareprovider the password is
+     * hashed.
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getPassword();
+
+    /**
+     * Set the public link token.
+     *
+     * @param string $token
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setToken($token);
+
+    /**
+     * Get the public link token.
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getToken();
+
+    /**
+     * Set the target path of this share relative to the recipients user folder.
+     *
+     * @param string $target
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setTarget($target);
+
+    /**
+     * Get the target path of this share relative to the recipients user folder.
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getTarget();
+
+    /**
+     * Set the time this share was created
+     *
+     * @param \DateTime $shareTime
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setShareTime(\DateTime $shareTime);
+
+    /**
+     * Get the timestamp this share was created
+     *
+     * @return \DateTime
+     * @since 9.0.0
+     */
+    public function getShareTime();
+
+    /**
+     * Set if the recipient is informed by mail about the share.
+     *
+     * @param bool $mailSend
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setMailSend($mailSend);
+
+    /**
+     * Get if the recipient informed by mail about the share.
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function getMailSend();
+
+    /**
+     * Set the cache entry for the shared node
+     *
+     * @param ICacheEntry $entry
+     * @since 11.0.0
+     */
+    public function setNodeCacheEntry(ICacheEntry $entry);
+
+    /**
+     * Get the cache entry for the shared node
+     *
+     * @return null|ICacheEntry
+     * @since 11.0.0
+     */
+    public function getNodeCacheEntry();
 }

lib/private/Contacts/ContactsMenu/ActionProviderStore.php

Indentation +75 added lines, -75 removed lines

@@ -35,80 +35,80 @@
 
 class ActionProviderStore {
 
-	/** @var IServerContainer */
-	private $serverContainer;
-
-	/** @var AppManager */
-	private $appManager;
-
-	/** @var ILogger */
-	private $logger;
-
-	/**
-	 * @param IServerContainer $serverContainer
-	 * @param AppManager $appManager
-	 * @param ILogger $logger
-	 */
-	public function __construct(IServerContainer $serverContainer, AppManager $appManager, ILogger $logger) {
-		$this->serverContainer = $serverContainer;
-		$this->appManager = $appManager;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return IProvider[]
-	 * @throws Exception
-	 */
-	public function getProviders(IUser $user) {
-		$appClasses = $this->getAppProviderClasses($user);
-		$providerClasses = $this->getServerProviderClasses();
-		$allClasses = array_merge($providerClasses, $appClasses);
-		$providers = [];
-
-		foreach ($allClasses as $class) {
-			try {
-				$providers[] = $this->serverContainer->query($class);
-			} catch (QueryException $ex) {
-				$this->logger->logException($ex, [
-					'message' => "Could not load contacts menu action provider $class",
-					'app' => 'core',
-				]);
-				throw new Exception("Could not load contacts menu action provider");
-			}
-		}
-
-		return $providers;
-	}
-
-	/**
-	 * @return string[]
-	 */
-	private function getServerProviderClasses() {
-		return [
-			EMailProvider::class,
-		];
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return string[]
-	 */
-	private function getAppProviderClasses(IUser $user) {
-		return array_reduce($this->appManager->getEnabledAppsForUser($user), function($all, $appId) {
-			$info = $this->appManager->getAppInfo($appId);
-
-			if (!isset($info['contactsmenu']) || !isset($info['contactsmenu'])) {
-				// Nothing to add
-				return $all;
-			}
-
-			$providers = array_reduce($info['contactsmenu'], function($all, $provider) {
-				return array_merge($all, [$provider]);
-			}, []);
-
-			return array_merge($all, $providers);
-		}, []);
-	}
+    /** @var IServerContainer */
+    private $serverContainer;
+
+    /** @var AppManager */
+    private $appManager;
+
+    /** @var ILogger */
+    private $logger;
+
+    /**
+     * @param IServerContainer $serverContainer
+     * @param AppManager $appManager
+     * @param ILogger $logger
+     */
+    public function __construct(IServerContainer $serverContainer, AppManager $appManager, ILogger $logger) {
+        $this->serverContainer = $serverContainer;
+        $this->appManager = $appManager;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @param IUser $user
+     * @return IProvider[]
+     * @throws Exception
+     */
+    public function getProviders(IUser $user) {
+        $appClasses = $this->getAppProviderClasses($user);
+        $providerClasses = $this->getServerProviderClasses();
+        $allClasses = array_merge($providerClasses, $appClasses);
+        $providers = [];
+
+        foreach ($allClasses as $class) {
+            try {
+                $providers[] = $this->serverContainer->query($class);
+            } catch (QueryException $ex) {
+                $this->logger->logException($ex, [
+                    'message' => "Could not load contacts menu action provider $class",
+                    'app' => 'core',
+                ]);
+                throw new Exception("Could not load contacts menu action provider");
+            }
+        }
+
+        return $providers;
+    }
+
+    /**
+     * @return string[]
+     */
+    private function getServerProviderClasses() {
+        return [
+            EMailProvider::class,
+        ];
+    }
+
+    /**
+     * @param IUser $user
+     * @return string[]
+     */
+    private function getAppProviderClasses(IUser $user) {
+        return array_reduce($this->appManager->getEnabledAppsForUser($user), function($all, $appId) {
+            $info = $this->appManager->getAppInfo($appId);
+
+            if (!isset($info['contactsmenu']) || !isset($info['contactsmenu'])) {
+                // Nothing to add
+                return $all;
+            }
+
+            $providers = array_reduce($info['contactsmenu'], function($all, $provider) {
+                return array_merge($all, [$provider]);
+            }, []);
+
+            return array_merge($all, $providers);
+        }, []);
+    }
 
 }

lib/private/Lockdown/LockdownManager.php

Indentation +43 added lines, -43 removed lines

@@ -24,56 +24,56 @@
 use OCP\Lockdown\ILockdownManager;
 
 class LockdownManager implements ILockdownManager {
-	/** @var ISession */
-	private $sessionCallback;
+    /** @var ISession */
+    private $sessionCallback;
 
-	private $enabled = false;
+    private $enabled = false;
 
-	/** @var array|null */
-	private $scope;
+    /** @var array|null */
+    private $scope;
 
-	/**
-	 * LockdownManager constructor.
-	 *
-	 * @param callable $sessionCallback we need to inject the session lazily to avoid dependency loops
-	 */
-	public function __construct(callable $sessionCallback) {
-		$this->sessionCallback = $sessionCallback;
-	}
+    /**
+     * LockdownManager constructor.
+     *
+     * @param callable $sessionCallback we need to inject the session lazily to avoid dependency loops
+     */
+    public function __construct(callable $sessionCallback) {
+        $this->sessionCallback = $sessionCallback;
+    }
 
 
-	public function enable() {
-		$this->enabled = true;
-	}
+    public function enable() {
+        $this->enabled = true;
+    }
 
-	/**
-	 * @return ISession
-	 */
-	private function getSession() {
-		$callback = $this->sessionCallback;
-		return $callback();
-	}
+    /**
+     * @return ISession
+     */
+    private function getSession() {
+        $callback = $this->sessionCallback;
+        return $callback();
+    }
 
-	private function getScopeAsArray() {
-		if (!$this->scope) {
-			$session = $this->getSession();
-			$sessionScope = $session->get('token_scope');
-			if ($sessionScope) {
-				$this->scope = $sessionScope;
-			}
-		}
-		return $this->scope;
-	}
+    private function getScopeAsArray() {
+        if (!$this->scope) {
+            $session = $this->getSession();
+            $sessionScope = $session->get('token_scope');
+            if ($sessionScope) {
+                $this->scope = $sessionScope;
+            }
+        }
+        return $this->scope;
+    }
 
-	public function setToken(IToken $token) {
-		$this->scope = $token->getScopeAsArray();
-		$session = $this->getSession();
-		$session->set('token_scope', $this->scope);
-		$this->enable();
-	}
+    public function setToken(IToken $token) {
+        $this->scope = $token->getScopeAsArray();
+        $session = $this->getSession();
+        $session->set('token_scope', $this->scope);
+        $this->enable();
+    }
 
-	public function canAccessFilesystem() {
-		$scope = $this->getScopeAsArray();
-		return !$scope || $scope['filesystem'];
-	}
+    public function canAccessFilesystem() {
+        $scope = $this->getScopeAsArray();
+        return !$scope || $scope['filesystem'];
+    }
 }

apps/user_ldap/appinfo/routes.php

Indentation +19 added lines, -19 removed lines

@@ -23,36 +23,36 @@
 
 /** @var $this \OCP\Route\IRouter */
 $this->create('user_ldap_ajax_clearMappings', 'ajax/clearMappings.php')
-	->actionInclude('user_ldap/ajax/clearMappings.php');
+    ->actionInclude('user_ldap/ajax/clearMappings.php');
 $this->create('user_ldap_ajax_deleteConfiguration', 'ajax/deleteConfiguration.php')
-	->actionInclude('user_ldap/ajax/deleteConfiguration.php');
+    ->actionInclude('user_ldap/ajax/deleteConfiguration.php');
 $this->create('user_ldap_ajax_getConfiguration', 'ajax/getConfiguration.php')
-	->actionInclude('user_ldap/ajax/getConfiguration.php');
+    ->actionInclude('user_ldap/ajax/getConfiguration.php');
 $this->create('user_ldap_ajax_getNewServerConfigPrefix', 'ajax/getNewServerConfigPrefix.php')
-	->actionInclude('user_ldap/ajax/getNewServerConfigPrefix.php');
+    ->actionInclude('user_ldap/ajax/getNewServerConfigPrefix.php');
 $this->create('user_ldap_ajax_setConfiguration', 'ajax/setConfiguration.php')
-	->actionInclude('user_ldap/ajax/setConfiguration.php');
+    ->actionInclude('user_ldap/ajax/setConfiguration.php');
 $this->create('user_ldap_ajax_testConfiguration', 'ajax/testConfiguration.php')
-	->actionInclude('user_ldap/ajax/testConfiguration.php');
+    ->actionInclude('user_ldap/ajax/testConfiguration.php');
 $this->create('user_ldap_ajax_wizard', 'ajax/wizard.php')
-	->actionInclude('user_ldap/ajax/wizard.php');
+    ->actionInclude('user_ldap/ajax/wizard.php');
 
 $application = new \OCP\AppFramework\App('user_ldap');
 $application->registerRoutes($this, [
-	'ocs' => [
-		['name' => 'ConfigAPI#create', 'url' => '/api/v1/config', 'verb' => 'POST'],
-		['name' => 'ConfigAPI#show',   'url' => '/api/v1/config/{configID}', 'verb' => 'GET'],
-		['name' => 'ConfigAPI#modify', 'url' => '/api/v1/config/{configID}', 'verb' => 'PUT'],
-		['name' => 'ConfigAPI#delete', 'url' => '/api/v1/config/{configID}', 'verb' => 'DELETE'],
-	]
+    'ocs' => [
+        ['name' => 'ConfigAPI#create', 'url' => '/api/v1/config', 'verb' => 'POST'],
+        ['name' => 'ConfigAPI#show',   'url' => '/api/v1/config/{configID}', 'verb' => 'GET'],
+        ['name' => 'ConfigAPI#modify', 'url' => '/api/v1/config/{configID}', 'verb' => 'PUT'],
+        ['name' => 'ConfigAPI#delete', 'url' => '/api/v1/config/{configID}', 'verb' => 'DELETE'],
+    ]
 ]);
 
 $application = new OCA\User_LDAP\AppInfo\Application();
 $application->registerRoutes($this, [
-	'routes' => [
-		['name' => 'renewPassword#tryRenewPassword', 'url' => '/renewpassword', 'verb' => 'POST'],
-		['name' => 'renewPassword#showRenewPasswordForm', 'url' => '/renewpassword/{user}', 'verb' => 'GET'],
-		['name' => 'renewPassword#cancel', 'url' => '/renewpassword/cancel', 'verb' => 'GET'],
-		['name' => 'renewPassword#showLoginFormInvalidPassword', 'url' => '/renewpassword/invalidlogin/{user}', 'verb' => 'GET'],
-	]
+    'routes' => [
+        ['name' => 'renewPassword#tryRenewPassword', 'url' => '/renewpassword', 'verb' => 'POST'],
+        ['name' => 'renewPassword#showRenewPasswordForm', 'url' => '/renewpassword/{user}', 'verb' => 'GET'],
+        ['name' => 'renewPassword#cancel', 'url' => '/renewpassword/cancel', 'verb' => 'GET'],
+        ['name' => 'renewPassword#showLoginFormInvalidPassword', 'url' => '/renewpassword/invalidlogin/{user}', 'verb' => 'GET'],
+    ]
 ]);