nextcloud / server

lib/private/AppFramework/Middleware/SessionMiddleware.php

Indentation +42 added lines, -42 removed lines

@@ -32,52 +32,52 @@
 
 class SessionMiddleware extends Middleware {
 
-	/**
-	 * @var IRequest
-	 */
-	private $request;
+    /**
+     * @var IRequest
+     */
+    private $request;
 
-	/**
-	 * @var ControllerMethodReflector
-	 */
-	private $reflector;
+    /**
+     * @var ControllerMethodReflector
+     */
+    private $reflector;
 
-	/**
-	 * @param IRequest $request
-	 * @param ControllerMethodReflector $reflector
-	 */
-	public function __construct(IRequest $request,
-								ControllerMethodReflector $reflector,
-								ISession $session
+    /**
+     * @param IRequest $request
+     * @param ControllerMethodReflector $reflector
+     */
+    public function __construct(IRequest $request,
+                                ControllerMethodReflector $reflector,
+                                ISession $session
 ) {
-		$this->request = $request;
-		$this->reflector = $reflector;
-		$this->session = $session;
-	}
+        $this->request = $request;
+        $this->reflector = $reflector;
+        $this->session = $session;
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 */
-	public function beforeController($controller, $methodName) {
-		$useSession = $this->reflector->hasAnnotation('UseSession');
-		if (!$useSession) {
-			$this->session->close();
-		}
-	}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     */
+    public function beforeController($controller, $methodName) {
+        $useSession = $this->reflector->hasAnnotation('UseSession');
+        if (!$useSession) {
+            $this->session->close();
+        }
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param Response $response
-	 * @return Response
-	 */
-	public function afterController($controller, $methodName, Response $response){
-		$useSession = $this->reflector->hasAnnotation('UseSession');
-		if ($useSession) {
-			$this->session->close();
-		}
-		return $response;
-	}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @param Response $response
+     * @return Response
+     */
+    public function afterController($controller, $methodName, Response $response){
+        $useSession = $this->reflector->hasAnnotation('UseSession');
+        if ($useSession) {
+            $this->session->close();
+        }
+        return $response;
+    }
 
 }

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

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/federation/lib/DbHandler.php

Indentation +289 added lines, -289 removed lines

@@ -42,294 +42,294 @@
  */
 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://'));
-		} else if (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://'));
+        } else if (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);
+    }
 
 }

apps/federation/lib/Command/SyncFederationAddressBooks.php

Indentation +33 added lines, -33 removed lines

@@ -30,45 +30,45 @@
 
 class SyncFederationAddressBooks extends Command {
 
-	/** @var \OCA\Federation\SyncFederationAddressBooks */
-	private $syncService;
+    /** @var \OCA\Federation\SyncFederationAddressBooks */
+    private $syncService;
 
-	/**
-	 * @param \OCA\Federation\SyncFederationAddressBooks $syncService
-	 */
-	public function __construct(\OCA\Federation\SyncFederationAddressBooks $syncService) {
-		parent::__construct();
+    /**
+     * @param \OCA\Federation\SyncFederationAddressBooks $syncService
+     */
+    public function __construct(\OCA\Federation\SyncFederationAddressBooks $syncService) {
+        parent::__construct();
 
-		$this->syncService = $syncService;
-	}
+        $this->syncService = $syncService;
+    }
 
-	protected function configure() {
-		$this
-			->setName('federation:sync-addressbooks')
-			->setDescription('Synchronizes addressbooks of all federated clouds');
-	}
+    protected function configure() {
+        $this
+            ->setName('federation:sync-addressbooks')
+            ->setDescription('Synchronizes addressbooks of all federated clouds');
+    }
 
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @return int
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
 
-		$progress = new ProgressBar($output);
-		$progress->start();
-		$this->syncService->syncThemAll(function($url, $ex) use ($progress, $output) {
-			if ($ex instanceof \Exception) {
-				$output->writeln("Error while syncing $url : " . $ex->getMessage());
+        $progress = new ProgressBar($output);
+        $progress->start();
+        $this->syncService->syncThemAll(function($url, $ex) use ($progress, $output) {
+            if ($ex instanceof \Exception) {
+                $output->writeln("Error while syncing $url : " . $ex->getMessage());
 
-			} else {
-				$progress->advance();
-			}
-		});
+            } else {
+                $progress->advance();
+            }
+        });
 
-		$progress->finish();
-		$output->writeln('');
+        $progress->finish();
+        $output->writeln('');
 
-		return 0;
-	}
+        return 0;
+    }
 }

lib/public/IGroupManager.php

Indentation +87 added lines, -87 removed lines

@@ -45,103 +45,103 @@
  * @since 8.0.0
  */
 interface IGroupManager {
-	/**
-	 * Checks whether a given backend is used
-	 *
-	 * @param string $backendClass Full classname including complete namespace
-	 * @return bool
-	 * @since 8.1.0
-	 */
-	public function isBackendUsed($backendClass);
+    /**
+     * Checks whether a given backend is used
+     *
+     * @param string $backendClass Full classname including complete namespace
+     * @return bool
+     * @since 8.1.0
+     */
+    public function isBackendUsed($backendClass);
 
-	/**
-	 * @param \OCP\GroupInterface $backend
-	 * @since 8.0.0
-	 */
-	public function addBackend($backend);
+    /**
+     * @param \OCP\GroupInterface $backend
+     * @since 8.0.0
+     */
+    public function addBackend($backend);
 
-	/**
-	 * @since 8.0.0
-	 */
-	public function clearBackends();
+    /**
+     * @since 8.0.0
+     */
+    public function clearBackends();
 
-	/**
-	 * Get the active backends
-	 * @return \OCP\GroupInterface[]
-	 * @since 13.0.0
-	 */
-	public function getBackends();
+    /**
+     * Get the active backends
+     * @return \OCP\GroupInterface[]
+     * @since 13.0.0
+     */
+    public function getBackends();
 
-	/**
-	 * @param string $gid
-	 * @return \OCP\IGroup
-	 * @since 8.0.0
-	 */
-	public function get($gid);
+    /**
+     * @param string $gid
+     * @return \OCP\IGroup
+     * @since 8.0.0
+     */
+    public function get($gid);
 
-	/**
-	 * @param string $gid
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function groupExists($gid);
+    /**
+     * @param string $gid
+     * @return bool
+     * @since 8.0.0
+     */
+    public function groupExists($gid);
 
-	/**
-	 * @param string $gid
-	 * @return \OCP\IGroup
-	 * @since 8.0.0
-	 */
-	public function createGroup($gid);
+    /**
+     * @param string $gid
+     * @return \OCP\IGroup
+     * @since 8.0.0
+     */
+    public function createGroup($gid);
 
-	/**
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return \OCP\IGroup[]
-	 * @since 8.0.0
-	 */
-	public function search($search, $limit = null, $offset = null);
+    /**
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return \OCP\IGroup[]
+     * @since 8.0.0
+     */
+    public function search($search, $limit = null, $offset = null);
 
-	/**
-	 * @param \OCP\IUser|null $user
-	 * @return \OCP\IGroup[]
-	 * @since 8.0.0
-	 */
-	public function getUserGroups(IUser $user = null);
+    /**
+     * @param \OCP\IUser|null $user
+     * @return \OCP\IGroup[]
+     * @since 8.0.0
+     */
+    public function getUserGroups(IUser $user = null);
 
-	/**
-	 * @param \OCP\IUser $user
-	 * @return array with group names
-	 * @since 8.0.0
-	 */
-	public function getUserGroupIds(IUser $user);
+    /**
+     * @param \OCP\IUser $user
+     * @return array with group names
+     * @since 8.0.0
+     */
+    public function getUserGroupIds(IUser $user);
 
-	/**
-	 * get a list of all display names in a group
-	 *
-	 * @param string $gid
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array an array of display names (value) and user ids (key)
-	 * @since 8.0.0
-	 */
-	public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0);
+    /**
+     * get a list of all display names in a group
+     *
+     * @param string $gid
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return array an array of display names (value) and user ids (key)
+     * @since 8.0.0
+     */
+    public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0);
 
-	/**
-	 * Checks if a userId is in the admin group
-	 * @param string $userId
-	 * @return bool if admin
-	 * @since 8.0.0
-	 */
-	public function isAdmin($userId);
+    /**
+     * Checks if a userId is in the admin group
+     * @param string $userId
+     * @return bool if admin
+     * @since 8.0.0
+     */
+    public function isAdmin($userId);
 
-	/**
-	 * Checks if a userId is in a group
-	 * @param string $userId
-	 * @param string $group
-	 * @return bool if in group
-	 * @since 8.0.0
-	 */
-	public function isInGroup($userId, $group);
+    /**
+     * Checks if a userId is in a group
+     * @param string $userId
+     * @param string $group
+     * @return bool if in group
+     * @since 8.0.0
+     */
+    public function isInGroup($userId, $group);
 }

apps/user_ldap/lib/Migration/UUIDFixUser.php

Indentation +5 added lines, -5 removed lines

@@ -30,9 +30,9 @@
 use OCP\IConfig;
 
 class UUIDFixUser extends UUIDFix {
-	public function __construct(UserMapping $mapper, LDAP $ldap, IConfig $config, Helper $helper) {
-		$this->mapper = $mapper;
-		$groupPluginManager = \OC::$server->query('LDAPGroupPluginManager');
-		$this->proxy = new Group_Proxy($helper->getServerConfigurationPrefixes(true), $ldap, $groupPluginManager);
-	}
+    public function __construct(UserMapping $mapper, LDAP $ldap, IConfig $config, Helper $helper) {
+        $this->mapper = $mapper;
+        $groupPluginManager = \OC::$server->query('LDAPGroupPluginManager');
+        $this->proxy = new Group_Proxy($helper->getServerConfigurationPrefixes(true), $ldap, $groupPluginManager);
+    }
 }

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

lib/private/Files/Storage/FailedStorage.php

Indentation +165 added lines, -165 removed lines

@@ -34,185 +34,185 @@
  */
 class FailedStorage extends Common {
 
-	/** @var \Exception */
-	protected $e;
-
-	/**
-	 * @param array $params ['exception' => \Exception]
-	 */
-	public function __construct($params) {
-		$this->e = $params['exception'];
-		if (!$this->e) {
-			throw new \InvalidArgumentException('Missing "exception" argument in FailedStorage constructor');
-		}
-	}
-
-	public function getId() {
-		// we can't return anything sane here
-		return 'failedstorage';
-	}
-
-	public function mkdir($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function rmdir($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function opendir($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function is_dir($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function is_file($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function stat($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function filetype($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function filesize($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function isCreatable($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function isReadable($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function isUpdatable($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function isDeletable($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function isSharable($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function getPermissions($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function file_exists($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function filemtime($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function file_get_contents($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function file_put_contents($path, $data) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function unlink($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function rename($path1, $path2) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function copy($path1, $path2) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function fopen($path, $mode) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function getMimeType($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function hash($type, $path, $raw = false) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function free_space($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    /** @var \Exception */
+    protected $e;
+
+    /**
+     * @param array $params ['exception' => \Exception]
+     */
+    public function __construct($params) {
+        $this->e = $params['exception'];
+        if (!$this->e) {
+            throw new \InvalidArgumentException('Missing "exception" argument in FailedStorage constructor');
+        }
+    }
+
+    public function getId() {
+        // we can't return anything sane here
+        return 'failedstorage';
+    }
+
+    public function mkdir($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function rmdir($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function opendir($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function is_dir($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function is_file($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function stat($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function filetype($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function filesize($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function isCreatable($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function isReadable($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function isUpdatable($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function isDeletable($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function isSharable($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function getPermissions($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function file_exists($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function filemtime($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function file_get_contents($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function file_put_contents($path, $data) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function unlink($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function rename($path1, $path2) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function copy($path1, $path2) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function fopen($path, $mode) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function getMimeType($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function hash($type, $path, $raw = false) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function free_space($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function search($query) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function search($query) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function touch($path, $mtime = null) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function touch($path, $mtime = null) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function getLocalFile($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function getLocalFile($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function getLocalFolder($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function getLocalFolder($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function hasUpdated($path, $time) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function hasUpdated($path, $time) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function getETag($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function getETag($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function getDirectDownload($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function getDirectDownload($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function verifyPath($path, $fileName) {
-		return true;
-	}
+    public function verifyPath($path, $fileName) {
+        return true;
+    }
 
-	public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function acquireLock($path, $type, ILockingProvider $provider) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function acquireLock($path, $type, ILockingProvider $provider) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function releaseLock($path, $type, ILockingProvider $provider) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function releaseLock($path, $type, ILockingProvider $provider) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function changeLock($path, $type, ILockingProvider $provider) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function changeLock($path, $type, ILockingProvider $provider) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function getAvailability() {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function getAvailability() {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function setAvailability($isAvailable) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function setAvailability($isAvailable) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function getCache($path = '', $storage = null) {
-		return new FailedCache();
-	}
+    public function getCache($path = '', $storage = null) {
+        return new FailedCache();
+    }
 }

lib/private/Route/Route.php

Indentation +115 added lines, -115 removed lines

@@ -32,128 +32,128 @@
 use Symfony\Component\Routing\Route as SymfonyRoute;
 
 class Route extends SymfonyRoute implements IRoute {
-	/**
-	 * Specify the method when this route is to be used
-	 *
-	 * @param string $method HTTP method (uppercase)
-	 * @return \OC\Route\Route
-	 */
-	public function method($method) {
-		$this->setMethods($method);
-		return $this;
-	}
+    /**
+     * Specify the method when this route is to be used
+     *
+     * @param string $method HTTP method (uppercase)
+     * @return \OC\Route\Route
+     */
+    public function method($method) {
+        $this->setMethods($method);
+        return $this;
+    }
 
-	/**
-	 * Specify POST as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function post() {
-		$this->method('POST');
-		return $this;
-	}
+    /**
+     * Specify POST as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function post() {
+        $this->method('POST');
+        return $this;
+    }
 
-	/**
-	 * Specify GET as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function get() {
-		$this->method('GET');
-		return $this;
-	}
+    /**
+     * Specify GET as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function get() {
+        $this->method('GET');
+        return $this;
+    }
 
-	/**
-	 * Specify PUT as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function put() {
-		$this->method('PUT');
-		return $this;
-	}
+    /**
+     * Specify PUT as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function put() {
+        $this->method('PUT');
+        return $this;
+    }
 
-	/**
-	 * Specify DELETE as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function delete() {
-		$this->method('DELETE');
-		return $this;
-	}
+    /**
+     * Specify DELETE as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function delete() {
+        $this->method('DELETE');
+        return $this;
+    }
 
-	/**
-	 * Specify PATCH as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function patch() {
-		$this->method('PATCH');
-		return $this;
-	}
+    /**
+     * Specify PATCH as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function patch() {
+        $this->method('PATCH');
+        return $this;
+    }
 
-	/**
-	 * Defaults to use for this route
-	 *
-	 * @param array $defaults The defaults
-	 * @return \OC\Route\Route
-	 */
-	public function defaults($defaults) {
-		$action = $this->getDefault('action');
-		$this->setDefaults($defaults);
-		if (isset($defaults['action'])) {
-			$action = $defaults['action'];
-		}
-		$this->action($action);
-		return $this;
-	}
+    /**
+     * Defaults to use for this route
+     *
+     * @param array $defaults The defaults
+     * @return \OC\Route\Route
+     */
+    public function defaults($defaults) {
+        $action = $this->getDefault('action');
+        $this->setDefaults($defaults);
+        if (isset($defaults['action'])) {
+            $action = $defaults['action'];
+        }
+        $this->action($action);
+        return $this;
+    }
 
-	/**
-	 * Requirements for this route
-	 *
-	 * @param array $requirements The requirements
-	 * @return \OC\Route\Route
-	 */
-	public function requirements($requirements) {
-		$method = $this->getMethods();
-		$this->setRequirements($requirements);
-		if (isset($requirements['_method'])) {
-			$method = $requirements['_method'];
-		}
-		if ($method) {
-			$this->method($method);
-		}
-		return $this;
-	}
+    /**
+     * Requirements for this route
+     *
+     * @param array $requirements The requirements
+     * @return \OC\Route\Route
+     */
+    public function requirements($requirements) {
+        $method = $this->getMethods();
+        $this->setRequirements($requirements);
+        if (isset($requirements['_method'])) {
+            $method = $requirements['_method'];
+        }
+        if ($method) {
+            $this->method($method);
+        }
+        return $this;
+    }
 
-	/**
-	 * The action to execute when this route matches
-	 *
-	 * @param string|callable $class the class or a callable
-	 * @param string $function the function to use with the class
-	 * @return \OC\Route\Route
-	 *
-	 * This function is called with $class set to a callable or
-	 * to the class with $function
-	 */
-	public function action($class, $function = null) {
-		$action = array($class, $function);
-		if (is_null($function)) {
-			$action = $class;
-		}
-		$this->setDefault('action', $action);
-		return $this;
-	}
+    /**
+     * The action to execute when this route matches
+     *
+     * @param string|callable $class the class or a callable
+     * @param string $function the function to use with the class
+     * @return \OC\Route\Route
+     *
+     * This function is called with $class set to a callable or
+     * to the class with $function
+     */
+    public function action($class, $function = null) {
+        $action = array($class, $function);
+        if (is_null($function)) {
+            $action = $class;
+        }
+        $this->setDefault('action', $action);
+        return $this;
+    }
 
-	/**
-	 * The action to execute when this route matches, includes a file like
-	 * it is called directly
-	 * @param string $file
-	 * @return void
-	 */
-	public function actionInclude($file) {
-		$function = function($param) use ($file) {
-			unset($param["_route"]);
-			$_GET=array_merge($_GET, $param);
-			unset($param);
-			require_once "$file";
-		} ;
-		$this->action($function);
-	}
+    /**
+     * The action to execute when this route matches, includes a file like
+     * it is called directly
+     * @param string $file
+     * @return void
+     */
+    public function actionInclude($file) {
+        $function = function($param) use ($file) {
+            unset($param["_route"]);
+            $_GET=array_merge($_GET, $param);
+            unset($param);
+            require_once "$file";
+        } ;
+        $this->action($function);
+    }
 }