nextcloud / server

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

Indentation +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@
  * @package OC\AppFramework\Middleware\Security\Exceptions
  */
 class NotLoggedInException extends SecurityException {
-	public function __construct() {
-		parent::__construct('Current user is not logged in', Http::STATUS_UNAUTHORIZED);
-	}
+    public function __construct() {
+        parent::__construct('Current user is not logged in', Http::STATUS_UNAUTHORIZED);
+    }
 }

lib/private/AppFramework/Middleware/MiddlewareDispatcher.php

Indentation +123 added lines, -123 removed lines

@@ -37,128 +37,128 @@
  */
 class MiddlewareDispatcher {
 
-	/**
-	 * @var array array containing all the middlewares
-	 */
-	private $middlewares;
-
-	/**
-	 * @var int counter which tells us what middlware was executed once an
-	 *                  exception occurs
-	 */
-	private $middlewareCounter;
-
-
-	/**
-	 * Constructor
-	 */
-	public function __construct(){
-		$this->middlewares = array();
-		$this->middlewareCounter = 0;
-	}
-
-
-	/**
-	 * Adds a new middleware
-	 * @param Middleware $middleWare the middleware which will be added
-	 */
-	public function registerMiddleware(Middleware $middleWare){
-		array_push($this->middlewares, $middleWare);
-	}
-
-
-	/**
-	 * returns an array with all middleware elements
-	 * @return array the middlewares
-	 */
-	public function getMiddlewares(){
-		return $this->middlewares;
-	}
-
-
-	/**
-	 * This is being run in normal order before the controller is being
-	 * called which allows several modifications and checks
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 */
-	public function beforeController(Controller $controller, $methodName){
-		// we need to count so that we know which middlewares we have to ask in
-		// case there is an exception
-		$middlewareCount = count($this->middlewares);
-		for($i = 0; $i < $middlewareCount; $i++){
-			$this->middlewareCounter++;
-			$middleware = $this->middlewares[$i];
-			$middleware->beforeController($controller, $methodName);
-		}
-	}
-
-
-	/**
-	 * This is being run when either the beforeController method or the
-	 * controller method itself is throwing an exception. The middleware is asked
-	 * in reverse order to handle the exception and to return a response.
-	 * If the response is null, it is assumed that the exception could not be
-	 * handled and the error will be thrown again
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                            the controller
-	 * @param \Exception $exception the thrown exception
-	 * @return Response a Response object if the middleware can handle the
-	 * exception
-	 * @throws \Exception the passed in exception if it can't handle it
-	 */
-	public function afterException(Controller $controller, $methodName, \Exception $exception){
-		for($i=$this->middlewareCounter-1; $i>=0; $i--){
-			$middleware = $this->middlewares[$i];
-			try {
-				return $middleware->afterException($controller, $methodName, $exception);
-			} catch(\Exception $exception){
-				continue;
-			}
-		}
-		throw $exception;
-	}
-
-
-	/**
-	 * This is being run after a successful controllermethod call and allows
-	 * the manipulation of a Response object. The middleware is run in reverse order
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                            the controller
-	 * @param Response $response the generated response from the controller
-	 * @return Response a Response object
-	 */
-	public function afterController(Controller $controller, $methodName, Response $response){
-		for($i=count($this->middlewares)-1; $i>=0; $i--){
-			$middleware = $this->middlewares[$i];
-			$response = $middleware->afterController($controller, $methodName, $response);
-		}
-		return $response;
-	}
-
-
-	/**
-	 * This is being run after the response object has been rendered and
-	 * allows the manipulation of the output. The middleware is run in reverse order
-	 *
-	 * @param Controller $controller the controller that is being called
-	 * @param string $methodName the name of the method that will be called on
-	 *                           the controller
-	 * @param string $output the generated output from a response
-	 * @return string the output that should be printed
-	 */
-	public function beforeOutput(Controller $controller, $methodName, $output){
-		for($i=count($this->middlewares)-1; $i>=0; $i--){
-			$middleware = $this->middlewares[$i];
-			$output = $middleware->beforeOutput($controller, $methodName, $output);
-		}
-		return $output;
-	}
+    /**
+     * @var array array containing all the middlewares
+     */
+    private $middlewares;
+
+    /**
+     * @var int counter which tells us what middlware was executed once an
+     *                  exception occurs
+     */
+    private $middlewareCounter;
+
+
+    /**
+     * Constructor
+     */
+    public function __construct(){
+        $this->middlewares = array();
+        $this->middlewareCounter = 0;
+    }
+
+
+    /**
+     * Adds a new middleware
+     * @param Middleware $middleWare the middleware which will be added
+     */
+    public function registerMiddleware(Middleware $middleWare){
+        array_push($this->middlewares, $middleWare);
+    }
+
+
+    /**
+     * returns an array with all middleware elements
+     * @return array the middlewares
+     */
+    public function getMiddlewares(){
+        return $this->middlewares;
+    }
+
+
+    /**
+     * This is being run in normal order before the controller is being
+     * called which allows several modifications and checks
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     */
+    public function beforeController(Controller $controller, $methodName){
+        // we need to count so that we know which middlewares we have to ask in
+        // case there is an exception
+        $middlewareCount = count($this->middlewares);
+        for($i = 0; $i < $middlewareCount; $i++){
+            $this->middlewareCounter++;
+            $middleware = $this->middlewares[$i];
+            $middleware->beforeController($controller, $methodName);
+        }
+    }
+
+
+    /**
+     * This is being run when either the beforeController method or the
+     * controller method itself is throwing an exception. The middleware is asked
+     * in reverse order to handle the exception and to return a response.
+     * If the response is null, it is assumed that the exception could not be
+     * handled and the error will be thrown again
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                            the controller
+     * @param \Exception $exception the thrown exception
+     * @return Response a Response object if the middleware can handle the
+     * exception
+     * @throws \Exception the passed in exception if it can't handle it
+     */
+    public function afterException(Controller $controller, $methodName, \Exception $exception){
+        for($i=$this->middlewareCounter-1; $i>=0; $i--){
+            $middleware = $this->middlewares[$i];
+            try {
+                return $middleware->afterException($controller, $methodName, $exception);
+            } catch(\Exception $exception){
+                continue;
+            }
+        }
+        throw $exception;
+    }
+
+
+    /**
+     * This is being run after a successful controllermethod call and allows
+     * the manipulation of a Response object. The middleware is run in reverse order
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                            the controller
+     * @param Response $response the generated response from the controller
+     * @return Response a Response object
+     */
+    public function afterController(Controller $controller, $methodName, Response $response){
+        for($i=count($this->middlewares)-1; $i>=0; $i--){
+            $middleware = $this->middlewares[$i];
+            $response = $middleware->afterController($controller, $methodName, $response);
+        }
+        return $response;
+    }
+
+
+    /**
+     * This is being run after the response object has been rendered and
+     * allows the manipulation of the output. The middleware is run in reverse order
+     *
+     * @param Controller $controller the controller that is being called
+     * @param string $methodName the name of the method that will be called on
+     *                           the controller
+     * @param string $output the generated output from a response
+     * @return string the output that should be printed
+     */
+    public function beforeOutput(Controller $controller, $methodName, $output){
+        for($i=count($this->middlewares)-1; $i>=0; $i--){
+            $middleware = $this->middlewares[$i];
+            $output = $middleware->beforeOutput($controller, $methodName, $output);
+        }
+        return $output;
+    }
 
 }

lib/private/AppFramework/OCS/BaseResponse.php

Indentation +56 added lines, -56 removed lines

@@ -27,70 +27,70 @@
 use OCP\AppFramework\Http\Response;
 
 abstract class BaseResponse extends Response   {
-	/** @var array */
-	protected $data;
+    /** @var array */
+    protected $data;
 
-	/** @var string */
-	protected $format;
+    /** @var string */
+    protected $format;
 
-	/** @var string */
-	protected $statusMessage;
+    /** @var string */
+    protected $statusMessage;
 
-	/** @var int */
-	protected $itemsCount;
+    /** @var int */
+    protected $itemsCount;
 
-	/** @var int */
-	protected $itemsPerPage;
+    /** @var int */
+    protected $itemsPerPage;
 
-	/**
-	 * BaseResponse constructor.
-	 *
-	 * @param DataResponse|null $dataResponse
-	 * @param string $format
-	 * @param string|null $statusMessage
-	 * @param int|null $itemsCount
-	 * @param int|null $itemsPerPage
-	 */
-	public function __construct(DataResponse $dataResponse,
-								$format = 'xml',
-								$statusMessage = null,
-								$itemsCount = null,
-								$itemsPerPage = null) {
-		$this->format = $format;
-		$this->statusMessage = $statusMessage;
-		$this->itemsCount = $itemsCount;
-		$this->itemsPerPage = $itemsPerPage;
+    /**
+     * BaseResponse constructor.
+     *
+     * @param DataResponse|null $dataResponse
+     * @param string $format
+     * @param string|null $statusMessage
+     * @param int|null $itemsCount
+     * @param int|null $itemsPerPage
+     */
+    public function __construct(DataResponse $dataResponse,
+                                $format = 'xml',
+                                $statusMessage = null,
+                                $itemsCount = null,
+                                $itemsPerPage = null) {
+        $this->format = $format;
+        $this->statusMessage = $statusMessage;
+        $this->itemsCount = $itemsCount;
+        $this->itemsPerPage = $itemsPerPage;
 
-		$this->data = $dataResponse->getData();
+        $this->data = $dataResponse->getData();
 
-		$this->setHeaders($dataResponse->getHeaders());
-		$this->setStatus($dataResponse->getStatus());
-		$this->setETag($dataResponse->getETag());
-		$this->setLastModified($dataResponse->getLastModified());
-		$this->setCookies($dataResponse->getCookies());
-		$this->setContentSecurityPolicy(new EmptyContentSecurityPolicy());
+        $this->setHeaders($dataResponse->getHeaders());
+        $this->setStatus($dataResponse->getStatus());
+        $this->setETag($dataResponse->getETag());
+        $this->setLastModified($dataResponse->getLastModified());
+        $this->setCookies($dataResponse->getCookies());
+        $this->setContentSecurityPolicy(new EmptyContentSecurityPolicy());
 
-		if ($format === 'json') {
-			$this->addHeader(
-				'Content-Type', 'application/json; charset=utf-8'
-			);
-		} else {
-			$this->addHeader(
-				'Content-Type', 'application/xml; charset=utf-8'
-			);
-		}
-	}
+        if ($format === 'json') {
+            $this->addHeader(
+                'Content-Type', 'application/json; charset=utf-8'
+            );
+        } else {
+            $this->addHeader(
+                'Content-Type', 'application/xml; charset=utf-8'
+            );
+        }
+    }
 
-	/**
-	 * @param string[] $meta
-	 * @return string
-	 */
-	protected function renderResult($meta) {
-		// TODO rewrite functions
-		return \OC_API::renderResult($this->format, $meta, $this->data);
-	}
+    /**
+     * @param string[] $meta
+     * @return string
+     */
+    protected function renderResult($meta) {
+        // TODO rewrite functions
+        return \OC_API::renderResult($this->format, $meta, $this->data);
+    }
 
-	public function getOCSStatus() {
-		return parent::getStatus();
-	}
+    public function getOCSStatus() {
+        return parent::getStatus();
+    }
 }

lib/private/AppFramework/OCS/V2Response.php

Indentation +40 added lines, -40 removed lines

@@ -27,50 +27,50 @@
 
 class V2Response extends BaseResponse {
 
-	/**
-	 * The V2 endpoint just passes on status codes.
-	 * Of course we have to map the OCS specific codes to proper HTTP status codes
-	 *
-	 * @return int
-	 */
-	public function getStatus() {
+    /**
+     * The V2 endpoint just passes on status codes.
+     * Of course we have to map the OCS specific codes to proper HTTP status codes
+     *
+     * @return int
+     */
+    public function getStatus() {
 
-		$status  = parent::getStatus();
-		if ($status === API::RESPOND_UNAUTHORISED) {
-			return Http::STATUS_UNAUTHORIZED;
-		} else if ($status === API::RESPOND_NOT_FOUND) {
-			return Http::STATUS_NOT_FOUND;
-		} else if ($status === API::RESPOND_SERVER_ERROR || $status === API::RESPOND_UNKNOWN_ERROR) {
-			return Http::STATUS_INTERNAL_SERVER_ERROR;
-		} else if ($status < 200 || $status > 600) {
-			return Http::STATUS_BAD_REQUEST;
-		}
+        $status  = parent::getStatus();
+        if ($status === API::RESPOND_UNAUTHORISED) {
+            return Http::STATUS_UNAUTHORIZED;
+        } else if ($status === API::RESPOND_NOT_FOUND) {
+            return Http::STATUS_NOT_FOUND;
+        } else if ($status === API::RESPOND_SERVER_ERROR || $status === API::RESPOND_UNKNOWN_ERROR) {
+            return Http::STATUS_INTERNAL_SERVER_ERROR;
+        } else if ($status < 200 || $status > 600) {
+            return Http::STATUS_BAD_REQUEST;
+        }
 
-		return $status;
-	}
+        return $status;
+    }
 
-	/**
-	 * Construct the meta part of the response
-	 * And then late the base class render
-	 *
-	 * @return string
-	 */
-	public function render() {
-		$status = parent::getStatus();
+    /**
+     * Construct the meta part of the response
+     * And then late the base class render
+     *
+     * @return string
+     */
+    public function render() {
+        $status = parent::getStatus();
 
-		$meta = [
-			'status' => $status >= 200 && $status < 300 ? 'ok' : 'failure',
-			'statuscode' => $this->getOCSStatus(),
-			'message' => $status >= 200 && $status < 300 ? 'OK' : $this->statusMessage,
-		];
+        $meta = [
+            'status' => $status >= 200 && $status < 300 ? 'ok' : 'failure',
+            'statuscode' => $this->getOCSStatus(),
+            'message' => $status >= 200 && $status < 300 ? 'OK' : $this->statusMessage,
+        ];
 
-		if ($this->itemsCount !== null) {
-			$meta['totalitems'] = $this->itemsCount;
-		}
-		if ($this->itemsPerPage !== null) {
-			$meta['itemsperpage'] = $this->itemsPerPage;
-		}
+        if ($this->itemsCount !== null) {
+            $meta['totalitems'] = $this->itemsCount;
+        }
+        if ($this->itemsPerPage !== null) {
+            $meta['itemsperpage'] = $this->itemsPerPage;
+        }
 
-		return $this->renderResult($meta);
-	}
+        return $this->renderResult($meta);
+    }
 }

lib/private/AppFramework/OCS/V1Response.php

Indentation +41 added lines, -41 removed lines

@@ -27,52 +27,52 @@
 
 class V1Response extends BaseResponse {
 
-	/**
-	 * The V1 endpoint has very limited http status codes basically everything
-	 * is status 200 except 401
-	 *
-	 * @return int
-	 */
-	public function getStatus() {
-		$status  = parent::getStatus();
-		if ($status === Http::STATUS_FORBIDDEN || $status === API::RESPOND_UNAUTHORISED) {
-			return Http::STATUS_UNAUTHORIZED;
-		}
+    /**
+     * The V1 endpoint has very limited http status codes basically everything
+     * is status 200 except 401
+     *
+     * @return int
+     */
+    public function getStatus() {
+        $status  = parent::getStatus();
+        if ($status === Http::STATUS_FORBIDDEN || $status === API::RESPOND_UNAUTHORISED) {
+            return Http::STATUS_UNAUTHORIZED;
+        }
 
-		return Http::STATUS_OK;
-	}
+        return Http::STATUS_OK;
+    }
 
-	/**
-	 * In v1 all OK is 100
-	 *
-	 * @return int
-	 */
-	public function getOCSStatus() {
-		$status = parent::getOCSStatus();
+    /**
+     * In v1 all OK is 100
+     *
+     * @return int
+     */
+    public function getOCSStatus() {
+        $status = parent::getOCSStatus();
 
-		if ($status === Http::STATUS_OK) {
-			return 100;
-		}
+        if ($status === Http::STATUS_OK) {
+            return 100;
+        }
 
-		return $status;
-	}
+        return $status;
+    }
 
-	/**
-	 * Construct the meta part of the response
-	 * And then late the base class render
-	 *
-	 * @return string
-	 */
-	public function render() {
-		$meta = [
-			'status' => $this->getOCSStatus() === 100 ? 'ok' : 'failure',
-			'statuscode' => $this->getOCSStatus(),
-			'message' => $this->getOCSStatus() === 100 ? 'OK' : $this->statusMessage,
-		];
+    /**
+     * Construct the meta part of the response
+     * And then late the base class render
+     *
+     * @return string
+     */
+    public function render() {
+        $meta = [
+            'status' => $this->getOCSStatus() === 100 ? 'ok' : 'failure',
+            'statuscode' => $this->getOCSStatus(),
+            'message' => $this->getOCSStatus() === 100 ? 'OK' : $this->statusMessage,
+        ];
 
-		$meta['totalitems'] = $this->itemsCount !== null ? (string)$this->itemsCount : '';
-		$meta['itemsperpage'] = $this->itemsPerPage !== null ? (string)$this->itemsPerPage: '';
+        $meta['totalitems'] = $this->itemsCount !== null ? (string)$this->itemsCount : '';
+        $meta['itemsperpage'] = $this->itemsPerPage !== null ? (string)$this->itemsPerPage: '';
 
-		return $this->renderResult($meta);
-	}
+        return $this->renderResult($meta);
+    }
 }

lib/private/AppFramework/Routing/RouteConfig.php

Indentation +236 added lines, -236 removed lines

@@ -36,242 +36,242 @@
  * @package OC\AppFramework\routing
  */
 class RouteConfig {
-	/** @var DIContainer */
-	private $container;
-
-	/** @var IRouter */
-	private $router;
-
-	/** @var array */
-	private $routes;
-
-	/** @var string */
-	private $appName;
-
-	/** @var string[] */
-	private $controllerNameCache = [];
-
-	/**
-	 * @param \OC\AppFramework\DependencyInjection\DIContainer $container
-	 * @param \OCP\Route\IRouter $router
-	 * @param array $routes
-	 * @internal param $appName
-	 */
-	public function __construct(DIContainer $container, IRouter $router, $routes) {
-		$this->routes = $routes;
-		$this->container = $container;
-		$this->router = $router;
-		$this->appName = $container['AppName'];
-	}
-
-	/**
-	 * The routes and resource will be registered to the \OCP\Route\IRouter
-	 */
-	public function register() {
-
-		// parse simple
-		$this->processSimpleRoutes($this->routes);
-
-		// parse resources
-		$this->processResources($this->routes);
-
-		/*
+    /** @var DIContainer */
+    private $container;
+
+    /** @var IRouter */
+    private $router;
+
+    /** @var array */
+    private $routes;
+
+    /** @var string */
+    private $appName;
+
+    /** @var string[] */
+    private $controllerNameCache = [];
+
+    /**
+     * @param \OC\AppFramework\DependencyInjection\DIContainer $container
+     * @param \OCP\Route\IRouter $router
+     * @param array $routes
+     * @internal param $appName
+     */
+    public function __construct(DIContainer $container, IRouter $router, $routes) {
+        $this->routes = $routes;
+        $this->container = $container;
+        $this->router = $router;
+        $this->appName = $container['AppName'];
+    }
+
+    /**
+     * The routes and resource will be registered to the \OCP\Route\IRouter
+     */
+    public function register() {
+
+        // parse simple
+        $this->processSimpleRoutes($this->routes);
+
+        // parse resources
+        $this->processResources($this->routes);
+
+        /*
 		 * OCS routes go into a different collection
 		 */
-		$oldCollection = $this->router->getCurrentCollection();
-		$this->router->useCollection($oldCollection.'.ocs');
-
-		// parse ocs simple routes
-		$this->processOCS($this->routes);
-
-		$this->router->useCollection($oldCollection);
-	}
-
-	private function processOCS(array $routes) {
-		$ocsRoutes = isset($routes['ocs']) ? $routes['ocs'] : [];
-		foreach ($ocsRoutes as $ocsRoute) {
-			$name = $ocsRoute['name'];
-			$postfix = '';
-
-			if (isset($ocsRoute['postfix'])) {
-				$postfix = $ocsRoute['postfix'];
-			}
-
-			if (isset($ocsRoute['root'])) {
-				$root = $ocsRoute['root'];
-			} else {
-				$root = '/apps/'.$this->appName;
-			}
-
-			$url = $root . $ocsRoute['url'];
-			$verb = isset($ocsRoute['verb']) ? strtoupper($ocsRoute['verb']) : 'GET';
-
-			$split = explode('#', $name, 2);
-			if (count($split) != 2) {
-				throw new \UnexpectedValueException('Invalid route name');
-			}
-			$controller = $split[0];
-			$action = $split[1];
-
-			$controllerName = $this->buildControllerName($controller);
-			$actionName = $this->buildActionName($action);
-
-			// register the route
-			$handler = new RouteActionHandler($this->container, $controllerName, $actionName);
-
-			$router = $this->router->create('ocs.'.$this->appName.'.'.$controller.'.'.$action . $postfix, $url)
-				->method($verb)
-				->action($handler);
-
-			// optionally register requirements for route. This is used to
-			// tell the route parser how url parameters should be matched
-			if(array_key_exists('requirements', $ocsRoute)) {
-				$router->requirements($ocsRoute['requirements']);
-			}
-
-			// optionally register defaults for route. This is used to
-			// tell the route parser how url parameters should be default valued
-			if(array_key_exists('defaults', $ocsRoute)) {
-				$router->defaults($ocsRoute['defaults']);
-			}
-		}
-	}
-
-	/**
-	 * Creates one route base on the give configuration
-	 * @param array $routes
-	 * @throws \UnexpectedValueException
-	 */
-	private function processSimpleRoutes($routes)
-	{
-		$simpleRoutes = isset($routes['routes']) ? $routes['routes'] : array();
-		foreach ($simpleRoutes as $simpleRoute) {
-			$name = $simpleRoute['name'];
-			$postfix = '';
-
-			if (isset($simpleRoute['postfix'])) {
-				$postfix = $simpleRoute['postfix'];
-			}
-
-			$url = $simpleRoute['url'];
-			$verb = isset($simpleRoute['verb']) ? strtoupper($simpleRoute['verb']) : 'GET';
-
-			$split = explode('#', $name, 2);
-			if (count($split) != 2) {
-				throw new \UnexpectedValueException('Invalid route name');
-			}
-			$controller = $split[0];
-			$action = $split[1];
-
-			$controllerName = $this->buildControllerName($controller);
-			$actionName = $this->buildActionName($action);
-
-			// register the route
-			$handler = new RouteActionHandler($this->container, $controllerName, $actionName);
-			$router = $this->router->create($this->appName.'.'.$controller.'.'.$action . $postfix, $url)
-							->method($verb)
-							->action($handler);
-
-			// optionally register requirements for route. This is used to
-			// tell the route parser how url parameters should be matched
-			if(array_key_exists('requirements', $simpleRoute)) {
-				$router->requirements($simpleRoute['requirements']);
-			}
-
-			// optionally register defaults for route. This is used to
-			// tell the route parser how url parameters should be default valued
-			if(array_key_exists('defaults', $simpleRoute)) {
-				$router->defaults($simpleRoute['defaults']);
-			}
-		}
-	}
-
-	/**
-	 * For a given name and url restful routes are created:
-	 *  - index
-	 *  - show
-	 *  - new
-	 *  - create
-	 *  - update
-	 *  - destroy
-	 *
-	 * @param array $routes
-	 */
-	private function processResources($routes)
-	{
-		// declaration of all restful actions
-		$actions = array(
-			array('name' => 'index', 'verb' => 'GET', 'on-collection' => true),
-			array('name' => 'show', 'verb' => 'GET'),
-			array('name' => 'create', 'verb' => 'POST', 'on-collection' => true),
-			array('name' => 'update', 'verb' => 'PUT'),
-			array('name' => 'destroy', 'verb' => 'DELETE'),
-		);
-
-		$resources = isset($routes['resources']) ? $routes['resources'] : array();
-		foreach ($resources as $resource => $config) {
-
-			// the url parameter used as id to the resource
-			foreach($actions as $action) {
-				$url = $config['url'];
-				$method = $action['name'];
-				$verb = isset($action['verb']) ? strtoupper($action['verb']) : 'GET';
-				$collectionAction = isset($action['on-collection']) ? $action['on-collection'] : false;
-				if (!$collectionAction) {
-					$url = $url . '/{id}';
-				}
-				if (isset($action['url-postfix'])) {
-					$url = $url . '/' . $action['url-postfix'];
-				}
-
-				$controller = $resource;
-
-				$controllerName = $this->buildControllerName($controller);
-				$actionName = $this->buildActionName($method);
-
-				$routeName = $this->appName . '.' . strtolower($resource) . '.' . strtolower($method);
-
-				$this->router->create($routeName, $url)->method($verb)->action(
-					new RouteActionHandler($this->container, $controllerName, $actionName)
-				);
-			}
-		}
-	}
-
-	/**
-	 * Based on a given route name the controller name is generated
-	 * @param string $controller
-	 * @return string
-	 */
-	private function buildControllerName($controller)
-	{
-		if (!isset($this->controllerNameCache[$controller])) {
-			$this->controllerNameCache[$controller] = $this->underScoreToCamelCase(ucfirst($controller)) . 'Controller';
-		}
-		return $this->controllerNameCache[$controller];
-	}
-
-	/**
-	 * Based on the action part of the route name the controller method name is generated
-	 * @param string $action
-	 * @return string
-	 */
-	private function buildActionName($action) {
-		return $this->underScoreToCamelCase($action);
-	}
-
-	/**
-	 * Underscored strings are converted to camel case strings
-	 * @param string $str
-	 * @return string
-	 */
-	private function underScoreToCamelCase($str) {
-		$pattern = "/_[a-z]?/";
-		return preg_replace_callback(
-			$pattern,
-			function ($matches) {
-				return strtoupper(ltrim($matches[0], "_"));
-			},
-			$str);
-	}
+        $oldCollection = $this->router->getCurrentCollection();
+        $this->router->useCollection($oldCollection.'.ocs');
+
+        // parse ocs simple routes
+        $this->processOCS($this->routes);
+
+        $this->router->useCollection($oldCollection);
+    }
+
+    private function processOCS(array $routes) {
+        $ocsRoutes = isset($routes['ocs']) ? $routes['ocs'] : [];
+        foreach ($ocsRoutes as $ocsRoute) {
+            $name = $ocsRoute['name'];
+            $postfix = '';
+
+            if (isset($ocsRoute['postfix'])) {
+                $postfix = $ocsRoute['postfix'];
+            }
+
+            if (isset($ocsRoute['root'])) {
+                $root = $ocsRoute['root'];
+            } else {
+                $root = '/apps/'.$this->appName;
+            }
+
+            $url = $root . $ocsRoute['url'];
+            $verb = isset($ocsRoute['verb']) ? strtoupper($ocsRoute['verb']) : 'GET';
+
+            $split = explode('#', $name, 2);
+            if (count($split) != 2) {
+                throw new \UnexpectedValueException('Invalid route name');
+            }
+            $controller = $split[0];
+            $action = $split[1];
+
+            $controllerName = $this->buildControllerName($controller);
+            $actionName = $this->buildActionName($action);
+
+            // register the route
+            $handler = new RouteActionHandler($this->container, $controllerName, $actionName);
+
+            $router = $this->router->create('ocs.'.$this->appName.'.'.$controller.'.'.$action . $postfix, $url)
+                ->method($verb)
+                ->action($handler);
+
+            // optionally register requirements for route. This is used to
+            // tell the route parser how url parameters should be matched
+            if(array_key_exists('requirements', $ocsRoute)) {
+                $router->requirements($ocsRoute['requirements']);
+            }
+
+            // optionally register defaults for route. This is used to
+            // tell the route parser how url parameters should be default valued
+            if(array_key_exists('defaults', $ocsRoute)) {
+                $router->defaults($ocsRoute['defaults']);
+            }
+        }
+    }
+
+    /**
+     * Creates one route base on the give configuration
+     * @param array $routes
+     * @throws \UnexpectedValueException
+     */
+    private function processSimpleRoutes($routes)
+    {
+        $simpleRoutes = isset($routes['routes']) ? $routes['routes'] : array();
+        foreach ($simpleRoutes as $simpleRoute) {
+            $name = $simpleRoute['name'];
+            $postfix = '';
+
+            if (isset($simpleRoute['postfix'])) {
+                $postfix = $simpleRoute['postfix'];
+            }
+
+            $url = $simpleRoute['url'];
+            $verb = isset($simpleRoute['verb']) ? strtoupper($simpleRoute['verb']) : 'GET';
+
+            $split = explode('#', $name, 2);
+            if (count($split) != 2) {
+                throw new \UnexpectedValueException('Invalid route name');
+            }
+            $controller = $split[0];
+            $action = $split[1];
+
+            $controllerName = $this->buildControllerName($controller);
+            $actionName = $this->buildActionName($action);
+
+            // register the route
+            $handler = new RouteActionHandler($this->container, $controllerName, $actionName);
+            $router = $this->router->create($this->appName.'.'.$controller.'.'.$action . $postfix, $url)
+                            ->method($verb)
+                            ->action($handler);
+
+            // optionally register requirements for route. This is used to
+            // tell the route parser how url parameters should be matched
+            if(array_key_exists('requirements', $simpleRoute)) {
+                $router->requirements($simpleRoute['requirements']);
+            }
+
+            // optionally register defaults for route. This is used to
+            // tell the route parser how url parameters should be default valued
+            if(array_key_exists('defaults', $simpleRoute)) {
+                $router->defaults($simpleRoute['defaults']);
+            }
+        }
+    }
+
+    /**
+     * For a given name and url restful routes are created:
+     *  - index
+     *  - show
+     *  - new
+     *  - create
+     *  - update
+     *  - destroy
+     *
+     * @param array $routes
+     */
+    private function processResources($routes)
+    {
+        // declaration of all restful actions
+        $actions = array(
+            array('name' => 'index', 'verb' => 'GET', 'on-collection' => true),
+            array('name' => 'show', 'verb' => 'GET'),
+            array('name' => 'create', 'verb' => 'POST', 'on-collection' => true),
+            array('name' => 'update', 'verb' => 'PUT'),
+            array('name' => 'destroy', 'verb' => 'DELETE'),
+        );
+
+        $resources = isset($routes['resources']) ? $routes['resources'] : array();
+        foreach ($resources as $resource => $config) {
+
+            // the url parameter used as id to the resource
+            foreach($actions as $action) {
+                $url = $config['url'];
+                $method = $action['name'];
+                $verb = isset($action['verb']) ? strtoupper($action['verb']) : 'GET';
+                $collectionAction = isset($action['on-collection']) ? $action['on-collection'] : false;
+                if (!$collectionAction) {
+                    $url = $url . '/{id}';
+                }
+                if (isset($action['url-postfix'])) {
+                    $url = $url . '/' . $action['url-postfix'];
+                }
+
+                $controller = $resource;
+
+                $controllerName = $this->buildControllerName($controller);
+                $actionName = $this->buildActionName($method);
+
+                $routeName = $this->appName . '.' . strtolower($resource) . '.' . strtolower($method);
+
+                $this->router->create($routeName, $url)->method($verb)->action(
+                    new RouteActionHandler($this->container, $controllerName, $actionName)
+                );
+            }
+        }
+    }
+
+    /**
+     * Based on a given route name the controller name is generated
+     * @param string $controller
+     * @return string
+     */
+    private function buildControllerName($controller)
+    {
+        if (!isset($this->controllerNameCache[$controller])) {
+            $this->controllerNameCache[$controller] = $this->underScoreToCamelCase(ucfirst($controller)) . 'Controller';
+        }
+        return $this->controllerNameCache[$controller];
+    }
+
+    /**
+     * Based on the action part of the route name the controller method name is generated
+     * @param string $action
+     * @return string
+     */
+    private function buildActionName($action) {
+        return $this->underScoreToCamelCase($action);
+    }
+
+    /**
+     * Underscored strings are converted to camel case strings
+     * @param string $str
+     * @return string
+     */
+    private function underScoreToCamelCase($str) {
+        $pattern = "/_[a-z]?/";
+        return preg_replace_callback(
+            $pattern,
+            function ($matches) {
+                return strtoupper(ltrim($matches[0], "_"));
+            },
+            $str);
+    }
 }

lib/private/AppFramework/Routing/RouteActionHandler.php

Indentation +15 added lines, -15 removed lines

@@ -29,21 +29,21 @@
 use \OC\AppFramework\DependencyInjection\DIContainer;
 
 class RouteActionHandler {
-	private $controllerName;
-	private $actionName;
-	private $container;
+    private $controllerName;
+    private $actionName;
+    private $container;
 
-	/**
-	 * @param string $controllerName
-	 * @param string $actionName
-	 */
-	public function __construct(DIContainer $container, $controllerName, $actionName) {
-		$this->controllerName = $controllerName;
-		$this->actionName = $actionName;
-		$this->container = $container;
-	}
+    /**
+     * @param string $controllerName
+     * @param string $actionName
+     */
+    public function __construct(DIContainer $container, $controllerName, $actionName) {
+        $this->controllerName = $controllerName;
+        $this->actionName = $actionName;
+        $this->container = $container;
+    }
 
-	public function __invoke($params) {
-		App::main($this->controllerName, $this->actionName, $this->container, $params);
-	}
+    public function __invoke($params) {
+        App::main($this->controllerName, $this->actionName, $this->container, $params);
+    }
 }

lib/private/Share/Helper.php

Indentation +232 added lines, -232 removed lines

@@ -33,263 +33,263 @@
 
 class Helper extends \OC\Share\Constants {
 
-	/**
-	 * Generate a unique target for the item
-	 * @param string $itemType
-	 * @param string $itemSource
-	 * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
-	 * @param string $shareWith User or group the item is being shared with
-	 * @param string $uidOwner User that is the owner of shared item
-	 * @param string $suggestedTarget The suggested target originating from a reshare (optional)
-	 * @param int $groupParent The id of the parent group share (optional)
-	 * @throws \Exception
-	 * @return string Item target
-	 */
-	public static function generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $suggestedTarget = null, $groupParent = null) {
-		// FIXME: $uidOwner and $groupParent seems to be unused
-		$backend = \OC\Share\Share::getBackend($itemType);
-		if ($shareType === self::SHARE_TYPE_LINK || $shareType === self::SHARE_TYPE_REMOTE) {
-			if (isset($suggestedTarget)) {
-				return $suggestedTarget;
-			}
-			return $backend->generateTarget($itemSource, false);
-		} else {
-			if ($shareType == self::SHARE_TYPE_USER) {
-				// Share with is a user, so set share type to user and groups
-				$shareType = self::$shareTypeUserAndGroups;
-			}
+    /**
+     * Generate a unique target for the item
+     * @param string $itemType
+     * @param string $itemSource
+     * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
+     * @param string $shareWith User or group the item is being shared with
+     * @param string $uidOwner User that is the owner of shared item
+     * @param string $suggestedTarget The suggested target originating from a reshare (optional)
+     * @param int $groupParent The id of the parent group share (optional)
+     * @throws \Exception
+     * @return string Item target
+     */
+    public static function generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $suggestedTarget = null, $groupParent = null) {
+        // FIXME: $uidOwner and $groupParent seems to be unused
+        $backend = \OC\Share\Share::getBackend($itemType);
+        if ($shareType === self::SHARE_TYPE_LINK || $shareType === self::SHARE_TYPE_REMOTE) {
+            if (isset($suggestedTarget)) {
+                return $suggestedTarget;
+            }
+            return $backend->generateTarget($itemSource, false);
+        } else {
+            if ($shareType == self::SHARE_TYPE_USER) {
+                // Share with is a user, so set share type to user and groups
+                $shareType = self::$shareTypeUserAndGroups;
+            }
 
-			// Check if suggested target exists first
-			if (!isset($suggestedTarget)) {
-				$suggestedTarget = $itemSource;
-			}
-			if ($shareType == self::SHARE_TYPE_GROUP) {
-				$target = $backend->generateTarget($suggestedTarget, false);
-			} else {
-				$target = $backend->generateTarget($suggestedTarget, $shareWith);
-			}
+            // Check if suggested target exists first
+            if (!isset($suggestedTarget)) {
+                $suggestedTarget = $itemSource;
+            }
+            if ($shareType == self::SHARE_TYPE_GROUP) {
+                $target = $backend->generateTarget($suggestedTarget, false);
+            } else {
+                $target = $backend->generateTarget($suggestedTarget, $shareWith);
+            }
 
-			return $target;
-		}
-	}
+            return $target;
+        }
+    }
 
-	/**
-	 * Delete all reshares and group share children of an item
-	 * @param int $parent Id of item to delete
-	 * @param bool $excludeParent If true, exclude the parent from the delete (optional)
-	 * @param string $uidOwner The user that the parent was shared with (optional)
-	 * @param int $newParent new parent for the childrens
-	 * @param bool $excludeGroupChildren exclude group children elements
-	 */
-	public static function delete($parent, $excludeParent = false, $uidOwner = null, $newParent = null, $excludeGroupChildren = false) {
-		$ids = array($parent);
-		$deletedItems = array();
-		$changeParent = array();
-		$parents = array($parent);
-		while (!empty($parents)) {
-			$parents = "'".implode("','", $parents)."'";
-			// Check the owner on the first search of reshares, useful for
-			// finding and deleting the reshares by a single user of a group share
-			$params = array();
-			if (count($ids) == 1 && isset($uidOwner)) {
-				// FIXME: don't concat $parents, use Docrine's PARAM_INT_ARRAY approach
-				$queryString = 'SELECT `id`, `share_with`, `item_type`, `share_type`, ' .
-					'`item_target`, `file_target`, `parent` ' .
-					'FROM `*PREFIX*share` ' .
-					'WHERE `parent` IN ('.$parents.') AND `uid_owner` = ? ';
-				$params[] = $uidOwner;
-			} else {
-				$queryString = 'SELECT `id`, `share_with`, `item_type`, `share_type`, ' .
-					'`item_target`, `file_target`, `parent`, `uid_owner` ' .
-					'FROM `*PREFIX*share` WHERE `parent` IN ('.$parents.') ';
-			}
-			if ($excludeGroupChildren) {
-				$queryString .= ' AND `share_type` != ?';
-				$params[] = self::$shareTypeGroupUserUnique;
-			}
-			$query = \OC_DB::prepare($queryString);
-			$result = $query->execute($params);
-			// Reset parents array, only go through loop again if items are found
-			$parents = array();
-			while ($item = $result->fetchRow()) {
-				$tmpItem = array(
-					'id' => $item['id'],
-					'shareWith' => $item['share_with'],
-					'itemTarget' => $item['item_target'],
-					'itemType' => $item['item_type'],
-					'shareType' => (int)$item['share_type'],
-				);
-				if (isset($item['file_target'])) {
-					$tmpItem['fileTarget'] = $item['file_target'];
-				}
-				// if we have a new parent for the child we remember the child
-				// to update the parent, if not we add it to the list of items
-				// which should be deleted
-				if ($newParent !== null) {
-					$changeParent[] = $item['id'];
-				} else {
-					$deletedItems[] = $tmpItem;
-					$ids[] = $item['id'];
-					$parents[] = $item['id'];
-				}
-			}
-		}
-		if ($excludeParent) {
-			unset($ids[0]);
-		}
+    /**
+     * Delete all reshares and group share children of an item
+     * @param int $parent Id of item to delete
+     * @param bool $excludeParent If true, exclude the parent from the delete (optional)
+     * @param string $uidOwner The user that the parent was shared with (optional)
+     * @param int $newParent new parent for the childrens
+     * @param bool $excludeGroupChildren exclude group children elements
+     */
+    public static function delete($parent, $excludeParent = false, $uidOwner = null, $newParent = null, $excludeGroupChildren = false) {
+        $ids = array($parent);
+        $deletedItems = array();
+        $changeParent = array();
+        $parents = array($parent);
+        while (!empty($parents)) {
+            $parents = "'".implode("','", $parents)."'";
+            // Check the owner on the first search of reshares, useful for
+            // finding and deleting the reshares by a single user of a group share
+            $params = array();
+            if (count($ids) == 1 && isset($uidOwner)) {
+                // FIXME: don't concat $parents, use Docrine's PARAM_INT_ARRAY approach
+                $queryString = 'SELECT `id`, `share_with`, `item_type`, `share_type`, ' .
+                    '`item_target`, `file_target`, `parent` ' .
+                    'FROM `*PREFIX*share` ' .
+                    'WHERE `parent` IN ('.$parents.') AND `uid_owner` = ? ';
+                $params[] = $uidOwner;
+            } else {
+                $queryString = 'SELECT `id`, `share_with`, `item_type`, `share_type`, ' .
+                    '`item_target`, `file_target`, `parent`, `uid_owner` ' .
+                    'FROM `*PREFIX*share` WHERE `parent` IN ('.$parents.') ';
+            }
+            if ($excludeGroupChildren) {
+                $queryString .= ' AND `share_type` != ?';
+                $params[] = self::$shareTypeGroupUserUnique;
+            }
+            $query = \OC_DB::prepare($queryString);
+            $result = $query->execute($params);
+            // Reset parents array, only go through loop again if items are found
+            $parents = array();
+            while ($item = $result->fetchRow()) {
+                $tmpItem = array(
+                    'id' => $item['id'],
+                    'shareWith' => $item['share_with'],
+                    'itemTarget' => $item['item_target'],
+                    'itemType' => $item['item_type'],
+                    'shareType' => (int)$item['share_type'],
+                );
+                if (isset($item['file_target'])) {
+                    $tmpItem['fileTarget'] = $item['file_target'];
+                }
+                // if we have a new parent for the child we remember the child
+                // to update the parent, if not we add it to the list of items
+                // which should be deleted
+                if ($newParent !== null) {
+                    $changeParent[] = $item['id'];
+                } else {
+                    $deletedItems[] = $tmpItem;
+                    $ids[] = $item['id'];
+                    $parents[] = $item['id'];
+                }
+            }
+        }
+        if ($excludeParent) {
+            unset($ids[0]);
+        }
 
-		if (!empty($changeParent)) {
-			$idList = "'".implode("','", $changeParent)."'";
-			$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `parent` = ? WHERE `id` IN ('.$idList.')');
-			$query->execute(array($newParent));
-		}
+        if (!empty($changeParent)) {
+            $idList = "'".implode("','", $changeParent)."'";
+            $query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `parent` = ? WHERE `id` IN ('.$idList.')');
+            $query->execute(array($newParent));
+        }
 
-		if (!empty($ids)) {
-			$idList = "'".implode("','", $ids)."'";
-			$query = \OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `id` IN ('.$idList.')');
-			$query->execute();
-		}
+        if (!empty($ids)) {
+            $idList = "'".implode("','", $ids)."'";
+            $query = \OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `id` IN ('.$idList.')');
+            $query->execute();
+        }
 
-		return $deletedItems;
-	}
+        return $deletedItems;
+    }
 
-	/**
-	 * get default expire settings defined by the admin
-	 * @return array contains 'defaultExpireDateSet', 'enforceExpireDate', 'expireAfterDays'
-	 */
-	public static function getDefaultExpireSetting() {
+    /**
+     * get default expire settings defined by the admin
+     * @return array contains 'defaultExpireDateSet', 'enforceExpireDate', 'expireAfterDays'
+     */
+    public static function getDefaultExpireSetting() {
 
-		$config = \OC::$server->getConfig();
+        $config = \OC::$server->getConfig();
 
-		$defaultExpireSettings = array('defaultExpireDateSet' => false);
+        $defaultExpireSettings = array('defaultExpireDateSet' => false);
 
-		// get default expire settings
-		$defaultExpireDate = $config->getAppValue('core', 'shareapi_default_expire_date', 'no');
-		if ($defaultExpireDate === 'yes') {
-			$enforceExpireDate = $config->getAppValue('core', 'shareapi_enforce_expire_date', 'no');
-			$defaultExpireSettings['defaultExpireDateSet'] = true;
-			$defaultExpireSettings['expireAfterDays'] = (int)($config->getAppValue('core', 'shareapi_expire_after_n_days', '7'));
-			$defaultExpireSettings['enforceExpireDate'] = $enforceExpireDate === 'yes' ? true : false;
-		}
+        // get default expire settings
+        $defaultExpireDate = $config->getAppValue('core', 'shareapi_default_expire_date', 'no');
+        if ($defaultExpireDate === 'yes') {
+            $enforceExpireDate = $config->getAppValue('core', 'shareapi_enforce_expire_date', 'no');
+            $defaultExpireSettings['defaultExpireDateSet'] = true;
+            $defaultExpireSettings['expireAfterDays'] = (int)($config->getAppValue('core', 'shareapi_expire_after_n_days', '7'));
+            $defaultExpireSettings['enforceExpireDate'] = $enforceExpireDate === 'yes' ? true : false;
+        }
 
-		return $defaultExpireSettings;
-	}
+        return $defaultExpireSettings;
+    }
 
-	public static function calcExpireDate() {
-		$expireAfter = \OC\Share\Share::getExpireInterval() * 24 * 60 * 60;
-		$expireAt = time() + $expireAfter;
-		$date = new \DateTime();
-		$date->setTimestamp($expireAt);
-		$date->setTime(0, 0, 0);
-		//$dateString = $date->format('Y-m-d') . ' 00:00:00';
+    public static function calcExpireDate() {
+        $expireAfter = \OC\Share\Share::getExpireInterval() * 24 * 60 * 60;
+        $expireAt = time() + $expireAfter;
+        $date = new \DateTime();
+        $date->setTimestamp($expireAt);
+        $date->setTime(0, 0, 0);
+        //$dateString = $date->format('Y-m-d') . ' 00:00:00';
 
-		return $date;
+        return $date;
 
-	}
+    }
 
-	/**
-	 * calculate expire date
-	 * @param array $defaultExpireSettings contains 'defaultExpireDateSet', 'enforceExpireDate', 'expireAfterDays'
-	 * @param int $creationTime timestamp when the share was created
-	 * @param int $userExpireDate expire timestamp set by the user
-	 * @return mixed integer timestamp or False
-	 */
-	public static function calculateExpireDate($defaultExpireSettings, $creationTime, $userExpireDate = null) {
+    /**
+     * calculate expire date
+     * @param array $defaultExpireSettings contains 'defaultExpireDateSet', 'enforceExpireDate', 'expireAfterDays'
+     * @param int $creationTime timestamp when the share was created
+     * @param int $userExpireDate expire timestamp set by the user
+     * @return mixed integer timestamp or False
+     */
+    public static function calculateExpireDate($defaultExpireSettings, $creationTime, $userExpireDate = null) {
 
-		$expires = false;
-		$defaultExpires = null;
+        $expires = false;
+        $defaultExpires = null;
 
-		if (!empty($defaultExpireSettings['defaultExpireDateSet'])) {
-			$defaultExpires = $creationTime + $defaultExpireSettings['expireAfterDays'] * 86400;
-		}
+        if (!empty($defaultExpireSettings['defaultExpireDateSet'])) {
+            $defaultExpires = $creationTime + $defaultExpireSettings['expireAfterDays'] * 86400;
+        }
 
 
-		if (isset($userExpireDate)) {
-			// if the admin decided to enforce the default expire date then we only take
-			// the user defined expire date of it is before the default expire date
-			if ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) {
-				$expires = min($userExpireDate, $defaultExpires);
-			} else {
-				$expires = $userExpireDate;
-			}
-		} else if ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) {
-			$expires = $defaultExpires;
-		}
+        if (isset($userExpireDate)) {
+            // if the admin decided to enforce the default expire date then we only take
+            // the user defined expire date of it is before the default expire date
+            if ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) {
+                $expires = min($userExpireDate, $defaultExpires);
+            } else {
+                $expires = $userExpireDate;
+            }
+        } else if ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) {
+            $expires = $defaultExpires;
+        }
 
-		return $expires;
-	}
+        return $expires;
+    }
 
-	/**
-	 * Strips away a potential file names and trailing slashes:
-	 * - http://localhost
-	 * - http://localhost/
-	 * - http://localhost/index.php
-	 * - http://localhost/index.php/s/{shareToken}
-	 *
-	 * all return: http://localhost
-	 *
-	 * @param string $remote
-	 * @return string
-	 */
-	protected static function fixRemoteURL($remote) {
-		$remote = str_replace('\\', '/', $remote);
-		if ($fileNamePosition = strpos($remote, '/index.php')) {
-			$remote = substr($remote, 0, $fileNamePosition);
-		}
-		$remote = rtrim($remote, '/');
+    /**
+     * Strips away a potential file names and trailing slashes:
+     * - http://localhost
+     * - http://localhost/
+     * - http://localhost/index.php
+     * - http://localhost/index.php/s/{shareToken}
+     *
+     * all return: http://localhost
+     *
+     * @param string $remote
+     * @return string
+     */
+    protected static function fixRemoteURL($remote) {
+        $remote = str_replace('\\', '/', $remote);
+        if ($fileNamePosition = strpos($remote, '/index.php')) {
+            $remote = substr($remote, 0, $fileNamePosition);
+        }
+        $remote = rtrim($remote, '/');
 
-		return $remote;
-	}
+        return $remote;
+    }
 
-	/**
-	 * split user and remote from federated cloud id
-	 *
-	 * @param string $id
-	 * @return string[]
-	 * @throws HintException
-	 */
-	public static function splitUserRemote($id) {
-		try {
-			$cloudId = \OC::$server->getCloudIdManager()->resolveCloudId($id);
-			return [$cloudId->getUser(), $cloudId->getRemote()];
-		} catch (\InvalidArgumentException $e) {
-			$l = \OC::$server->getL10N('core');
-			$hint = $l->t('Invalid Federated Cloud ID');
-			throw new HintException('Invalid Federated Cloud ID', $hint, 0, $e);
-		}
-	}
+    /**
+     * split user and remote from federated cloud id
+     *
+     * @param string $id
+     * @return string[]
+     * @throws HintException
+     */
+    public static function splitUserRemote($id) {
+        try {
+            $cloudId = \OC::$server->getCloudIdManager()->resolveCloudId($id);
+            return [$cloudId->getUser(), $cloudId->getRemote()];
+        } catch (\InvalidArgumentException $e) {
+            $l = \OC::$server->getL10N('core');
+            $hint = $l->t('Invalid Federated Cloud ID');
+            throw new HintException('Invalid Federated Cloud ID', $hint, 0, $e);
+        }
+    }
 
-	/**
-	 * check if two federated cloud IDs refer to the same user
-	 *
-	 * @param string $user1
-	 * @param string $server1
-	 * @param string $user2
-	 * @param string $server2
-	 * @return bool true if both users and servers are the same
-	 */
-	public static function isSameUserOnSameServer($user1, $server1, $user2, $server2) {
-		$normalizedServer1 = strtolower(\OC\Share\Share::removeProtocolFromUrl($server1));
-		$normalizedServer2 = strtolower(\OC\Share\Share::removeProtocolFromUrl($server2));
+    /**
+     * check if two federated cloud IDs refer to the same user
+     *
+     * @param string $user1
+     * @param string $server1
+     * @param string $user2
+     * @param string $server2
+     * @return bool true if both users and servers are the same
+     */
+    public static function isSameUserOnSameServer($user1, $server1, $user2, $server2) {
+        $normalizedServer1 = strtolower(\OC\Share\Share::removeProtocolFromUrl($server1));
+        $normalizedServer2 = strtolower(\OC\Share\Share::removeProtocolFromUrl($server2));
 
-		if (rtrim($normalizedServer1, '/') === rtrim($normalizedServer2, '/')) {
-			// FIXME this should be a method in the user management instead
-			\OCP\Util::emitHook(
-					'\OCA\Files_Sharing\API\Server2Server',
-					'preLoginNameUsedAsUserName',
-					array('uid' => &$user1)
-			);
-			\OCP\Util::emitHook(
-					'\OCA\Files_Sharing\API\Server2Server',
-					'preLoginNameUsedAsUserName',
-					array('uid' => &$user2)
-			);
+        if (rtrim($normalizedServer1, '/') === rtrim($normalizedServer2, '/')) {
+            // FIXME this should be a method in the user management instead
+            \OCP\Util::emitHook(
+                    '\OCA\Files_Sharing\API\Server2Server',
+                    'preLoginNameUsedAsUserName',
+                    array('uid' => &$user1)
+            );
+            \OCP\Util::emitHook(
+                    '\OCA\Files_Sharing\API\Server2Server',
+                    'preLoginNameUsedAsUserName',
+                    array('uid' => &$user2)
+            );
 
-			if ($user1 === $user2) {
-				return true;
-			}
-		}
+            if ($user1 === $user2) {
+                return true;
+            }
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

lib/private/Share/SearchResultSorter.php

Indentation +43 added lines, -43 removed lines

@@ -26,51 +26,51 @@
 use OCP\ILogger;
 
 class SearchResultSorter {
-	private $search;
-	private $encoding;
-	private $key;
-	private $log;
+    private $search;
+    private $encoding;
+    private $key;
+    private $log;
 
-	/**
-	 * @param string $search the search term as was given by the user
-	 * @param string $key the array key containing the value that should be compared
-	 * against
-	 * @param string $encoding optional, encoding to use, defaults to UTF-8
-	 * @param ILogger $log optional
-	 */
-	public function __construct($search, $key, ILogger $log = null, $encoding = 'UTF-8') {
-		$this->encoding = $encoding;
-		$this->key = $key;
-		$this->log = $log;
-		$this->search = mb_strtolower($search, $this->encoding);
-	}
+    /**
+     * @param string $search the search term as was given by the user
+     * @param string $key the array key containing the value that should be compared
+     * against
+     * @param string $encoding optional, encoding to use, defaults to UTF-8
+     * @param ILogger $log optional
+     */
+    public function __construct($search, $key, ILogger $log = null, $encoding = 'UTF-8') {
+        $this->encoding = $encoding;
+        $this->key = $key;
+        $this->log = $log;
+        $this->search = mb_strtolower($search, $this->encoding);
+    }
 
-	/**
-	 * User and Group names matching the search term at the beginning shall appear
-	 * on top of the share dialog. Following entries in alphabetical order.
-	 * Callback function for usort. http://php.net/usort
-	 */
-	public function sort($a, $b) {
-		if(!isset($a[$this->key]) || !isset($b[$this->key])) {
-			if(!is_null($this->log)) {
-				$this->log->error('Sharing dialogue: cannot sort due to ' .
-								  'missing array key', array('app' => 'core'));
-			}
-			return 0;
-		}
-		$nameA = mb_strtolower($a[$this->key], $this->encoding);
-		$nameB = mb_strtolower($b[$this->key], $this->encoding);
-		$i = mb_strpos($nameA, $this->search, 0, $this->encoding);
-		$j = mb_strpos($nameB, $this->search, 0, $this->encoding);
+    /**
+     * User and Group names matching the search term at the beginning shall appear
+     * on top of the share dialog. Following entries in alphabetical order.
+     * Callback function for usort. http://php.net/usort
+     */
+    public function sort($a, $b) {
+        if(!isset($a[$this->key]) || !isset($b[$this->key])) {
+            if(!is_null($this->log)) {
+                $this->log->error('Sharing dialogue: cannot sort due to ' .
+                                    'missing array key', array('app' => 'core'));
+            }
+            return 0;
+        }
+        $nameA = mb_strtolower($a[$this->key], $this->encoding);
+        $nameB = mb_strtolower($b[$this->key], $this->encoding);
+        $i = mb_strpos($nameA, $this->search, 0, $this->encoding);
+        $j = mb_strpos($nameB, $this->search, 0, $this->encoding);
 
-		if($i === $j || $i > 0 && $j > 0) {
-			return strcmp(mb_strtolower($nameA, $this->encoding),
-						  mb_strtolower($nameB, $this->encoding));
-		} elseif ($i === 0) {
-			return -1;
-		} else {
-			return 1;
-		}
-	}
+        if($i === $j || $i > 0 && $j > 0) {
+            return strcmp(mb_strtolower($nameA, $this->encoding),
+                            mb_strtolower($nameB, $this->encoding));
+        } elseif ($i === 0) {
+            return -1;
+        } else {
+            return 1;
+        }
+    }
 }