nextcloud / server

lib/private/NaturalSort.php

Spacing +2 added lines, -2 removed lines

@@ -117,8 +117,8 @@
 			if ($aChunk !== $bChunk) {
 				// test first character (character comparison, not number comparison)
 				if ($aChunk[0] >= '0' && $aChunk[0] <= '9' && $bChunk[0] >= '0' && $bChunk[0] <= '9') {
-					$aNum = (int)$aChunk;
-					$bNum = (int)$bChunk;
+					$aNum = (int) $aChunk;
+					$bNum = (int) $bChunk;
 					return $aNum - $bNum;
 				}
 				return self::getCollator()->compare($aChunk, $bChunk);

Braces +1 added lines, -2 removed lines

@@ -88,8 +88,7 @@
 			// German umlauts, so using en_US instead
 			if (class_exists('Collator')) {
 				$this->collator = new \Collator('en_US');
-			}
-			else {
+			} else {
 				$this->collator = new \OC\NaturalSort_DefaultCollator();
 			}
 		}

Indentation +102 added lines, -102 removed lines

@@ -30,113 +30,113 @@
 use OCP\ILogger;
 
 class NaturalSort {
-	private static $instance;
-	private $collator;
-	private $cache = [];
+    private static $instance;
+    private $collator;
+    private $cache = [];
 
-	/**
-	 * Instantiate a new \OC\NaturalSort instance.
-	 * @param object $injectedCollator
-	 */
-	public function __construct($injectedCollator = null) {
-		// inject an instance of \Collator('en_US') to force using the php5-intl Collator
-		// or inject an instance of \OC\NaturalSort_DefaultCollator to force using Owncloud's default collator
-		if (isset($injectedCollator)) {
-			$this->collator = $injectedCollator;
-			\OCP\Util::writeLog('core', 'forced use of '.get_class($injectedCollator), ILogger::DEBUG);
-		}
-	}
+    /**
+     * Instantiate a new \OC\NaturalSort instance.
+     * @param object $injectedCollator
+     */
+    public function __construct($injectedCollator = null) {
+        // inject an instance of \Collator('en_US') to force using the php5-intl Collator
+        // or inject an instance of \OC\NaturalSort_DefaultCollator to force using Owncloud's default collator
+        if (isset($injectedCollator)) {
+            $this->collator = $injectedCollator;
+            \OCP\Util::writeLog('core', 'forced use of '.get_class($injectedCollator), ILogger::DEBUG);
+        }
+    }
 
-	/**
-	 * Split the given string in chunks of numbers and strings
-	 * @param string $t string
-	 * @return array of strings and number chunks
-	 */
-	private function naturalSortChunkify($t) {
-		// Adapted and ported to PHP from
-		// http://my.opera.com/GreyWyvern/blog/show.dml/1671288
-		if (isset($this->cache[$t])) {
-			return $this->cache[$t];
-		}
-		$tz = [];
-		$x = 0;
-		$y = -1;
-		$n = null;
+    /**
+     * Split the given string in chunks of numbers and strings
+     * @param string $t string
+     * @return array of strings and number chunks
+     */
+    private function naturalSortChunkify($t) {
+        // Adapted and ported to PHP from
+        // http://my.opera.com/GreyWyvern/blog/show.dml/1671288
+        if (isset($this->cache[$t])) {
+            return $this->cache[$t];
+        }
+        $tz = [];
+        $x = 0;
+        $y = -1;
+        $n = null;
 
-		while (isset($t[$x])) {
-			$c = $t[$x];
-			// only include the dot in strings
-			$m = ((!$n && $c === '.') || ($c >= '0' && $c <= '9'));
-			if ($m !== $n) {
-				// next chunk
-				$y++;
-				$tz[$y] = '';
-				$n = $m;
-			}
-			$tz[$y] .= $c;
-			$x++;
-		}
-		$this->cache[$t] = $tz;
-		return $tz;
-	}
+        while (isset($t[$x])) {
+            $c = $t[$x];
+            // only include the dot in strings
+            $m = ((!$n && $c === '.') || ($c >= '0' && $c <= '9'));
+            if ($m !== $n) {
+                // next chunk
+                $y++;
+                $tz[$y] = '';
+                $n = $m;
+            }
+            $tz[$y] .= $c;
+            $x++;
+        }
+        $this->cache[$t] = $tz;
+        return $tz;
+    }
 
-	/**
-	 * Returns the string collator
-	 * @return \Collator string collator
-	 */
-	private function getCollator() {
-		if (!isset($this->collator)) {
-			// looks like the default is en_US_POSIX which yields wrong sorting with
-			// German umlauts, so using en_US instead
-			if (class_exists('Collator')) {
-				$this->collator = new \Collator('en_US');
-			}
-			else {
-				$this->collator = new \OC\NaturalSort_DefaultCollator();
-			}
-		}
-		return $this->collator;
-	}
+    /**
+     * Returns the string collator
+     * @return \Collator string collator
+     */
+    private function getCollator() {
+        if (!isset($this->collator)) {
+            // looks like the default is en_US_POSIX which yields wrong sorting with
+            // German umlauts, so using en_US instead
+            if (class_exists('Collator')) {
+                $this->collator = new \Collator('en_US');
+            }
+            else {
+                $this->collator = new \OC\NaturalSort_DefaultCollator();
+            }
+        }
+        return $this->collator;
+    }
 
-	/**
-	 * Compare two strings to provide a natural sort
-	 * @param string $a first string to compare
-	 * @param string $b second string to compare
-	 * @return int -1 if $b comes before $a, 1 if $a comes before $b
-	 * or 0 if the strings are identical
-	 */
-	public function compare($a, $b) {
-		// Needed because PHP doesn't sort correctly when numbers are enclosed in
-		// parenthesis, even with NUMERIC_COLLATION enabled.
-		// For example it gave ["test (2).txt", "test.txt"]
-		// instead of ["test.txt", "test (2).txt"]
-		$aa = self::naturalSortChunkify($a);
-		$bb = self::naturalSortChunkify($b);
+    /**
+     * Compare two strings to provide a natural sort
+     * @param string $a first string to compare
+     * @param string $b second string to compare
+     * @return int -1 if $b comes before $a, 1 if $a comes before $b
+     * or 0 if the strings are identical
+     */
+    public function compare($a, $b) {
+        // Needed because PHP doesn't sort correctly when numbers are enclosed in
+        // parenthesis, even with NUMERIC_COLLATION enabled.
+        // For example it gave ["test (2).txt", "test.txt"]
+        // instead of ["test.txt", "test (2).txt"]
+        $aa = self::naturalSortChunkify($a);
+        $bb = self::naturalSortChunkify($b);
 
-		for ($x = 0; isset($aa[$x]) && isset($bb[$x]); $x++) {
-			$aChunk = $aa[$x];
-			$bChunk = $bb[$x];
-			if ($aChunk !== $bChunk) {
-				// test first character (character comparison, not number comparison)
-				if ($aChunk[0] >= '0' && $aChunk[0] <= '9' && $bChunk[0] >= '0' && $bChunk[0] <= '9') {
-					$aNum = (int)$aChunk;
-					$bNum = (int)$bChunk;
-					return $aNum - $bNum;
-				}
-				return self::getCollator()->compare($aChunk, $bChunk);
-			}
-		}
-		return count($aa) - count($bb);
-	}
+        for ($x = 0; isset($aa[$x]) && isset($bb[$x]); $x++) {
+            $aChunk = $aa[$x];
+            $bChunk = $bb[$x];
+            if ($aChunk !== $bChunk) {
+                // test first character (character comparison, not number comparison)
+                if ($aChunk[0] >= '0' && $aChunk[0] <= '9' && $bChunk[0] >= '0' && $bChunk[0] <= '9') {
+                    $aNum = (int)$aChunk;
+                    $bNum = (int)$bChunk;
+                    return $aNum - $bNum;
+                }
+                return self::getCollator()->compare($aChunk, $bChunk);
+            }
+        }
+        return count($aa) - count($bb);
+    }
 
-	/**
-	 * Returns a singleton
-	 * @return \OC\NaturalSort instance
-	 */
-	public static function getInstance() {
-		if (!isset(self::$instance)) {
-			self::$instance = new \OC\NaturalSort();
-		}
-		return self::$instance;
-	}
+    /**
+     * Returns a singleton
+     * @return \OC\NaturalSort instance
+     */
+    public static function getInstance() {
+        if (!isset(self::$instance)) {
+            self::$instance = new \OC\NaturalSort();
+        }
+        return self::$instance;
+    }
 }

lib/private/Group/Database.php

Braces +1 added lines, -1 removed lines

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

Spacing +12 added lines, -12 removed lines

@@ -111,7 +111,7 @@ 
 				->setValue('gid', $builder->createNamedParameter($gid))
 				->setValue('displayname', $builder->createNamedParameter($gid))
 				->execute();
-		} catch(UniqueConstraintViolationException $e) {
+		} catch (UniqueConstraintViolationException $e) {
 			$result = 0;
 		}
 
@@ -163,7 +163,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
@@ -192,14 +192,14 @@ 
 		$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;
 		}
 	}
@@ -232,7 +232,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 [];
@@ -248,7 +248,7 @@ 
 			->execute();
 
 		$groups = [];
-		while( $row = $cursor->fetch()) {
+		while ($row = $cursor->fetch()) {
 			$groups[] = $row['gid'];
 			$this->groupCache[$row['gid']] = $row['gid'];
 		}
@@ -276,7 +276,7 @@ 
 
 		if ($search !== '') {
 			$query->where($query->expr()->iLike('gid', $query->createNamedParameter(
-				'%' . $this->dbConn->escapeLikeParameter($search) . '%'
+				'%'.$this->dbConn->escapeLikeParameter($search).'%'
 			)));
 		}
 
@@ -340,7 +340,7 @@ 
 
 		if ($search !== '') {
 			$query->andWhere($query->expr()->like('uid', $query->createNamedParameter(
-				'%' . $this->dbConn->escapeLikeParameter($search) . '%'
+				'%'.$this->dbConn->escapeLikeParameter($search).'%'
 			)));
 		}
 
@@ -378,7 +378,7 @@ 
 
 		if ($search !== '') {
 			$query->andWhere($query->expr()->like('uid', $query->createNamedParameter(
-				'%' . $this->dbConn->escapeLikeParameter($search) . '%'
+				'%'.$this->dbConn->escapeLikeParameter($search).'%'
 			)));
 		}
 
@@ -387,7 +387,7 @@ 
 		$result->closeCursor();
 
 		if ($count !== false) {
-			$count = (int)$count;
+			$count = (int) $count;
 		} else {
 			$count = 0;
 		}
@@ -405,7 +405,7 @@ 
 		$this->fixDI();
 
 		$query = $this->dbConn->getQueryBuilder();
-		$query->select($query->createFunction('COUNT(DISTINCT ' . $query->getColumnName('uid') . ')'))
+		$query->select($query->createFunction('COUNT(DISTINCT '.$query->getColumnName('uid').')'))
 			->from('preferences', 'p')
 			->innerJoin('p', 'group_user', 'g', $query->expr()->eq('p.userid', 'g.uid'))
 			->where($query->expr()->eq('appid', $query->createNamedParameter('core')))
@@ -418,7 +418,7 @@ 
 		$result->closeCursor();
 
 		if ($count !== false) {
-			$count = (int)$count;
+			$count = (int) $count;
 		} else {
 			$count = 0;
 		}

Indentation +412 added lines, -412 removed lines

@@ -60,417 +60,417 @@
  * Class for group management in a SQL Database (e.g. MySQL, SQLite)
  */
 class Database extends ABackend
-	implements IAddToGroupBackend,
-	           ICountDisabledInGroup,
-	           ICountUsersBackend,
-	           ICreateGroupBackend,
-	           IDeleteGroupBackend,
-	           IGetDisplayNameBackend,
-	           IGroupDetailsBackend,
-	           IRemoveFromGroupBackend,
-	           ISetDisplayNameBackend {
-
-	/** @var string[] */
-	private $groupCache = [];
-
-	/** @var IDBConnection */
-	private $dbConn;
-
-	/**
-	 * \OC\Group\Database constructor.
-	 *
-	 * @param IDBConnection|null $dbConn
-	 */
-	public function __construct(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(string $gid): bool {
-		$this->fixDI();
-
-		try {
-			// Add group
-			$builder = $this->dbConn->getQueryBuilder();
-			$result = $builder->insert('groups')
-				->setValue('gid', $builder->createNamedParameter($gid))
-				->setValue('displayname', $builder->createNamedParameter($gid))
-				->execute();
-		} catch(UniqueConstraintViolationException $e) {
-			$result = 0;
-		}
-
-		// 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(string $gid): bool {
-		$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(string $uid, string $gid): bool {
-		$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(string $uid, string $gid): bool {
-		$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) {
-		$this->fixDI();
-
-		$query = $this->dbConn->getQueryBuilder();
-		$query->select('gid')
-			->from('groups')
-			->orderBy('gid', 'ASC');
-
-		if ($search !== '') {
-			$query->where($query->expr()->iLike('gid', $query->createNamedParameter(
-				'%' . $this->dbConn->escapeLikeParameter($search) . '%'
-			)));
-		}
-
-		$query->setMaxResults($limit)
-			->setFirstResult($offset);
-		$result = $query->execute();
-
-		$groups = [];
-		while ($row = $result->fetch()) {
-			$groups[] = $row['gid'];
-		}
-		$result->closeCursor();
-
-		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 = -1, $offset = 0) {
-		$this->fixDI();
-
-		$query = $this->dbConn->getQueryBuilder();
-		$query->select('uid')
-			->from('group_user')
-			->where($query->expr()->eq('gid', $query->createNamedParameter($gid)))
-			->orderBy('uid', 'ASC');
-
-		if ($search !== '') {
-			$query->andWhere($query->expr()->like('uid', $query->createNamedParameter(
-				'%' . $this->dbConn->escapeLikeParameter($search) . '%'
-			)));
-		}
-
-		if ($limit !== -1) {
-			$query->setMaxResults($limit);
-		}
-		if ($offset !== 0) {
-			$query->setFirstResult($offset);
-		}
-
-		$result = $query->execute();
-
-		$users = [];
-		while ($row = $result->fetch()) {
-			$users[] = $row['uid'];
-		}
-		$result->closeCursor();
-
-		return $users;
-	}
-
-	/**
-	 * get the number of all users matching the search string in a group
-	 * @param string $gid
-	 * @param string $search
-	 * @return int
-	 */
-	public function countUsersInGroup(string $gid, string $search = ''): int {
-		$this->fixDI();
-
-		$query = $this->dbConn->getQueryBuilder();
-		$query->select($query->func()->count('*', 'num_users'))
-			->from('group_user')
-			->where($query->expr()->eq('gid', $query->createNamedParameter($gid)));
-
-		if ($search !== '') {
-			$query->andWhere($query->expr()->like('uid', $query->createNamedParameter(
-				'%' . $this->dbConn->escapeLikeParameter($search) . '%'
-			)));
-		}
-
-		$result = $query->execute();
-		$count = $result->fetchColumn();
-		$result->closeCursor();
-
-		if ($count !== false) {
-			$count = (int)$count;
-		} else {
-			$count = 0;
-		}
-
-		return $count;
-	}
-
-	/**
-	 * get the number of disabled users in a group
-	 *
-	 * @param string $search
-	 *
-	 * @return int
-	 */
-	public function countDisabledInGroup(string $gid): int {
-		$this->fixDI();
-
-		$query = $this->dbConn->getQueryBuilder();
-		$query->select($query->createFunction('COUNT(DISTINCT ' . $query->getColumnName('uid') . ')'))
-			->from('preferences', 'p')
-			->innerJoin('p', 'group_user', 'g', $query->expr()->eq('p.userid', 'g.uid'))
-			->where($query->expr()->eq('appid', $query->createNamedParameter('core')))
-			->andWhere($query->expr()->eq('configkey', $query->createNamedParameter('enabled')))
-			->andWhere($query->expr()->eq('configvalue', $query->createNamedParameter('false'), IQueryBuilder::PARAM_STR))
-			->andWhere($query->expr()->eq('gid', $query->createNamedParameter($gid), IQueryBuilder::PARAM_STR));
-
-		$result = $query->execute();
-		$count = $result->fetchColumn();
-		$result->closeCursor();
-
-		if ($count !== false) {
-			$count = (int)$count;
-		} else {
-			$count = 0;
-		}
-
-		return $count;
-	}
-
-	public function getDisplayName(string $gid): string {
-		$this->fixDI();
-
-		$query = $this->dbConn->getQueryBuilder();
-		$query->select('displayname')
-			->from('groups')
-			->where($query->expr()->eq('gid', $query->createNamedParameter($gid)));
-
-		$result = $query->execute();
-		$displayName = $result->fetchColumn();
-		$result->closeCursor();
-
-		return (string) $displayName;
-	}
-
-	public function getGroupDetails(string $gid): array {
-		$displayName = $this->getDisplayName($gid);
-		if ($displayName !== '') {
-			return ['displayName' => $displayName];
-		}
-
-		return [];
-	}
-
-	public function setDisplayName(string $gid, string $displayName): bool {
-		if (!$this->groupExists($gid)) {
-			return false;
-		}
-
-		$this->fixDI();
-
-		$displayName = trim($displayName);
-		if ($displayName === '') {
-			$displayName = $gid;
-		}
-
-		$query = $this->dbConn->getQueryBuilder();
-		$query->update('groups')
-			->set('displayname', $query->createNamedParameter($displayName))
-			->where($query->expr()->eq('gid', $query->createNamedParameter($gid)));
-		$query->execute();
-
-		return true;
-	}
+    implements IAddToGroupBackend,
+                ICountDisabledInGroup,
+                ICountUsersBackend,
+                ICreateGroupBackend,
+                IDeleteGroupBackend,
+                IGetDisplayNameBackend,
+                IGroupDetailsBackend,
+                IRemoveFromGroupBackend,
+                ISetDisplayNameBackend {
+
+    /** @var string[] */
+    private $groupCache = [];
+
+    /** @var IDBConnection */
+    private $dbConn;
+
+    /**
+     * \OC\Group\Database constructor.
+     *
+     * @param IDBConnection|null $dbConn
+     */
+    public function __construct(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(string $gid): bool {
+        $this->fixDI();
+
+        try {
+            // Add group
+            $builder = $this->dbConn->getQueryBuilder();
+            $result = $builder->insert('groups')
+                ->setValue('gid', $builder->createNamedParameter($gid))
+                ->setValue('displayname', $builder->createNamedParameter($gid))
+                ->execute();
+        } catch(UniqueConstraintViolationException $e) {
+            $result = 0;
+        }
+
+        // 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(string $gid): bool {
+        $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(string $uid, string $gid): bool {
+        $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(string $uid, string $gid): bool {
+        $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) {
+        $this->fixDI();
+
+        $query = $this->dbConn->getQueryBuilder();
+        $query->select('gid')
+            ->from('groups')
+            ->orderBy('gid', 'ASC');
+
+        if ($search !== '') {
+            $query->where($query->expr()->iLike('gid', $query->createNamedParameter(
+                '%' . $this->dbConn->escapeLikeParameter($search) . '%'
+            )));
+        }
+
+        $query->setMaxResults($limit)
+            ->setFirstResult($offset);
+        $result = $query->execute();
+
+        $groups = [];
+        while ($row = $result->fetch()) {
+            $groups[] = $row['gid'];
+        }
+        $result->closeCursor();
+
+        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 = -1, $offset = 0) {
+        $this->fixDI();
+
+        $query = $this->dbConn->getQueryBuilder();
+        $query->select('uid')
+            ->from('group_user')
+            ->where($query->expr()->eq('gid', $query->createNamedParameter($gid)))
+            ->orderBy('uid', 'ASC');
+
+        if ($search !== '') {
+            $query->andWhere($query->expr()->like('uid', $query->createNamedParameter(
+                '%' . $this->dbConn->escapeLikeParameter($search) . '%'
+            )));
+        }
+
+        if ($limit !== -1) {
+            $query->setMaxResults($limit);
+        }
+        if ($offset !== 0) {
+            $query->setFirstResult($offset);
+        }
+
+        $result = $query->execute();
+
+        $users = [];
+        while ($row = $result->fetch()) {
+            $users[] = $row['uid'];
+        }
+        $result->closeCursor();
+
+        return $users;
+    }
+
+    /**
+     * get the number of all users matching the search string in a group
+     * @param string $gid
+     * @param string $search
+     * @return int
+     */
+    public function countUsersInGroup(string $gid, string $search = ''): int {
+        $this->fixDI();
+
+        $query = $this->dbConn->getQueryBuilder();
+        $query->select($query->func()->count('*', 'num_users'))
+            ->from('group_user')
+            ->where($query->expr()->eq('gid', $query->createNamedParameter($gid)));
+
+        if ($search !== '') {
+            $query->andWhere($query->expr()->like('uid', $query->createNamedParameter(
+                '%' . $this->dbConn->escapeLikeParameter($search) . '%'
+            )));
+        }
+
+        $result = $query->execute();
+        $count = $result->fetchColumn();
+        $result->closeCursor();
+
+        if ($count !== false) {
+            $count = (int)$count;
+        } else {
+            $count = 0;
+        }
+
+        return $count;
+    }
+
+    /**
+     * get the number of disabled users in a group
+     *
+     * @param string $search
+     *
+     * @return int
+     */
+    public function countDisabledInGroup(string $gid): int {
+        $this->fixDI();
+
+        $query = $this->dbConn->getQueryBuilder();
+        $query->select($query->createFunction('COUNT(DISTINCT ' . $query->getColumnName('uid') . ')'))
+            ->from('preferences', 'p')
+            ->innerJoin('p', 'group_user', 'g', $query->expr()->eq('p.userid', 'g.uid'))
+            ->where($query->expr()->eq('appid', $query->createNamedParameter('core')))
+            ->andWhere($query->expr()->eq('configkey', $query->createNamedParameter('enabled')))
+            ->andWhere($query->expr()->eq('configvalue', $query->createNamedParameter('false'), IQueryBuilder::PARAM_STR))
+            ->andWhere($query->expr()->eq('gid', $query->createNamedParameter($gid), IQueryBuilder::PARAM_STR));
+
+        $result = $query->execute();
+        $count = $result->fetchColumn();
+        $result->closeCursor();
+
+        if ($count !== false) {
+            $count = (int)$count;
+        } else {
+            $count = 0;
+        }
+
+        return $count;
+    }
+
+    public function getDisplayName(string $gid): string {
+        $this->fixDI();
+
+        $query = $this->dbConn->getQueryBuilder();
+        $query->select('displayname')
+            ->from('groups')
+            ->where($query->expr()->eq('gid', $query->createNamedParameter($gid)));
+
+        $result = $query->execute();
+        $displayName = $result->fetchColumn();
+        $result->closeCursor();
+
+        return (string) $displayName;
+    }
+
+    public function getGroupDetails(string $gid): array {
+        $displayName = $this->getDisplayName($gid);
+        if ($displayName !== '') {
+            return ['displayName' => $displayName];
+        }
+
+        return [];
+    }
+
+    public function setDisplayName(string $gid, string $displayName): bool {
+        if (!$this->groupExists($gid)) {
+            return false;
+        }
+
+        $this->fixDI();
+
+        $displayName = trim($displayName);
+        if ($displayName === '') {
+            $displayName = $gid;
+        }
+
+        $query = $this->dbConn->getQueryBuilder();
+        $query->update('groups')
+            ->set('displayname', $query->createNamedParameter($displayName))
+            ->where($query->expr()->eq('gid', $query->createNamedParameter($gid)));
+        $query->execute();
+
+        return true;
+    }
 
 }

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

@@ -28,107 +28,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 [];
-	}
+    /**
+     * 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 [];
+    }
 
-	/**
-	 * 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 [];
-	}
+    public function getGroups($search = '', $limit = -1, $offset = 0) {
+        return [];
+    }
 
-	/**
-	 * 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 [];
-	}
+    /**
+     * 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 [];
+    }
 }

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/exception.php

Indentation +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php
-	/** @var array $_ */
-	/** @var \OCP\IL10N $l */
+    /** @var array $_ */
+    /** @var \OCP\IL10N $l */
 
 style('core', ['styles', 'header']);
 ?>

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 	<ul>
 		<li><?php p($l->t('Remote Address: %s', [$_['remoteAddr']])) ?></li>
 		<li><?php p($l->t('Request ID: %s', [$_['requestID']])) ?></li>
-		<?php if($_['debugMode']): ?>
+		<?php if ($_['debugMode']): ?>
 			<li><?php p($l->t('Type: %s', [$_['errorClass']])) ?></li>
 			<li><?php p($l->t('Code: %s', [$_['errorCode']])) ?></li>
 			<li><?php p($l->t('Message: %s', [$_['errorMsg']])) ?></li>
@@ -23,7 +23,7 @@ 
 		<?php endif; ?>
 	</ul>
 
-	<?php if($_['debugMode']): ?>
+	<?php if ($_['debugMode']): ?>
 		<br />
 		<h3><?php p($l->t('Trace')) ?></h3>
 		<pre><?php p($_['trace']) ?></pre>

core/Command/Security/RemoveCertificate.php

Indentation +24 added lines, -24 removed lines

@@ -34,28 +34,28 @@
 
 class RemoveCertificate extends Base {
 
-	/** @var ICertificateManager */
-	protected $certificateManager;
-
-	public function __construct(ICertificateManager $certificateManager) {
-		$this->certificateManager = $certificateManager;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('security:certificates:remove')
-			->setDescription('remove trusted certificate')
-			->addArgument(
-				'name',
-				InputArgument::REQUIRED,
-				'the file name of the certificate to remove'
-			);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$name = $input->getArgument('name');
-
-		$this->certificateManager->removeCertificate($name);
-	}
+    /** @var ICertificateManager */
+    protected $certificateManager;
+
+    public function __construct(ICertificateManager $certificateManager) {
+        $this->certificateManager = $certificateManager;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('security:certificates:remove')
+            ->setDescription('remove trusted certificate')
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED,
+                'the file name of the certificate to remove'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $name = $input->getArgument('name');
+
+        $this->certificateManager->removeCertificate($name);
+    }
 }

core/Command/Security/ListCertificates.php

Indentation +56 added lines, -56 removed lines

@@ -34,64 +34,64 @@
 
 class ListCertificates extends Base {
 
-	/** @var ICertificateManager */
-	protected $certificateManager;
-	/** @var IL10N */
-	protected $l;
+    /** @var ICertificateManager */
+    protected $certificateManager;
+    /** @var IL10N */
+    protected $l;
 
-	public function __construct(ICertificateManager $certificateManager, IL10N $l) {
-		$this->certificateManager = $certificateManager;
-		$this->l = $l;
-		parent::__construct();
-	}
+    public function __construct(ICertificateManager $certificateManager, IL10N $l) {
+        $this->certificateManager = $certificateManager;
+        $this->l = $l;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('security:certificates')
-			->setDescription('list trusted certificates');
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('security:certificates')
+            ->setDescription('list trusted certificates');
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$outputType = $input->getOption('output');
-		if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
-			$certificates = array_map(function (ICertificate $certificate) {
-				return [
-					'name' => $certificate->getName(),
-					'common_name' => $certificate->getCommonName(),
-					'organization' => $certificate->getOrganization(),
-					'expire' => $certificate->getExpireDate()->format(\DateTime::ATOM),
-					'issuer' => $certificate->getIssuerName(),
-					'issuer_organization' => $certificate->getIssuerOrganization(),
-					'issue_date' => $certificate->getIssueDate()->format(\DateTime::ATOM)
-				];
-			}, $this->certificateManager->listCertificates());
-			if ($outputType === self::OUTPUT_FORMAT_JSON) {
-				$output->writeln(json_encode(array_values($certificates)));
-			} else {
-				$output->writeln(json_encode(array_values($certificates), JSON_PRETTY_PRINT));
-			}
-		} else {
-			$table = new Table($output);
-			$table->setHeaders([
-				'File Name',
-				'Common Name',
-				'Organization',
-				'Valid Until',
-				'Issued By'
-			]);
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $outputType = $input->getOption('output');
+        if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
+            $certificates = array_map(function (ICertificate $certificate) {
+                return [
+                    'name' => $certificate->getName(),
+                    'common_name' => $certificate->getCommonName(),
+                    'organization' => $certificate->getOrganization(),
+                    'expire' => $certificate->getExpireDate()->format(\DateTime::ATOM),
+                    'issuer' => $certificate->getIssuerName(),
+                    'issuer_organization' => $certificate->getIssuerOrganization(),
+                    'issue_date' => $certificate->getIssueDate()->format(\DateTime::ATOM)
+                ];
+            }, $this->certificateManager->listCertificates());
+            if ($outputType === self::OUTPUT_FORMAT_JSON) {
+                $output->writeln(json_encode(array_values($certificates)));
+            } else {
+                $output->writeln(json_encode(array_values($certificates), JSON_PRETTY_PRINT));
+            }
+        } else {
+            $table = new Table($output);
+            $table->setHeaders([
+                'File Name',
+                'Common Name',
+                'Organization',
+                'Valid Until',
+                'Issued By'
+            ]);
 
-			$rows = array_map(function (ICertificate $certificate) {
-				return [
-					$certificate->getName(),
-					$certificate->getCommonName(),
-					$certificate->getOrganization(),
-					$this->l->l('date', $certificate->getExpireDate()),
-					$certificate->getIssuerName()
-				];
-			}, $this->certificateManager->listCertificates());
-			$table->setRows($rows);
-			$table->render();
-		}
-	}
+            $rows = array_map(function (ICertificate $certificate) {
+                return [
+                    $certificate->getName(),
+                    $certificate->getCommonName(),
+                    $certificate->getOrganization(),
+                    $this->l->l('date', $certificate->getExpireDate()),
+                    $certificate->getIssuerName()
+                ];
+            }, $this->certificateManager->listCertificates());
+            $table->setRows($rows);
+            $table->render();
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		$outputType = $input->getOption('output');
 		if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
-			$certificates = array_map(function (ICertificate $certificate) {
+			$certificates = array_map(function(ICertificate $certificate) {
 				return [
 					'name' => $certificate->getName(),
 					'common_name' => $certificate->getCommonName(),
@@ -81,7 +81,7 @@ 
 				'Issued By'
 			]);
 
-			$rows = array_map(function (ICertificate $certificate) {
+			$rows = array_map(function(ICertificate $certificate) {
 				return [
 					$certificate->getName(),
 					$certificate->getCommonName(),

core/Command/Security/ImportCertificate.php

Indentation +26 added lines, -26 removed lines

@@ -33,36 +33,36 @@
 
 class ImportCertificate extends Base {
 
-	/** @var ICertificateManager */
-	protected $certificateManager;
+    /** @var ICertificateManager */
+    protected $certificateManager;
 
-	public function __construct(ICertificateManager $certificateManager) {
-		$this->certificateManager = $certificateManager;
-		parent::__construct();
-	}
+    public function __construct(ICertificateManager $certificateManager) {
+        $this->certificateManager = $certificateManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('security:certificates:import')
-			->setDescription('import trusted certificate')
-			->addArgument(
-				'path',
-				InputArgument::REQUIRED,
-				'path to the certificate to import'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('security:certificates:import')
+            ->setDescription('import trusted certificate')
+            ->addArgument(
+                'path',
+                InputArgument::REQUIRED,
+                'path to the certificate to import'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$path = $input->getArgument('path');
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $path = $input->getArgument('path');
 
-		if (!file_exists($path)) {
-			$output->writeln('<error>certificate not found</error>');
-			return;
-		}
+        if (!file_exists($path)) {
+            $output->writeln('<error>certificate not found</error>');
+            return;
+        }
 
-		$certData = file_get_contents($path);
-		$name = basename($path);
+        $certData = file_get_contents($path);
+        $name = basename($path);
 
-		$this->certificateManager->addCertificate($certData, $name);
-	}
+        $this->certificateManager->addCertificate($certData, $name);
+    }
 }