nextcloud / server

lib/private/SystemTag/SystemTagObjectMapper.php

Spacing +1 added lines, -1 removed lines

@@ -231,7 +231,7 @@
 		$result->closeCursor();
 
 		if ($all) {
-			return ((int)$row[0] === count($objIds));
+			return ((int) $row[0] === count($objIds));
 		} else {
 			return (bool) $row;
 		}

Indentation +225 added lines, -225 removed lines

@@ -35,229 +35,229 @@
 
 class SystemTagObjectMapper implements ISystemTagObjectMapper {
 
-	const RELATION_TABLE = 'systemtag_object_mapping';
-
-	/** @var ISystemTagManager */
-	protected $tagManager;
-
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var EventDispatcherInterface */
-	protected $dispatcher;
-
-	/**
-	* Constructor.
-	*
-	* @param IDBConnection $connection database connection
-	* @param ISystemTagManager $tagManager system tag manager
-	* @param EventDispatcherInterface $dispatcher
-	*/
-	public function __construct(IDBConnection $connection, ISystemTagManager $tagManager, EventDispatcherInterface $dispatcher) {
-		$this->connection = $connection;
-		$this->tagManager = $tagManager;
-		$this->dispatcher = $dispatcher;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getTagIdsForObjects($objIds, $objectType) {
-		if (!is_array($objIds)) {
-			$objIds = [$objIds];
-		} else if (empty($objIds)) {
-			return [];
-		}
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select(['systemtagid', 'objectid'])
-			->from(self::RELATION_TABLE)
-			->where($query->expr()->in('objectid', $query->createParameter('objectids')))
-			->andWhere($query->expr()->eq('objecttype', $query->createParameter('objecttype')))
-			->setParameter('objectids', $objIds, IQueryBuilder::PARAM_INT_ARRAY)
-			->setParameter('objecttype', $objectType)
-			->addOrderBy('objectid', 'ASC')
-			->addOrderBy('systemtagid', 'ASC');
-
-		$mapping = [];
-		foreach ($objIds as $objId) {
-			$mapping[$objId] = [];
-		}
-
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			$objectId = $row['objectid'];
-			$mapping[$objectId][] = $row['systemtagid'];
-		}
-
-		$result->closeCursor();
-
-		return $mapping;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getObjectIdsForTags($tagIds, $objectType, $limit = 0, $offset = '') {
-		if (!is_array($tagIds)) {
-			$tagIds = [$tagIds];
-		}
-
-		$this->assertTagsExist($tagIds);
-
-		$query = $this->connection->getQueryBuilder();
-		$query->selectDistinct('objectid')
-			->from(self::RELATION_TABLE)
-			->where($query->expr()->in('systemtagid', $query->createNamedParameter($tagIds, IQueryBuilder::PARAM_INT_ARRAY)))
-			->andWhere($query->expr()->eq('objecttype', $query->createNamedParameter($objectType)));
-
-		if ($limit) {
-			if (count($tagIds) !== 1) {
-				throw new \InvalidArgumentException('Limit is only allowed with a single tag');
-			}
-
-			$query->setMaxResults($limit)
-				->orderBy('objectid', 'ASC');
-
-			if ($offset !== '') {
-				$query->andWhere($query->expr()->gt('objectid', $query->createNamedParameter($offset)));
-			}
-		}
-
-		$objectIds = [];
-
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			$objectIds[] = $row['objectid'];
-		}
-
-		return $objectIds;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function assignTags($objId, $objectType, $tagIds) {
-		if (!is_array($tagIds)) {
-			$tagIds = [$tagIds];
-		}
-
-		$this->assertTagsExist($tagIds);
-
-		$query = $this->connection->getQueryBuilder();
-		$query->insert(self::RELATION_TABLE)
-			->values([
-				'objectid' => $query->createNamedParameter($objId),
-				'objecttype' => $query->createNamedParameter($objectType),
-				'systemtagid' => $query->createParameter('tagid'),
-			]);
-
-		foreach ($tagIds as $tagId) {
-			try {
-				$query->setParameter('tagid', $tagId);
-				$query->execute();
-			} catch (UniqueConstraintViolationException $e) {
-				// ignore existing relations
-			}
-		}
-
-		$this->dispatcher->dispatch(MapperEvent::EVENT_ASSIGN, new MapperEvent(
-			MapperEvent::EVENT_ASSIGN,
-			$objectType,
-			$objId,
-			$tagIds
-		));
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function unassignTags($objId, $objectType, $tagIds) {
-		if (!is_array($tagIds)) {
-			$tagIds = [$tagIds];
-		}
-
-		$this->assertTagsExist($tagIds);
-
-		$query = $this->connection->getQueryBuilder();
-		$query->delete(self::RELATION_TABLE)
-			->where($query->expr()->eq('objectid', $query->createParameter('objectid')))
-			->andWhere($query->expr()->eq('objecttype', $query->createParameter('objecttype')))
-			->andWhere($query->expr()->in('systemtagid', $query->createParameter('tagids')))
-			->setParameter('objectid', $objId)
-			->setParameter('objecttype', $objectType)
-			->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY)
-			->execute();
-
-		$this->dispatcher->dispatch(MapperEvent::EVENT_UNASSIGN, new MapperEvent(
-			MapperEvent::EVENT_UNASSIGN,
-			$objectType,
-			$objId,
-			$tagIds
-		));
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function haveTag($objIds, $objectType, $tagId, $all = true) {
-		$this->assertTagsExist([$tagId]);
-
-		if (!is_array($objIds)) {
-			$objIds = [$objIds];
-		}
-
-		$query = $this->connection->getQueryBuilder();
-
-		if (!$all) {
-			// If we only need one entry, we make the query lighter, by not
-			// counting the elements
-			$query->select('*')
-				->setMaxResults(1);
-		} else {
-			$query->select($query->createFunction('COUNT(1)'));
-		}
-
-		$query->from(self::RELATION_TABLE)
-			->where($query->expr()->in('objectid', $query->createParameter('objectids')))
-			->andWhere($query->expr()->eq('objecttype', $query->createParameter('objecttype')))
-			->andWhere($query->expr()->eq('systemtagid', $query->createParameter('tagid')))
-			->setParameter('objectids', $objIds, IQueryBuilder::PARAM_STR_ARRAY)
-			->setParameter('tagid', $tagId)
-			->setParameter('objecttype', $objectType);
-
-		$result = $query->execute();
-		$row = $result->fetch(\PDO::FETCH_NUM);
-		$result->closeCursor();
-
-		if ($all) {
-			return ((int)$row[0] === count($objIds));
-		} else {
-			return (bool) $row;
-		}
-	}
-
-	/**
-	 * Asserts that all the given tag ids exist.
-	 *
-	 * @param string[] $tagIds tag ids to check
-	 *
-	 * @throws \OCP\SystemTag\TagNotFoundException if at least one tag did not exist
-	 */
-	private function assertTagsExist($tagIds) {
-		$tags = $this->tagManager->getTagsByIds($tagIds);
-		if (count($tags) !== count($tagIds)) {
-			// at least one tag missing, bail out
-			$foundTagIds = array_map(
-				function(ISystemTag $tag) {
-					return $tag->getId();
-				},
-				$tags
-			);
-			$missingTagIds = array_diff($tagIds, $foundTagIds);
-			throw new TagNotFoundException(
-				'Tags not found', 0, null, $missingTagIds
-			);
-		}
-	}
+    const RELATION_TABLE = 'systemtag_object_mapping';
+
+    /** @var ISystemTagManager */
+    protected $tagManager;
+
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var EventDispatcherInterface */
+    protected $dispatcher;
+
+    /**
+     * Constructor.
+     *
+     * @param IDBConnection $connection database connection
+     * @param ISystemTagManager $tagManager system tag manager
+     * @param EventDispatcherInterface $dispatcher
+     */
+    public function __construct(IDBConnection $connection, ISystemTagManager $tagManager, EventDispatcherInterface $dispatcher) {
+        $this->connection = $connection;
+        $this->tagManager = $tagManager;
+        $this->dispatcher = $dispatcher;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTagIdsForObjects($objIds, $objectType) {
+        if (!is_array($objIds)) {
+            $objIds = [$objIds];
+        } else if (empty($objIds)) {
+            return [];
+        }
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select(['systemtagid', 'objectid'])
+            ->from(self::RELATION_TABLE)
+            ->where($query->expr()->in('objectid', $query->createParameter('objectids')))
+            ->andWhere($query->expr()->eq('objecttype', $query->createParameter('objecttype')))
+            ->setParameter('objectids', $objIds, IQueryBuilder::PARAM_INT_ARRAY)
+            ->setParameter('objecttype', $objectType)
+            ->addOrderBy('objectid', 'ASC')
+            ->addOrderBy('systemtagid', 'ASC');
+
+        $mapping = [];
+        foreach ($objIds as $objId) {
+            $mapping[$objId] = [];
+        }
+
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            $objectId = $row['objectid'];
+            $mapping[$objectId][] = $row['systemtagid'];
+        }
+
+        $result->closeCursor();
+
+        return $mapping;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getObjectIdsForTags($tagIds, $objectType, $limit = 0, $offset = '') {
+        if (!is_array($tagIds)) {
+            $tagIds = [$tagIds];
+        }
+
+        $this->assertTagsExist($tagIds);
+
+        $query = $this->connection->getQueryBuilder();
+        $query->selectDistinct('objectid')
+            ->from(self::RELATION_TABLE)
+            ->where($query->expr()->in('systemtagid', $query->createNamedParameter($tagIds, IQueryBuilder::PARAM_INT_ARRAY)))
+            ->andWhere($query->expr()->eq('objecttype', $query->createNamedParameter($objectType)));
+
+        if ($limit) {
+            if (count($tagIds) !== 1) {
+                throw new \InvalidArgumentException('Limit is only allowed with a single tag');
+            }
+
+            $query->setMaxResults($limit)
+                ->orderBy('objectid', 'ASC');
+
+            if ($offset !== '') {
+                $query->andWhere($query->expr()->gt('objectid', $query->createNamedParameter($offset)));
+            }
+        }
+
+        $objectIds = [];
+
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            $objectIds[] = $row['objectid'];
+        }
+
+        return $objectIds;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function assignTags($objId, $objectType, $tagIds) {
+        if (!is_array($tagIds)) {
+            $tagIds = [$tagIds];
+        }
+
+        $this->assertTagsExist($tagIds);
+
+        $query = $this->connection->getQueryBuilder();
+        $query->insert(self::RELATION_TABLE)
+            ->values([
+                'objectid' => $query->createNamedParameter($objId),
+                'objecttype' => $query->createNamedParameter($objectType),
+                'systemtagid' => $query->createParameter('tagid'),
+            ]);
+
+        foreach ($tagIds as $tagId) {
+            try {
+                $query->setParameter('tagid', $tagId);
+                $query->execute();
+            } catch (UniqueConstraintViolationException $e) {
+                // ignore existing relations
+            }
+        }
+
+        $this->dispatcher->dispatch(MapperEvent::EVENT_ASSIGN, new MapperEvent(
+            MapperEvent::EVENT_ASSIGN,
+            $objectType,
+            $objId,
+            $tagIds
+        ));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function unassignTags($objId, $objectType, $tagIds) {
+        if (!is_array($tagIds)) {
+            $tagIds = [$tagIds];
+        }
+
+        $this->assertTagsExist($tagIds);
+
+        $query = $this->connection->getQueryBuilder();
+        $query->delete(self::RELATION_TABLE)
+            ->where($query->expr()->eq('objectid', $query->createParameter('objectid')))
+            ->andWhere($query->expr()->eq('objecttype', $query->createParameter('objecttype')))
+            ->andWhere($query->expr()->in('systemtagid', $query->createParameter('tagids')))
+            ->setParameter('objectid', $objId)
+            ->setParameter('objecttype', $objectType)
+            ->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY)
+            ->execute();
+
+        $this->dispatcher->dispatch(MapperEvent::EVENT_UNASSIGN, new MapperEvent(
+            MapperEvent::EVENT_UNASSIGN,
+            $objectType,
+            $objId,
+            $tagIds
+        ));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function haveTag($objIds, $objectType, $tagId, $all = true) {
+        $this->assertTagsExist([$tagId]);
+
+        if (!is_array($objIds)) {
+            $objIds = [$objIds];
+        }
+
+        $query = $this->connection->getQueryBuilder();
+
+        if (!$all) {
+            // If we only need one entry, we make the query lighter, by not
+            // counting the elements
+            $query->select('*')
+                ->setMaxResults(1);
+        } else {
+            $query->select($query->createFunction('COUNT(1)'));
+        }
+
+        $query->from(self::RELATION_TABLE)
+            ->where($query->expr()->in('objectid', $query->createParameter('objectids')))
+            ->andWhere($query->expr()->eq('objecttype', $query->createParameter('objecttype')))
+            ->andWhere($query->expr()->eq('systemtagid', $query->createParameter('tagid')))
+            ->setParameter('objectids', $objIds, IQueryBuilder::PARAM_STR_ARRAY)
+            ->setParameter('tagid', $tagId)
+            ->setParameter('objecttype', $objectType);
+
+        $result = $query->execute();
+        $row = $result->fetch(\PDO::FETCH_NUM);
+        $result->closeCursor();
+
+        if ($all) {
+            return ((int)$row[0] === count($objIds));
+        } else {
+            return (bool) $row;
+        }
+    }
+
+    /**
+     * Asserts that all the given tag ids exist.
+     *
+     * @param string[] $tagIds tag ids to check
+     *
+     * @throws \OCP\SystemTag\TagNotFoundException if at least one tag did not exist
+     */
+    private function assertTagsExist($tagIds) {
+        $tags = $this->tagManager->getTagsByIds($tagIds);
+        if (count($tags) !== count($tagIds)) {
+            // at least one tag missing, bail out
+            $foundTagIds = array_map(
+                function(ISystemTag $tag) {
+                    return $tag->getId();
+                },
+                $tags
+            );
+            $missingTagIds = array_diff($tagIds, $foundTagIds);
+            throw new TagNotFoundException(
+                'Tags not found', 0, null, $missingTagIds
+            );
+        }
+    }
 }

lib/private/SystemTag/SystemTagManager.php

Spacing +15 added lines, -15 removed lines

@@ -136,14 +136,14 @@ 
 			->from(self::TAG_TABLE);
 
 		if (!is_null($visibilityFilter)) {
-			$query->andWhere($query->expr()->eq('visibility', $query->createNamedParameter((int)$visibilityFilter)));
+			$query->andWhere($query->expr()->eq('visibility', $query->createNamedParameter((int) $visibilityFilter)));
 		}
 
 		if (!empty($nameSearchPattern)) {
 			$query->andWhere(
 				$query->expr()->like(
 					'name',
-					$query->createNamedParameter('%' . $this->connection->escapeLikeParameter($nameSearchPattern). '%')
+					$query->createNamedParameter('%'.$this->connection->escapeLikeParameter($nameSearchPattern).'%')
 				)
 			);
 		}
@@ -167,8 +167,8 @@ 
 	 * {@inheritdoc}
 	 */
 	public function getTag($tagName, $userVisible, $userAssignable) {
-		$userVisible = (int)$userVisible;
-		$userAssignable = (int)$userAssignable;
+		$userVisible = (int) $userVisible;
+		$userAssignable = (int) $userAssignable;
 
 		$result = $this->selectTagQuery
 			->setParameter('name', $tagName)
@@ -180,7 +180,7 @@ 
 		$result->closeCursor();
 		if (!$row) {
 			throw new TagNotFoundException(
-				'Tag ("' . $tagName . '", '. $userVisible . ', ' . $userAssignable . ') does not exist'
+				'Tag ("'.$tagName.'", '.$userVisible.', '.$userAssignable.') does not exist'
 			);
 		}
 
@@ -191,8 +191,8 @@ 
 	 * {@inheritdoc}
 	 */
 	public function createTag($tagName, $userVisible, $userAssignable) {
-		$userVisible = (int)$userVisible;
-		$userAssignable = (int)$userAssignable;
+		$userVisible = (int) $userVisible;
+		$userAssignable = (int) $userAssignable;
 
 		$query = $this->connection->getQueryBuilder();
 		$query->insert(self::TAG_TABLE)
@@ -206,7 +206,7 @@ 
 			$query->execute();
 		} catch (UniqueConstraintViolationException $e) {
 			throw new TagAlreadyExistsException(
-				'Tag ("' . $tagName . '", '. $userVisible . ', ' . $userAssignable . ') already exists',
+				'Tag ("'.$tagName.'", '.$userVisible.', '.$userAssignable.') already exists',
 				0,
 				$e
 			);
@@ -215,10 +215,10 @@ 
 		$tagId = $query->getLastInsertId();
 
 		$tag = new SystemTag(
-			(int)$tagId,
+			(int) $tagId,
 			$tagName,
-			(bool)$userVisible,
-			(bool)$userAssignable
+			(bool) $userVisible,
+			(bool) $userAssignable
 		);
 
 		$this->dispatcher->dispatch(ManagerEvent::EVENT_CREATE, new ManagerEvent(
@@ -232,8 +232,8 @@ 
 	 * {@inheritdoc}
 	 */
 	public function updateTag($tagId, $tagName, $userVisible, $userAssignable) {
-		$userVisible = (int)$userVisible;
-		$userAssignable = (int)$userAssignable;
+		$userVisible = (int) $userVisible;
+		$userAssignable = (int) $userAssignable;
 
 		try {
 			$tags = $this->getTagsByIds($tagId);
@@ -270,7 +270,7 @@ 
 			}
 		} catch (UniqueConstraintViolationException $e) {
 			throw new TagAlreadyExistsException(
-				'Tag ("' . $tagName . '", '. $userVisible . ', ' . $userAssignable . ') already exists',
+				'Tag ("'.$tagName.'", '.$userVisible.', '.$userAssignable.') already exists',
 				0,
 				$e
 			);
@@ -377,7 +377,7 @@ 
 	}
 
 	private function createSystemTagFromRow($row) {
-		return new SystemTag((int)$row['id'], $row['name'], (bool)$row['visibility'], (bool)$row['editable']);
+		return new SystemTag((int) $row['id'], $row['name'], (bool) $row['visibility'], (bool) $row['editable']);
 	}
 
 	/**

Indentation +393 added lines, -393 removed lines

@@ -40,397 +40,397 @@
  */
 class SystemTagManager implements ISystemTagManager {
 
-	const TAG_TABLE = 'systemtag';
-	const TAG_GROUP_TABLE = 'systemtag_group';
-
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var EventDispatcherInterface */
-	protected $dispatcher;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/**
-	 * Prepared query for selecting tags directly
-	 *
-	 * @var \OCP\DB\QueryBuilder\IQueryBuilder
-	 */
-	private $selectTagQuery;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param IDBConnection $connection database connection
-	 * @param EventDispatcherInterface $dispatcher
-	 */
-	public function __construct(
-		IDBConnection $connection,
-		IGroupManager $groupManager,
-		EventDispatcherInterface $dispatcher
-	) {
-		$this->connection = $connection;
-		$this->groupManager = $groupManager;
-		$this->dispatcher = $dispatcher;
-
-		$query = $this->connection->getQueryBuilder();
-		$this->selectTagQuery = $query->select('*')
-			->from(self::TAG_TABLE)
-			->where($query->expr()->eq('name', $query->createParameter('name')))
-			->andWhere($query->expr()->eq('visibility', $query->createParameter('visibility')))
-			->andWhere($query->expr()->eq('editable', $query->createParameter('editable')));
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getTagsByIds($tagIds) {
-		if (!is_array($tagIds)) {
-			$tagIds = [$tagIds];
-		}
-
-		$tags = [];
-
-		// note: not all databases will fail if it's a string or starts with a number
-		foreach ($tagIds as $tagId) {
-			if (!is_numeric($tagId)) {
-				throw new \InvalidArgumentException('Tag id must be integer');
-			}
-		}
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from(self::TAG_TABLE)
-			->where($query->expr()->in('id', $query->createParameter('tagids')))
-			->addOrderBy('name', 'ASC')
-			->addOrderBy('visibility', 'ASC')
-			->addOrderBy('editable', 'ASC')
-			->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY);
-
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			$tags[$row['id']] = $this->createSystemTagFromRow($row);
-		}
-
-		$result->closeCursor();
-
-		if (count($tags) !== count($tagIds)) {
-			throw new TagNotFoundException(
-				'Tag id(s) not found', 0, null, array_diff($tagIds, array_keys($tags))
-			);
-		}
-
-		return $tags;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getAllTags($visibilityFilter = null, $nameSearchPattern = null) {
-		$tags = [];
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from(self::TAG_TABLE);
-
-		if (!is_null($visibilityFilter)) {
-			$query->andWhere($query->expr()->eq('visibility', $query->createNamedParameter((int)$visibilityFilter)));
-		}
-
-		if (!empty($nameSearchPattern)) {
-			$query->andWhere(
-				$query->expr()->like(
-					'name',
-					$query->createNamedParameter('%' . $this->connection->escapeLikeParameter($nameSearchPattern). '%')
-				)
-			);
-		}
-
-		$query
-			->addOrderBy('name', 'ASC')
-			->addOrderBy('visibility', 'ASC')
-			->addOrderBy('editable', 'ASC');
-
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			$tags[$row['id']] = $this->createSystemTagFromRow($row);
-		}
-
-		$result->closeCursor();
-
-		return $tags;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getTag($tagName, $userVisible, $userAssignable) {
-		$userVisible = (int)$userVisible;
-		$userAssignable = (int)$userAssignable;
-
-		$result = $this->selectTagQuery
-			->setParameter('name', $tagName)
-			->setParameter('visibility', $userVisible)
-			->setParameter('editable', $userAssignable)
-			->execute();
-
-		$row = $result->fetch();
-		$result->closeCursor();
-		if (!$row) {
-			throw new TagNotFoundException(
-				'Tag ("' . $tagName . '", '. $userVisible . ', ' . $userAssignable . ') does not exist'
-			);
-		}
-
-		return $this->createSystemTagFromRow($row);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function createTag($tagName, $userVisible, $userAssignable) {
-		$userVisible = (int)$userVisible;
-		$userAssignable = (int)$userAssignable;
-
-		$query = $this->connection->getQueryBuilder();
-		$query->insert(self::TAG_TABLE)
-			->values([
-				'name' => $query->createNamedParameter($tagName),
-				'visibility' => $query->createNamedParameter($userVisible),
-				'editable' => $query->createNamedParameter($userAssignable),
-			]);
-
-		try {
-			$query->execute();
-		} catch (UniqueConstraintViolationException $e) {
-			throw new TagAlreadyExistsException(
-				'Tag ("' . $tagName . '", '. $userVisible . ', ' . $userAssignable . ') already exists',
-				0,
-				$e
-			);
-		}
-
-		$tagId = $query->getLastInsertId();
-
-		$tag = new SystemTag(
-			(int)$tagId,
-			$tagName,
-			(bool)$userVisible,
-			(bool)$userAssignable
-		);
-
-		$this->dispatcher->dispatch(ManagerEvent::EVENT_CREATE, new ManagerEvent(
-			ManagerEvent::EVENT_CREATE, $tag
-		));
-
-		return $tag;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function updateTag($tagId, $tagName, $userVisible, $userAssignable) {
-		$userVisible = (int)$userVisible;
-		$userAssignable = (int)$userAssignable;
-
-		try {
-			$tags = $this->getTagsByIds($tagId);
-		} catch (TagNotFoundException $e) {
-			throw new TagNotFoundException(
-				'Tag does not exist', 0, null, [$tagId]
-			);
-		}
-
-		$beforeUpdate = array_shift($tags);
-		$afterUpdate = new SystemTag(
-			(int) $tagId,
-			$tagName,
-			(bool) $userVisible,
-			(bool) $userAssignable
-		);
-
-		$query = $this->connection->getQueryBuilder();
-		$query->update(self::TAG_TABLE)
-			->set('name', $query->createParameter('name'))
-			->set('visibility', $query->createParameter('visibility'))
-			->set('editable', $query->createParameter('editable'))
-			->where($query->expr()->eq('id', $query->createParameter('tagid')))
-			->setParameter('name', $tagName)
-			->setParameter('visibility', $userVisible)
-			->setParameter('editable', $userAssignable)
-			->setParameter('tagid', $tagId);
-
-		try {
-			if ($query->execute() === 0) {
-				throw new TagNotFoundException(
-					'Tag does not exist', 0, null, [$tagId]
-				);
-			}
-		} catch (UniqueConstraintViolationException $e) {
-			throw new TagAlreadyExistsException(
-				'Tag ("' . $tagName . '", '. $userVisible . ', ' . $userAssignable . ') already exists',
-				0,
-				$e
-			);
-		}
-
-		$this->dispatcher->dispatch(ManagerEvent::EVENT_UPDATE, new ManagerEvent(
-			ManagerEvent::EVENT_UPDATE, $afterUpdate, $beforeUpdate
-		));
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function deleteTags($tagIds) {
-		if (!is_array($tagIds)) {
-			$tagIds = [$tagIds];
-		}
-
-		$tagNotFoundException = null;
-		$tags = [];
-		try {
-			$tags = $this->getTagsByIds($tagIds);
-		} catch (TagNotFoundException $e) {
-			$tagNotFoundException = $e;
-
-			// Get existing tag objects for the hooks later
-			$existingTags = array_diff($tagIds, $tagNotFoundException->getMissingTags());
-			if (!empty($existingTags)) {
-				try {
-					$tags = $this->getTagsByIds($existingTags);
-				} catch (TagNotFoundException $e) {
-					// Ignore further errors...
-				}
-			}
-		}
-
-		// delete relationships first
-		$query = $this->connection->getQueryBuilder();
-		$query->delete(SystemTagObjectMapper::RELATION_TABLE)
-			->where($query->expr()->in('systemtagid', $query->createParameter('tagids')))
-			->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY)
-			->execute();
-
-		$query = $this->connection->getQueryBuilder();
-		$query->delete(self::TAG_TABLE)
-			->where($query->expr()->in('id', $query->createParameter('tagids')))
-			->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY)
-			->execute();
-
-		foreach ($tags as $tag) {
-			$this->dispatcher->dispatch(ManagerEvent::EVENT_DELETE, new ManagerEvent(
-				ManagerEvent::EVENT_DELETE, $tag
-			));
-		}
-
-		if ($tagNotFoundException !== null) {
-			throw new TagNotFoundException(
-				'Tag id(s) not found', 0, $tagNotFoundException, $tagNotFoundException->getMissingTags()
-			);
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function canUserAssignTag(ISystemTag $tag, IUser $user) {
-		// early check to avoid unneeded group lookups
-		if ($tag->isUserAssignable() && $tag->isUserVisible()) {
-			return true;
-		}
-
-		if ($this->groupManager->isAdmin($user->getUID())) {
-			return true;
-		}
-
-		if (!$tag->isUserVisible()) {
-			return false;
-		}
-
-		$groupIds = $this->groupManager->getUserGroupIds($user);
-		if (!empty($groupIds)) {
-			$matchingGroups = array_intersect($groupIds, $this->getTagGroups($tag));
-			if (!empty($matchingGroups)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function canUserSeeTag(ISystemTag $tag, IUser $user) {
-		if ($tag->isUserVisible()) {
-			return true;
-		}
-
-		if ($this->groupManager->isAdmin($user->getUID())) {
-			return true;
-		}
-
-		return false;
-	}
-
-	private function createSystemTagFromRow($row) {
-		return new SystemTag((int)$row['id'], $row['name'], (bool)$row['visibility'], (bool)$row['editable']);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function setTagGroups(ISystemTag $tag, $groupIds) {
-		// delete relationships first
-		$this->connection->beginTransaction();
-		try {
-			$query = $this->connection->getQueryBuilder();
-			$query->delete(self::TAG_GROUP_TABLE)
-				->where($query->expr()->eq('systemtagid', $query->createNamedParameter($tag->getId())))
-				->execute();
-
-			// add each group id
-			$query = $this->connection->getQueryBuilder();
-			$query->insert(self::TAG_GROUP_TABLE)
-				->values([
-					'systemtagid' => $query->createNamedParameter($tag->getId()),
-					'gid' => $query->createParameter('gid'),
-				]);
-			foreach ($groupIds as $groupId) {
-				if ($groupId === '') {
-					continue;
-				}
-				$query->setParameter('gid', $groupId);
-				$query->execute();
-			}
-
-			$this->connection->commit();
-		} catch (\Exception $e) {
-			$this->connection->rollBack();
-			throw $e;
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getTagGroups(ISystemTag $tag) {
-		$groupIds = [];
-		$query = $this->connection->getQueryBuilder();
-		$query->select('gid')
-			->from(self::TAG_GROUP_TABLE)
-			->where($query->expr()->eq('systemtagid', $query->createNamedParameter($tag->getId())))
-			->orderBy('gid');
-
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			$groupIds[] = $row['gid'];
-		}
-
-		$result->closeCursor();
-
-		return $groupIds;
-	}
+    const TAG_TABLE = 'systemtag';
+    const TAG_GROUP_TABLE = 'systemtag_group';
+
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var EventDispatcherInterface */
+    protected $dispatcher;
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /**
+     * Prepared query for selecting tags directly
+     *
+     * @var \OCP\DB\QueryBuilder\IQueryBuilder
+     */
+    private $selectTagQuery;
+
+    /**
+     * Constructor.
+     *
+     * @param IDBConnection $connection database connection
+     * @param EventDispatcherInterface $dispatcher
+     */
+    public function __construct(
+        IDBConnection $connection,
+        IGroupManager $groupManager,
+        EventDispatcherInterface $dispatcher
+    ) {
+        $this->connection = $connection;
+        $this->groupManager = $groupManager;
+        $this->dispatcher = $dispatcher;
+
+        $query = $this->connection->getQueryBuilder();
+        $this->selectTagQuery = $query->select('*')
+            ->from(self::TAG_TABLE)
+            ->where($query->expr()->eq('name', $query->createParameter('name')))
+            ->andWhere($query->expr()->eq('visibility', $query->createParameter('visibility')))
+            ->andWhere($query->expr()->eq('editable', $query->createParameter('editable')));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTagsByIds($tagIds) {
+        if (!is_array($tagIds)) {
+            $tagIds = [$tagIds];
+        }
+
+        $tags = [];
+
+        // note: not all databases will fail if it's a string or starts with a number
+        foreach ($tagIds as $tagId) {
+            if (!is_numeric($tagId)) {
+                throw new \InvalidArgumentException('Tag id must be integer');
+            }
+        }
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from(self::TAG_TABLE)
+            ->where($query->expr()->in('id', $query->createParameter('tagids')))
+            ->addOrderBy('name', 'ASC')
+            ->addOrderBy('visibility', 'ASC')
+            ->addOrderBy('editable', 'ASC')
+            ->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY);
+
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            $tags[$row['id']] = $this->createSystemTagFromRow($row);
+        }
+
+        $result->closeCursor();
+
+        if (count($tags) !== count($tagIds)) {
+            throw new TagNotFoundException(
+                'Tag id(s) not found', 0, null, array_diff($tagIds, array_keys($tags))
+            );
+        }
+
+        return $tags;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAllTags($visibilityFilter = null, $nameSearchPattern = null) {
+        $tags = [];
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from(self::TAG_TABLE);
+
+        if (!is_null($visibilityFilter)) {
+            $query->andWhere($query->expr()->eq('visibility', $query->createNamedParameter((int)$visibilityFilter)));
+        }
+
+        if (!empty($nameSearchPattern)) {
+            $query->andWhere(
+                $query->expr()->like(
+                    'name',
+                    $query->createNamedParameter('%' . $this->connection->escapeLikeParameter($nameSearchPattern). '%')
+                )
+            );
+        }
+
+        $query
+            ->addOrderBy('name', 'ASC')
+            ->addOrderBy('visibility', 'ASC')
+            ->addOrderBy('editable', 'ASC');
+
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            $tags[$row['id']] = $this->createSystemTagFromRow($row);
+        }
+
+        $result->closeCursor();
+
+        return $tags;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTag($tagName, $userVisible, $userAssignable) {
+        $userVisible = (int)$userVisible;
+        $userAssignable = (int)$userAssignable;
+
+        $result = $this->selectTagQuery
+            ->setParameter('name', $tagName)
+            ->setParameter('visibility', $userVisible)
+            ->setParameter('editable', $userAssignable)
+            ->execute();
+
+        $row = $result->fetch();
+        $result->closeCursor();
+        if (!$row) {
+            throw new TagNotFoundException(
+                'Tag ("' . $tagName . '", '. $userVisible . ', ' . $userAssignable . ') does not exist'
+            );
+        }
+
+        return $this->createSystemTagFromRow($row);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createTag($tagName, $userVisible, $userAssignable) {
+        $userVisible = (int)$userVisible;
+        $userAssignable = (int)$userAssignable;
+
+        $query = $this->connection->getQueryBuilder();
+        $query->insert(self::TAG_TABLE)
+            ->values([
+                'name' => $query->createNamedParameter($tagName),
+                'visibility' => $query->createNamedParameter($userVisible),
+                'editable' => $query->createNamedParameter($userAssignable),
+            ]);
+
+        try {
+            $query->execute();
+        } catch (UniqueConstraintViolationException $e) {
+            throw new TagAlreadyExistsException(
+                'Tag ("' . $tagName . '", '. $userVisible . ', ' . $userAssignable . ') already exists',
+                0,
+                $e
+            );
+        }
+
+        $tagId = $query->getLastInsertId();
+
+        $tag = new SystemTag(
+            (int)$tagId,
+            $tagName,
+            (bool)$userVisible,
+            (bool)$userAssignable
+        );
+
+        $this->dispatcher->dispatch(ManagerEvent::EVENT_CREATE, new ManagerEvent(
+            ManagerEvent::EVENT_CREATE, $tag
+        ));
+
+        return $tag;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function updateTag($tagId, $tagName, $userVisible, $userAssignable) {
+        $userVisible = (int)$userVisible;
+        $userAssignable = (int)$userAssignable;
+
+        try {
+            $tags = $this->getTagsByIds($tagId);
+        } catch (TagNotFoundException $e) {
+            throw new TagNotFoundException(
+                'Tag does not exist', 0, null, [$tagId]
+            );
+        }
+
+        $beforeUpdate = array_shift($tags);
+        $afterUpdate = new SystemTag(
+            (int) $tagId,
+            $tagName,
+            (bool) $userVisible,
+            (bool) $userAssignable
+        );
+
+        $query = $this->connection->getQueryBuilder();
+        $query->update(self::TAG_TABLE)
+            ->set('name', $query->createParameter('name'))
+            ->set('visibility', $query->createParameter('visibility'))
+            ->set('editable', $query->createParameter('editable'))
+            ->where($query->expr()->eq('id', $query->createParameter('tagid')))
+            ->setParameter('name', $tagName)
+            ->setParameter('visibility', $userVisible)
+            ->setParameter('editable', $userAssignable)
+            ->setParameter('tagid', $tagId);
+
+        try {
+            if ($query->execute() === 0) {
+                throw new TagNotFoundException(
+                    'Tag does not exist', 0, null, [$tagId]
+                );
+            }
+        } catch (UniqueConstraintViolationException $e) {
+            throw new TagAlreadyExistsException(
+                'Tag ("' . $tagName . '", '. $userVisible . ', ' . $userAssignable . ') already exists',
+                0,
+                $e
+            );
+        }
+
+        $this->dispatcher->dispatch(ManagerEvent::EVENT_UPDATE, new ManagerEvent(
+            ManagerEvent::EVENT_UPDATE, $afterUpdate, $beforeUpdate
+        ));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function deleteTags($tagIds) {
+        if (!is_array($tagIds)) {
+            $tagIds = [$tagIds];
+        }
+
+        $tagNotFoundException = null;
+        $tags = [];
+        try {
+            $tags = $this->getTagsByIds($tagIds);
+        } catch (TagNotFoundException $e) {
+            $tagNotFoundException = $e;
+
+            // Get existing tag objects for the hooks later
+            $existingTags = array_diff($tagIds, $tagNotFoundException->getMissingTags());
+            if (!empty($existingTags)) {
+                try {
+                    $tags = $this->getTagsByIds($existingTags);
+                } catch (TagNotFoundException $e) {
+                    // Ignore further errors...
+                }
+            }
+        }
+
+        // delete relationships first
+        $query = $this->connection->getQueryBuilder();
+        $query->delete(SystemTagObjectMapper::RELATION_TABLE)
+            ->where($query->expr()->in('systemtagid', $query->createParameter('tagids')))
+            ->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY)
+            ->execute();
+
+        $query = $this->connection->getQueryBuilder();
+        $query->delete(self::TAG_TABLE)
+            ->where($query->expr()->in('id', $query->createParameter('tagids')))
+            ->setParameter('tagids', $tagIds, IQueryBuilder::PARAM_INT_ARRAY)
+            ->execute();
+
+        foreach ($tags as $tag) {
+            $this->dispatcher->dispatch(ManagerEvent::EVENT_DELETE, new ManagerEvent(
+                ManagerEvent::EVENT_DELETE, $tag
+            ));
+        }
+
+        if ($tagNotFoundException !== null) {
+            throw new TagNotFoundException(
+                'Tag id(s) not found', 0, $tagNotFoundException, $tagNotFoundException->getMissingTags()
+            );
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function canUserAssignTag(ISystemTag $tag, IUser $user) {
+        // early check to avoid unneeded group lookups
+        if ($tag->isUserAssignable() && $tag->isUserVisible()) {
+            return true;
+        }
+
+        if ($this->groupManager->isAdmin($user->getUID())) {
+            return true;
+        }
+
+        if (!$tag->isUserVisible()) {
+            return false;
+        }
+
+        $groupIds = $this->groupManager->getUserGroupIds($user);
+        if (!empty($groupIds)) {
+            $matchingGroups = array_intersect($groupIds, $this->getTagGroups($tag));
+            if (!empty($matchingGroups)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function canUserSeeTag(ISystemTag $tag, IUser $user) {
+        if ($tag->isUserVisible()) {
+            return true;
+        }
+
+        if ($this->groupManager->isAdmin($user->getUID())) {
+            return true;
+        }
+
+        return false;
+    }
+
+    private function createSystemTagFromRow($row) {
+        return new SystemTag((int)$row['id'], $row['name'], (bool)$row['visibility'], (bool)$row['editable']);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setTagGroups(ISystemTag $tag, $groupIds) {
+        // delete relationships first
+        $this->connection->beginTransaction();
+        try {
+            $query = $this->connection->getQueryBuilder();
+            $query->delete(self::TAG_GROUP_TABLE)
+                ->where($query->expr()->eq('systemtagid', $query->createNamedParameter($tag->getId())))
+                ->execute();
+
+            // add each group id
+            $query = $this->connection->getQueryBuilder();
+            $query->insert(self::TAG_GROUP_TABLE)
+                ->values([
+                    'systemtagid' => $query->createNamedParameter($tag->getId()),
+                    'gid' => $query->createParameter('gid'),
+                ]);
+            foreach ($groupIds as $groupId) {
+                if ($groupId === '') {
+                    continue;
+                }
+                $query->setParameter('gid', $groupId);
+                $query->execute();
+            }
+
+            $this->connection->commit();
+        } catch (\Exception $e) {
+            $this->connection->rollBack();
+            throw $e;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTagGroups(ISystemTag $tag) {
+        $groupIds = [];
+        $query = $this->connection->getQueryBuilder();
+        $query->select('gid')
+            ->from(self::TAG_GROUP_TABLE)
+            ->where($query->expr()->eq('systemtagid', $query->createNamedParameter($tag->getId())))
+            ->orderBy('gid');
+
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            $groupIds[] = $row['gid'];
+        }
+
+        $result->closeCursor();
+
+        return $groupIds;
+    }
 }

lib/private/Group/Group.php

Spacing +2 added lines, -2 removed lines

@@ -222,8 +222,8 @@
 	public function count($search = '') {
 		$users = false;
 		foreach ($this->backends as $backend) {
-			if($backend->implementsActions(\OC\Group\Backend::COUNT_USERS)) {
-				if($users === false) {
+			if ($backend->implementsActions(\OC\Group\Backend::COUNT_USERS)) {
+				if ($users === false) {
 					//we could directly add to a bool variable, but this would
 					//be ugly
 					$users = 0;

Indentation +246 added lines, -246 removed lines

@@ -32,272 +32,272 @@
 use OCP\IUser;
 
 class Group implements IGroup {
-	/** @var null|string  */
-	protected $displayName;
+    /** @var null|string  */
+    protected $displayName;
 
-	/**
-	 * @var string $id
-	 */
-	private $gid;
+    /**
+     * @var string $id
+     */
+    private $gid;
 
-	/**
-	 * @var \OC\User\User[] $users
-	 */
-	private $users = array();
+    /**
+     * @var \OC\User\User[] $users
+     */
+    private $users = array();
 
-	/**
-	 * @var bool $usersLoaded
-	 */
-	private $usersLoaded;
+    /**
+     * @var bool $usersLoaded
+     */
+    private $usersLoaded;
 
-	/**
-	 * @var \OC\Group\Backend[]|\OC\Group\Database[] $backend
-	 */
-	private $backends;
+    /**
+     * @var \OC\Group\Backend[]|\OC\Group\Database[] $backend
+     */
+    private $backends;
 
-	/**
-	 * @var \OC\Hooks\PublicEmitter $emitter
-	 */
-	private $emitter;
+    /**
+     * @var \OC\Hooks\PublicEmitter $emitter
+     */
+    private $emitter;
 
-	/**
-	 * @var \OC\User\Manager $userManager
-	 */
-	private $userManager;
+    /**
+     * @var \OC\User\Manager $userManager
+     */
+    private $userManager;
 
-	/**
-	 * @param string $gid
-	 * @param \OC\Group\Backend[] $backends
-	 * @param \OC\User\Manager $userManager
-	 * @param \OC\Hooks\PublicEmitter $emitter
-	 * @param string $displayName
-	 */
-	public function __construct($gid, $backends, $userManager, $emitter = null, $displayName = null) {
-		$this->gid = $gid;
-		$this->backends = $backends;
-		$this->userManager = $userManager;
-		$this->emitter = $emitter;
-		$this->displayName = $displayName;
-	}
+    /**
+     * @param string $gid
+     * @param \OC\Group\Backend[] $backends
+     * @param \OC\User\Manager $userManager
+     * @param \OC\Hooks\PublicEmitter $emitter
+     * @param string $displayName
+     */
+    public function __construct($gid, $backends, $userManager, $emitter = null, $displayName = null) {
+        $this->gid = $gid;
+        $this->backends = $backends;
+        $this->userManager = $userManager;
+        $this->emitter = $emitter;
+        $this->displayName = $displayName;
+    }
 
-	public function getGID() {
-		return $this->gid;
-	}
+    public function getGID() {
+        return $this->gid;
+    }
 
-	public function getDisplayName() {
-		if (is_null($this->displayName)) {
-			return $this->gid;
-		}
-		return $this->displayName;
-	}
+    public function getDisplayName() {
+        if (is_null($this->displayName)) {
+            return $this->gid;
+        }
+        return $this->displayName;
+    }
 
-	/**
-	 * get all users in the group
-	 *
-	 * @return \OC\User\User[]
-	 */
-	public function getUsers() {
-		if ($this->usersLoaded) {
-			return $this->users;
-		}
+    /**
+     * get all users in the group
+     *
+     * @return \OC\User\User[]
+     */
+    public function getUsers() {
+        if ($this->usersLoaded) {
+            return $this->users;
+        }
 
-		$userIds = array();
-		foreach ($this->backends as $backend) {
-			$diff = array_diff(
-				$backend->usersInGroup($this->gid),
-				$userIds
-			);
-			if ($diff) {
-				$userIds = array_merge($userIds, $diff);
-			}
-		}
+        $userIds = array();
+        foreach ($this->backends as $backend) {
+            $diff = array_diff(
+                $backend->usersInGroup($this->gid),
+                $userIds
+            );
+            if ($diff) {
+                $userIds = array_merge($userIds, $diff);
+            }
+        }
 
-		$this->users = $this->getVerifiedUsers($userIds);
-		$this->usersLoaded = true;
-		return $this->users;
-	}
+        $this->users = $this->getVerifiedUsers($userIds);
+        $this->usersLoaded = true;
+        return $this->users;
+    }
 
-	/**
-	 * check if a user is in the group
-	 *
-	 * @param IUser $user
-	 * @return bool
-	 */
-	public function inGroup(IUser $user) {
-		if (isset($this->users[$user->getUID()])) {
-			return true;
-		}
-		foreach ($this->backends as $backend) {
-			if ($backend->inGroup($user->getUID(), $this->gid)) {
-				$this->users[$user->getUID()] = $user;
-				return true;
-			}
-		}
-		return false;
-	}
+    /**
+     * check if a user is in the group
+     *
+     * @param IUser $user
+     * @return bool
+     */
+    public function inGroup(IUser $user) {
+        if (isset($this->users[$user->getUID()])) {
+            return true;
+        }
+        foreach ($this->backends as $backend) {
+            if ($backend->inGroup($user->getUID(), $this->gid)) {
+                $this->users[$user->getUID()] = $user;
+                return true;
+            }
+        }
+        return false;
+    }
 
-	/**
-	 * add a user to the group
-	 *
-	 * @param IUser $user
-	 */
-	public function addUser(IUser $user) {
-		if ($this->inGroup($user)) {
-			return;
-		}
+    /**
+     * add a user to the group
+     *
+     * @param IUser $user
+     */
+    public function addUser(IUser $user) {
+        if ($this->inGroup($user)) {
+            return;
+        }
 
-		if ($this->emitter) {
-			$this->emitter->emit('\OC\Group', 'preAddUser', array($this, $user));
-		}
-		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(\OC\Group\Backend::ADD_TO_GROUP)) {
-				$backend->addToGroup($user->getUID(), $this->gid);
-				if ($this->users) {
-					$this->users[$user->getUID()] = $user;
-				}
-				if ($this->emitter) {
-					$this->emitter->emit('\OC\Group', 'postAddUser', array($this, $user));
-				}
-				return;
-			}
-		}
-	}
+        if ($this->emitter) {
+            $this->emitter->emit('\OC\Group', 'preAddUser', array($this, $user));
+        }
+        foreach ($this->backends as $backend) {
+            if ($backend->implementsActions(\OC\Group\Backend::ADD_TO_GROUP)) {
+                $backend->addToGroup($user->getUID(), $this->gid);
+                if ($this->users) {
+                    $this->users[$user->getUID()] = $user;
+                }
+                if ($this->emitter) {
+                    $this->emitter->emit('\OC\Group', 'postAddUser', array($this, $user));
+                }
+                return;
+            }
+        }
+    }
 
-	/**
-	 * remove a user from the group
-	 *
-	 * @param \OC\User\User $user
-	 */
-	public function removeUser($user) {
-		$result = false;
-		if ($this->emitter) {
-			$this->emitter->emit('\OC\Group', 'preRemoveUser', array($this, $user));
-		}
-		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(\OC\Group\Backend::REMOVE_FROM_GOUP) and $backend->inGroup($user->getUID(), $this->gid)) {
-				$backend->removeFromGroup($user->getUID(), $this->gid);
-				$result = true;
-			}
-		}
-		if ($result) {
-			if ($this->emitter) {
-				$this->emitter->emit('\OC\Group', 'postRemoveUser', array($this, $user));
-			}
-			if ($this->users) {
-				foreach ($this->users as $index => $groupUser) {
-					if ($groupUser->getUID() === $user->getUID()) {
-						unset($this->users[$index]);
-						return;
-					}
-				}
-			}
-		}
-	}
+    /**
+     * remove a user from the group
+     *
+     * @param \OC\User\User $user
+     */
+    public function removeUser($user) {
+        $result = false;
+        if ($this->emitter) {
+            $this->emitter->emit('\OC\Group', 'preRemoveUser', array($this, $user));
+        }
+        foreach ($this->backends as $backend) {
+            if ($backend->implementsActions(\OC\Group\Backend::REMOVE_FROM_GOUP) and $backend->inGroup($user->getUID(), $this->gid)) {
+                $backend->removeFromGroup($user->getUID(), $this->gid);
+                $result = true;
+            }
+        }
+        if ($result) {
+            if ($this->emitter) {
+                $this->emitter->emit('\OC\Group', 'postRemoveUser', array($this, $user));
+            }
+            if ($this->users) {
+                foreach ($this->users as $index => $groupUser) {
+                    if ($groupUser->getUID() === $user->getUID()) {
+                        unset($this->users[$index]);
+                        return;
+                    }
+                }
+            }
+        }
+    }
 
-	/**
-	 * search for users in the group by userid
-	 *
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return \OC\User\User[]
-	 */
-	public function searchUsers($search, $limit = null, $offset = null) {
-		$users = array();
-		foreach ($this->backends as $backend) {
-			$userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset);
-			$users += $this->getVerifiedUsers($userIds);
-			if (!is_null($limit) and $limit <= 0) {
-				return array_values($users);
-			}
-		}
-		return array_values($users);
-	}
+    /**
+     * search for users in the group by userid
+     *
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return \OC\User\User[]
+     */
+    public function searchUsers($search, $limit = null, $offset = null) {
+        $users = array();
+        foreach ($this->backends as $backend) {
+            $userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset);
+            $users += $this->getVerifiedUsers($userIds);
+            if (!is_null($limit) and $limit <= 0) {
+                return array_values($users);
+            }
+        }
+        return array_values($users);
+    }
 
-	/**
-	 * returns the number of users matching the search string
-	 *
-	 * @param string $search
-	 * @return int|bool
-	 */
-	public function count($search = '') {
-		$users = false;
-		foreach ($this->backends as $backend) {
-			if($backend->implementsActions(\OC\Group\Backend::COUNT_USERS)) {
-				if($users === false) {
-					//we could directly add to a bool variable, but this would
-					//be ugly
-					$users = 0;
-				}
-				$users += $backend->countUsersInGroup($this->gid, $search);
-			}
-		}
-		return $users;
-	}
+    /**
+     * returns the number of users matching the search string
+     *
+     * @param string $search
+     * @return int|bool
+     */
+    public function count($search = '') {
+        $users = false;
+        foreach ($this->backends as $backend) {
+            if($backend->implementsActions(\OC\Group\Backend::COUNT_USERS)) {
+                if($users === false) {
+                    //we could directly add to a bool variable, but this would
+                    //be ugly
+                    $users = 0;
+                }
+                $users += $backend->countUsersInGroup($this->gid, $search);
+            }
+        }
+        return $users;
+    }
 
-	/**
-	 * search for users in the group by displayname
-	 *
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return \OC\User\User[]
-	 */
-	public function searchDisplayName($search, $limit = null, $offset = null) {
-		$users = array();
-		foreach ($this->backends as $backend) {
-			$userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset);
-			$users = $this->getVerifiedUsers($userIds);
-			if (!is_null($limit) and $limit <= 0) {
-				return array_values($users);
-			}
-		}
-		return array_values($users);
-	}
+    /**
+     * search for users in the group by displayname
+     *
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return \OC\User\User[]
+     */
+    public function searchDisplayName($search, $limit = null, $offset = null) {
+        $users = array();
+        foreach ($this->backends as $backend) {
+            $userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset);
+            $users = $this->getVerifiedUsers($userIds);
+            if (!is_null($limit) and $limit <= 0) {
+                return array_values($users);
+            }
+        }
+        return array_values($users);
+    }
 
-	/**
-	 * delete the group
-	 *
-	 * @return bool
-	 */
-	public function delete() {
-		// Prevent users from deleting group admin
-		if ($this->getGID() === 'admin') {
-			return false;
-		}
+    /**
+     * delete the group
+     *
+     * @return bool
+     */
+    public function delete() {
+        // Prevent users from deleting group admin
+        if ($this->getGID() === 'admin') {
+            return false;
+        }
 
-		$result = false;
-		if ($this->emitter) {
-			$this->emitter->emit('\OC\Group', 'preDelete', array($this));
-		}
-		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(\OC\Group\Backend::DELETE_GROUP)) {
-				$result = true;
-				$backend->deleteGroup($this->gid);
-			}
-		}
-		if ($result and $this->emitter) {
-			$this->emitter->emit('\OC\Group', 'postDelete', array($this));
-		}
-		return $result;
-	}
+        $result = false;
+        if ($this->emitter) {
+            $this->emitter->emit('\OC\Group', 'preDelete', array($this));
+        }
+        foreach ($this->backends as $backend) {
+            if ($backend->implementsActions(\OC\Group\Backend::DELETE_GROUP)) {
+                $result = true;
+                $backend->deleteGroup($this->gid);
+            }
+        }
+        if ($result and $this->emitter) {
+            $this->emitter->emit('\OC\Group', 'postDelete', array($this));
+        }
+        return $result;
+    }
 
-	/**
-	 * returns all the Users from an array that really exists
-	 * @param string[] $userIds an array containing user IDs
-	 * @return \OC\User\User[] an Array with the userId as Key and \OC\User\User as value
-	 */
-	private function getVerifiedUsers($userIds) {
-		if (!is_array($userIds)) {
-			return array();
-		}
-		$users = array();
-		foreach ($userIds as $userId) {
-			$user = $this->userManager->get($userId);
-			if (!is_null($user)) {
-				$users[$userId] = $user;
-			}
-		}
-		return $users;
-	}
+    /**
+     * returns all the Users from an array that really exists
+     * @param string[] $userIds an array containing user IDs
+     * @return \OC\User\User[] an Array with the userId as Key and \OC\User\User as value
+     */
+    private function getVerifiedUsers($userIds) {
+        if (!is_array($userIds)) {
+            return array();
+        }
+        $users = array();
+        foreach ($userIds as $userId) {
+            $user = $this->userManager->get($userId);
+            if (!is_null($user)) {
+                $users[$userId] = $user;
+            }
+        }
+        return $users;
+    }
 }

lib/private/Group/Database.php

Indentation +286 added lines, -286 removed lines

@@ -44,291 +44,291 @@
  */
 class Database extends \OC\Group\Backend {
 
-	/** @var string[] */
-	private $groupCache = [];
-
-	/** @var \OCP\IDBConnection */
-	private $dbConn;
-
-	/**
-	 * \OC\Group\Database constructor.
-	 *
-	 * @param \OCP\IDBConnection|null $dbConn
-	 */
-	public function __construct(\OCP\IDBConnection $dbConn = null) {
-		$this->dbConn = $dbConn;
-	}
-
-	/**
-	 * FIXME: This function should not be required!
-	 */
-	private function fixDI() {
-		if ($this->dbConn === null) {
-			$this->dbConn = \OC::$server->getDatabaseConnection();
-		}
-	}
-
-	/**
-	 * Try to create a new group
-	 * @param string $gid The name of the group to create
-	 * @return bool
-	 *
-	 * Tries to create a new group. If the group name already exists, false will
-	 * be returned.
-	 */
-	public function createGroup( $gid ) {
-		$this->fixDI();
-
-		// Add group
-		$result = $this->dbConn->insertIfNotExist('*PREFIX*groups', [
-			'gid' => $gid,
-		]);
-
-		// Add to cache
-		$this->groupCache[$gid] = $gid;
-
-		return $result === 1;
-	}
-
-	/**
-	 * delete a group
-	 * @param string $gid gid of the group to delete
-	 * @return bool
-	 *
-	 * Deletes a group and removes it from the group_user-table
-	 */
-	public function deleteGroup( $gid ) {
-		$this->fixDI();
-
-		// Delete the group
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->delete('groups')
-			->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
-			->execute();
-
-		// Delete the group-user relation
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->delete('group_user')
-			->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
-			->execute();
-
-		// Delete the group-groupadmin relation
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->delete('group_admin')
-			->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
-			->execute();
-
-		// Delete from cache
-		unset($this->groupCache[$gid]);
-
-		return true;
-	}
-
-	/**
-	 * is user in group?
-	 * @param string $uid uid of the user
-	 * @param string $gid gid of the group
-	 * @return bool
-	 *
-	 * Checks whether the user is member of a group or not.
-	 */
-	public function inGroup( $uid, $gid ) {
-		$this->fixDI();
-
-		// check
-		$qb = $this->dbConn->getQueryBuilder();
-		$cursor = $qb->select('uid')
-			->from('group_user')
-			->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
-			->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
-			->execute();
-
-		$result = $cursor->fetch();
-		$cursor->closeCursor();
-
-		return $result ? true : false;
-	}
-
-	/**
-	 * Add a user to a group
-	 * @param string $uid Name of the user to add to group
-	 * @param string $gid Name of the group in which add the user
-	 * @return bool
-	 *
-	 * Adds a user to a group.
-	 */
-	public function addToGroup( $uid, $gid ) {
-		$this->fixDI();
-
-		// No duplicate entries!
-		if( !$this->inGroup( $uid, $gid )) {
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->insert('group_user')
-				->setValue('uid', $qb->createNamedParameter($uid))
-				->setValue('gid', $qb->createNamedParameter($gid))
-				->execute();
-			return true;
-		}else{
-			return false;
-		}
-	}
-
-	/**
-	 * Removes a user from a group
-	 * @param string $uid Name of the user to remove from group
-	 * @param string $gid Name of the group from which remove the user
-	 * @return bool
-	 *
-	 * removes the user from a group.
-	 */
-	public function removeFromGroup( $uid, $gid ) {
-		$this->fixDI();
-
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->delete('group_user')
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
-			->andWhere($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
-			->execute();
-
-		return true;
-	}
-
-	/**
-	 * Get all groups a user belongs to
-	 * @param string $uid Name of the user
-	 * @return array an array of group names
-	 *
-	 * This function fetches all groups a user belongs to. It does not check
-	 * if the user exists at all.
-	 */
-	public function getUserGroups( $uid ) {
-		//guests has empty or null $uid
-		if ($uid === null || $uid === '') {
-			return [];
-		}
-
-		$this->fixDI();
-
-		// No magic!
-		$qb = $this->dbConn->getQueryBuilder();
-		$cursor = $qb->select('gid')
-			->from('group_user')
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
-			->execute();
-
-		$groups = [];
-		while( $row = $cursor->fetch()) {
-			$groups[] = $row["gid"];
-			$this->groupCache[$row['gid']] = $row['gid'];
-		}
-		$cursor->closeCursor();
-
-		return $groups;
-	}
-
-	/**
-	 * get a list of all groups
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array an array of group names
-	 *
-	 * Returns a list with all groups
-	 */
-	public function getGroups($search = '', $limit = null, $offset = null) {
-		$parameters = [];
-		$searchLike = '';
-		if ($search !== '') {
-			$parameters[] = '%' . $search . '%';
-			$searchLike = ' WHERE LOWER(`gid`) LIKE LOWER(?)';
-		}
-
-		$stmt = \OC_DB::prepare('SELECT `gid` FROM `*PREFIX*groups`' . $searchLike . ' ORDER BY `gid` ASC', $limit, $offset);
-		$result = $stmt->execute($parameters);
-		$groups = array();
-		while ($row = $result->fetchRow()) {
-			$groups[] = $row['gid'];
-		}
-		return $groups;
-	}
-
-	/**
-	 * check if a group exists
-	 * @param string $gid
-	 * @return bool
-	 */
-	public function groupExists($gid) {
-		$this->fixDI();
-
-		// Check cache first
-		if (isset($this->groupCache[$gid])) {
-			return true;
-		}
-
-		$qb = $this->dbConn->getQueryBuilder();
-		$cursor = $qb->select('gid')
-			->from('groups')
-			->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
-			->execute();
-		$result = $cursor->fetch();
-		$cursor->closeCursor();
-
-		if ($result !== false) {
-			$this->groupCache[$gid] = $gid;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * get a list of all users in a group
-	 * @param string $gid
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array an array of user ids
-	 */
-	public function usersInGroup($gid, $search = '', $limit = null, $offset = null) {
-		$parameters = [$gid];
-		$searchLike = '';
-		if ($search !== '') {
-			$parameters[] = '%' . $this->dbConn->escapeLikeParameter($search) . '%';
-			$searchLike = ' AND `uid` LIKE ?';
-		}
-
-		$stmt = \OC_DB::prepare('SELECT `uid` FROM `*PREFIX*group_user` WHERE `gid` = ?' . $searchLike . ' ORDER BY `uid` ASC',
-			$limit,
-			$offset);
-		$result = $stmt->execute($parameters);
-		$users = array();
-		while ($row = $result->fetchRow()) {
-			$users[] = $row['uid'];
-		}
-		return $users;
-	}
-
-	/**
-	 * get the number of all users matching the search string in a group
-	 * @param string $gid
-	 * @param string $search
-	 * @return int|false
-	 * @throws \OC\DatabaseException
-	 */
-	public function countUsersInGroup($gid, $search = '') {
-		$parameters = [$gid];
-		$searchLike = '';
-		if ($search !== '') {
-			$parameters[] = '%' . $this->dbConn->escapeLikeParameter($search) . '%';
-			$searchLike = ' AND `uid` LIKE ?';
-		}
-
-		$stmt = \OC_DB::prepare('SELECT COUNT(`uid`) AS `count` FROM `*PREFIX*group_user` WHERE `gid` = ?' . $searchLike);
-		$result = $stmt->execute($parameters);
-		$count = $result->fetchOne();
-		if($count !== false) {
-			$count = intval($count);
-		}
-		return $count;
-	}
+    /** @var string[] */
+    private $groupCache = [];
+
+    /** @var \OCP\IDBConnection */
+    private $dbConn;
+
+    /**
+     * \OC\Group\Database constructor.
+     *
+     * @param \OCP\IDBConnection|null $dbConn
+     */
+    public function __construct(\OCP\IDBConnection $dbConn = null) {
+        $this->dbConn = $dbConn;
+    }
+
+    /**
+     * FIXME: This function should not be required!
+     */
+    private function fixDI() {
+        if ($this->dbConn === null) {
+            $this->dbConn = \OC::$server->getDatabaseConnection();
+        }
+    }
+
+    /**
+     * Try to create a new group
+     * @param string $gid The name of the group to create
+     * @return bool
+     *
+     * Tries to create a new group. If the group name already exists, false will
+     * be returned.
+     */
+    public function createGroup( $gid ) {
+        $this->fixDI();
+
+        // Add group
+        $result = $this->dbConn->insertIfNotExist('*PREFIX*groups', [
+            'gid' => $gid,
+        ]);
+
+        // Add to cache
+        $this->groupCache[$gid] = $gid;
+
+        return $result === 1;
+    }
+
+    /**
+     * delete a group
+     * @param string $gid gid of the group to delete
+     * @return bool
+     *
+     * Deletes a group and removes it from the group_user-table
+     */
+    public function deleteGroup( $gid ) {
+        $this->fixDI();
+
+        // Delete the group
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->delete('groups')
+            ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
+            ->execute();
+
+        // Delete the group-user relation
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->delete('group_user')
+            ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
+            ->execute();
+
+        // Delete the group-groupadmin relation
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->delete('group_admin')
+            ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
+            ->execute();
+
+        // Delete from cache
+        unset($this->groupCache[$gid]);
+
+        return true;
+    }
+
+    /**
+     * is user in group?
+     * @param string $uid uid of the user
+     * @param string $gid gid of the group
+     * @return bool
+     *
+     * Checks whether the user is member of a group or not.
+     */
+    public function inGroup( $uid, $gid ) {
+        $this->fixDI();
+
+        // check
+        $qb = $this->dbConn->getQueryBuilder();
+        $cursor = $qb->select('uid')
+            ->from('group_user')
+            ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
+            ->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
+            ->execute();
+
+        $result = $cursor->fetch();
+        $cursor->closeCursor();
+
+        return $result ? true : false;
+    }
+
+    /**
+     * Add a user to a group
+     * @param string $uid Name of the user to add to group
+     * @param string $gid Name of the group in which add the user
+     * @return bool
+     *
+     * Adds a user to a group.
+     */
+    public function addToGroup( $uid, $gid ) {
+        $this->fixDI();
+
+        // No duplicate entries!
+        if( !$this->inGroup( $uid, $gid )) {
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->insert('group_user')
+                ->setValue('uid', $qb->createNamedParameter($uid))
+                ->setValue('gid', $qb->createNamedParameter($gid))
+                ->execute();
+            return true;
+        }else{
+            return false;
+        }
+    }
+
+    /**
+     * Removes a user from a group
+     * @param string $uid Name of the user to remove from group
+     * @param string $gid Name of the group from which remove the user
+     * @return bool
+     *
+     * removes the user from a group.
+     */
+    public function removeFromGroup( $uid, $gid ) {
+        $this->fixDI();
+
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->delete('group_user')
+            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
+            ->andWhere($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
+            ->execute();
+
+        return true;
+    }
+
+    /**
+     * Get all groups a user belongs to
+     * @param string $uid Name of the user
+     * @return array an array of group names
+     *
+     * This function fetches all groups a user belongs to. It does not check
+     * if the user exists at all.
+     */
+    public function getUserGroups( $uid ) {
+        //guests has empty or null $uid
+        if ($uid === null || $uid === '') {
+            return [];
+        }
+
+        $this->fixDI();
+
+        // No magic!
+        $qb = $this->dbConn->getQueryBuilder();
+        $cursor = $qb->select('gid')
+            ->from('group_user')
+            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
+            ->execute();
+
+        $groups = [];
+        while( $row = $cursor->fetch()) {
+            $groups[] = $row["gid"];
+            $this->groupCache[$row['gid']] = $row['gid'];
+        }
+        $cursor->closeCursor();
+
+        return $groups;
+    }
+
+    /**
+     * get a list of all groups
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return array an array of group names
+     *
+     * Returns a list with all groups
+     */
+    public function getGroups($search = '', $limit = null, $offset = null) {
+        $parameters = [];
+        $searchLike = '';
+        if ($search !== '') {
+            $parameters[] = '%' . $search . '%';
+            $searchLike = ' WHERE LOWER(`gid`) LIKE LOWER(?)';
+        }
+
+        $stmt = \OC_DB::prepare('SELECT `gid` FROM `*PREFIX*groups`' . $searchLike . ' ORDER BY `gid` ASC', $limit, $offset);
+        $result = $stmt->execute($parameters);
+        $groups = array();
+        while ($row = $result->fetchRow()) {
+            $groups[] = $row['gid'];
+        }
+        return $groups;
+    }
+
+    /**
+     * check if a group exists
+     * @param string $gid
+     * @return bool
+     */
+    public function groupExists($gid) {
+        $this->fixDI();
+
+        // Check cache first
+        if (isset($this->groupCache[$gid])) {
+            return true;
+        }
+
+        $qb = $this->dbConn->getQueryBuilder();
+        $cursor = $qb->select('gid')
+            ->from('groups')
+            ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
+            ->execute();
+        $result = $cursor->fetch();
+        $cursor->closeCursor();
+
+        if ($result !== false) {
+            $this->groupCache[$gid] = $gid;
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * get a list of all users in a group
+     * @param string $gid
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return array an array of user ids
+     */
+    public function usersInGroup($gid, $search = '', $limit = null, $offset = null) {
+        $parameters = [$gid];
+        $searchLike = '';
+        if ($search !== '') {
+            $parameters[] = '%' . $this->dbConn->escapeLikeParameter($search) . '%';
+            $searchLike = ' AND `uid` LIKE ?';
+        }
+
+        $stmt = \OC_DB::prepare('SELECT `uid` FROM `*PREFIX*group_user` WHERE `gid` = ?' . $searchLike . ' ORDER BY `uid` ASC',
+            $limit,
+            $offset);
+        $result = $stmt->execute($parameters);
+        $users = array();
+        while ($row = $result->fetchRow()) {
+            $users[] = $row['uid'];
+        }
+        return $users;
+    }
+
+    /**
+     * get the number of all users matching the search string in a group
+     * @param string $gid
+     * @param string $search
+     * @return int|false
+     * @throws \OC\DatabaseException
+     */
+    public function countUsersInGroup($gid, $search = '') {
+        $parameters = [$gid];
+        $searchLike = '';
+        if ($search !== '') {
+            $parameters[] = '%' . $this->dbConn->escapeLikeParameter($search) . '%';
+            $searchLike = ' AND `uid` LIKE ?';
+        }
+
+        $stmt = \OC_DB::prepare('SELECT COUNT(`uid`) AS `count` FROM `*PREFIX*group_user` WHERE `gid` = ?' . $searchLike);
+        $result = $stmt->execute($parameters);
+        $count = $result->fetchOne();
+        if($count !== false) {
+            $count = intval($count);
+        }
+        return $count;
+    }
 
 }

Spacing +16 added lines, -16 removed lines

@@ -76,7 +76,7 @@ 
 	 * Tries to create a new group. If the group name already exists, false will
 	 * be returned.
 	 */
-	public function createGroup( $gid ) {
+	public function createGroup($gid) {
 		$this->fixDI();
 
 		// Add group
@@ -97,7 +97,7 @@ 
 	 *
 	 * Deletes a group and removes it from the group_user-table
 	 */
-	public function deleteGroup( $gid ) {
+	public function deleteGroup($gid) {
 		$this->fixDI();
 
 		// Delete the group
@@ -132,7 +132,7 @@ 
 	 *
 	 * Checks whether the user is member of a group or not.
 	 */
-	public function inGroup( $uid, $gid ) {
+	public function inGroup($uid, $gid) {
 		$this->fixDI();
 
 		// check
@@ -157,18 +157,18 @@ 
 	 *
 	 * Adds a user to a group.
 	 */
-	public function addToGroup( $uid, $gid ) {
+	public function addToGroup($uid, $gid) {
 		$this->fixDI();
 
 		// No duplicate entries!
-		if( !$this->inGroup( $uid, $gid )) {
+		if (!$this->inGroup($uid, $gid)) {
 			$qb = $this->dbConn->getQueryBuilder();
 			$qb->insert('group_user')
 				->setValue('uid', $qb->createNamedParameter($uid))
 				->setValue('gid', $qb->createNamedParameter($gid))
 				->execute();
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -181,7 +181,7 @@ 
 	 *
 	 * removes the user from a group.
 	 */
-	public function removeFromGroup( $uid, $gid ) {
+	public function removeFromGroup($uid, $gid) {
 		$this->fixDI();
 
 		$qb = $this->dbConn->getQueryBuilder();
@@ -201,7 +201,7 @@ 
 	 * This function fetches all groups a user belongs to. It does not check
 	 * if the user exists at all.
 	 */
-	public function getUserGroups( $uid ) {
+	public function getUserGroups($uid) {
 		//guests has empty or null $uid
 		if ($uid === null || $uid === '') {
 			return [];
@@ -217,7 +217,7 @@ 
 			->execute();
 
 		$groups = [];
-		while( $row = $cursor->fetch()) {
+		while ($row = $cursor->fetch()) {
 			$groups[] = $row["gid"];
 			$this->groupCache[$row['gid']] = $row['gid'];
 		}
@@ -239,11 +239,11 @@ 
 		$parameters = [];
 		$searchLike = '';
 		if ($search !== '') {
-			$parameters[] = '%' . $search . '%';
+			$parameters[] = '%'.$search.'%';
 			$searchLike = ' WHERE LOWER(`gid`) LIKE LOWER(?)';
 		}
 
-		$stmt = \OC_DB::prepare('SELECT `gid` FROM `*PREFIX*groups`' . $searchLike . ' ORDER BY `gid` ASC', $limit, $offset);
+		$stmt = \OC_DB::prepare('SELECT `gid` FROM `*PREFIX*groups`'.$searchLike.' ORDER BY `gid` ASC', $limit, $offset);
 		$result = $stmt->execute($parameters);
 		$groups = array();
 		while ($row = $result->fetchRow()) {
@@ -292,11 +292,11 @@ 
 		$parameters = [$gid];
 		$searchLike = '';
 		if ($search !== '') {
-			$parameters[] = '%' . $this->dbConn->escapeLikeParameter($search) . '%';
+			$parameters[] = '%'.$this->dbConn->escapeLikeParameter($search).'%';
 			$searchLike = ' AND `uid` LIKE ?';
 		}
 
-		$stmt = \OC_DB::prepare('SELECT `uid` FROM `*PREFIX*group_user` WHERE `gid` = ?' . $searchLike . ' ORDER BY `uid` ASC',
+		$stmt = \OC_DB::prepare('SELECT `uid` FROM `*PREFIX*group_user` WHERE `gid` = ?'.$searchLike.' ORDER BY `uid` ASC',
 			$limit,
 			$offset);
 		$result = $stmt->execute($parameters);
@@ -318,14 +318,14 @@ 
 		$parameters = [$gid];
 		$searchLike = '';
 		if ($search !== '') {
-			$parameters[] = '%' . $this->dbConn->escapeLikeParameter($search) . '%';
+			$parameters[] = '%'.$this->dbConn->escapeLikeParameter($search).'%';
 			$searchLike = ' AND `uid` LIKE ?';
 		}
 
-		$stmt = \OC_DB::prepare('SELECT COUNT(`uid`) AS `count` FROM `*PREFIX*group_user` WHERE `gid` = ?' . $searchLike);
+		$stmt = \OC_DB::prepare('SELECT COUNT(`uid`) AS `count` FROM `*PREFIX*group_user` WHERE `gid` = ?'.$searchLike);
 		$result = $stmt->execute($parameters);
 		$count = $result->fetchOne();
-		if($count !== false) {
+		if ($count !== false) {
 			$count = intval($count);
 		}
 		return $count;

Braces +1 added lines, -1 removed lines

@@ -168,7 +168,7 @@
 				->setValue('gid', $qb->createNamedParameter($gid))
 				->execute();
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}

lib/private/Group/MetaData.php

Spacing +6 added lines, -6 removed lines

@@ -60,7 +60,7 @@ 
 			IUserSession $userSession
 			) {
 		$this->user = $user;
-		$this->isAdmin = (bool)$isAdmin;
+		$this->isAdmin = (bool) $isAdmin;
 		$this->groupManager = $groupManager;
 		$this->userSession = $userSession;
 	}
@@ -76,8 +76,8 @@ 
 	 * @return array
 	 */
 	public function get($groupSearch = '', $userSearch = '') {
-		$key = $groupSearch . '::' . $userSearch;
-		if(isset($this->metaData[$key])) {
+		$key = $groupSearch.'::'.$userSearch;
+		if (isset($this->metaData[$key])) {
 			return $this->metaData[$key];
 		}
 
@@ -88,7 +88,7 @@ 
 		$sortAdminGroupsIndex = 0;
 		$sortAdminGroupsKeys = array();
 
-		foreach($this->getGroups($groupSearch) as $group) {
+		foreach ($this->getGroups($groupSearch) as $group) {
 			$groupMetaData = $this->generateGroupMetaData($group, $userSearch);
 			if (strtolower($group->getGID()) !== 'admin') {
 				$this->addEntry(
@@ -185,11 +185,11 @@ 
 	 * @return \OCP\IGroup[]
 	 */
 	protected function getGroups($search = '') {
-		if($this->isAdmin) {
+		if ($this->isAdmin) {
 			return $this->groupManager->search($search);
 		} else {
 			$userObject = $this->userSession->getUser();
-			if($userObject !== null) {
+			if ($userObject !== null) {
 				$groups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($userObject);
 			} else {
 				$groups = [];

Indentation +168 added lines, -168 removed lines

@@ -30,172 +30,172 @@
 use OCP\IUserSession;
 
 class MetaData {
-	const SORT_NONE = 0;
-	const SORT_USERCOUNT = 1; // May have performance issues on LDAP backends
-	const SORT_GROUPNAME = 2;
-
-	/** @var string */
-	protected $user;
-	/** @var bool */
-	protected $isAdmin;
-	/** @var array */
-	protected $metaData = array();
-	/** @var \OCP\IGroupManager */
-	protected $groupManager;
-	/** @var bool */
-	protected $sorting = false;
-	/** @var IUserSession */
-	protected $userSession;
-
-	/**
-	 * @param string $user the uid of the current user
-	 * @param bool $isAdmin whether the current users is an admin
-	 * @param \OCP\IGroupManager $groupManager
-	 * @param IUserSession $userSession
-	 */
-	public function __construct(
-			$user,
-			$isAdmin,
-			\OCP\IGroupManager $groupManager,
-			IUserSession $userSession
-			) {
-		$this->user = $user;
-		$this->isAdmin = (bool)$isAdmin;
-		$this->groupManager = $groupManager;
-		$this->userSession = $userSession;
-	}
-
-	/**
-	 * returns an array with meta data about all available groups
-	 * the array is structured as follows:
-	 * [0] array containing meta data about admin groups
-	 * [1] array containing meta data about unprivileged groups
-	 * @param string $groupSearch only effective when instance was created with
-	 * isAdmin being true
-	 * @param string $userSearch the pattern users are search for
-	 * @return array
-	 */
-	public function get($groupSearch = '', $userSearch = '') {
-		$key = $groupSearch . '::' . $userSearch;
-		if(isset($this->metaData[$key])) {
-			return $this->metaData[$key];
-		}
-
-		$adminGroups = array();
-		$groups = array();
-		$sortGroupsIndex = 0;
-		$sortGroupsKeys = array();
-		$sortAdminGroupsIndex = 0;
-		$sortAdminGroupsKeys = array();
-
-		foreach($this->getGroups($groupSearch) as $group) {
-			$groupMetaData = $this->generateGroupMetaData($group, $userSearch);
-			if (strtolower($group->getGID()) !== 'admin') {
-				$this->addEntry(
-					$groups,
-					$sortGroupsKeys,
-					$sortGroupsIndex,
-					$groupMetaData);
-			} else {
-				//admin group is hard coded to 'admin' for now. In future,
-				//backends may define admin groups too. Then the if statement
-				//has to be adjusted accordingly.
-				$this->addEntry(
-					$adminGroups,
-					$sortAdminGroupsKeys,
-					$sortAdminGroupsIndex,
-					$groupMetaData);
-			}
-		}
-
-		//whether sorting is necessary is will be checked in sort()
-		$this->sort($groups, $sortGroupsKeys);
-		$this->sort($adminGroups, $sortAdminGroupsKeys);
-
-		$this->metaData[$key] = array($adminGroups, $groups);
-		return $this->metaData[$key];
-	}
-
-	/**
-	 * sets the sort mode, see SORT_* constants for supported modes
-	 *
-	 * @param int $sortMode
-	 */
-	public function setSorting($sortMode) {
-		switch ($sortMode) {
-			case self::SORT_USERCOUNT:
-			case self::SORT_GROUPNAME:
-				$this->sorting = $sortMode;
-				break;
-
-			default:
-				$this->sorting = self::SORT_NONE;
-		}
-	}
-
-	/**
-	 * adds an group entry to the resulting array
-	 * @param array $entries the resulting array, by reference
-	 * @param array $sortKeys the sort key array, by reference
-	 * @param int $sortIndex the sort key index, by reference
-	 * @param array $data the group's meta data as returned by generateGroupMetaData()
-	 */
-	private function addEntry(&$entries, &$sortKeys, &$sortIndex, $data) {
-		$entries[] = $data;
-		if ($this->sorting === self::SORT_USERCOUNT) {
-			$sortKeys[$sortIndex] = $data['usercount'];
-			$sortIndex++;
-		} else if ($this->sorting === self::SORT_GROUPNAME) {
-			$sortKeys[$sortIndex] = $data['name'];
-			$sortIndex++;
-		}
-	}
-
-	/**
-	 * creates an array containing the group meta data
-	 * @param \OCP\IGroup $group
-	 * @param string $userSearch
-	 * @return array with the keys 'id', 'name' and 'usercount'
-	 */
-	private function generateGroupMetaData(\OCP\IGroup $group, $userSearch) {
-		return array(
-				'id' => $group->getGID(),
-				'name' => $group->getDisplayName(),
-				'usercount' => $this->sorting === self::SORT_USERCOUNT ? $group->count($userSearch) : 0,
-			);
-	}
-
-	/**
-	 * sorts the result array, if applicable
-	 * @param array $entries the result array, by reference
-	 * @param array $sortKeys the array containing the sort keys
-	 * @param return null
-	 */
-	private function sort(&$entries, $sortKeys) {
-		if ($this->sorting === self::SORT_USERCOUNT) {
-			array_multisort($sortKeys, SORT_DESC, $entries);
-		} else if ($this->sorting === self::SORT_GROUPNAME) {
-			array_multisort($sortKeys, SORT_ASC, $entries);
-		}
-	}
-
-	/**
-	 * returns the available groups
-	 * @param string $search a search string
-	 * @return \OCP\IGroup[]
-	 */
-	protected function getGroups($search = '') {
-		if($this->isAdmin) {
-			return $this->groupManager->search($search);
-		} else {
-			$userObject = $this->userSession->getUser();
-			if($userObject !== null) {
-				$groups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($userObject);
-			} else {
-				$groups = [];
-			}
-
-			return $groups;
-		}
-	}
+    const SORT_NONE = 0;
+    const SORT_USERCOUNT = 1; // May have performance issues on LDAP backends
+    const SORT_GROUPNAME = 2;
+
+    /** @var string */
+    protected $user;
+    /** @var bool */
+    protected $isAdmin;
+    /** @var array */
+    protected $metaData = array();
+    /** @var \OCP\IGroupManager */
+    protected $groupManager;
+    /** @var bool */
+    protected $sorting = false;
+    /** @var IUserSession */
+    protected $userSession;
+
+    /**
+     * @param string $user the uid of the current user
+     * @param bool $isAdmin whether the current users is an admin
+     * @param \OCP\IGroupManager $groupManager
+     * @param IUserSession $userSession
+     */
+    public function __construct(
+            $user,
+            $isAdmin,
+            \OCP\IGroupManager $groupManager,
+            IUserSession $userSession
+            ) {
+        $this->user = $user;
+        $this->isAdmin = (bool)$isAdmin;
+        $this->groupManager = $groupManager;
+        $this->userSession = $userSession;
+    }
+
+    /**
+     * returns an array with meta data about all available groups
+     * the array is structured as follows:
+     * [0] array containing meta data about admin groups
+     * [1] array containing meta data about unprivileged groups
+     * @param string $groupSearch only effective when instance was created with
+     * isAdmin being true
+     * @param string $userSearch the pattern users are search for
+     * @return array
+     */
+    public function get($groupSearch = '', $userSearch = '') {
+        $key = $groupSearch . '::' . $userSearch;
+        if(isset($this->metaData[$key])) {
+            return $this->metaData[$key];
+        }
+
+        $adminGroups = array();
+        $groups = array();
+        $sortGroupsIndex = 0;
+        $sortGroupsKeys = array();
+        $sortAdminGroupsIndex = 0;
+        $sortAdminGroupsKeys = array();
+
+        foreach($this->getGroups($groupSearch) as $group) {
+            $groupMetaData = $this->generateGroupMetaData($group, $userSearch);
+            if (strtolower($group->getGID()) !== 'admin') {
+                $this->addEntry(
+                    $groups,
+                    $sortGroupsKeys,
+                    $sortGroupsIndex,
+                    $groupMetaData);
+            } else {
+                //admin group is hard coded to 'admin' for now. In future,
+                //backends may define admin groups too. Then the if statement
+                //has to be adjusted accordingly.
+                $this->addEntry(
+                    $adminGroups,
+                    $sortAdminGroupsKeys,
+                    $sortAdminGroupsIndex,
+                    $groupMetaData);
+            }
+        }
+
+        //whether sorting is necessary is will be checked in sort()
+        $this->sort($groups, $sortGroupsKeys);
+        $this->sort($adminGroups, $sortAdminGroupsKeys);
+
+        $this->metaData[$key] = array($adminGroups, $groups);
+        return $this->metaData[$key];
+    }
+
+    /**
+     * sets the sort mode, see SORT_* constants for supported modes
+     *
+     * @param int $sortMode
+     */
+    public function setSorting($sortMode) {
+        switch ($sortMode) {
+            case self::SORT_USERCOUNT:
+            case self::SORT_GROUPNAME:
+                $this->sorting = $sortMode;
+                break;
+
+            default:
+                $this->sorting = self::SORT_NONE;
+        }
+    }
+
+    /**
+     * adds an group entry to the resulting array
+     * @param array $entries the resulting array, by reference
+     * @param array $sortKeys the sort key array, by reference
+     * @param int $sortIndex the sort key index, by reference
+     * @param array $data the group's meta data as returned by generateGroupMetaData()
+     */
+    private function addEntry(&$entries, &$sortKeys, &$sortIndex, $data) {
+        $entries[] = $data;
+        if ($this->sorting === self::SORT_USERCOUNT) {
+            $sortKeys[$sortIndex] = $data['usercount'];
+            $sortIndex++;
+        } else if ($this->sorting === self::SORT_GROUPNAME) {
+            $sortKeys[$sortIndex] = $data['name'];
+            $sortIndex++;
+        }
+    }
+
+    /**
+     * creates an array containing the group meta data
+     * @param \OCP\IGroup $group
+     * @param string $userSearch
+     * @return array with the keys 'id', 'name' and 'usercount'
+     */
+    private function generateGroupMetaData(\OCP\IGroup $group, $userSearch) {
+        return array(
+                'id' => $group->getGID(),
+                'name' => $group->getDisplayName(),
+                'usercount' => $this->sorting === self::SORT_USERCOUNT ? $group->count($userSearch) : 0,
+            );
+    }
+
+    /**
+     * sorts the result array, if applicable
+     * @param array $entries the result array, by reference
+     * @param array $sortKeys the array containing the sort keys
+     * @param return null
+     */
+    private function sort(&$entries, $sortKeys) {
+        if ($this->sorting === self::SORT_USERCOUNT) {
+            array_multisort($sortKeys, SORT_DESC, $entries);
+        } else if ($this->sorting === self::SORT_GROUPNAME) {
+            array_multisort($sortKeys, SORT_ASC, $entries);
+        }
+    }
+
+    /**
+     * returns the available groups
+     * @param string $search a search string
+     * @return \OCP\IGroup[]
+     */
+    protected function getGroups($search = '') {
+        if($this->isAdmin) {
+            return $this->groupManager->search($search);
+        } else {
+            $userObject = $this->userSession->getUser();
+            if($userObject !== null) {
+                $groups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($userObject);
+            } else {
+                $groups = [];
+            }
+
+            return $groups;
+        }
+    }
 }

lib/private/Group/Backend.php

Spacing +3 added lines, -3 removed lines

@@ -49,8 +49,8 @@ 
 	*/
 	public function getSupportedActions() {
 		$actions = 0;
-		foreach($this->possibleActions AS $action => $methodName) {
-			if(method_exists($this, $methodName)) {
+		foreach ($this->possibleActions AS $action => $methodName) {
+			if (method_exists($this, $methodName)) {
 				$actions |= $action;
 			}
 		}
@@ -67,7 +67,7 @@ 
 	* compared with \OC\Group\Backend::CREATE_GROUP etc.
 	*/
 	public function implementsActions($actions) {
-		return (bool)($this->getSupportedActions() & $actions);
+		return (bool) ($this->getSupportedActions() & $actions);
 	}
 
 	/**

Indentation +93 added lines, -93 removed lines

@@ -26,107 +26,107 @@
  * Abstract base class for user management
  */
 abstract class Backend implements \OCP\GroupInterface {
-	/**
-	 * error code for functions not provided by the group backend
-	 */
-	const NOT_IMPLEMENTED = -501;
+    /**
+     * error code for functions not provided by the group backend
+     */
+    const NOT_IMPLEMENTED = -501;
 
-	protected $possibleActions = [
-		self::CREATE_GROUP => 'createGroup',
-		self::DELETE_GROUP => 'deleteGroup',
-		self::ADD_TO_GROUP => 'addToGroup',
-		self::REMOVE_FROM_GOUP => 'removeFromGroup',
-		self::COUNT_USERS => 'countUsersInGroup',
-		self::GROUP_DETAILS => 'getGroupDetails',
-		self::IS_ADMIN => 'isAdmin',
-	];
+    protected $possibleActions = [
+        self::CREATE_GROUP => 'createGroup',
+        self::DELETE_GROUP => 'deleteGroup',
+        self::ADD_TO_GROUP => 'addToGroup',
+        self::REMOVE_FROM_GOUP => 'removeFromGroup',
+        self::COUNT_USERS => 'countUsersInGroup',
+        self::GROUP_DETAILS => 'getGroupDetails',
+        self::IS_ADMIN => 'isAdmin',
+    ];
 
-	/**
-	* Get all supported actions
-	* @return int bitwise-or'ed actions
-	*
-	* Returns the supported actions as int to be
-	* compared with \OC\Group\Backend::CREATE_GROUP etc.
-	*/
-	public function getSupportedActions() {
-		$actions = 0;
-		foreach($this->possibleActions AS $action => $methodName) {
-			if(method_exists($this, $methodName)) {
-				$actions |= $action;
-			}
-		}
+    /**
+     * Get all supported actions
+     * @return int bitwise-or'ed actions
+     *
+     * Returns the supported actions as int to be
+     * compared with \OC\Group\Backend::CREATE_GROUP etc.
+     */
+    public function getSupportedActions() {
+        $actions = 0;
+        foreach($this->possibleActions AS $action => $methodName) {
+            if(method_exists($this, $methodName)) {
+                $actions |= $action;
+            }
+        }
 
-		return $actions;
-	}
+        return $actions;
+    }
 
-	/**
-	* Check if backend implements actions
-	* @param int $actions bitwise-or'ed actions
-	* @return bool
-	*
-	* Returns the supported actions as int to be
-	* compared with \OC\Group\Backend::CREATE_GROUP etc.
-	*/
-	public function implementsActions($actions) {
-		return (bool)($this->getSupportedActions() & $actions);
-	}
+    /**
+     * Check if backend implements actions
+     * @param int $actions bitwise-or'ed actions
+     * @return bool
+     *
+     * Returns the supported actions as int to be
+     * compared with \OC\Group\Backend::CREATE_GROUP etc.
+     */
+    public function implementsActions($actions) {
+        return (bool)($this->getSupportedActions() & $actions);
+    }
 
-	/**
-	 * is user in group?
-	 * @param string $uid uid of the user
-	 * @param string $gid gid of the group
-	 * @return bool
-	 *
-	 * Checks whether the user is member of a group or not.
-	 */
-	public function inGroup($uid, $gid) {
-		return in_array($gid, $this->getUserGroups($uid));
-	}
+    /**
+     * is user in group?
+     * @param string $uid uid of the user
+     * @param string $gid gid of the group
+     * @return bool
+     *
+     * Checks whether the user is member of a group or not.
+     */
+    public function inGroup($uid, $gid) {
+        return in_array($gid, $this->getUserGroups($uid));
+    }
 
-	/**
-	 * Get all groups a user belongs to
-	 * @param string $uid Name of the user
-	 * @return array an array of group names
-	 *
-	 * This function fetches all groups a user belongs to. It does not check
-	 * if the user exists at all.
-	 */
-	public function getUserGroups($uid) {
-		return array();
-	}
+    /**
+     * Get all groups a user belongs to
+     * @param string $uid Name of the user
+     * @return array an array of group names
+     *
+     * This function fetches all groups a user belongs to. It does not check
+     * if the user exists at all.
+     */
+    public function getUserGroups($uid) {
+        return array();
+    }
 
-	/**
-	 * get a list of all groups
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array an array of group names
-	 *
-	 * Returns a list with all groups
-	 */
+    /**
+     * get a list of all groups
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return array an array of group names
+     *
+     * Returns a list with all groups
+     */
 
-	public function getGroups($search = '', $limit = -1, $offset = 0) {
-		return array();
-	}
+    public function getGroups($search = '', $limit = -1, $offset = 0) {
+        return array();
+    }
 
-	/**
-	 * check if a group exists
-	 * @param string $gid
-	 * @return bool
-	 */
-	public function groupExists($gid) {
-		return in_array($gid, $this->getGroups($gid, 1));
-	}
+    /**
+     * check if a group exists
+     * @param string $gid
+     * @return bool
+     */
+    public function groupExists($gid) {
+        return in_array($gid, $this->getGroups($gid, 1));
+    }
 
-	/**
-	 * get a list of all users in a group
-	 * @param string $gid
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array an array of user ids
-	 */
-	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
-		return array();
-	}
+    /**
+     * get a list of all users in a group
+     * @param string $gid
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return array an array of user ids
+     */
+    public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
+        return array();
+    }
 }

ocs/v2.php

Spacing +1 added lines, -1 removed lines

@@ -20,4 +20,4 @@
  *
  */
 
-require_once __DIR__ . '/v1.php';
+require_once __DIR__.'/v1.php';

ocs-provider/index.php

Indentation +3 added lines, -3 removed lines

@@ -26,8 +26,8 @@
 $server = \OC::$server;
 
 $controller = new \OC\OCS\Provider(
-	'ocs_provider',
-	$server->getRequest(),
-	$server->getAppManager()
+    'ocs_provider',
+    $server->getRequest(),
+    $server->getAppManager()
 );
 echo $controller->buildProviderList()->render();

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  *
  */
 
-require_once __DIR__ . '/../lib/base.php';
+require_once __DIR__.'/../lib/base.php';
 
 header('Content-Type: application/json');
 

core/templates/login.php

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
 <form method="post" name="login">
 	<fieldset>
 	<?php if (!empty($_['redirect_url'])) {
-		print_unescaped('<input type="hidden" name="redirect_url" value="' . \OCP\Util::sanitizeHTML($_['redirect_url']) . '">');
+		print_unescaped('<input type="hidden" name="redirect_url" value="'.\OCP\Util::sanitizeHTML($_['redirect_url']).'">');
 	} ?>
 		<?php if (isset($_['apacheauthfailed']) && ($_['apacheauthfailed'])): ?>
 			<div class="warning">
@@ -20,7 +20,7 @@ 
 				<small><?php p($l->t('Please contact your administrator.')); ?></small>
 			</div>
 		<?php endif; ?>
-		<?php foreach($_['messages'] as $message): ?>
+		<?php foreach ($_['messages'] as $message): ?>
 			<div class="warning">
 				<?php p($message); ?><br>
 			</div>
@@ -33,7 +33,7 @@ 
 		<?php endif; ?>
 		<div id="message" class="hidden">
 			<img class="float-spinner" alt=""
-				src="<?php p(image_path('core', 'loading-dark.gif'));?>">
+				src="<?php p(image_path('core', 'loading-dark.gif')); ?>">
 			<span id="messageText"></span>
 			<!-- the following div ensures that the spinner is always inside the #message div -->
 			<div style="clear: both;"></div>
@@ -88,7 +88,7 @@ 
 	<fieldset>
 		<legend><?php p($l->t('Alternative Logins')) ?></legend>
 		<ul>
-			<?php foreach($_['alt_login'] as $login): ?>
+			<?php foreach ($_['alt_login'] as $login): ?>
 				<li><a class="button" href="<?php print_unescaped($login['href']); ?>" ><?php p($login['name']); ?></a></li>
 			<?php endforeach; ?>
 		</ul>

Indentation +2 added lines, -2 removed lines

@@ -8,8 +8,8 @@
 <form method="post" name="login">
 	<fieldset>
 	<?php if (!empty($_['redirect_url'])) {
-		print_unescaped('<input type="hidden" name="redirect_url" value="' . \OCP\Util::sanitizeHTML($_['redirect_url']) . '">');
-	} ?>
+        print_unescaped('<input type="hidden" name="redirect_url" value="' . \OCP\Util::sanitizeHTML($_['redirect_url']) . '">');
+    } ?>
 		<?php if (isset($_['apacheauthfailed']) && ($_['apacheauthfailed'])): ?>
 			<div class="warning">
 				<?php p($l->t('Server side authentication failed!')); ?><br>