nextcloud / server

lib/private/Repair/Owncloud/DropAccountTermsTable.php

Indentation +27 added lines, -27 removed lines

@@ -29,32 +29,32 @@
 
 class DropAccountTermsTable implements IRepairStep {
 
-	/** @var IDBConnection */
-	protected $db;
-
-	/**
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		$this->db = $db;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Drop account terms table when migrating from ownCloud';
-	}
-
-	/**
-	 * @param IOutput $output
-	 */
-	public function run(IOutput $output) {
-		if (!$this->db->tableExists('account_terms')) {
-			return;
-		}
-
-		$this->db->dropTable('account_terms');
-	}
+    /** @var IDBConnection */
+    protected $db;
+
+    /**
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        $this->db = $db;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Drop account terms table when migrating from ownCloud';
+    }
+
+    /**
+     * @param IOutput $output
+     */
+    public function run(IOutput $output) {
+        if (!$this->db->tableExists('account_terms')) {
+            return;
+        }
+
+        $this->db->dropTable('account_terms');
+    }
 }
 

apps/files_external/lib/Lib/Auth/InvalidAuth.php

Indentation +13 added lines, -13 removed lines

@@ -27,18 +27,18 @@
  */
 class InvalidAuth extends AuthMechanism {
 
-	/**
-	 * Constructs a new InvalidAuth with the id of the invalid auth
-	 * for display purposes
-	 *
-	 * @param string $invalidId invalid id
-	 */
-	public function __construct($invalidId) {
-		$this
-			->setIdentifier($invalidId)
-			->setScheme(self::SCHEME_NULL)
-			->setText('Unknown auth mechanism backend ' . $invalidId)
-		;
-	}
+    /**
+     * Constructs a new InvalidAuth with the id of the invalid auth
+     * for display purposes
+     *
+     * @param string $invalidId invalid id
+     */
+    public function __construct($invalidId) {
+        $this
+            ->setIdentifier($invalidId)
+            ->setScheme(self::SCHEME_NULL)
+            ->setText('Unknown auth mechanism backend ' . $invalidId)
+        ;
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 		$this
 			->setIdentifier($invalidId)
 			->setScheme(self::SCHEME_NULL)
-			->setText('Unknown auth mechanism backend ' . $invalidId)
+			->setText('Unknown auth mechanism backend '.$invalidId)
 		;
 	}
 }

apps/user_ldap/lib/IGroupLDAP.php

Indentation +13 added lines, -13 removed lines

@@ -26,20 +26,20 @@
 
 interface IGroupLDAP {
 
-	//Used by LDAPProvider
+    //Used by LDAPProvider
 
-	/**
-	 * Return access for LDAP interaction.
-	 * @param string $gid
-	 * @return Access instance of Access for LDAP interaction
-	 */
-	public function getLDAPAccess($gid);
+    /**
+     * Return access for LDAP interaction.
+     * @param string $gid
+     * @return Access instance of Access for LDAP interaction
+     */
+    public function getLDAPAccess($gid);
 
-	/**
-	 * Return a new LDAP connection for the specified group.
-	 * @param string $gid
-	 * @return resource of the LDAP connection
-	 */
-	public function getNewLDAPConnection($gid);
+    /**
+     * Return a new LDAP connection for the specified group.
+     * @param string $gid
+     * @return resource of the LDAP connection
+     */
+    public function getNewLDAPConnection($gid);
 
 }

lib/public/Authentication/IApacheBackend.php

Indentation +20 added lines, -20 removed lines

@@ -38,27 +38,27 @@
  */
 interface IApacheBackend {
 
-	/**
-	 * In case the user has been authenticated by a module true is returned.
-	 *
-	 * @return boolean whether the module reports a user as currently logged in.
-	 * @since 6.0.0
-	 */
-	public function isSessionActive();
+    /**
+     * In case the user has been authenticated by a module true is returned.
+     *
+     * @return boolean whether the module reports a user as currently logged in.
+     * @since 6.0.0
+     */
+    public function isSessionActive();
 
-	/**
-	 * Gets the current logout URL
-	 *
-	 * @return string
-	 * @since 12.0.3
-	 */
-	public function getLogoutUrl();
+    /**
+     * Gets the current logout URL
+     *
+     * @return string
+     * @since 12.0.3
+     */
+    public function getLogoutUrl();
 
-	/**
-	 * Return the id of the current user
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getCurrentUserId();
+    /**
+     * Return the id of the current user
+     * @return string
+     * @since 6.0.0
+     */
+    public function getCurrentUserId();
 
 }

lib/private/Command/AsyncBus.php

Indentation +66 added lines, -66 removed lines

@@ -29,76 +29,76 @@
  * Asynchronous command bus that uses the background job system as backend
  */
 abstract class AsyncBus implements IBus {
-	/**
-	 * List of traits for command which require sync execution
-	 *
-	 * @var string[]
-	 */
-	private $syncTraits = [];
+    /**
+     * List of traits for command which require sync execution
+     *
+     * @var string[]
+     */
+    private $syncTraits = [];
 
-	/**
-	 * Schedule a command to be fired
-	 *
-	 * @param \OCP\Command\ICommand | callable $command
-	 */
-	public function push($command) {
-		if ($this->canRunAsync($command)) {
-			$this->queueCommand($command);
-		} else {
-			$this->runCommand($command);
-		}
-	}
+    /**
+     * Schedule a command to be fired
+     *
+     * @param \OCP\Command\ICommand | callable $command
+     */
+    public function push($command) {
+        if ($this->canRunAsync($command)) {
+            $this->queueCommand($command);
+        } else {
+            $this->runCommand($command);
+        }
+    }
 
-	/**
-	 * Queue a command in the bus
-	 *
-	 * @param \OCP\Command\ICommand | callable $command
-	 */
-	abstract protected function queueCommand($command);
+    /**
+     * Queue a command in the bus
+     *
+     * @param \OCP\Command\ICommand | callable $command
+     */
+    abstract protected function queueCommand($command);
 
-	/**
-	 * Require all commands using a trait to be run synchronous
-	 *
-	 * @param string $trait
-	 */
-	public function requireSync($trait) {
-		$this->syncTraits[] = trim($trait, '\\');
-	}
+    /**
+     * Require all commands using a trait to be run synchronous
+     *
+     * @param string $trait
+     */
+    public function requireSync($trait) {
+        $this->syncTraits[] = trim($trait, '\\');
+    }
 
-	/**
-	 * @param \OCP\Command\ICommand | callable $command
-	 */
-	private function runCommand($command) {
-		if ($command instanceof ICommand) {
-			$command->handle();
-		} else {
-			$command();
-		}
-	}
+    /**
+     * @param \OCP\Command\ICommand | callable $command
+     */
+    private function runCommand($command) {
+        if ($command instanceof ICommand) {
+            $command->handle();
+        } else {
+            $command();
+        }
+    }
 
-	/**
-	 * @param \OCP\Command\ICommand | callable $command
-	 * @return bool
-	 */
-	private function canRunAsync($command) {
-		$traits = $this->getTraits($command);
-		foreach ($traits as $trait) {
-			if (array_search($trait, $this->syncTraits) !== false) {
-				return false;
-			}
-		}
-		return true;
-	}
+    /**
+     * @param \OCP\Command\ICommand | callable $command
+     * @return bool
+     */
+    private function canRunAsync($command) {
+        $traits = $this->getTraits($command);
+        foreach ($traits as $trait) {
+            if (array_search($trait, $this->syncTraits) !== false) {
+                return false;
+            }
+        }
+        return true;
+    }
 
-	/**
-	 * @param \OCP\Command\ICommand | callable $command
-	 * @return string[]
-	 */
-	private function getTraits($command) {
-		if ($command instanceof ICommand) {
-			return class_uses($command);
-		} else {
-			return [];
-		}
-	}
+    /**
+     * @param \OCP\Command\ICommand | callable $command
+     * @return string[]
+     */
+    private function getTraits($command) {
+        if ($command instanceof ICommand) {
+            return class_uses($command);
+        } else {
+            return [];
+        }
+    }
 }

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

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([

Indentation +70 added lines, -70 removed lines

@@ -31,81 +31,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 = [];
-		if (empty($config['dbuser']) && empty($config['dbname'])) {
-			$errors[] = $this->trans->t("%s enter the database username and name.", [$this->dbprettyname]);
-		} elseif (empty($config['dbuser'])) {
-			$errors[] = $this->trans->t("%s enter the database username.", [$this->dbprettyname]);
-		} elseif (empty($config['dbname'])) {
-			$errors[] = $this->trans->t("%s enter the database name.", [$this->dbprettyname]);
-		}
-		return $errors;
-	}
+    public function validate($config) {
+        $errors = [];
+        if (empty($config['dbuser']) && empty($config['dbname'])) {
+            $errors[] = $this->trans->t("%s enter the database username and name.", [$this->dbprettyname]);
+        } elseif (empty($config['dbuser'])) {
+            $errors[] = $this->trans->t("%s enter the database username.", [$this->dbprettyname]);
+        } elseif (empty($config['dbname'])) {
+            $errors[] = $this->trans->t("%s enter the database name.", [$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 (['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 (['message', 'code'] as $key) {
+            if (isset($error[$key])) {
+                return $error[$key];
+            }
+        }
+        return '';
+    }
 }

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