nextcloud / server

lib/private/SystemTag/SystemTag.php

Indentation +54 added lines, -54 removed lines

@@ -27,66 +27,66 @@
 
 class SystemTag implements ISystemTag {
 
-	/**
-	 * @var string
-	 */
-	private $id;
+    /**
+     * @var string
+     */
+    private $id;
 
-	/**
-	 * @var string
-	 */
-	private $name;
+    /**
+     * @var string
+     */
+    private $name;
 
-	/**
-	 * @var bool
-	 */
-	private $userVisible;
+    /**
+     * @var bool
+     */
+    private $userVisible;
 
-	/**
-	 * @var bool
-	 */
-	private $userAssignable;
+    /**
+     * @var bool
+     */
+    private $userAssignable;
 
-	/**
-	 * Constructor.
-	 *
-	 * @param string $id tag id
-	 * @param string $name tag name
-	 * @param bool $userVisible whether the tag is user visible
-	 * @param bool $userAssignable whether the tag is user assignable
-	 */
-	public function __construct($id, $name, $userVisible, $userAssignable) {
-		$this->id = $id;
-		$this->name = $name;
-		$this->userVisible = $userVisible;
-		$this->userAssignable = $userAssignable;
-	}
+    /**
+     * Constructor.
+     *
+     * @param string $id tag id
+     * @param string $name tag name
+     * @param bool $userVisible whether the tag is user visible
+     * @param bool $userAssignable whether the tag is user assignable
+     */
+    public function __construct($id, $name, $userVisible, $userAssignable) {
+        $this->id = $id;
+        $this->name = $name;
+        $this->userVisible = $userVisible;
+        $this->userAssignable = $userAssignable;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getId() {
-		return $this->id;
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function getId() {
+        return $this->id;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getName() {
-		return $this->name;
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function getName() {
+        return $this->name;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function isUserVisible() {
-		return $this->userVisible;
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function isUserVisible() {
+        return $this->userVisible;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function isUserAssignable() {
-		return $this->userAssignable;
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function isUserAssignable() {
+        return $this->userAssignable;
+    }
 }

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;
+    }
 
 }

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();

core/templates/update.admin.php

Indentation +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 		<h2 class="title"><?php p($l->t('App update required')); ?></h2>
 		<?php } else { ?>
 		<h2 class="title"><?php p($l->t('%s will be updated to version %s',
-			array($_['productName'], $_['version']))); ?></h2>
+            array($_['productName'], $_['version']))); ?></h2>
 		<?php } ?>
 		<?php if (!empty($_['appsToUpgrade'])) { ?>
 		<div class="infogroup">

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']);
 ?>

core/search/ajax/search.php

Indentation +14 added lines, -14 removed lines

@@ -31,32 +31,32 @@
 \OC::$server->getSession()->close();
 
 if (isset($_GET['query'])) {
-	$query = $_GET['query'];
+    $query = $_GET['query'];
 } else {
-	$query = '';
+    $query = '';
 }
 if (isset($_GET['inApps'])) {
-	$inApps = $_GET['inApps'];
-	if (is_string($inApps)) {
-		$inApps = array($inApps);
-	}
+    $inApps = $_GET['inApps'];
+    if (is_string($inApps)) {
+        $inApps = array($inApps);
+    }
 } else {
-	$inApps = array();
+    $inApps = array();
 }
 if (isset($_GET['page'])) {
-	$page = (int)$_GET['page'];
+    $page = (int)$_GET['page'];
 } else {
-	$page = 1;
+    $page = 1;
 }
 if (isset($_GET['size'])) {
-	$size = (int)$_GET['size'];
+    $size = (int)$_GET['size'];
 } else {
-	$size = 30;
+    $size = 30;
 }
 if($query) {
-	$result = \OC::$server->getSearch()->searchPaged($query, $inApps, $page, $size);
-	OC_JSON::encodedPrint($result);
+    $result = \OC::$server->getSearch()->searchPaged($query, $inApps, $page, $size);
+    OC_JSON::encodedPrint($result);
 }
 else {
-	echo 'false';
+    echo 'false';
 }

core/Controller/SetupController.php

Indentation +81 added lines, -81 removed lines

@@ -31,97 +31,97 @@
 use OC\Setup;
 
 class SetupController {
-	/** @var Setup */
-	protected $setupHelper;
-	/** @var string */
-	private $autoConfigFile;
+    /** @var Setup */
+    protected $setupHelper;
+    /** @var string */
+    private $autoConfigFile;
 
-	/**
-	 * @param Setup $setupHelper
-	 */
-	function __construct(Setup $setupHelper) {
-		$this->autoConfigFile = \OC::$configDir.'autoconfig.php';
-		$this->setupHelper = $setupHelper;
-	}
+    /**
+     * @param Setup $setupHelper
+     */
+    function __construct(Setup $setupHelper) {
+        $this->autoConfigFile = \OC::$configDir.'autoconfig.php';
+        $this->setupHelper = $setupHelper;
+    }
 
-	/**
-	 * @param $post
-	 */
-	public function run($post) {
-		// Check for autosetup:
-		$post = $this->loadAutoConfig($post);
-		$opts = $this->setupHelper->getSystemInfo();
+    /**
+     * @param $post
+     */
+    public function run($post) {
+        // Check for autosetup:
+        $post = $this->loadAutoConfig($post);
+        $opts = $this->setupHelper->getSystemInfo();
 
-		// convert 'abcpassword' to 'abcpass'
-		if (isset($post['adminpassword'])) {
-			$post['adminpass'] = $post['adminpassword'];
-		}
-		if (isset($post['dbpassword'])) {
-			$post['dbpass'] = $post['dbpassword'];
-		}
+        // convert 'abcpassword' to 'abcpass'
+        if (isset($post['adminpassword'])) {
+            $post['adminpass'] = $post['adminpassword'];
+        }
+        if (isset($post['dbpassword'])) {
+            $post['dbpass'] = $post['dbpassword'];
+        }
 
-		if(isset($post['install']) AND $post['install']=='true') {
-			// We have to launch the installation process :
-			$e = $this->setupHelper->install($post);
-			$errors = array('errors' => $e);
+        if(isset($post['install']) AND $post['install']=='true') {
+            // We have to launch the installation process :
+            $e = $this->setupHelper->install($post);
+            $errors = array('errors' => $e);
 
-			if(count($e) > 0) {
-				$options = array_merge($opts, $post, $errors);
-				$this->display($options);
-			} else {
-				$this->finishSetup();
-			}
-		} else {
-			$options = array_merge($opts, $post);
-			$this->display($options);
-		}
-	}
+            if(count($e) > 0) {
+                $options = array_merge($opts, $post, $errors);
+                $this->display($options);
+            } else {
+                $this->finishSetup();
+            }
+        } else {
+            $options = array_merge($opts, $post);
+            $this->display($options);
+        }
+    }
 
-	public function display($post) {
-		$defaults = array(
-			'adminlogin' => '',
-			'adminpass' => '',
-			'dbuser' => '',
-			'dbpass' => '',
-			'dbname' => '',
-			'dbtablespace' => '',
-			'dbhost' => 'localhost',
-			'dbtype' => '',
-		);
-		$parameters = array_merge($defaults, $post);
+    public function display($post) {
+        $defaults = array(
+            'adminlogin' => '',
+            'adminpass' => '',
+            'dbuser' => '',
+            'dbpass' => '',
+            'dbname' => '',
+            'dbtablespace' => '',
+            'dbhost' => 'localhost',
+            'dbtype' => '',
+        );
+        $parameters = array_merge($defaults, $post);
 
-		\OC_Util::addVendorScript('strengthify/jquery.strengthify');
-		\OC_Util::addVendorStyle('strengthify/strengthify');
-		\OC_Util::addScript('setup');
-		\OC_Template::printGuestPage('', 'installation', $parameters);
-	}
+        \OC_Util::addVendorScript('strengthify/jquery.strengthify');
+        \OC_Util::addVendorStyle('strengthify/strengthify');
+        \OC_Util::addScript('setup');
+        \OC_Template::printGuestPage('', 'installation', $parameters);
+    }
 
-	public function finishSetup() {
-		if( file_exists( $this->autoConfigFile )) {
-			unlink($this->autoConfigFile);
-		}
-		\OC::$server->getIntegrityCodeChecker()->runInstanceVerification();
-		\OC_Util::redirectToDefaultPage();
-	}
+    public function finishSetup() {
+        if( file_exists( $this->autoConfigFile )) {
+            unlink($this->autoConfigFile);
+        }
+        \OC::$server->getIntegrityCodeChecker()->runInstanceVerification();
+        \OC_Util::redirectToDefaultPage();
+    }
 
-	public function loadAutoConfig($post) {
-		if( file_exists($this->autoConfigFile)) {
-			\OCP\Util::writeLog('core', 'Autoconfig file found, setting up ownCloud…', \OCP\Util::INFO);
-			$AUTOCONFIG = array();
-			include $this->autoConfigFile;
-			$post = array_merge ($post, $AUTOCONFIG);
-		}
+    public function loadAutoConfig($post) {
+        if( file_exists($this->autoConfigFile)) {
+            \OCP\Util::writeLog('core', 'Autoconfig file found, setting up ownCloud…', \OCP\Util::INFO);
+            $AUTOCONFIG = array();
+            include $this->autoConfigFile;
+            $post = array_merge ($post, $AUTOCONFIG);
+        }
 
-		$dbIsSet = isset($post['dbtype']);
-		$directoryIsSet = isset($post['directory']);
-		$adminAccountIsSet = isset($post['adminlogin']);
+        $dbIsSet = isset($post['dbtype']);
+        $directoryIsSet = isset($post['directory']);
+        $adminAccountIsSet = isset($post['adminlogin']);
 
-		if ($dbIsSet AND $directoryIsSet AND $adminAccountIsSet) {
-			$post['install'] = 'true';
-		}
-		$post['dbIsSet'] = $dbIsSet;
-		$post['directoryIsSet'] = $directoryIsSet;
+        if ($dbIsSet AND $directoryIsSet AND $adminAccountIsSet) {
+            $post['install'] = 'true';
+        }
+        $post['dbIsSet'] = $dbIsSet;
+        $post['directoryIsSet'] = $directoryIsSet;
 
-		return $post;
-	}
+        return $post;
+    }
 }

core/Controller/UserController.php

Indentation +36 added lines, -36 removed lines

@@ -29,46 +29,46 @@
 use \OCP\IUserManager;
 
 class UserController extends Controller {
-	/**
-	 * @var IUserManager
-	 */
-	protected $userManager;
+    /**
+     * @var IUserManager
+     */
+    protected $userManager;
 
-	public function __construct($appName,
-								IRequest $request,
-								IUserManager $userManager
-	) {
-		parent::__construct($appName, $request);
-		$this->userManager = $userManager;
-	}
+    public function __construct($appName,
+                                IRequest $request,
+                                IUserManager $userManager
+    ) {
+        parent::__construct($appName, $request);
+        $this->userManager = $userManager;
+    }
 
-	/**
-	 * Lookup user display names
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param array $users
-	 *
-	 * @return JSONResponse
-	 */
-	public function getDisplayNames($users) {
-		$result = array();
+    /**
+     * Lookup user display names
+     *
+     * @NoAdminRequired
+     *
+     * @param array $users
+     *
+     * @return JSONResponse
+     */
+    public function getDisplayNames($users) {
+        $result = array();
 
-		foreach ($users as $user) {
-			$userObject = $this->userManager->get($user);
-			if (is_object($userObject)) {
-				$result[$user] = $userObject->getDisplayName();
-			} else {
-				$result[$user] = $user;
-			}
-		}
+        foreach ($users as $user) {
+            $userObject = $this->userManager->get($user);
+            if (is_object($userObject)) {
+                $result[$user] = $userObject->getDisplayName();
+            } else {
+                $result[$user] = $user;
+            }
+        }
 
-		$json = array(
-			'users' => $result,
-			'status' => 'success'
-		);
+        $json = array(
+            'users' => $result,
+            'status' => 'success'
+        );
 
-		return new JSONResponse($json);
+        return new JSONResponse($json);
 
-	}
+    }
 }

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);
+    }
 }