nextcloud / server

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

apps/files_trashbin/lib/Events/MoveToTrashEvent.php

Indentation +30 added lines, -30 removed lines

@@ -35,39 +35,39 @@
  */
 class MoveToTrashEvent extends Event {
 
-	/** @var bool */
-	private $moveToTrashBin;
+    /** @var bool */
+    private $moveToTrashBin;
 
-	/** @var Node */
-	private $node;
+    /** @var Node */
+    private $node;
 
-	public function __construct(Node $node) {
-		$this->moveToTrashBin = true;
-		$this->node = $node;
-	}
+    public function __construct(Node $node) {
+        $this->moveToTrashBin = true;
+        $this->node = $node;
+    }
 
-	/**
-	 * get Node which will be deleted
-	 *
-	 * @return Node
-	 */
-	public function getNode() {
-		return $this->node;
-	}
+    /**
+     * get Node which will be deleted
+     *
+     * @return Node
+     */
+    public function getNode() {
+        return $this->node;
+    }
 
-	/**
-	 * disable trash bin for this operation
-	 */
-	public function disableTrashBin() {
-		$this->moveToTrashBin = false;
-	}
+    /**
+     * disable trash bin for this operation
+     */
+    public function disableTrashBin() {
+        $this->moveToTrashBin = false;
+    }
 
-	/**
-	 * should the file be moved to the trash bin?
-	 *
-	 * @return bool
-	 */
-	public function shouldMoveToTrashBin() {
-		return $this->moveToTrashBin;
-	}
+    /**
+     * should the file be moved to the trash bin?
+     *
+     * @return bool
+     */
+    public function shouldMoveToTrashBin() {
+        return $this->moveToTrashBin;
+    }
 }

apps/files_versions/lib/Events/CreateVersionEvent.php

Indentation +35 added lines, -35 removed lines

@@ -37,45 +37,45 @@
 class CreateVersionEvent extends Event {
 
 
-	/** @var bool */
-	private $createVersion;
+    /** @var bool */
+    private $createVersion;
 
-	/** @var Node */
-	private $node;
+    /** @var Node */
+    private $node;
 
-	/**
-	 * CreateVersionEvent constructor.
-	 *
-	 * @param Node $node
-	 */
-	public function __construct(Node $node) {
-		$this->createVersion = true;
-		$this->node = $node;
-	}
+    /**
+     * CreateVersionEvent constructor.
+     *
+     * @param Node $node
+     */
+    public function __construct(Node $node) {
+        $this->createVersion = true;
+        $this->node = $node;
+    }
 
-	/**
-	 * get Node of the file which should be versioned
-	 *
-	 * @return Node
-	 */
-	public function getNode() {
-		return $this->node;
-	}
+    /**
+     * get Node of the file which should be versioned
+     *
+     * @return Node
+     */
+    public function getNode() {
+        return $this->node;
+    }
 
-	/**
-	 * disable versions for this file
-	 */
-	public function disableVersions() {
-		$this->createVersion = false;
-	}
+    /**
+     * disable versions for this file
+     */
+    public function disableVersions() {
+        $this->createVersion = false;
+    }
 
-	/**
-	 * should a version be created for this file?
-	 *
-	 * @return bool
-	 */
-	public function shouldCreateVersion() {
-		return $this->createVersion;
-	}
+    /**
+     * should a version be created for this file?
+     *
+     * @return bool
+     */
+    public function shouldCreateVersion() {
+        return $this->createVersion;
+    }
 
 }

lib/private/AppFramework/Middleware/Security/Exceptions/LaxSameSiteCookieFailedException.php

Indentation +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@
  * @package OC\AppFramework\Middleware\Security\Exceptions
  */
 class LaxSameSiteCookieFailedException extends SecurityException {
-	public function __construct() {
-		parent::__construct('Lax Same Site Cookie is invalid in request.', Http::STATUS_PRECONDITION_FAILED);
-	}
+    public function __construct() {
+        parent::__construct('Lax Same Site Cookie is invalid in request.', Http::STATUS_PRECONDITION_FAILED);
+    }
 }

apps/dav/lib/CardDAV/ContactsManager.php

Indentation +50 added lines, -50 removed lines

@@ -29,60 +29,60 @@
 use OCP\IURLGenerator;
 
 class ContactsManager {
-	/** @var CardDavBackend  */
-	private $backend;
+    /** @var CardDavBackend  */
+    private $backend;
 
-	/** @var IL10N  */
-	private $l10n;
+    /** @var IL10N  */
+    private $l10n;
 
-	/**
-	 * ContactsManager constructor.
-	 *
-	 * @param CardDavBackend $backend
-	 * @param IL10N $l10n
-	 */
-	public function __construct(CardDavBackend $backend, IL10N $l10n) {
-		$this->backend = $backend;
-		$this->l10n = $l10n;
-	}
+    /**
+     * ContactsManager constructor.
+     *
+     * @param CardDavBackend $backend
+     * @param IL10N $l10n
+     */
+    public function __construct(CardDavBackend $backend, IL10N $l10n) {
+        $this->backend = $backend;
+        $this->l10n = $l10n;
+    }
 
-	/**
-	 * @param IManager $cm
-	 * @param string $userId
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function setupContactsProvider(IManager $cm, $userId, IURLGenerator $urlGenerator) {
-		$addressBooks = $this->backend->getAddressBooksForUser("principals/users/$userId");
-		$this->register($cm, $addressBooks, $urlGenerator);
-		$this->setupSystemContactsProvider($cm, $urlGenerator);
-	}
+    /**
+     * @param IManager $cm
+     * @param string $userId
+     * @param IURLGenerator $urlGenerator
+     */
+    public function setupContactsProvider(IManager $cm, $userId, IURLGenerator $urlGenerator) {
+        $addressBooks = $this->backend->getAddressBooksForUser("principals/users/$userId");
+        $this->register($cm, $addressBooks, $urlGenerator);
+        $this->setupSystemContactsProvider($cm, $urlGenerator);
+    }
 
-	/**
-	 * @param IManager $cm
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function setupSystemContactsProvider(IManager $cm, IURLGenerator $urlGenerator) {
-		$addressBooks = $this->backend->getAddressBooksForUser("principals/system/system");
-		$this->register($cm, $addressBooks, $urlGenerator);
-	}
+    /**
+     * @param IManager $cm
+     * @param IURLGenerator $urlGenerator
+     */
+    public function setupSystemContactsProvider(IManager $cm, IURLGenerator $urlGenerator) {
+        $addressBooks = $this->backend->getAddressBooksForUser("principals/system/system");
+        $this->register($cm, $addressBooks, $urlGenerator);
+    }
 
-	/**
-	 * @param IManager $cm
-	 * @param $addressBooks
-	 * @param IURLGenerator $urlGenerator
-	 */
-	private function register(IManager $cm, $addressBooks, $urlGenerator) {
-		foreach ($addressBooks as $addressBookInfo) {
-			$addressBook = new \OCA\DAV\CardDAV\AddressBook($this->backend, $addressBookInfo, $this->l10n);
-			$cm->registerAddressBook(
-				new AddressBookImpl(
-					$addressBook,
-					$addressBookInfo,
-					$this->backend,
-					$urlGenerator
-				)
-			);
-		}
-	}
+    /**
+     * @param IManager $cm
+     * @param $addressBooks
+     * @param IURLGenerator $urlGenerator
+     */
+    private function register(IManager $cm, $addressBooks, $urlGenerator) {
+        foreach ($addressBooks as $addressBookInfo) {
+            $addressBook = new \OCA\DAV\CardDAV\AddressBook($this->backend, $addressBookInfo, $this->l10n);
+            $cm->registerAddressBook(
+                new AddressBookImpl(
+                    $addressBook,
+                    $addressBookInfo,
+                    $this->backend,
+                    $urlGenerator
+                )
+            );
+        }
+    }
 
 }

apps/twofactor_backupcodes/lib/Migration/Version1002Date20170926101419.php

Indentation +10 added lines, -10 removed lines

@@ -11,15 +11,15 @@
  */
 class Version1002Date20170926101419 extends BigIntMigration {
 
-	/**
-	 * @return array Returns an array with the following structure
-	 * ['table1' => ['column1', 'column2'], ...]
-	 * @since 13.0.0
-	 */
-	protected function getColumnsByTable() {
-		return [
-			'twofactor_backupcodes' => ['id'],
-		];
-	}
+    /**
+     * @return array Returns an array with the following structure
+     * ['table1' => ['column1', 'column2'], ...]
+     * @since 13.0.0
+     */
+    protected function getColumnsByTable() {
+        return [
+            'twofactor_backupcodes' => ['id'],
+        ];
+    }
 
 }

apps/dav/lib/Migration/Version1004Date20170926103422.php

Indentation +20 added lines, -20 removed lines

@@ -11,25 +11,25 @@
  */
 class Version1004Date20170926103422 extends BigIntMigration {
 
-	/**
-	 * @return array Returns an array with the following structure
-	 * ['table1' => ['column1', 'column2'], ...]
-	 * @since 13.0.0
-	 */
-	protected function getColumnsByTable() {
-		return [
-			'addressbooks' => ['id'],
-			'addressbookchanges' => ['id', 'addressbookid'],
-			'calendars' => ['id'],
-			'calendarchanges' => ['id', 'calendarid'],
-			'calendarobjects' => ['id', 'calendarid'],
-			'calendarobjects_props' => ['id', 'calendarid', 'objectid'],
-			'calendarsubscriptions' => ['id'],
-			'cards' => ['id', 'addressbookid'],
-			'cards_properties' => ['id', 'addressbookid', 'cardid'],
-			'dav_shares' => ['id', 'resourceid'],
-			'schedulingobjects' => ['id'],
-		];
-	}
+    /**
+     * @return array Returns an array with the following structure
+     * ['table1' => ['column1', 'column2'], ...]
+     * @since 13.0.0
+     */
+    protected function getColumnsByTable() {
+        return [
+            'addressbooks' => ['id'],
+            'addressbookchanges' => ['id', 'addressbookid'],
+            'calendars' => ['id'],
+            'calendarchanges' => ['id', 'calendarid'],
+            'calendarobjects' => ['id', 'calendarid'],
+            'calendarobjects_props' => ['id', 'calendarid', 'objectid'],
+            'calendarsubscriptions' => ['id'],
+            'cards' => ['id', 'addressbookid'],
+            'cards_properties' => ['id', 'addressbookid', 'cardid'],
+            'dav_shares' => ['id', 'resourceid'],
+            'schedulingobjects' => ['id'],
+        ];
+    }
 
 }