nextcloud / server

lib/public/GroupInterface.php

Indentation +73 added lines, -73 removed lines

@@ -40,84 +40,84 @@
  */
 interface GroupInterface {
 
-	/**
-	 * actions that user backends can define
-	 */
-	const CREATE_GROUP		= 0x00000001;
-	const DELETE_GROUP		= 0x00000010;
-	const ADD_TO_GROUP		= 0x00000100;
-	const REMOVE_FROM_GOUP	= 0x00001000; // oops
-	const REMOVE_FROM_GROUP	= 0x00001000;
-	//OBSOLETE const GET_DISPLAYNAME	= 0x00010000;
-	const COUNT_USERS		= 0x00100000;
-	const GROUP_DETAILS		= 0x01000000;
-	/**
-	 * @since 13.0.0
-	 */
-	const IS_ADMIN  = 0x10000000;
+    /**
+     * actions that user backends can define
+     */
+    const CREATE_GROUP		= 0x00000001;
+    const DELETE_GROUP		= 0x00000010;
+    const ADD_TO_GROUP		= 0x00000100;
+    const REMOVE_FROM_GOUP	= 0x00001000; // oops
+    const REMOVE_FROM_GROUP	= 0x00001000;
+    //OBSOLETE const GET_DISPLAYNAME	= 0x00010000;
+    const COUNT_USERS		= 0x00100000;
+    const GROUP_DETAILS		= 0x01000000;
+    /**
+     * @since 13.0.0
+     */
+    const IS_ADMIN  = 0x10000000;
 
-	/**
-	 * Check if backend implements actions
-	 * @param int $actions bitwise-or'ed actions
-	 * @return boolean
-	 * @since 4.5.0
-	 *
-	 * Returns the supported actions as int to be
-	 * compared with \OC_Group_Backend::CREATE_GROUP etc.
-	 */
-	public function implementsActions($actions);
+    /**
+     * Check if backend implements actions
+     * @param int $actions bitwise-or'ed actions
+     * @return boolean
+     * @since 4.5.0
+     *
+     * Returns the supported actions as int to be
+     * compared with \OC_Group_Backend::CREATE_GROUP etc.
+     */
+    public function implementsActions($actions);
 
-	/**
-	 * is user in group?
-	 * @param string $uid uid of the user
-	 * @param string $gid gid of the group
-	 * @return bool
-	 * @since 4.5.0
-	 *
-	 * Checks whether the user is member of a group or not.
-	 */
-	public function inGroup($uid, $gid);
+    /**
+     * is user in group?
+     * @param string $uid uid of the user
+     * @param string $gid gid of the group
+     * @return bool
+     * @since 4.5.0
+     *
+     * Checks whether the user is member of a group or not.
+     */
+    public function inGroup($uid, $gid);
 
-	/**
-	 * Get all groups a user belongs to
-	 * @param string $uid Name of the user
-	 * @return array an array of group names
-	 * @since 4.5.0
-	 *
-	 * This function fetches all groups a user belongs to. It does not check
-	 * if the user exists at all.
-	 */
-	public function getUserGroups($uid);
+    /**
+     * Get all groups a user belongs to
+     * @param string $uid Name of the user
+     * @return array an array of group names
+     * @since 4.5.0
+     *
+     * This function fetches all groups a user belongs to. It does not check
+     * if the user exists at all.
+     */
+    public function getUserGroups($uid);
 
-	/**
-	 * get a list of all groups
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array an array of group names
-	 * @since 4.5.0
-	 *
-	 * Returns a list with all groups
-	 */
-	public function getGroups($search = '', $limit = -1, $offset = 0);
+    /**
+     * get a list of all groups
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return array an array of group names
+     * @since 4.5.0
+     *
+     * Returns a list with all groups
+     */
+    public function getGroups($search = '', $limit = -1, $offset = 0);
 
-	/**
-	 * check if a group exists
-	 * @param string $gid
-	 * @return bool
-	 * @since 4.5.0
-	 */
-	public function groupExists($gid);
+    /**
+     * check if a group exists
+     * @param string $gid
+     * @return bool
+     * @since 4.5.0
+     */
+    public function groupExists($gid);
 
-	/**
-	 * 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
-	 * @since 4.5.0
-	 */
-	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0);
+    /**
+     * 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
+     * @since 4.5.0
+     */
+    public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0);
 
 }

Spacing +5 added lines, -5 removed lines

@@ -46,15 +46,15 @@
 	const CREATE_GROUP		= 0x00000001;
 	const DELETE_GROUP		= 0x00000010;
 	const ADD_TO_GROUP		= 0x00000100;
-	const REMOVE_FROM_GOUP	= 0x00001000; // oops
-	const REMOVE_FROM_GROUP	= 0x00001000;
+	const REMOVE_FROM_GOUP = 0x00001000; // oops
+	const REMOVE_FROM_GROUP = 0x00001000;
 	//OBSOLETE const GET_DISPLAYNAME	= 0x00010000;
-	const COUNT_USERS		= 0x00100000;
-	const GROUP_DETAILS		= 0x01000000;
+	const COUNT_USERS = 0x00100000;
+	const GROUP_DETAILS = 0x01000000;
 	/**
 	 * @since 13.0.0
 	 */
-	const IS_ADMIN  = 0x10000000;
+	const IS_ADMIN = 0x10000000;
 
 	/**
 	 * Check if backend implements actions

lib/public/Collaboration/Collaborators/ISearchPlugin.php

Indentation +9 added lines, -9 removed lines

@@ -30,13 +30,13 @@
  * @since 13.0.0
  */
 interface ISearchPlugin {
-	/**
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @param ISearchResult $searchResult
-	 * @return bool whether the plugin has more results
-	 * @since 13.0.0
-	 */
-	public function search($search, $limit, $offset, ISearchResult $searchResult);
+    /**
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @param ISearchResult $searchResult
+     * @return bool whether the plugin has more results
+     * @since 13.0.0
+     */
+    public function search($search, $limit, $offset, ISearchResult $searchResult);
 }

lib/private/Setup/OCI.php

Indentation +70 added lines, -70 removed lines

@@ -32,81 +32,81 @@
 namespace OC\Setup;
 
 class OCI extends AbstractDatabase {
-	public $dbprettyname = 'Oracle';
+    public $dbprettyname = 'Oracle';
 
-	protected $dbtablespace;
+    protected $dbtablespace;
 
-	public function initialize($config) {
-		parent::initialize($config);
-		if (array_key_exists('dbtablespace', $config)) {
-			$this->dbtablespace = $config['dbtablespace'];
-		} else {
-			$this->dbtablespace = 'USERS';
-		}
-		// allow empty hostname for oracle
-		$this->dbHost = $config['dbhost'];
+    public function initialize($config) {
+        parent::initialize($config);
+        if (array_key_exists('dbtablespace', $config)) {
+            $this->dbtablespace = $config['dbtablespace'];
+        } else {
+            $this->dbtablespace = 'USERS';
+        }
+        // allow empty hostname for oracle
+        $this->dbHost = $config['dbhost'];
 
-		$this->config->setValues([
-			'dbhost' => $this->dbHost,
-			'dbtablespace' => $this->dbtablespace,
-		]);
-	}
+        $this->config->setValues([
+            'dbhost' => $this->dbHost,
+            'dbtablespace' => $this->dbtablespace,
+        ]);
+    }
 
-	public function validate($config) {
-		$errors = array();
-		if (empty($config['dbuser']) && empty($config['dbname'])) {
-			$errors[] = $this->trans->t("%s enter the database username and name.", array($this->dbprettyname));
-		} else if (empty($config['dbuser'])) {
-			$errors[] = $this->trans->t("%s enter the database username.", array($this->dbprettyname));
-		} else if (empty($config['dbname'])) {
-			$errors[] = $this->trans->t("%s enter the database name.", array($this->dbprettyname));
-		}
-		return $errors;
-	}
+    public function validate($config) {
+        $errors = array();
+        if (empty($config['dbuser']) && empty($config['dbname'])) {
+            $errors[] = $this->trans->t("%s enter the database username and name.", array($this->dbprettyname));
+        } else if (empty($config['dbuser'])) {
+            $errors[] = $this->trans->t("%s enter the database username.", array($this->dbprettyname));
+        } else if (empty($config['dbname'])) {
+            $errors[] = $this->trans->t("%s enter the database name.", array($this->dbprettyname));
+        }
+        return $errors;
+    }
 
-	public function setupDatabase($username) {
-		try {
-			$this->connect();
-		} catch (\Exception $e) {
-			$errorMessage = $this->getLastError();
-			if ($errorMessage) {
-				throw new \OC\DatabaseSetupException($this->trans->t('Oracle connection could not be established'),
-					$errorMessage . ' Check environment: ORACLE_HOME=' . getenv('ORACLE_HOME')
-					. ' ORACLE_SID=' . getenv('ORACLE_SID')
-					. ' LD_LIBRARY_PATH=' . getenv('LD_LIBRARY_PATH')
-					. ' NLS_LANG=' . getenv('NLS_LANG')
-					. ' tnsnames.ora is ' . (is_readable(getenv('ORACLE_HOME') . '/network/admin/tnsnames.ora') ? '' : 'not ') . 'readable');
-			}
-			throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
-				'Check environment: ORACLE_HOME=' . getenv('ORACLE_HOME')
-				. ' ORACLE_SID=' . getenv('ORACLE_SID')
-				. ' LD_LIBRARY_PATH=' . getenv('LD_LIBRARY_PATH')
-				. ' NLS_LANG=' . getenv('NLS_LANG')
-				. ' tnsnames.ora is ' . (is_readable(getenv('ORACLE_HOME') . '/network/admin/tnsnames.ora') ? '' : 'not ') . 'readable');
-		}
+    public function setupDatabase($username) {
+        try {
+            $this->connect();
+        } catch (\Exception $e) {
+            $errorMessage = $this->getLastError();
+            if ($errorMessage) {
+                throw new \OC\DatabaseSetupException($this->trans->t('Oracle connection could not be established'),
+                    $errorMessage . ' Check environment: ORACLE_HOME=' . getenv('ORACLE_HOME')
+                    . ' ORACLE_SID=' . getenv('ORACLE_SID')
+                    . ' LD_LIBRARY_PATH=' . getenv('LD_LIBRARY_PATH')
+                    . ' NLS_LANG=' . getenv('NLS_LANG')
+                    . ' tnsnames.ora is ' . (is_readable(getenv('ORACLE_HOME') . '/network/admin/tnsnames.ora') ? '' : 'not ') . 'readable');
+            }
+            throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
+                'Check environment: ORACLE_HOME=' . getenv('ORACLE_HOME')
+                . ' ORACLE_SID=' . getenv('ORACLE_SID')
+                . ' LD_LIBRARY_PATH=' . getenv('LD_LIBRARY_PATH')
+                . ' NLS_LANG=' . getenv('NLS_LANG')
+                . ' tnsnames.ora is ' . (is_readable(getenv('ORACLE_HOME') . '/network/admin/tnsnames.ora') ? '' : 'not ') . 'readable');
+        }
 
-		$this->config->setValues([
-			'dbuser' => $this->dbUser,
-			'dbname' => $this->dbName,
-			'dbpassword' => $this->dbPassword,
-		]);
-	}
+        $this->config->setValues([
+            'dbuser' => $this->dbUser,
+            'dbname' => $this->dbName,
+            'dbpassword' => $this->dbPassword,
+        ]);
+    }
 
-	/**
-	 * @param resource $connection
-	 * @return string
-	 */
-	protected function getLastError($connection = null) {
-		if ($connection) {
-			$error = oci_error($connection);
-		} else {
-			$error = oci_error();
-		}
-		foreach (array('message', 'code') as $key) {
-			if (isset($error[$key])) {
-				return $error[$key];
-			}
-		}
-		return '';
-	}
+    /**
+     * @param resource $connection
+     * @return string
+     */
+    protected function getLastError($connection = null) {
+        if ($connection) {
+            $error = oci_error($connection);
+        } else {
+            $error = oci_error();
+        }
+        foreach (array('message', 'code') as $key) {
+            if (isset($error[$key])) {
+                return $error[$key];
+            }
+        }
+        return '';
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -71,18 +71,18 @@
 			$errorMessage = $this->getLastError();
 			if ($errorMessage) {
 				throw new \OC\DatabaseSetupException($this->trans->t('Oracle connection could not be established'),
-					$errorMessage . ' Check environment: ORACLE_HOME=' . getenv('ORACLE_HOME')
-					. ' ORACLE_SID=' . getenv('ORACLE_SID')
-					. ' LD_LIBRARY_PATH=' . getenv('LD_LIBRARY_PATH')
-					. ' NLS_LANG=' . getenv('NLS_LANG')
-					. ' tnsnames.ora is ' . (is_readable(getenv('ORACLE_HOME') . '/network/admin/tnsnames.ora') ? '' : 'not ') . 'readable');
+					$errorMessage.' Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
+					. ' ORACLE_SID='.getenv('ORACLE_SID')
+					. ' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
+					. ' NLS_LANG='.getenv('NLS_LANG')
+					. ' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora') ? '' : 'not ').'readable');
 			}
 			throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
-				'Check environment: ORACLE_HOME=' . getenv('ORACLE_HOME')
-				. ' ORACLE_SID=' . getenv('ORACLE_SID')
-				. ' LD_LIBRARY_PATH=' . getenv('LD_LIBRARY_PATH')
-				. ' NLS_LANG=' . getenv('NLS_LANG')
-				. ' tnsnames.ora is ' . (is_readable(getenv('ORACLE_HOME') . '/network/admin/tnsnames.ora') ? '' : 'not ') . 'readable');
+				'Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
+				. ' ORACLE_SID='.getenv('ORACLE_SID')
+				. ' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
+				. ' NLS_LANG='.getenv('NLS_LANG')
+				. ' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora') ? '' : 'not ').'readable');
 		}
 
 		$this->config->setValues([

lib/public/Collaboration/Collaborators/ISearch.php

Indentation +16 added lines, -16 removed lines

@@ -30,21 +30,21 @@
  * @since 13.0.0
  */
 interface ISearch {
-	/**
-	 * @param string $search
-	 * @param array $shareTypes
-	 * @param bool $lookup
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array with two elements, 1st ISearchResult as array, 2nd a bool indicating whether more result are available
-	 * @since 13.0.0
-	 */
-	public function search($search, array $shareTypes, $lookup, $limit, $offset);
+    /**
+     * @param string $search
+     * @param array $shareTypes
+     * @param bool $lookup
+     * @param int $limit
+     * @param int $offset
+     * @return array with two elements, 1st ISearchResult as array, 2nd a bool indicating whether more result are available
+     * @since 13.0.0
+     */
+    public function search($search, array $shareTypes, $lookup, $limit, $offset);
 
-	/**
-	 * @param array $pluginInfo with keys 'shareType' containing the name of a corresponding constant in \OCP\Share and
-	 * 	'class' with the class name of the plugin
-	 * @since 13.0.0
-	 */
-	public function registerPlugin(array $pluginInfo);
+    /**
+     * @param array $pluginInfo with keys 'shareType' containing the name of a corresponding constant in \OCP\Share and
+     * 	'class' with the class name of the plugin
+     * @since 13.0.0
+     */
+    public function registerPlugin(array $pluginInfo);
 }

lib/public/Collaboration/Collaborators/ISearchResult.php

Indentation +35 added lines, -35 removed lines

@@ -30,44 +30,44 @@
  * @since 13.0.0
  */
 interface ISearchResult {
-	/**
-	 * @param SearchResultType $type
-	 * @param array $matches
-	 * @param array|null $exactMatches
-	 * @since 13.0.0
-	 */
-	public function addResultSet(SearchResultType $type, array $matches, array $exactMatches = null);
+    /**
+     * @param SearchResultType $type
+     * @param array $matches
+     * @param array|null $exactMatches
+     * @since 13.0.0
+     */
+    public function addResultSet(SearchResultType $type, array $matches, array $exactMatches = null);
 
-	/**
-	 * @param SearchResultType $type
-	 * @param string $collaboratorId
-	 * @return bool
-	 * @since 13.0.0
-	 */
-	public function hasResult(SearchResultType $type, $collaboratorId);
+    /**
+     * @param SearchResultType $type
+     * @param string $collaboratorId
+     * @return bool
+     * @since 13.0.0
+     */
+    public function hasResult(SearchResultType $type, $collaboratorId);
 
-	/**
-	 * @param SearchResultType $type
-	 * @since 13.0.0
-	 */
-	public function unsetResult(SearchResultType $type);
+    /**
+     * @param SearchResultType $type
+     * @since 13.0.0
+     */
+    public function unsetResult(SearchResultType $type);
 
-	/**
-	 * @param SearchResultType $type
-	 * @since 13.0.0
-	 */
-	public function markExactIdMatch(SearchResultType $type);
+    /**
+     * @param SearchResultType $type
+     * @since 13.0.0
+     */
+    public function markExactIdMatch(SearchResultType $type);
 
-	/**
-	 * @param SearchResultType $type
-	 * @return bool
-	 * @since 13.0.0
-	 */
-	public function hasExactIdMatch(SearchResultType $type);
+    /**
+     * @param SearchResultType $type
+     * @return bool
+     * @since 13.0.0
+     */
+    public function hasExactIdMatch(SearchResultType $type);
 
-	/**
-	 * @return array
-	 * @since 13.0.0
-	 */
-	public function asArray();
+    /**
+     * @return array
+     * @since 13.0.0
+     */
+    public function asArray();
 }

lib/private/Repair/Owncloud/SaveAccountsTableData.php

Indentation +132 added lines, -132 removed lines

@@ -38,137 +38,137 @@
  */
 class SaveAccountsTableData implements IRepairStep {
 
-	const BATCH_SIZE = 75;
-
-	/** @var IDBConnection */
-	protected $db;
-
-	/** @var IConfig */
-	protected $config;
-
-	/**
-	 * @param IDBConnection $db
-	 * @param IConfig $config
-	 */
-	public function __construct(IDBConnection $db, IConfig $config) {
-		$this->db = $db;
-		$this->config = $config;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Copy data from accounts table when migrating from ownCloud';
-	}
-
-	/**
-	 * @param IOutput $output
-	 */
-	public function run(IOutput $output) {
-		if (!$this->shouldRun()) {
-			return;
-		}
-
-		$offset = 0;
-		$numUsers = $this->runStep($offset);
-
-		while ($numUsers === self::BATCH_SIZE) {
-			$offset += $numUsers;
-			$numUsers = $this->runStep($offset);
-		}
-
-		// Remove the table
-		$this->db->dropTable('accounts');
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function shouldRun() {
-		$schema = $this->db->createSchema();
-
-		$tableName = $this->config->getSystemValue('dbtableprefix', 'oc_') . 'accounts';
-		if (!$schema->hasTable($tableName)) {
-			return false;
-		}
-
-		$table = $schema->getTable($tableName);
-		return $table->hasColumn('user_id');
-	}
-
-	/**
-	 * @param int $offset
-	 * @return int Number of copied users
-	 */
-	protected function runStep($offset) {
-		$query = $this->db->getQueryBuilder();
-		$query->select('*')
-			->from('accounts')
-			->orderBy('id')
-			->setMaxResults(self::BATCH_SIZE);
-
-		if ($offset > 0) {
-			$query->setFirstResult($offset);
-		}
-
-		$result = $query->execute();
-
-		$update = $this->db->getQueryBuilder();
-		$update->update('users')
-			->set('displayname', $update->createParameter('displayname'))
-			->where($update->expr()->eq('uid', $update->createParameter('userid')));
-
-		$updatedUsers = 0;
-		while ($row = $result->fetch()) {
-			try {
-				$this->migrateUserInfo($update, $row);
-			} catch (PreConditionNotMetException $e) {
-				// Ignore and continue
-			} catch (\UnexpectedValueException $e) {
-				// Ignore and continue
-			}
-			$updatedUsers++;
-		}
-		$result->closeCursor();
-
-		return $updatedUsers;
-	}
-
-	/**
-	 * @param IQueryBuilder $update
-	 * @param array $userdata
-	 * @throws PreConditionNotMetException
-	 * @throws \UnexpectedValueException
-	 */
-	protected function migrateUserInfo(IQueryBuilder $update, $userdata) {
-		$state = (int) $userdata['state'];
-		if ($state === 3) {
-			// Deleted user, ignore
-			return;
-		}
-
-		if ($userdata['email'] !== null) {
-			$this->config->setUserValue($userdata['user_id'], 'settings', 'email', $userdata['email']);
-		}
-		if ($userdata['quota'] !== null) {
-			$this->config->setUserValue($userdata['user_id'], 'files', 'quota', $userdata['quota']);
-		}
-		if ($userdata['last_login'] !== null) {
-			$this->config->setUserValue($userdata['user_id'], 'login', 'lastLogin', $userdata['last_login']);
-		}
-		if ($state === 1) {
-			$this->config->setUserValue($userdata['user_id'], 'core', 'enabled', 'true');
-		} else if ($state === 2) {
-			$this->config->setUserValue($userdata['user_id'], 'core', 'enabled', 'false');
-		}
-
-		if ($userdata['display_name'] !== null) {
-			$update->setParameter('displayname', $userdata['display_name'])
-				->setParameter('userid', $userdata['user_id']);
-			$update->execute();
-		}
-
-	}
+    const BATCH_SIZE = 75;
+
+    /** @var IDBConnection */
+    protected $db;
+
+    /** @var IConfig */
+    protected $config;
+
+    /**
+     * @param IDBConnection $db
+     * @param IConfig $config
+     */
+    public function __construct(IDBConnection $db, IConfig $config) {
+        $this->db = $db;
+        $this->config = $config;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Copy data from accounts table when migrating from ownCloud';
+    }
+
+    /**
+     * @param IOutput $output
+     */
+    public function run(IOutput $output) {
+        if (!$this->shouldRun()) {
+            return;
+        }
+
+        $offset = 0;
+        $numUsers = $this->runStep($offset);
+
+        while ($numUsers === self::BATCH_SIZE) {
+            $offset += $numUsers;
+            $numUsers = $this->runStep($offset);
+        }
+
+        // Remove the table
+        $this->db->dropTable('accounts');
+    }
+
+    /**
+     * @return bool
+     */
+    protected function shouldRun() {
+        $schema = $this->db->createSchema();
+
+        $tableName = $this->config->getSystemValue('dbtableprefix', 'oc_') . 'accounts';
+        if (!$schema->hasTable($tableName)) {
+            return false;
+        }
+
+        $table = $schema->getTable($tableName);
+        return $table->hasColumn('user_id');
+    }
+
+    /**
+     * @param int $offset
+     * @return int Number of copied users
+     */
+    protected function runStep($offset) {
+        $query = $this->db->getQueryBuilder();
+        $query->select('*')
+            ->from('accounts')
+            ->orderBy('id')
+            ->setMaxResults(self::BATCH_SIZE);
+
+        if ($offset > 0) {
+            $query->setFirstResult($offset);
+        }
+
+        $result = $query->execute();
+
+        $update = $this->db->getQueryBuilder();
+        $update->update('users')
+            ->set('displayname', $update->createParameter('displayname'))
+            ->where($update->expr()->eq('uid', $update->createParameter('userid')));
+
+        $updatedUsers = 0;
+        while ($row = $result->fetch()) {
+            try {
+                $this->migrateUserInfo($update, $row);
+            } catch (PreConditionNotMetException $e) {
+                // Ignore and continue
+            } catch (\UnexpectedValueException $e) {
+                // Ignore and continue
+            }
+            $updatedUsers++;
+        }
+        $result->closeCursor();
+
+        return $updatedUsers;
+    }
+
+    /**
+     * @param IQueryBuilder $update
+     * @param array $userdata
+     * @throws PreConditionNotMetException
+     * @throws \UnexpectedValueException
+     */
+    protected function migrateUserInfo(IQueryBuilder $update, $userdata) {
+        $state = (int) $userdata['state'];
+        if ($state === 3) {
+            // Deleted user, ignore
+            return;
+        }
+
+        if ($userdata['email'] !== null) {
+            $this->config->setUserValue($userdata['user_id'], 'settings', 'email', $userdata['email']);
+        }
+        if ($userdata['quota'] !== null) {
+            $this->config->setUserValue($userdata['user_id'], 'files', 'quota', $userdata['quota']);
+        }
+        if ($userdata['last_login'] !== null) {
+            $this->config->setUserValue($userdata['user_id'], 'login', 'lastLogin', $userdata['last_login']);
+        }
+        if ($state === 1) {
+            $this->config->setUserValue($userdata['user_id'], 'core', 'enabled', 'true');
+        } else if ($state === 2) {
+            $this->config->setUserValue($userdata['user_id'], 'core', 'enabled', 'false');
+        }
+
+        if ($userdata['display_name'] !== null) {
+            $update->setParameter('displayname', $userdata['display_name'])
+                ->setParameter('userid', $userdata['user_id']);
+            $update->execute();
+        }
+
+    }
 }
 

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
 	protected function shouldRun() {
 		$schema = $this->db->createSchema();
 
-		$tableName = $this->config->getSystemValue('dbtableprefix', 'oc_') . 'accounts';
+		$tableName = $this->config->getSystemValue('dbtableprefix', 'oc_').'accounts';
 		if (!$schema->hasTable($tableName)) {
 			return false;
 		}

lib/public/Share/IManager.php

Indentation +308 added lines, -308 removed lines

@@ -35,313 +35,313 @@
  */
 interface IManager {
 
-	/**
-	 * Create a Share
-	 *
-	 * @param IShare $share
-	 * @return IShare The share object
-	 * @throws \Exception
-	 * @since 9.0.0
-	 */
-	public function createShare(IShare $share);
-
-	/**
-	 * Update a share.
-	 * The target of the share can't be changed this way: use moveShare
-	 * The share can't be removed this way (permission 0): use deleteShare
-	 *
-	 * @param IShare $share
-	 * @return IShare The share object
-	 * @throws \InvalidArgumentException
-	 * @since 9.0.0
-	 */
-	public function updateShare(IShare $share);
-
-	/**
-	 * Delete a share
-	 *
-	 * @param IShare $share
-	 * @throws ShareNotFound
-	 * @throws \InvalidArgumentException
-	 * @since 9.0.0
-	 */
-	public function deleteShare(IShare $share);
-
-	/**
-	 * Unshare a file as the recipient.
-	 * This can be different from a regular delete for example when one of
-	 * the users in a groups deletes that share. But the provider should
-	 * handle this.
-	 *
-	 * @param IShare $share
-	 * @param string $recipientId
-	 * @since 9.0.0
-	 */
-	public function deleteFromSelf(IShare $share, $recipientId);
-
-	/**
-	 * Move the share as a recipient of the share.
-	 * This is updating the share target. So where the recipient has the share mounted.
-	 *
-	 * @param IShare $share
-	 * @param string $recipientId
-	 * @return IShare
-	 * @throws \InvalidArgumentException If $share is a link share or the $recipient does not match
-	 * @since 9.0.0
-	 */
-	public function moveShare(IShare $share, $recipientId);
-
-	/**
-	 * Get all shares shared by (initiated) by the provided user in a folder.
-	 *
-	 * @param string $userId
-	 * @param Folder $node
-	 * @param bool $reshares
-	 * @return IShare[][] [$fileId => IShare[], ...]
-	 * @since 11.0.0
-	 */
-	public function getSharesInFolder($userId, Folder $node, $reshares = false);
-
-	/**
-	 * Get shares shared by (initiated) by the provided user.
-	 *
-	 * @param string $userId
-	 * @param int $shareType
-	 * @param Node|null $path
-	 * @param bool $reshares
-	 * @param int $limit The maximum number of returned results, -1 for all results
-	 * @param int $offset
-	 * @return IShare[]
-	 * @since 9.0.0
-	 */
-	public function getSharesBy($userId, $shareType, $path = null, $reshares = false, $limit = 50, $offset = 0);
-
-	/**
-	 * Get shares shared with $user.
-	 * Filter by $node if provided
-	 *
-	 * @param string $userId
-	 * @param int $shareType
-	 * @param Node|null $node
-	 * @param int $limit The maximum number of shares returned, -1 for all
-	 * @param int $offset
-	 * @return IShare[]
-	 * @since 9.0.0
-	 */
-	public function getSharedWith($userId, $shareType, $node = null, $limit = 50, $offset = 0);
-
-	/**
-	 * Retrieve a share by the share id.
-	 * If the recipient is set make sure to retrieve the file for that user.
-	 * This makes sure that if a user has moved/deleted a group share this
-	 * is reflected.
-	 *
-	 * @param string $id
-	 * @param string|null $recipient userID of the recipient
-	 * @return IShare
-	 * @throws ShareNotFound
-	 * @since 9.0.0
-	 */
-	public function getShareById($id, $recipient = null);
-
-	/**
-	 * Get the share by token possible with password
-	 *
-	 * @param string $token
-	 * @return IShare
-	 * @throws ShareNotFound
-	 * @since 9.0.0
-	 */
-	public function getShareByToken($token);
-
-	/**
-	 * Verify the password of a public share
-	 *
-	 * @param IShare $share
-	 * @param string $password
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function checkPassword(IShare $share, $password);
-
-	/**
-	 * The user with UID is deleted.
-	 * All share providers have to cleanup the shares with this user as well
-	 * as shares owned by this user.
-	 * Shares only initiated by this user are fine.
-	 *
-	 * @param string $uid
-	 * @since 9.1.0
-	 */
-	public function userDeleted($uid);
-
-	/**
-	 * The group with $gid is deleted
-	 * We need to clear up all shares to this group
-	 *
-	 * @param string $gid
-	 * @since 9.1.0
-	 */
-	public function groupDeleted($gid);
-
-	/**
-	 * The user $uid is deleted from the group $gid
-	 * All user specific group shares have to be removed
-	 *
-	 * @param string $uid
-	 * @param string $gid
-	 * @since 9.1.0
-	 */
-	public function userDeletedFromGroup($uid, $gid);
-
-	/**
-	 * Get access list to a path. This means
-	 * all the users that can access a given path.
-	 *
-	 * Consider:
-	 * -root
-	 * |-folder1 (23)
-	 *  |-folder2 (32)
-	 *   |-fileA (42)
-	 *
-	 * fileA is shared with user1 and user1@server1
-	 * folder2 is shared with group2 (user4 is a member of group2)
-	 * folder1 is shared with user2 (renamed to "folder (1)") and user2@server2
-	 *
-	 * Then the access list to '/folder1/folder2/fileA' with $currentAccess is:
-	 * [
-	 *  users  => [
-	 *      'user1' => ['node_id' => 42, 'node_path' => '/fileA'],
-	 *      'user4' => ['node_id' => 32, 'node_path' => '/folder2'],
-	 *      'user2' => ['node_id' => 23, 'node_path' => '/folder (1)'],
-	 *  ],
-	 *  remote => [
-	 *      'user1@server1' => ['node_id' => 42, 'token' => 'SeCr3t'],
-	 *      'user2@server2' => ['node_id' => 23, 'token' => 'FooBaR'],
-	 *  ],
-	 *  public => bool
-	 *  mail => bool
-	 * ]
-	 *
-	 * The access list to '/folder1/folder2/fileA' **without** $currentAccess is:
-	 * [
-	 *  users  => ['user1', 'user2', 'user4'],
-	 *  remote => bool,
-	 *  public => bool
-	 *  mail => bool
-	 * ]
-	 *
-	 * This is required for encryption/activity
-	 *
-	 * @param \OCP\Files\Node $path
-	 * @param bool $recursive Should we check all parent folders as well
-	 * @param bool $currentAccess Should the user have currently access to the file
-	 * @return array
-	 * @since 12
-	 */
-	public function getAccessList(\OCP\Files\Node $path, $recursive = true, $currentAccess = false);
-
-	/**
-	 * Instantiates a new share object. This is to be passed to
-	 * createShare.
-	 *
-	 * @return IShare
-	 * @since 9.0.0
-	 */
-	public function newShare();
-
-	/**
-	 * Is the share API enabled
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function shareApiEnabled();
-
-	/**
-	 * Is public link sharing enabled
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function shareApiAllowLinks();
-
-	/**
-	 * Is password on public link requires
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function shareApiLinkEnforcePassword();
-
-	/**
-	 * Is default expire date enabled
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function shareApiLinkDefaultExpireDate();
-
-	/**
-	 * Is default expire date enforced
-	 *`
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function shareApiLinkDefaultExpireDateEnforced();
-
-	/**
-	 * Number of default expire days
-	 *
-	 * @return int
-	 * @since 9.0.0
-	 */
-	public function shareApiLinkDefaultExpireDays();
-
-	/**
-	 * Allow public upload on link shares
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function shareApiLinkAllowPublicUpload();
-
-	/**
-	 * check if user can only share with group members
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function shareWithGroupMembersOnly();
-
-	/**
-	 * Check if users can share with groups
-	 * @return bool
-	 * @since 9.0.1
-	 */
-	public function allowGroupSharing();
-
-	/**
-	 * Check if sharing is disabled for the given user
-	 *
-	 * @param string $userId
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function sharingDisabledForUser($userId);
-
-	/**
-	 * Check if outgoing server2server shares are allowed
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function outgoingServer2ServerSharesAllowed();
-
-	/**
-	 * Check if a given share provider exists
-	 * @param int $shareType
-	 * @return bool
-	 * @since 11.0.0
-	 */
-	public function shareProviderExists($shareType);
+    /**
+     * Create a Share
+     *
+     * @param IShare $share
+     * @return IShare The share object
+     * @throws \Exception
+     * @since 9.0.0
+     */
+    public function createShare(IShare $share);
+
+    /**
+     * Update a share.
+     * The target of the share can't be changed this way: use moveShare
+     * The share can't be removed this way (permission 0): use deleteShare
+     *
+     * @param IShare $share
+     * @return IShare The share object
+     * @throws \InvalidArgumentException
+     * @since 9.0.0
+     */
+    public function updateShare(IShare $share);
+
+    /**
+     * Delete a share
+     *
+     * @param IShare $share
+     * @throws ShareNotFound
+     * @throws \InvalidArgumentException
+     * @since 9.0.0
+     */
+    public function deleteShare(IShare $share);
+
+    /**
+     * Unshare a file as the recipient.
+     * This can be different from a regular delete for example when one of
+     * the users in a groups deletes that share. But the provider should
+     * handle this.
+     *
+     * @param IShare $share
+     * @param string $recipientId
+     * @since 9.0.0
+     */
+    public function deleteFromSelf(IShare $share, $recipientId);
+
+    /**
+     * Move the share as a recipient of the share.
+     * This is updating the share target. So where the recipient has the share mounted.
+     *
+     * @param IShare $share
+     * @param string $recipientId
+     * @return IShare
+     * @throws \InvalidArgumentException If $share is a link share or the $recipient does not match
+     * @since 9.0.0
+     */
+    public function moveShare(IShare $share, $recipientId);
+
+    /**
+     * Get all shares shared by (initiated) by the provided user in a folder.
+     *
+     * @param string $userId
+     * @param Folder $node
+     * @param bool $reshares
+     * @return IShare[][] [$fileId => IShare[], ...]
+     * @since 11.0.0
+     */
+    public function getSharesInFolder($userId, Folder $node, $reshares = false);
+
+    /**
+     * Get shares shared by (initiated) by the provided user.
+     *
+     * @param string $userId
+     * @param int $shareType
+     * @param Node|null $path
+     * @param bool $reshares
+     * @param int $limit The maximum number of returned results, -1 for all results
+     * @param int $offset
+     * @return IShare[]
+     * @since 9.0.0
+     */
+    public function getSharesBy($userId, $shareType, $path = null, $reshares = false, $limit = 50, $offset = 0);
+
+    /**
+     * Get shares shared with $user.
+     * Filter by $node if provided
+     *
+     * @param string $userId
+     * @param int $shareType
+     * @param Node|null $node
+     * @param int $limit The maximum number of shares returned, -1 for all
+     * @param int $offset
+     * @return IShare[]
+     * @since 9.0.0
+     */
+    public function getSharedWith($userId, $shareType, $node = null, $limit = 50, $offset = 0);
+
+    /**
+     * Retrieve a share by the share id.
+     * If the recipient is set make sure to retrieve the file for that user.
+     * This makes sure that if a user has moved/deleted a group share this
+     * is reflected.
+     *
+     * @param string $id
+     * @param string|null $recipient userID of the recipient
+     * @return IShare
+     * @throws ShareNotFound
+     * @since 9.0.0
+     */
+    public function getShareById($id, $recipient = null);
+
+    /**
+     * Get the share by token possible with password
+     *
+     * @param string $token
+     * @return IShare
+     * @throws ShareNotFound
+     * @since 9.0.0
+     */
+    public function getShareByToken($token);
+
+    /**
+     * Verify the password of a public share
+     *
+     * @param IShare $share
+     * @param string $password
+     * @return bool
+     * @since 9.0.0
+     */
+    public function checkPassword(IShare $share, $password);
+
+    /**
+     * The user with UID is deleted.
+     * All share providers have to cleanup the shares with this user as well
+     * as shares owned by this user.
+     * Shares only initiated by this user are fine.
+     *
+     * @param string $uid
+     * @since 9.1.0
+     */
+    public function userDeleted($uid);
+
+    /**
+     * The group with $gid is deleted
+     * We need to clear up all shares to this group
+     *
+     * @param string $gid
+     * @since 9.1.0
+     */
+    public function groupDeleted($gid);
+
+    /**
+     * The user $uid is deleted from the group $gid
+     * All user specific group shares have to be removed
+     *
+     * @param string $uid
+     * @param string $gid
+     * @since 9.1.0
+     */
+    public function userDeletedFromGroup($uid, $gid);
+
+    /**
+     * Get access list to a path. This means
+     * all the users that can access a given path.
+     *
+     * Consider:
+     * -root
+     * |-folder1 (23)
+     *  |-folder2 (32)
+     *   |-fileA (42)
+     *
+     * fileA is shared with user1 and user1@server1
+     * folder2 is shared with group2 (user4 is a member of group2)
+     * folder1 is shared with user2 (renamed to "folder (1)") and user2@server2
+     *
+     * Then the access list to '/folder1/folder2/fileA' with $currentAccess is:
+     * [
+     *  users  => [
+     *      'user1' => ['node_id' => 42, 'node_path' => '/fileA'],
+     *      'user4' => ['node_id' => 32, 'node_path' => '/folder2'],
+     *      'user2' => ['node_id' => 23, 'node_path' => '/folder (1)'],
+     *  ],
+     *  remote => [
+     *      'user1@server1' => ['node_id' => 42, 'token' => 'SeCr3t'],
+     *      'user2@server2' => ['node_id' => 23, 'token' => 'FooBaR'],
+     *  ],
+     *  public => bool
+     *  mail => bool
+     * ]
+     *
+     * The access list to '/folder1/folder2/fileA' **without** $currentAccess is:
+     * [
+     *  users  => ['user1', 'user2', 'user4'],
+     *  remote => bool,
+     *  public => bool
+     *  mail => bool
+     * ]
+     *
+     * This is required for encryption/activity
+     *
+     * @param \OCP\Files\Node $path
+     * @param bool $recursive Should we check all parent folders as well
+     * @param bool $currentAccess Should the user have currently access to the file
+     * @return array
+     * @since 12
+     */
+    public function getAccessList(\OCP\Files\Node $path, $recursive = true, $currentAccess = false);
+
+    /**
+     * Instantiates a new share object. This is to be passed to
+     * createShare.
+     *
+     * @return IShare
+     * @since 9.0.0
+     */
+    public function newShare();
+
+    /**
+     * Is the share API enabled
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function shareApiEnabled();
+
+    /**
+     * Is public link sharing enabled
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function shareApiAllowLinks();
+
+    /**
+     * Is password on public link requires
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function shareApiLinkEnforcePassword();
+
+    /**
+     * Is default expire date enabled
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function shareApiLinkDefaultExpireDate();
+
+    /**
+     * Is default expire date enforced
+     *`
+     * @return bool
+     * @since 9.0.0
+     */
+    public function shareApiLinkDefaultExpireDateEnforced();
+
+    /**
+     * Number of default expire days
+     *
+     * @return int
+     * @since 9.0.0
+     */
+    public function shareApiLinkDefaultExpireDays();
+
+    /**
+     * Allow public upload on link shares
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function shareApiLinkAllowPublicUpload();
+
+    /**
+     * check if user can only share with group members
+     * @return bool
+     * @since 9.0.0
+     */
+    public function shareWithGroupMembersOnly();
+
+    /**
+     * Check if users can share with groups
+     * @return bool
+     * @since 9.0.1
+     */
+    public function allowGroupSharing();
+
+    /**
+     * Check if sharing is disabled for the given user
+     *
+     * @param string $userId
+     * @return bool
+     * @since 9.0.0
+     */
+    public function sharingDisabledForUser($userId);
+
+    /**
+     * Check if outgoing server2server shares are allowed
+     * @return bool
+     * @since 9.0.0
+     */
+    public function outgoingServer2ServerSharesAllowed();
+
+    /**
+     * Check if a given share provider exists
+     * @param int $shareType
+     * @return bool
+     * @since 11.0.0
+     */
+    public function shareProviderExists($shareType);
 
 }

lib/private/Collaboration/Collaborators/RemotePlugin.php

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
 							$searchResult->markExactIdMatch($resultType);
 						}
 						$result['exact'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
+							'label' => $contact['FN']." ($cloudId)",
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_REMOTE,
 								'shareWith' => $cloudId,
@@ -88,7 +88,7 @@ 
 						];
 					} else {
 						$result['wide'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
+							'label' => $contact['FN']." ($cloudId)",
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_REMOTE,
 								'shareWith' => $cloudId,

Indentation +92 added lines, -92 removed lines

@@ -33,107 +33,107 @@
 use OCP\Share;
 
 class RemotePlugin implements ISearchPlugin {
-	protected $shareeEnumeration;
+    protected $shareeEnumeration;
 
-	/** @var IManager */
-	private $contactsManager;
-	/** @var ICloudIdManager */
-	private $cloudIdManager;
-	/** @var IConfig */
-	private $config;
+    /** @var IManager */
+    private $contactsManager;
+    /** @var ICloudIdManager */
+    private $cloudIdManager;
+    /** @var IConfig */
+    private $config;
 
-	public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config) {
-		$this->contactsManager = $contactsManager;
-		$this->cloudIdManager = $cloudIdManager;
-		$this->config = $config;
+    public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config) {
+        $this->contactsManager = $contactsManager;
+        $this->cloudIdManager = $cloudIdManager;
+        $this->config = $config;
 
-		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-	}
+        $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+    }
 
-	public function search($search, $limit, $offset, ISearchResult $searchResult) {
-		$result = ['wide' => [], 'exact' => []];
-		$resultType = new SearchResultType('remotes');
+    public function search($search, $limit, $offset, ISearchResult $searchResult) {
+        $result = ['wide' => [], 'exact' => []];
+        $resultType = new SearchResultType('remotes');
 
-		// Search in contacts
-		//@todo Pagination missing
-		$addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN']);
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['isLocalSystemBook'])) {
-				continue;
-			}
-			if (isset($contact['CLOUD'])) {
-				$cloudIds = $contact['CLOUD'];
-				if (!is_array($cloudIds)) {
-					$cloudIds = [$cloudIds];
-				}
-				$lowerSearch = strtolower($search);
-				foreach ($cloudIds as $cloudId) {
-					try {
-						list(, $serverUrl) = $this->splitUserRemote($cloudId);
-					} catch (\InvalidArgumentException $e) {
-						continue;
-					}
+        // Search in contacts
+        //@todo Pagination missing
+        $addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN']);
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['isLocalSystemBook'])) {
+                continue;
+            }
+            if (isset($contact['CLOUD'])) {
+                $cloudIds = $contact['CLOUD'];
+                if (!is_array($cloudIds)) {
+                    $cloudIds = [$cloudIds];
+                }
+                $lowerSearch = strtolower($search);
+                foreach ($cloudIds as $cloudId) {
+                    try {
+                        list(, $serverUrl) = $this->splitUserRemote($cloudId);
+                    } catch (\InvalidArgumentException $e) {
+                        continue;
+                    }
 
-					if (strtolower($contact['FN']) === $lowerSearch || strtolower($cloudId) === $lowerSearch) {
-						if (strtolower($cloudId) === $lowerSearch) {
-							$searchResult->markExactIdMatch($resultType);
-						}
-						$result['exact'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
-							'value' => [
-								'shareType' => Share::SHARE_TYPE_REMOTE,
-								'shareWith' => $cloudId,
-								'server' => $serverUrl,
-							],
-						];
-					} else {
-						$result['wide'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
-							'value' => [
-								'shareType' => Share::SHARE_TYPE_REMOTE,
-								'shareWith' => $cloudId,
-								'server' => $serverUrl,
-							],
-						];
-					}
-				}
-			}
-		}
+                    if (strtolower($contact['FN']) === $lowerSearch || strtolower($cloudId) === $lowerSearch) {
+                        if (strtolower($cloudId) === $lowerSearch) {
+                            $searchResult->markExactIdMatch($resultType);
+                        }
+                        $result['exact'][] = [
+                            'label' => $contact['FN'] . " ($cloudId)",
+                            'value' => [
+                                'shareType' => Share::SHARE_TYPE_REMOTE,
+                                'shareWith' => $cloudId,
+                                'server' => $serverUrl,
+                            ],
+                        ];
+                    } else {
+                        $result['wide'][] = [
+                            'label' => $contact['FN'] . " ($cloudId)",
+                            'value' => [
+                                'shareType' => Share::SHARE_TYPE_REMOTE,
+                                'shareWith' => $cloudId,
+                                'server' => $serverUrl,
+                            ],
+                        ];
+                    }
+                }
+            }
+        }
 
-		if (!$this->shareeEnumeration) {
-			$result['wide'] = [];
-		} else {
-			$result['wide'] = array_slice($result['wide'], $offset, $limit);
-		}
+        if (!$this->shareeEnumeration) {
+            $result['wide'] = [];
+        } else {
+            $result['wide'] = array_slice($result['wide'], $offset, $limit);
+        }
 
-		if (!$searchResult->hasExactIdMatch($resultType) && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
-			$result['exact'][] = [
-				'label' => $search,
-				'value' => [
-					'shareType' => Share::SHARE_TYPE_REMOTE,
-					'shareWith' => $search,
-				],
-			];
-		}
+        if (!$searchResult->hasExactIdMatch($resultType) && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
+            $result['exact'][] = [
+                'label' => $search,
+                'value' => [
+                    'shareType' => Share::SHARE_TYPE_REMOTE,
+                    'shareWith' => $search,
+                ],
+            ];
+        }
 
-		$searchResult->addResultSet($resultType, $result['wide'], $result['exact']);
+        $searchResult->addResultSet($resultType, $result['wide'], $result['exact']);
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * split user and remote from federated cloud id
-	 *
-	 * @param string $address federated share address
-	 * @return array [user, remoteURL]
-	 * @throws \InvalidArgumentException
-	 */
-	public function splitUserRemote($address) {
-		try {
-			$cloudId = $this->cloudIdManager->resolveCloudId($address);
-			return [$cloudId->getUser(), $cloudId->getRemote()];
-		} catch (\InvalidArgumentException $e) {
-			throw new \InvalidArgumentException('Invalid Federated Cloud ID', 0, $e);
-		}
-	}
+    /**
+     * split user and remote from federated cloud id
+     *
+     * @param string $address federated share address
+     * @return array [user, remoteURL]
+     * @throws \InvalidArgumentException
+     */
+    public function splitUserRemote($address) {
+        try {
+            $cloudId = $this->cloudIdManager->resolveCloudId($address);
+            return [$cloudId->getUser(), $cloudId->getRemote()];
+        } catch (\InvalidArgumentException $e) {
+            throw new \InvalidArgumentException('Invalid Federated Cloud ID', 0, $e);
+        }
+    }
 }

lib/private/Collaboration/Collaborators/Search.php

Spacing +5 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
 		$searchResult = $this->c->resolve(SearchResult::class);
 
 		foreach ($shareTypes as $type) {
-			if(!isset($this->pluginList[$type])) {
+			if (!isset($this->pluginList[$type])) {
 				continue;
 			}
 			foreach ($this->pluginList[$type] as $plugin) {
@@ -70,18 +70,18 @@ 
 		// that the exact same email address and federated cloud id exists
 		$emailType = new SearchResultType('emails');
 		$remoteType = new SearchResultType('remotes');
-		if($searchResult->hasExactIdMatch($emailType) && !$searchResult->hasExactIdMatch($remoteType)) {
+		if ($searchResult->hasExactIdMatch($emailType) && !$searchResult->hasExactIdMatch($remoteType)) {
 			$searchResult->unsetResult($remoteType);
 		} elseif (!$searchResult->hasExactIdMatch($emailType) && $searchResult->hasExactIdMatch($remoteType)) {
 			$searchResult->unsetResult($emailType);
 		}
 
-		return [$searchResult->asArray(), (bool)$hasMoreResults];
+		return [$searchResult->asArray(), (bool) $hasMoreResults];
 	}
 
 	public function registerPlugin(array $pluginInfo) {
-		$shareType = constant(Share::class . '::' . $pluginInfo['shareType']);
-		if($shareType === null) {
+		$shareType = constant(Share::class.'::'.$pluginInfo['shareType']);
+		if ($shareType === null) {
 			throw new \InvalidArgumentException('Provided ShareType is invalid');
 		}
 		$this->pluginList[$shareType][] = $pluginInfo['class'];

Indentation +54 added lines, -54 removed lines

@@ -31,68 +31,68 @@
 use OCP\Share;
 
 class Search implements ISearch {
-	/** @var IContainer */
-	private $c;
+    /** @var IContainer */
+    private $c;
 
-	protected $pluginList = [];
+    protected $pluginList = [];
 
-	public function __construct(IContainer $c) {
-		$this->c = $c;
-	}
+    public function __construct(IContainer $c) {
+        $this->c = $c;
+    }
 
-	/**
-	 * @param string $search
-	 * @param array $shareTypes
-	 * @param bool $lookup
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @return array
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public function search($search, array $shareTypes, $lookup, $limit, $offset) {
-		$hasMoreResults = false;
+    /**
+     * @param string $search
+     * @param array $shareTypes
+     * @param bool $lookup
+     * @param int|null $limit
+     * @param int|null $offset
+     * @return array
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public function search($search, array $shareTypes, $lookup, $limit, $offset) {
+        $hasMoreResults = false;
 
-		/** @var ISearchResult $searchResult */
-		$searchResult = $this->c->resolve(SearchResult::class);
+        /** @var ISearchResult $searchResult */
+        $searchResult = $this->c->resolve(SearchResult::class);
 
-		foreach ($shareTypes as $type) {
-			if(!isset($this->pluginList[$type])) {
-				continue;
-			}
-			foreach ($this->pluginList[$type] as $plugin) {
-				/** @var ISearchPlugin $searchPlugin */
-				$searchPlugin = $this->c->resolve($plugin);
-				$hasMoreResults |= $searchPlugin->search($search, $limit, $offset, $searchResult);
-			}
-		}
+        foreach ($shareTypes as $type) {
+            if(!isset($this->pluginList[$type])) {
+                continue;
+            }
+            foreach ($this->pluginList[$type] as $plugin) {
+                /** @var ISearchPlugin $searchPlugin */
+                $searchPlugin = $this->c->resolve($plugin);
+                $hasMoreResults |= $searchPlugin->search($search, $limit, $offset, $searchResult);
+            }
+        }
 
-		// Get from lookup server, not a separate share type
-		if ($lookup) {
-			$searchPlugin = $this->c->resolve(LookupPlugin::class);
-			$hasMoreResults |= $searchPlugin->search($search, $limit, $offset, $searchResult);
-		}
+        // Get from lookup server, not a separate share type
+        if ($lookup) {
+            $searchPlugin = $this->c->resolve(LookupPlugin::class);
+            $hasMoreResults |= $searchPlugin->search($search, $limit, $offset, $searchResult);
+        }
 
-		// sanitizing, could go into the plugins as well
+        // sanitizing, could go into the plugins as well
 
-		// if we have a exact match, either for the federated cloud id or for the
-		// email address we only return the exact match. It is highly unlikely
-		// that the exact same email address and federated cloud id exists
-		$emailType = new SearchResultType('emails');
-		$remoteType = new SearchResultType('remotes');
-		if($searchResult->hasExactIdMatch($emailType) && !$searchResult->hasExactIdMatch($remoteType)) {
-			$searchResult->unsetResult($remoteType);
-		} elseif (!$searchResult->hasExactIdMatch($emailType) && $searchResult->hasExactIdMatch($remoteType)) {
-			$searchResult->unsetResult($emailType);
-		}
+        // if we have a exact match, either for the federated cloud id or for the
+        // email address we only return the exact match. It is highly unlikely
+        // that the exact same email address and federated cloud id exists
+        $emailType = new SearchResultType('emails');
+        $remoteType = new SearchResultType('remotes');
+        if($searchResult->hasExactIdMatch($emailType) && !$searchResult->hasExactIdMatch($remoteType)) {
+            $searchResult->unsetResult($remoteType);
+        } elseif (!$searchResult->hasExactIdMatch($emailType) && $searchResult->hasExactIdMatch($remoteType)) {
+            $searchResult->unsetResult($emailType);
+        }
 
-		return [$searchResult->asArray(), (bool)$hasMoreResults];
-	}
+        return [$searchResult->asArray(), (bool)$hasMoreResults];
+    }
 
-	public function registerPlugin(array $pluginInfo) {
-		$shareType = constant(Share::class . '::' . $pluginInfo['shareType']);
-		if($shareType === null) {
-			throw new \InvalidArgumentException('Provided ShareType is invalid');
-		}
-		$this->pluginList[$shareType][] = $pluginInfo['class'];
-	}
+    public function registerPlugin(array $pluginInfo) {
+        $shareType = constant(Share::class . '::' . $pluginInfo['shareType']);
+        if($shareType === null) {
+            throw new \InvalidArgumentException('Provided ShareType is invalid');
+        }
+        $this->pluginList[$shareType][] = $pluginInfo['class'];
+    }
 }