nextcloud / server

lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php

Spacing +3 added lines, -3 removed lines

@@ -147,7 +147,7 @@ 
 	public function castColumn($column, $type) {
 		if ($type === IQueryBuilder::PARAM_STR) {
 			$column = $this->helper->quoteColumnName($column);
-			return new QueryFunction('to_char(' . $column . ')');
+			return new QueryFunction('to_char('.$column.')');
 		}
 
 		return parent::castColumn($column, $type);
@@ -157,7 +157,7 @@ 
 	 * @inheritdoc
 	 */
 	public function like($x, $y, $type = null) {
-		return parent::like($x, $y, $type) . " ESCAPE '\\'";
+		return parent::like($x, $y, $type)." ESCAPE '\\'";
 	}
 
 	/**
@@ -166,6 +166,6 @@ 
 	public function iLike($x, $y, $type = null) {
 		$x = $this->helper->quoteColumnName($x);
 		$y = $this->helper->quoteColumnName($y);
-		return new QueryFunction('REGEXP_LIKE(' . $x . ', \'^\' || REPLACE(REPLACE(' . $y . ', \'%\', \'.*\'), \'_\', \'.\') || \'$\', \'i\')');
+		return new QueryFunction('REGEXP_LIKE('.$x.', \'^\' || REPLACE(REPLACE('.$y.', \'%\', \'.*\'), \'_\', \'.\') || \'$\', \'i\')');
 	}
 }

Indentation +157 added lines, -157 removed lines

@@ -33,161 +33,161 @@
 
 class OCIExpressionBuilder extends ExpressionBuilder {
 
-	/**
-	 * @param mixed $column
-	 * @param mixed|null $type
-	 * @return array|IQueryFunction|string
-	 */
-	protected function prepareColumn($column, $type) {
-		if ($type === IQueryBuilder::PARAM_STR && !is_array($column) && !($column instanceof IParameter) && !($column instanceof ILiteral)) {
-			$column = $this->castColumn($column, $type);
-		} else {
-			$column = $this->helper->quoteColumnNames($column);
-		}
-		return $column;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function comparison($x, $operator, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->comparison($x, $operator, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function eq($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->eq($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function neq($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->neq($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function lt($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->lt($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function lte($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->lte($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function gt($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->gt($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function gte($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->gte($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function in($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->in($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function notIn($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->notIn($x, $y);
-	}
-
-	/**
-	 * Creates a $x = '' statement, because Oracle needs a different check
-	 *
-	 * @param string $x The field in string format to be inspected by the comparison.
-	 * @return string
-	 * @since 13.0.0
-	 */
-	public function emptyString($x) {
-		return $this->isNull($x);
-	}
-
-	/**
-	 * Creates a `$x <> ''` statement, because Oracle needs a different check
-	 *
-	 * @param string $x The field in string format to be inspected by the comparison.
-	 * @return string
-	 * @since 13.0.0
-	 */
-	public function nonEmptyString($x) {
-		return $this->isNotNull($x);
-	}
-
-	/**
-	 * Returns a IQueryFunction that casts the column to the given type
-	 *
-	 * @param string $column
-	 * @param mixed $type One of IQueryBuilder::PARAM_*
-	 * @return IQueryFunction
-	 */
-	public function castColumn($column, $type) {
-		if ($type === IQueryBuilder::PARAM_STR) {
-			$column = $this->helper->quoteColumnName($column);
-			return new QueryFunction('to_char(' . $column . ')');
-		}
-
-		return parent::castColumn($column, $type);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function like($x, $y, $type = null) {
-		return parent::like($x, $y, $type) . " ESCAPE '\\'";
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function iLike($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return new QueryFunction('REGEXP_LIKE(' . $x . ', \'^\' || REPLACE(REPLACE(' . $y . ', \'%\', \'.*\'), \'_\', \'.\') || \'$\', \'i\')');
-	}
+    /**
+     * @param mixed $column
+     * @param mixed|null $type
+     * @return array|IQueryFunction|string
+     */
+    protected function prepareColumn($column, $type) {
+        if ($type === IQueryBuilder::PARAM_STR && !is_array($column) && !($column instanceof IParameter) && !($column instanceof ILiteral)) {
+            $column = $this->castColumn($column, $type);
+        } else {
+            $column = $this->helper->quoteColumnNames($column);
+        }
+        return $column;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function comparison($x, $operator, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->comparison($x, $operator, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function eq($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->eq($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function neq($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->neq($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function lt($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->lt($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function lte($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->lte($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function gt($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->gt($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function gte($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->gte($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function in($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->in($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function notIn($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->notIn($x, $y);
+    }
+
+    /**
+     * Creates a $x = '' statement, because Oracle needs a different check
+     *
+     * @param string $x The field in string format to be inspected by the comparison.
+     * @return string
+     * @since 13.0.0
+     */
+    public function emptyString($x) {
+        return $this->isNull($x);
+    }
+
+    /**
+     * Creates a `$x <> ''` statement, because Oracle needs a different check
+     *
+     * @param string $x The field in string format to be inspected by the comparison.
+     * @return string
+     * @since 13.0.0
+     */
+    public function nonEmptyString($x) {
+        return $this->isNotNull($x);
+    }
+
+    /**
+     * Returns a IQueryFunction that casts the column to the given type
+     *
+     * @param string $column
+     * @param mixed $type One of IQueryBuilder::PARAM_*
+     * @return IQueryFunction
+     */
+    public function castColumn($column, $type) {
+        if ($type === IQueryBuilder::PARAM_STR) {
+            $column = $this->helper->quoteColumnName($column);
+            return new QueryFunction('to_char(' . $column . ')');
+        }
+
+        return parent::castColumn($column, $type);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function like($x, $y, $type = null) {
+        return parent::like($x, $y, $type) . " ESCAPE '\\'";
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function iLike($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return new QueryFunction('REGEXP_LIKE(' . $x . ', \'^\' || REPLACE(REPLACE(' . $y . ', \'%\', \'.*\'), \'_\', \'.\') || \'$\', \'i\')');
+    }
 }

apps/files_external/lib/Controller/GlobalStoragesController.php

Spacing +1 added lines, -1 removed lines

@@ -197,7 +197,7 @@
 		} catch (NotFoundException $e) {
 			return new DataResponse(
 				[
-					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', [$id])
+					'message' => (string) $this->l10n->t('Storage with ID "%d" not found', [$id])
 				],
 				Http::STATUS_NOT_FOUND
 			);

Indentation +134 added lines, -134 removed lines

@@ -40,148 +40,148 @@
  * Global storages controller
  */
 class GlobalStoragesController extends StoragesController {
-	/**
-	 * Creates a new global storages controller.
-	 *
-	 * @param string $AppName application name
-	 * @param IRequest $request request object
-	 * @param IL10N $l10n l10n service
-	 * @param GlobalStoragesService $globalStoragesService storage service
-	 * @param ILogger $logger
-	 */
-	public function __construct(
-		$AppName,
-		IRequest $request,
-		IL10N $l10n,
-		GlobalStoragesService $globalStoragesService,
-		ILogger $logger
-	) {
-		parent::__construct(
-			$AppName,
-			$request,
-			$l10n,
-			$globalStoragesService,
-			$logger
-		);
-	}
+    /**
+     * Creates a new global storages controller.
+     *
+     * @param string $AppName application name
+     * @param IRequest $request request object
+     * @param IL10N $l10n l10n service
+     * @param GlobalStoragesService $globalStoragesService storage service
+     * @param ILogger $logger
+     */
+    public function __construct(
+        $AppName,
+        IRequest $request,
+        IL10N $l10n,
+        GlobalStoragesService $globalStoragesService,
+        ILogger $logger
+    ) {
+        parent::__construct(
+            $AppName,
+            $request,
+            $l10n,
+            $globalStoragesService,
+            $logger
+        );
+    }
 
-	/**
-	 * Create an external storage entry.
-	 *
-	 * @param string $mountPoint storage mount point
-	 * @param string $backend backend identifier
-	 * @param string $authMechanism authentication mechanism identifier
-	 * @param array $backendOptions backend-specific options
-	 * @param array $mountOptions mount-specific options
-	 * @param array $applicableUsers users for which to mount the storage
-	 * @param array $applicableGroups groups for which to mount the storage
-	 * @param int $priority priority
-	 *
-	 * @return DataResponse
-	 */
-	public function create(
-		$mountPoint,
-		$backend,
-		$authMechanism,
-		$backendOptions,
-		$mountOptions,
-		$applicableUsers,
-		$applicableGroups,
-		$priority
-	) {
-		$newStorage = $this->createStorage(
-			$mountPoint,
-			$backend,
-			$authMechanism,
-			$backendOptions,
-			$mountOptions,
-			$applicableUsers,
-			$applicableGroups,
-			$priority
-		);
-		if ($newStorage instanceof DataResponse) {
-			return $newStorage;
-		}
+    /**
+     * Create an external storage entry.
+     *
+     * @param string $mountPoint storage mount point
+     * @param string $backend backend identifier
+     * @param string $authMechanism authentication mechanism identifier
+     * @param array $backendOptions backend-specific options
+     * @param array $mountOptions mount-specific options
+     * @param array $applicableUsers users for which to mount the storage
+     * @param array $applicableGroups groups for which to mount the storage
+     * @param int $priority priority
+     *
+     * @return DataResponse
+     */
+    public function create(
+        $mountPoint,
+        $backend,
+        $authMechanism,
+        $backendOptions,
+        $mountOptions,
+        $applicableUsers,
+        $applicableGroups,
+        $priority
+    ) {
+        $newStorage = $this->createStorage(
+            $mountPoint,
+            $backend,
+            $authMechanism,
+            $backendOptions,
+            $mountOptions,
+            $applicableUsers,
+            $applicableGroups,
+            $priority
+        );
+        if ($newStorage instanceof DataResponse) {
+            return $newStorage;
+        }
 
-		$response = $this->validate($newStorage);
-		if (!empty($response)) {
-			return $response;
-		}
+        $response = $this->validate($newStorage);
+        if (!empty($response)) {
+            return $response;
+        }
 
-		$newStorage = $this->service->addStorage($newStorage);
+        $newStorage = $this->service->addStorage($newStorage);
 
-		$this->updateStorageStatus($newStorage);
+        $this->updateStorageStatus($newStorage);
 
-		return new DataResponse(
-			$this->formatStorageForUI($newStorage),
-			Http::STATUS_CREATED
-		);
-	}
+        return new DataResponse(
+            $this->formatStorageForUI($newStorage),
+            Http::STATUS_CREATED
+        );
+    }
 
-	/**
-	 * Update an external storage entry.
-	 *
-	 * @param int $id storage id
-	 * @param string $mountPoint storage mount point
-	 * @param string $backend backend identifier
-	 * @param string $authMechanism authentication mechansim identifier
-	 * @param array $backendOptions backend-specific options
-	 * @param array $mountOptions mount-specific options
-	 * @param array $applicableUsers users for which to mount the storage
-	 * @param array $applicableGroups groups for which to mount the storage
-	 * @param int $priority priority
-	 * @param bool $testOnly whether to storage should only test the connection or do more things
-	 *
-	 * @return DataResponse
-	 */
-	public function update(
-		$id,
-		$mountPoint,
-		$backend,
-		$authMechanism,
-		$backendOptions,
-		$mountOptions,
-		$applicableUsers,
-		$applicableGroups,
-		$priority,
-		$testOnly = true
-	) {
-		$storage = $this->createStorage(
-			$mountPoint,
-			$backend,
-			$authMechanism,
-			$backendOptions,
-			$mountOptions,
-			$applicableUsers,
-			$applicableGroups,
-			$priority
-		);
-		if ($storage instanceof DataResponse) {
-			return $storage;
-		}
-		$storage->setId($id);
+    /**
+     * Update an external storage entry.
+     *
+     * @param int $id storage id
+     * @param string $mountPoint storage mount point
+     * @param string $backend backend identifier
+     * @param string $authMechanism authentication mechansim identifier
+     * @param array $backendOptions backend-specific options
+     * @param array $mountOptions mount-specific options
+     * @param array $applicableUsers users for which to mount the storage
+     * @param array $applicableGroups groups for which to mount the storage
+     * @param int $priority priority
+     * @param bool $testOnly whether to storage should only test the connection or do more things
+     *
+     * @return DataResponse
+     */
+    public function update(
+        $id,
+        $mountPoint,
+        $backend,
+        $authMechanism,
+        $backendOptions,
+        $mountOptions,
+        $applicableUsers,
+        $applicableGroups,
+        $priority,
+        $testOnly = true
+    ) {
+        $storage = $this->createStorage(
+            $mountPoint,
+            $backend,
+            $authMechanism,
+            $backendOptions,
+            $mountOptions,
+            $applicableUsers,
+            $applicableGroups,
+            $priority
+        );
+        if ($storage instanceof DataResponse) {
+            return $storage;
+        }
+        $storage->setId($id);
 
-		$response = $this->validate($storage);
-		if (!empty($response)) {
-			return $response;
-		}
+        $response = $this->validate($storage);
+        if (!empty($response)) {
+            return $response;
+        }
 
-		try {
-			$storage = $this->service->updateStorage($storage);
-		} catch (NotFoundException $e) {
-			return new DataResponse(
-				[
-					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', [$id])
-				],
-				Http::STATUS_NOT_FOUND
-			);
-		}
+        try {
+            $storage = $this->service->updateStorage($storage);
+        } catch (NotFoundException $e) {
+            return new DataResponse(
+                [
+                    'message' => (string)$this->l10n->t('Storage with ID "%d" not found', [$id])
+                ],
+                Http::STATUS_NOT_FOUND
+            );
+        }
 
-		$this->updateStorageStatus($storage, $testOnly);
+        $this->updateStorageStatus($storage, $testOnly);
 
-		return new DataResponse(
-			$this->formatStorageForUI($storage),
-			Http::STATUS_OK
-		);
-	}
+        return new DataResponse(
+            $this->formatStorageForUI($storage),
+            Http::STATUS_OK
+        );
+    }
 }

lib/private/App/AppStore/Bundles/EducationBundle.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	 * {@inheritDoc}
 	 */
 	public function getName() {
-		return (string)$this->l10n->t('Education Edition');
+		return (string) $this->l10n->t('Education Edition');
 	}
 
 	/**

Indentation +19 added lines, -19 removed lines

@@ -25,24 +25,24 @@
 
 class EducationBundle extends Bundle {
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getName() {
-		return (string)$this->l10n->t('Education Edition');
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getName() {
+        return (string)$this->l10n->t('Education Edition');
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getAppIdentifiers() {
-		return [
-			'dashboard',
-			'circles',
-			'groupfolders',
-			'announcementcenter',
-			'quota_warning',
-			'user_saml',
-		];
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getAppIdentifiers() {
+        return [
+            'dashboard',
+            'circles',
+            'groupfolders',
+            'announcementcenter',
+            'quota_warning',
+            'user_saml',
+        ];
+    }
 }

lib/private/Setup/AbstractDatabase.php

Indentation +104 added lines, -104 removed lines

@@ -35,118 +35,118 @@
 
 abstract class AbstractDatabase {
 
-	/** @var IL10N */
-	protected $trans;
-	/** @var string */
-	protected $dbUser;
-	/** @var string */
-	protected $dbPassword;
-	/** @var string */
-	protected $dbName;
-	/** @var string */
-	protected $dbHost;
-	/** @var string */
-	protected $dbPort;
-	/** @var string */
-	protected $tablePrefix;
-	/** @var SystemConfig */
-	protected $config;
-	/** @var ILogger */
-	protected $logger;
-	/** @var ISecureRandom */
-	protected $random;
+    /** @var IL10N */
+    protected $trans;
+    /** @var string */
+    protected $dbUser;
+    /** @var string */
+    protected $dbPassword;
+    /** @var string */
+    protected $dbName;
+    /** @var string */
+    protected $dbHost;
+    /** @var string */
+    protected $dbPort;
+    /** @var string */
+    protected $tablePrefix;
+    /** @var SystemConfig */
+    protected $config;
+    /** @var ILogger */
+    protected $logger;
+    /** @var ISecureRandom */
+    protected $random;
 
-	public function __construct(IL10N $trans, SystemConfig $config, ILogger $logger, ISecureRandom $random) {
-		$this->trans = $trans;
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->random = $random;
-	}
+    public function __construct(IL10N $trans, SystemConfig $config, ILogger $logger, ISecureRandom $random) {
+        $this->trans = $trans;
+        $this->config = $config;
+        $this->logger = $logger;
+        $this->random = $random;
+    }
 
-	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]);
-		}
-		if (substr_count($config['dbname'], '.') >= 1) {
-			$errors[] = $this->trans->t("%s you may not use dots in 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]);
+        }
+        if (substr_count($config['dbname'], '.') >= 1) {
+            $errors[] = $this->trans->t("%s you may not use dots in the database name", [$this->dbprettyname]);
+        }
+        return $errors;
+    }
 
-	public function initialize($config) {
-		$dbUser = $config['dbuser'];
-		$dbPass = $config['dbpass'];
-		$dbName = $config['dbname'];
-		$dbHost = !empty($config['dbhost']) ? $config['dbhost'] : 'localhost';
-		$dbPort = !empty($config['dbport']) ? $config['dbport'] : '';
-		$dbTablePrefix = isset($config['dbtableprefix']) ? $config['dbtableprefix'] : 'oc_';
+    public function initialize($config) {
+        $dbUser = $config['dbuser'];
+        $dbPass = $config['dbpass'];
+        $dbName = $config['dbname'];
+        $dbHost = !empty($config['dbhost']) ? $config['dbhost'] : 'localhost';
+        $dbPort = !empty($config['dbport']) ? $config['dbport'] : '';
+        $dbTablePrefix = isset($config['dbtableprefix']) ? $config['dbtableprefix'] : 'oc_';
 
-		$this->config->setValues([
-			'dbname' => $dbName,
-			'dbhost' => $dbHost,
-			'dbport' => $dbPort,
-			'dbtableprefix' => $dbTablePrefix,
-		]);
+        $this->config->setValues([
+            'dbname' => $dbName,
+            'dbhost' => $dbHost,
+            'dbport' => $dbPort,
+            'dbtableprefix' => $dbTablePrefix,
+        ]);
 
-		$this->dbUser = $dbUser;
-		$this->dbPassword = $dbPass;
-		$this->dbName = $dbName;
-		$this->dbHost = $dbHost;
-		$this->dbPort = $dbPort;
-		$this->tablePrefix = $dbTablePrefix;
-	}
+        $this->dbUser = $dbUser;
+        $this->dbPassword = $dbPass;
+        $this->dbName = $dbName;
+        $this->dbHost = $dbHost;
+        $this->dbPort = $dbPort;
+        $this->tablePrefix = $dbTablePrefix;
+    }
 
-	/**
-	 * @param array $configOverwrite
-	 * @return \OC\DB\Connection
-	 */
-	protected function connect(array $configOverwrite = []) {
-		$connectionParams = [
-			'host' => $this->dbHost,
-			'user' => $this->dbUser,
-			'password' => $this->dbPassword,
-			'tablePrefix' => $this->tablePrefix,
-			'dbname' => $this->dbName
-		];
+    /**
+     * @param array $configOverwrite
+     * @return \OC\DB\Connection
+     */
+    protected function connect(array $configOverwrite = []) {
+        $connectionParams = [
+            'host' => $this->dbHost,
+            'user' => $this->dbUser,
+            'password' => $this->dbPassword,
+            'tablePrefix' => $this->tablePrefix,
+            'dbname' => $this->dbName
+        ];
 
-		// adding port support through installer
-		if (!empty($this->dbPort)) {
-			if (ctype_digit($this->dbPort)) {
-				$connectionParams['port'] = $this->dbPort;
-			} else {
-				$connectionParams['unix_socket'] = $this->dbPort;
-			}
-		} elseif (strpos($this->dbHost, ':')) {
-			// Host variable may carry a port or socket.
-			list($host, $portOrSocket) = explode(':', $this->dbHost, 2);
-			if (ctype_digit($portOrSocket)) {
-				$connectionParams['port'] = $portOrSocket;
-			} else {
-				$connectionParams['unix_socket'] = $portOrSocket;
-			}
-			$connectionParams['host'] = $host;
-		}
+        // adding port support through installer
+        if (!empty($this->dbPort)) {
+            if (ctype_digit($this->dbPort)) {
+                $connectionParams['port'] = $this->dbPort;
+            } else {
+                $connectionParams['unix_socket'] = $this->dbPort;
+            }
+        } elseif (strpos($this->dbHost, ':')) {
+            // Host variable may carry a port or socket.
+            list($host, $portOrSocket) = explode(':', $this->dbHost, 2);
+            if (ctype_digit($portOrSocket)) {
+                $connectionParams['port'] = $portOrSocket;
+            } else {
+                $connectionParams['unix_socket'] = $portOrSocket;
+            }
+            $connectionParams['host'] = $host;
+        }
 
-		$connectionParams = array_merge($connectionParams, $configOverwrite);
-		$cf = new ConnectionFactory($this->config);
-		return $cf->getConnection($this->config->getValue('dbtype', 'sqlite'), $connectionParams);
-	}
+        $connectionParams = array_merge($connectionParams, $configOverwrite);
+        $cf = new ConnectionFactory($this->config);
+        return $cf->getConnection($this->config->getValue('dbtype', 'sqlite'), $connectionParams);
+    }
 
-	/**
-	 * @param string $userName
-	 */
-	abstract public function setupDatabase($userName);
+    /**
+     * @param string $userName
+     */
+    abstract public function setupDatabase($userName);
 
-	public function runMigrations() {
-		if (!is_dir(\OC::$SERVERROOT."/core/Migrations")) {
-			return;
-		}
-		$ms = new MigrationService('core', \OC::$server->getDatabaseConnection());
-		$ms->migrate();
-	}
+    public function runMigrations() {
+        if (!is_dir(\OC::$SERVERROOT."/core/Migrations")) {
+            return;
+        }
+        $ms = new MigrationService('core', \OC::$server->getDatabaseConnection());
+        $ms->migrate();
+    }
 }

lib/private/DB/QueryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php

Indentation +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@
 use OC\DB\QueryBuilder\QueryFunction;
 
 class PgSqlFunctionBuilder extends FunctionBuilder {
-	public function concat($x, $y) {
-		return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')');
-	}
+    public function concat($x, $y) {
+        return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')');
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -25,6 +25,6 @@
 
 class PgSqlFunctionBuilder extends FunctionBuilder {
 	public function concat($x, $y) {
-		return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')');
+		return new QueryFunction('('.$this->helper->quoteColumnName($x).' || '.$this->helper->quoteColumnName($y).')');
 	}
 }

lib/private/Files/ObjectStore/S3.php

Indentation +12 added lines, -12 removed lines

@@ -24,18 +24,18 @@
 use OCP\Files\ObjectStore\IObjectStore;
 
 class S3 implements IObjectStore {
-	use S3ConnectionTrait;
-	use S3ObjectTrait;
+    use S3ConnectionTrait;
+    use S3ObjectTrait;
 
-	public function __construct($parameters) {
-		$this->parseParams($parameters);
-	}
+    public function __construct($parameters) {
+        $this->parseParams($parameters);
+    }
 
-	/**
-	 * @return string the container or bucket name where objects are stored
-	 * @since 7.0.0
-	 */
-	public function getStorageId() {
-		return $this->id;
-	}
+    /**
+     * @return string the container or bucket name where objects are stored
+     * @since 7.0.0
+     */
+    public function getStorageId() {
+        return $this->id;
+    }
 }

apps/files_sharing/lib/Middleware/OCSShareAPIMiddleware.php

Indentation +35 added lines, -35 removed lines

@@ -11,43 +11,43 @@
 use OCP\Share\IManager;
 
 class OCSShareAPIMiddleware extends Middleware {
-	/** @var IManager */
-	private $shareManager;
-	/** @var IL10N */
-	private $l;
+    /** @var IManager */
+    private $shareManager;
+    /** @var IL10N */
+    private $l;
 
-	public function __construct(IManager $shareManager,
-								IL10N $l) {
-		$this->shareManager = $shareManager;
-		$this->l = $l;
-	}
+    public function __construct(IManager $shareManager,
+                                IL10N $l) {
+        $this->shareManager = $shareManager;
+        $this->l = $l;
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 *
-	 * @throws OCSNotFoundException
-	 */
-	public function beforeController($controller, $methodName) {
-		if ($controller instanceof ShareAPIController) {
-			if (!$this->shareManager->shareApiEnabled()) {
-				throw new OCSNotFoundException($this->l->t('Share API is disabled'));
-			}
-		}
-	}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     *
+     * @throws OCSNotFoundException
+     */
+    public function beforeController($controller, $methodName) {
+        if ($controller instanceof ShareAPIController) {
+            if (!$this->shareManager->shareApiEnabled()) {
+                throw new OCSNotFoundException($this->l->t('Share API is disabled'));
+            }
+        }
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param Response $response
-	 * @return Response
-	 */
-	public function afterController($controller, $methodName, Response $response) {
-		if ($controller instanceof ShareAPIController) {
-			/** @var ShareAPIController $controller */
-			$controller->cleanup();
-		}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @param Response $response
+     * @return Response
+     */
+    public function afterController($controller, $methodName, Response $response) {
+        if ($controller instanceof ShareAPIController) {
+            /** @var ShareAPIController $controller */
+            $controller->cleanup();
+        }
 
-		return $response;
-	}
+        return $response;
+    }
 }

apps/federation/lib/DbHandler.php

Spacing +5 added lines, -5 removed lines

@@ -87,10 +87,10 @@ 
 		$result = $query->execute();
 
 		if ($result) {
-			return (int)$this->connection->lastInsertId('*PREFIX*'.$this->dbTable);
+			return (int) $this->connection->lastInsertId('*PREFIX*'.$this->dbTable);
 		}
 
-		$message = 'Internal failure, Could not add trusted server: ' . $url;
+		$message = 'Internal failure, Could not add trusted server: '.$url;
 		$message_t = $this->IL10N->t('Could not add server');
 		throw new HintException($message, $message_t);
 	}
@@ -124,7 +124,7 @@ 
 		$result = $query->execute()->fetchAll();
 
 		if (empty($result)) {
-			throw new \Exception('No Server found with ID: ' . $id);
+			throw new \Exception('No Server found with ID: '.$id);
 		}
 
 		return $result[0];
@@ -201,7 +201,7 @@ 
 		$statement->closeCursor();
 
 		if (!isset($result['token'])) {
-			throw new \Exception('No token found for: ' . $url);
+			throw new \Exception('No token found for: '.$url);
 		}
 
 		return $result['token'];
@@ -278,7 +278,7 @@ 
 		$statement = $query->execute();
 		$result = $statement->fetch();
 		$statement->closeCursor();
-		return (int)$result['status'];
+		return (int) $result['status'];
 	}
 
 	/**

Indentation +289 added lines, -289 removed lines

@@ -42,293 +42,293 @@
  */
 class DbHandler {
 
-	/** @var  IDBConnection */
-	private $connection;
-
-	/** @var  IL10N */
-	private $IL10N;
-
-	/** @var string  */
-	private $dbTable = 'trusted_servers';
-
-	/**
-	 * @param IDBConnection $connection
-	 * @param IL10N $il10n
-	 */
-	public function __construct(
-		IDBConnection $connection,
-		IL10N $il10n
-	) {
-		$this->connection = $connection;
-		$this->IL10N = $il10n;
-	}
-
-	/**
-	 * add server to the list of trusted servers
-	 *
-	 * @param string $url
-	 * @return int
-	 * @throws HintException
-	 */
-	public function addServer($url) {
-		$hash = $this->hash($url);
-		$url = rtrim($url, '/');
-		$query = $this->connection->getQueryBuilder();
-		$query->insert($this->dbTable)
-			->values(
-				[
-					'url' => $query->createParameter('url'),
-					'url_hash' => $query->createParameter('url_hash'),
-				]
-			)
-			->setParameter('url', $url)
-			->setParameter('url_hash', $hash);
-
-		$result = $query->execute();
-
-		if ($result) {
-			return (int)$this->connection->lastInsertId('*PREFIX*'.$this->dbTable);
-		}
-
-		$message = 'Internal failure, Could not add trusted server: ' . $url;
-		$message_t = $this->IL10N->t('Could not add server');
-		throw new HintException($message, $message_t);
-	}
-
-	/**
-	 * remove server from the list of trusted servers
-	 *
-	 * @param int $id
-	 */
-	public function removeServer($id) {
-		$query = $this->connection->getQueryBuilder();
-		$query->delete($this->dbTable)
-			->where($query->expr()->eq('id', $query->createParameter('id')))
-			->setParameter('id', $id);
-		$query->execute();
-	}
-
-	/**
-	 * get trusted server with given ID
-	 *
-	 * @param int $id
-	 * @return array
-	 * @throws \Exception
-	 */
-	public function getServerById($id) {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')->from($this->dbTable)
-			->where($query->expr()->eq('id', $query->createParameter('id')))
-			->setParameter('id', $id);
-		$query->execute();
-		$result = $query->execute()->fetchAll();
-
-		if (empty($result)) {
-			throw new \Exception('No Server found with ID: ' . $id);
-		}
-
-		return $result[0];
-	}
-
-	/**
-	 * get all trusted servers
-	 *
-	 * @return array
-	 */
-	public function getAllServer() {
-		$query = $this->connection->getQueryBuilder();
-		$query->select(['url', 'url_hash', 'id', 'status', 'shared_secret', 'sync_token'])
-			->from($this->dbTable);
-		$statement = $query->execute();
-		$result = $statement->fetchAll();
-		$statement->closeCursor();
-		return $result;
-	}
-
-	/**
-	 * check if server already exists in the database table
-	 *
-	 * @param string $url
-	 * @return bool
-	 */
-	public function serverExists($url) {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->select('url')
-			->from($this->dbTable)
-			->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-			->setParameter('url_hash', $hash);
-		$statement = $query->execute();
-		$result = $statement->fetchAll();
-		$statement->closeCursor();
-
-		return !empty($result);
-	}
-
-	/**
-	 * write token to database. Token is used to exchange the secret
-	 *
-	 * @param string $url
-	 * @param string $token
-	 */
-	public function addToken($url, $token) {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->update($this->dbTable)
-			->set('token', $query->createParameter('token'))
-			->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-			->setParameter('url_hash', $hash)
-			->setParameter('token', $token);
-		$query->execute();
-	}
-
-	/**
-	 * get token stored in database
-	 *
-	 * @param string $url
-	 * @return string
-	 * @throws \Exception
-	 */
-	public function getToken($url) {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->select('token')->from($this->dbTable)
-			->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-			->setParameter('url_hash', $hash);
-
-		$statement = $query->execute();
-		$result = $statement->fetch();
-		$statement->closeCursor();
-
-		if (!isset($result['token'])) {
-			throw new \Exception('No token found for: ' . $url);
-		}
-
-		return $result['token'];
-	}
-
-	/**
-	 * add shared Secret to database
-	 *
-	 * @param string $url
-	 * @param string $sharedSecret
-	 */
-	public function addSharedSecret($url, $sharedSecret) {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->update($this->dbTable)
-			->set('shared_secret', $query->createParameter('sharedSecret'))
-			->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-			->setParameter('url_hash', $hash)
-			->setParameter('sharedSecret', $sharedSecret);
-		$query->execute();
-	}
-
-	/**
-	 * get shared secret from database
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	public function getSharedSecret($url) {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->select('shared_secret')->from($this->dbTable)
-			->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-			->setParameter('url_hash', $hash);
-
-		$statement = $query->execute();
-		$result = $statement->fetch();
-		$statement->closeCursor();
-		return $result['shared_secret'];
-	}
-
-	/**
-	 * set server status
-	 *
-	 * @param string $url
-	 * @param int $status
-	 * @param string|null $token
-	 */
-	public function setServerStatus($url, $status, $token = null) {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->update($this->dbTable)
-				->set('status', $query->createNamedParameter($status))
-				->where($query->expr()->eq('url_hash', $query->createNamedParameter($hash)));
-		if (!is_null($token)) {
-			$query->set('sync_token', $query->createNamedParameter($token));
-		}
-		$query->execute();
-	}
-
-	/**
-	 * get server status
-	 *
-	 * @param string $url
-	 * @return int
-	 */
-	public function getServerStatus($url) {
-		$hash = $this->hash($url);
-		$query = $this->connection->getQueryBuilder();
-		$query->select('status')->from($this->dbTable)
-				->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
-				->setParameter('url_hash', $hash);
-
-		$statement = $query->execute();
-		$result = $statement->fetch();
-		$statement->closeCursor();
-		return (int)$result['status'];
-	}
-
-	/**
-	 * create hash from URL
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	protected function hash($url) {
-		$normalized = $this->normalizeUrl($url);
-		return sha1($normalized);
-	}
-
-	/**
-	 * normalize URL, used to create the sha1 hash
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	protected function normalizeUrl($url) {
-		$normalized = $url;
-
-		if (strpos($url, 'https://') === 0) {
-			$normalized = substr($url, strlen('https://'));
-		} elseif (strpos($url, 'http://') === 0) {
-			$normalized = substr($url, strlen('http://'));
-		}
-
-		$normalized = Filesystem::normalizePath($normalized);
-		$normalized = trim($normalized, '/');
-
-		return $normalized;
-	}
-
-	/**
-	 * @param $username
-	 * @param $password
-	 * @return bool
-	 */
-	public function auth($username, $password) {
-		if ($username !== 'system') {
-			return false;
-		}
-		$query = $this->connection->getQueryBuilder();
-		$query->select('url')->from($this->dbTable)
-				->where($query->expr()->eq('shared_secret', $query->createNamedParameter($password)));
-
-		$statement = $query->execute();
-		$result = $statement->fetch();
-		$statement->closeCursor();
-		return !empty($result);
-	}
+    /** @var  IDBConnection */
+    private $connection;
+
+    /** @var  IL10N */
+    private $IL10N;
+
+    /** @var string  */
+    private $dbTable = 'trusted_servers';
+
+    /**
+     * @param IDBConnection $connection
+     * @param IL10N $il10n
+     */
+    public function __construct(
+        IDBConnection $connection,
+        IL10N $il10n
+    ) {
+        $this->connection = $connection;
+        $this->IL10N = $il10n;
+    }
+
+    /**
+     * add server to the list of trusted servers
+     *
+     * @param string $url
+     * @return int
+     * @throws HintException
+     */
+    public function addServer($url) {
+        $hash = $this->hash($url);
+        $url = rtrim($url, '/');
+        $query = $this->connection->getQueryBuilder();
+        $query->insert($this->dbTable)
+            ->values(
+                [
+                    'url' => $query->createParameter('url'),
+                    'url_hash' => $query->createParameter('url_hash'),
+                ]
+            )
+            ->setParameter('url', $url)
+            ->setParameter('url_hash', $hash);
+
+        $result = $query->execute();
+
+        if ($result) {
+            return (int)$this->connection->lastInsertId('*PREFIX*'.$this->dbTable);
+        }
+
+        $message = 'Internal failure, Could not add trusted server: ' . $url;
+        $message_t = $this->IL10N->t('Could not add server');
+        throw new HintException($message, $message_t);
+    }
+
+    /**
+     * remove server from the list of trusted servers
+     *
+     * @param int $id
+     */
+    public function removeServer($id) {
+        $query = $this->connection->getQueryBuilder();
+        $query->delete($this->dbTable)
+            ->where($query->expr()->eq('id', $query->createParameter('id')))
+            ->setParameter('id', $id);
+        $query->execute();
+    }
+
+    /**
+     * get trusted server with given ID
+     *
+     * @param int $id
+     * @return array
+     * @throws \Exception
+     */
+    public function getServerById($id) {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')->from($this->dbTable)
+            ->where($query->expr()->eq('id', $query->createParameter('id')))
+            ->setParameter('id', $id);
+        $query->execute();
+        $result = $query->execute()->fetchAll();
+
+        if (empty($result)) {
+            throw new \Exception('No Server found with ID: ' . $id);
+        }
+
+        return $result[0];
+    }
+
+    /**
+     * get all trusted servers
+     *
+     * @return array
+     */
+    public function getAllServer() {
+        $query = $this->connection->getQueryBuilder();
+        $query->select(['url', 'url_hash', 'id', 'status', 'shared_secret', 'sync_token'])
+            ->from($this->dbTable);
+        $statement = $query->execute();
+        $result = $statement->fetchAll();
+        $statement->closeCursor();
+        return $result;
+    }
+
+    /**
+     * check if server already exists in the database table
+     *
+     * @param string $url
+     * @return bool
+     */
+    public function serverExists($url) {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('url')
+            ->from($this->dbTable)
+            ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+            ->setParameter('url_hash', $hash);
+        $statement = $query->execute();
+        $result = $statement->fetchAll();
+        $statement->closeCursor();
+
+        return !empty($result);
+    }
+
+    /**
+     * write token to database. Token is used to exchange the secret
+     *
+     * @param string $url
+     * @param string $token
+     */
+    public function addToken($url, $token) {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->update($this->dbTable)
+            ->set('token', $query->createParameter('token'))
+            ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+            ->setParameter('url_hash', $hash)
+            ->setParameter('token', $token);
+        $query->execute();
+    }
+
+    /**
+     * get token stored in database
+     *
+     * @param string $url
+     * @return string
+     * @throws \Exception
+     */
+    public function getToken($url) {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('token')->from($this->dbTable)
+            ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+            ->setParameter('url_hash', $hash);
+
+        $statement = $query->execute();
+        $result = $statement->fetch();
+        $statement->closeCursor();
+
+        if (!isset($result['token'])) {
+            throw new \Exception('No token found for: ' . $url);
+        }
+
+        return $result['token'];
+    }
+
+    /**
+     * add shared Secret to database
+     *
+     * @param string $url
+     * @param string $sharedSecret
+     */
+    public function addSharedSecret($url, $sharedSecret) {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->update($this->dbTable)
+            ->set('shared_secret', $query->createParameter('sharedSecret'))
+            ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+            ->setParameter('url_hash', $hash)
+            ->setParameter('sharedSecret', $sharedSecret);
+        $query->execute();
+    }
+
+    /**
+     * get shared secret from database
+     *
+     * @param string $url
+     * @return string
+     */
+    public function getSharedSecret($url) {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('shared_secret')->from($this->dbTable)
+            ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+            ->setParameter('url_hash', $hash);
+
+        $statement = $query->execute();
+        $result = $statement->fetch();
+        $statement->closeCursor();
+        return $result['shared_secret'];
+    }
+
+    /**
+     * set server status
+     *
+     * @param string $url
+     * @param int $status
+     * @param string|null $token
+     */
+    public function setServerStatus($url, $status, $token = null) {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->update($this->dbTable)
+                ->set('status', $query->createNamedParameter($status))
+                ->where($query->expr()->eq('url_hash', $query->createNamedParameter($hash)));
+        if (!is_null($token)) {
+            $query->set('sync_token', $query->createNamedParameter($token));
+        }
+        $query->execute();
+    }
+
+    /**
+     * get server status
+     *
+     * @param string $url
+     * @return int
+     */
+    public function getServerStatus($url) {
+        $hash = $this->hash($url);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('status')->from($this->dbTable)
+                ->where($query->expr()->eq('url_hash', $query->createParameter('url_hash')))
+                ->setParameter('url_hash', $hash);
+
+        $statement = $query->execute();
+        $result = $statement->fetch();
+        $statement->closeCursor();
+        return (int)$result['status'];
+    }
+
+    /**
+     * create hash from URL
+     *
+     * @param string $url
+     * @return string
+     */
+    protected function hash($url) {
+        $normalized = $this->normalizeUrl($url);
+        return sha1($normalized);
+    }
+
+    /**
+     * normalize URL, used to create the sha1 hash
+     *
+     * @param string $url
+     * @return string
+     */
+    protected function normalizeUrl($url) {
+        $normalized = $url;
+
+        if (strpos($url, 'https://') === 0) {
+            $normalized = substr($url, strlen('https://'));
+        } elseif (strpos($url, 'http://') === 0) {
+            $normalized = substr($url, strlen('http://'));
+        }
+
+        $normalized = Filesystem::normalizePath($normalized);
+        $normalized = trim($normalized, '/');
+
+        return $normalized;
+    }
+
+    /**
+     * @param $username
+     * @param $password
+     * @return bool
+     */
+    public function auth($username, $password) {
+        if ($username !== 'system') {
+            return false;
+        }
+        $query = $this->connection->getQueryBuilder();
+        $query->select('url')->from($this->dbTable)
+                ->where($query->expr()->eq('shared_secret', $query->createNamedParameter($password)));
+
+        $statement = $query->execute();
+        $result = $statement->fetch();
+        $statement->closeCursor();
+        return !empty($result);
+    }
 }

lib/private/Lockdown/Filesystem/NullStorage.php

Indentation +114 added lines, -114 removed lines

@@ -25,155 +25,155 @@
 use OCP\Files\Storage\IStorage;
 
 class NullStorage extends Common {
-	public function __construct($parameters) {
-		parent::__construct($parameters);
-	}
+    public function __construct($parameters) {
+        parent::__construct($parameters);
+    }
 
-	public function getId() {
-		return 'null';
-	}
+    public function getId() {
+        return 'null';
+    }
 
-	public function mkdir($path) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function mkdir($path) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function rmdir($path) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function rmdir($path) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function opendir($path) {
-		return new IteratorDirectory([]);
-	}
+    public function opendir($path) {
+        return new IteratorDirectory([]);
+    }
 
-	public function is_dir($path) {
-		return $path === '';
-	}
+    public function is_dir($path) {
+        return $path === '';
+    }
 
-	public function is_file($path) {
-		return false;
-	}
+    public function is_file($path) {
+        return false;
+    }
 
-	public function stat($path) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function stat($path) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function filetype($path) {
-		return ($path === '') ? 'dir' : false;
-	}
+    public function filetype($path) {
+        return ($path === '') ? 'dir' : false;
+    }
 
-	public function filesize($path) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function filesize($path) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function isCreatable($path) {
-		return false;
-	}
+    public function isCreatable($path) {
+        return false;
+    }
 
-	public function isReadable($path) {
-		return $path === '';
-	}
+    public function isReadable($path) {
+        return $path === '';
+    }
 
-	public function isUpdatable($path) {
-		return false;
-	}
+    public function isUpdatable($path) {
+        return false;
+    }
 
-	public function isDeletable($path) {
-		return false;
-	}
+    public function isDeletable($path) {
+        return false;
+    }
 
-	public function isSharable($path) {
-		return false;
-	}
+    public function isSharable($path) {
+        return false;
+    }
 
-	public function getPermissions($path) {
-		return null;
-	}
+    public function getPermissions($path) {
+        return null;
+    }
 
-	public function file_exists($path) {
-		return $path === '';
-	}
+    public function file_exists($path) {
+        return $path === '';
+    }
 
-	public function filemtime($path) {
-		return ($path === '') ? time() : false;
-	}
+    public function filemtime($path) {
+        return ($path === '') ? time() : false;
+    }
 
-	public function file_get_contents($path) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function file_get_contents($path) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function file_put_contents($path, $data) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function file_put_contents($path, $data) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function unlink($path) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function unlink($path) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function rename($path1, $path2) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function rename($path1, $path2) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function copy($path1, $path2) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function copy($path1, $path2) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function fopen($path, $mode) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function fopen($path, $mode) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function getMimeType($path) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function getMimeType($path) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function hash($type, $path, $raw = false) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function hash($type, $path, $raw = false) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function free_space($path) {
-		return FileInfo::SPACE_UNKNOWN;
-	}
+    public function free_space($path) {
+        return FileInfo::SPACE_UNKNOWN;
+    }
 
-	public function touch($path, $mtime = null) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function touch($path, $mtime = null) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function getLocalFile($path) {
-		return false;
-	}
+    public function getLocalFile($path) {
+        return false;
+    }
 
-	public function hasUpdated($path, $time) {
-		return false;
-	}
+    public function hasUpdated($path, $time) {
+        return false;
+    }
 
-	public function getETag($path) {
-		return '';
-	}
+    public function getETag($path) {
+        return '';
+    }
 
-	public function isLocal() {
-		return false;
-	}
+    public function isLocal() {
+        return false;
+    }
 
-	public function getDirectDownload($path) {
-		return false;
-	}
+    public function getDirectDownload($path) {
+        return false;
+    }
 
-	public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function test() {
-		return true;
-	}
+    public function test() {
+        return true;
+    }
 
-	public function getOwner($path) {
-		return null;
-	}
+    public function getOwner($path) {
+        return null;
+    }
 
-	public function getCache($path = '', $storage = null) {
-		return new NullCache();
-	}
+    public function getCache($path = '', $storage = null) {
+        return new NullCache();
+    }
 }