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/OCSMiddleware.php

Spacing +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
 		$format = $this->request->getParam('format');
 
 		// if none is given try the first Accept header
-		if($format === null) {
+		if ($format === null) {
 			$headers = $this->request->getHeader('Accept');
 			$format = $controller->getResponderByHTTPHeader($headers, 'xml');
 		}

Indentation +109 added lines, -109 removed lines

@@ -39,116 +39,116 @@
 
 class OCSMiddleware extends Middleware {
 
-	/** @var IRequest */
-	private $request;
-
-	/** @var int */
-	private $ocsVersion;
-
-	/**
-	 * @param IRequest $request
-	 */
-	public function __construct(IRequest $request) {
-		$this->request = $request;
-	}
-
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 */
-	public function beforeController($controller, $methodName) {
-		if ($controller instanceof OCSController) {
-			if (substr_compare($this->request->getScriptName(), '/ocs/v2.php', -strlen('/ocs/v2.php')) === 0) {
-				$this->ocsVersion = 2;
-			} else {
-				$this->ocsVersion = 1;
-			}
-			$controller->setOCSVersion($this->ocsVersion);
-		}
-	}
-
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param \Exception $exception
-	 * @throws \Exception
-	 * @return BaseResponse
-	 */
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if ($controller instanceof OCSController && $exception instanceof OCSException) {
-			$code = $exception->getCode();
-			if ($code === 0) {
-				$code = API::RESPOND_UNKNOWN_ERROR;
-			}
-
-			return $this->buildNewResponse($controller, $code, $exception->getMessage());
-		}
-
-		throw $exception;
-	}
-
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param Response $response
-	 * @return \OCP\AppFramework\Http\Response
-	 */
-	public function afterController($controller, $methodName, Response $response) {
-		/*
+    /** @var IRequest */
+    private $request;
+
+    /** @var int */
+    private $ocsVersion;
+
+    /**
+     * @param IRequest $request
+     */
+    public function __construct(IRequest $request) {
+        $this->request = $request;
+    }
+
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     */
+    public function beforeController($controller, $methodName) {
+        if ($controller instanceof OCSController) {
+            if (substr_compare($this->request->getScriptName(), '/ocs/v2.php', -strlen('/ocs/v2.php')) === 0) {
+                $this->ocsVersion = 2;
+            } else {
+                $this->ocsVersion = 1;
+            }
+            $controller->setOCSVersion($this->ocsVersion);
+        }
+    }
+
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @param \Exception $exception
+     * @throws \Exception
+     * @return BaseResponse
+     */
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if ($controller instanceof OCSController && $exception instanceof OCSException) {
+            $code = $exception->getCode();
+            if ($code === 0) {
+                $code = API::RESPOND_UNKNOWN_ERROR;
+            }
+
+            return $this->buildNewResponse($controller, $code, $exception->getMessage());
+        }
+
+        throw $exception;
+    }
+
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @param Response $response
+     * @return \OCP\AppFramework\Http\Response
+     */
+    public function afterController($controller, $methodName, Response $response) {
+        /*
 		 * If a different middleware has detected that a request unauthorized or forbidden
 		 * we need to catch the response and convert it to a proper OCS response.
 		 */
-		if ($controller instanceof OCSController && !($response instanceof BaseResponse)) {
-			if ($response->getStatus() === Http::STATUS_UNAUTHORIZED ||
-			    $response->getStatus() === Http::STATUS_FORBIDDEN) {
-
-				$message = '';
-				if ($response instanceof JSONResponse) {
-					/** @var DataResponse $response */
-					$message = $response->getData()['message'];
-				}
-
-				return $this->buildNewResponse($controller, API::RESPOND_UNAUTHORISED, $message);
-			}
-		}
-
-		return $response;
-	}
-
-	/**
-	 * @param Controller $controller
-	 * @param int $code
-	 * @param string $message
-	 * @return V1Response|V2Response
-	 */
-	private function buildNewResponse(Controller $controller, $code, $message) {
-		$format = $this->getFormat($controller);
-
-		$data = new DataResponse();
-		$data->setStatus($code);
-		if ($this->ocsVersion === 1) {
-			$response = new V1Response($data, $format, $message);
-		} else {
-			$response = new V2Response($data, $format, $message);
-		}
-
-		return $response;
-	}
-
-	/**
-	 * @param Controller $controller
-	 * @return string
-	 */
-	private function getFormat(Controller $controller) {
-		// get format from the url format or request format parameter
-		$format = $this->request->getParam('format');
-
-		// if none is given try the first Accept header
-		if($format === null) {
-			$headers = $this->request->getHeader('Accept');
-			$format = $controller->getResponderByHTTPHeader($headers, 'xml');
-		}
-
-		return $format;
-	}
+        if ($controller instanceof OCSController && !($response instanceof BaseResponse)) {
+            if ($response->getStatus() === Http::STATUS_UNAUTHORIZED ||
+                $response->getStatus() === Http::STATUS_FORBIDDEN) {
+
+                $message = '';
+                if ($response instanceof JSONResponse) {
+                    /** @var DataResponse $response */
+                    $message = $response->getData()['message'];
+                }
+
+                return $this->buildNewResponse($controller, API::RESPOND_UNAUTHORISED, $message);
+            }
+        }
+
+        return $response;
+    }
+
+    /**
+     * @param Controller $controller
+     * @param int $code
+     * @param string $message
+     * @return V1Response|V2Response
+     */
+    private function buildNewResponse(Controller $controller, $code, $message) {
+        $format = $this->getFormat($controller);
+
+        $data = new DataResponse();
+        $data->setStatus($code);
+        if ($this->ocsVersion === 1) {
+            $response = new V1Response($data, $format, $message);
+        } else {
+            $response = new V2Response($data, $format, $message);
+        }
+
+        return $response;
+    }
+
+    /**
+     * @param Controller $controller
+     * @return string
+     */
+    private function getFormat(Controller $controller) {
+        // get format from the url format or request format parameter
+        $format = $this->request->getParam('format');
+
+        // if none is given try the first Accept header
+        if($format === null) {
+            $headers = $this->request->getHeader('Accept');
+            $format = $controller->getResponderByHTTPHeader($headers, 'xml');
+        }
+
+        return $format;
+    }
 }

lib/private/AppFramework/Middleware/SessionMiddleware.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 	 * @param Response $response
 	 * @return Response
 	 */
-	public function afterController($controller, $methodName, Response $response){
+	public function afterController($controller, $methodName, Response $response) {
 		$useSession = $this->reflector->hasAnnotation('UseSession');
 		if ($useSession) {
 			$this->session->close();

Indentation +32 added lines, -32 removed lines

@@ -34,41 +34,41 @@
 
 class SessionMiddleware extends Middleware {
 
-	/** @var ControllerMethodReflector */
-	private $reflector;
+    /** @var ControllerMethodReflector */
+    private $reflector;
 
-	/** @var ISession */
-	private $session;
+    /** @var ISession */
+    private $session;
 
-	public function __construct(ControllerMethodReflector $reflector,
-								ISession $session) {
-		$this->reflector = $reflector;
-		$this->session = $session;
-	}
+    public function __construct(ControllerMethodReflector $reflector,
+                                ISession $session) {
+        $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/AppFramework/OCS/BaseResponse.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 use OCP\AppFramework\Http\EmptyContentSecurityPolicy;
 use OCP\AppFramework\Http\Response;
 
-abstract class BaseResponse extends Response   {
+abstract class BaseResponse extends Response {
 	/** @var array */
 	protected $data;
 

Indentation +118 added lines, -118 removed lines

@@ -30,122 +30,122 @@
 use OCP\AppFramework\Http\Response;
 
 abstract class BaseResponse extends Response   {
-	/** @var array */
-	protected $data;
-
-	/** @var string */
-	protected $format;
-
-	/** @var string */
-	protected $statusMessage;
-
-	/** @var int */
-	protected $itemsCount;
-
-	/** @var int */
-	protected $itemsPerPage;
-
-	/**
-	 * BaseResponse constructor.
-	 *
-	 * @param DataResponse $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) {
-		parent::__construct();
-
-		$this->format = $format;
-		$this->statusMessage = $statusMessage;
-		$this->itemsCount = $itemsCount;
-		$this->itemsPerPage = $itemsPerPage;
-
-		$this->data = $dataResponse->getData();
-
-		$this->setHeaders($dataResponse->getHeaders());
-		$this->setStatus($dataResponse->getStatus());
-		$this->setETag($dataResponse->getETag());
-		$this->setLastModified($dataResponse->getLastModified());
-		$this->setCookies($dataResponse->getCookies());
-
-		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(array $meta): string {
-		$status = $this->getStatus();
-		if ($status === Http::STATUS_NO_CONTENT ||
-			$status === Http::STATUS_NOT_MODIFIED ||
-			($status >= 100 && $status <= 199)) {
-			// Those status codes are not supposed to have a body:
-			// https://stackoverflow.com/q/8628725
-			return '';
-		}
-
-		$response = [
-			'ocs' => [
-				'meta' => $meta,
-				'data' => $this->data,
-			],
-		];
-
-		if ($this->format === 'json') {
-			return json_encode($response, JSON_HEX_TAG);
-		}
-
-		$writer = new \XMLWriter();
-		$writer->openMemory();
-		$writer->setIndent(true);
-		$writer->startDocument();
-		$this->toXML($response, $writer);
-		$writer->endDocument();
-		return $writer->outputMemory(true);
-
-	}
-
-	/**
-	 * @param array $array
-	 * @param \XMLWriter $writer
-	 */
-	protected function toXML(array $array, \XMLWriter $writer) {
-		foreach ($array as $k => $v) {
-			if (\is_string($k) && strpos($k, '@') === 0) {
-				$writer->writeAttribute(substr($k, 1), $v);
-				continue;
-			}
-
-			if (\is_numeric($k)) {
-				$k = 'element';
-			}
-
-			if (\is_array($v)) {
-				$writer->startElement($k);
-				$this->toXML($v, $writer);
-				$writer->endElement();
-			} else {
-				$writer->writeElement($k, $v);
-			}
-		}
-	}
-
-	public function getOCSStatus() {
-		return parent::getStatus();
-	}
+    /** @var array */
+    protected $data;
+
+    /** @var string */
+    protected $format;
+
+    /** @var string */
+    protected $statusMessage;
+
+    /** @var int */
+    protected $itemsCount;
+
+    /** @var int */
+    protected $itemsPerPage;
+
+    /**
+     * BaseResponse constructor.
+     *
+     * @param DataResponse $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) {
+        parent::__construct();
+
+        $this->format = $format;
+        $this->statusMessage = $statusMessage;
+        $this->itemsCount = $itemsCount;
+        $this->itemsPerPage = $itemsPerPage;
+
+        $this->data = $dataResponse->getData();
+
+        $this->setHeaders($dataResponse->getHeaders());
+        $this->setStatus($dataResponse->getStatus());
+        $this->setETag($dataResponse->getETag());
+        $this->setLastModified($dataResponse->getLastModified());
+        $this->setCookies($dataResponse->getCookies());
+
+        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(array $meta): string {
+        $status = $this->getStatus();
+        if ($status === Http::STATUS_NO_CONTENT ||
+            $status === Http::STATUS_NOT_MODIFIED ||
+            ($status >= 100 && $status <= 199)) {
+            // Those status codes are not supposed to have a body:
+            // https://stackoverflow.com/q/8628725
+            return '';
+        }
+
+        $response = [
+            'ocs' => [
+                'meta' => $meta,
+                'data' => $this->data,
+            ],
+        ];
+
+        if ($this->format === 'json') {
+            return json_encode($response, JSON_HEX_TAG);
+        }
+
+        $writer = new \XMLWriter();
+        $writer->openMemory();
+        $writer->setIndent(true);
+        $writer->startDocument();
+        $this->toXML($response, $writer);
+        $writer->endDocument();
+        return $writer->outputMemory(true);
+
+    }
+
+    /**
+     * @param array $array
+     * @param \XMLWriter $writer
+     */
+    protected function toXML(array $array, \XMLWriter $writer) {
+        foreach ($array as $k => $v) {
+            if (\is_string($k) && strpos($k, '@') === 0) {
+                $writer->writeAttribute(substr($k, 1), $v);
+                continue;
+            }
+
+            if (\is_numeric($k)) {
+                $k = 'element';
+            }
+
+            if (\is_array($v)) {
+                $writer->startElement($k);
+                $this->toXML($v, $writer);
+                $writer->endElement();
+            } else {
+                $writer->writeElement($k, $v);
+            }
+        }
+    }
+
+    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);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	 */
 	public function getStatus() {
 
-		$status  = parent::getStatus();
+		$status = parent::getStatus();
 		if ($status === API::RESPOND_UNAUTHORISED) {
 			return Http::STATUS_UNAUTHORIZED;
 		} else if ($status === API::RESPOND_NOT_FOUND) {

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

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 	 * @return int
 	 */
 	public function getStatus() {
-		$status  = parent::getStatus();
+		$status = parent::getStatus();
 		if ($status === Http::STATUS_FORBIDDEN || $status === API::RESPOND_UNAUTHORISED) {
 			return Http::STATUS_UNAUTHORIZED;
 		}
@@ -70,8 +70,8 @@ 
 			'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);
 	}

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

Spacing +4 added lines, -4 removed lines

@@ -51,9 +51,9 @@ 
 	 * 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 ' .
+		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;
@@ -63,7 +63,7 @@ 
 		$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) {
+		if ($i === $j || $i > 0 && $j > 0) {
 			return strcmp(mb_strtolower($nameA, $this->encoding),
 						  mb_strtolower($nameB, $this->encoding));
 		} elseif ($i === 0) {

lib/private/Share/Constants.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 
 	const FORMAT_NONE = -1;
 	const FORMAT_STATUSES = -2;
-	const FORMAT_SOURCES = -3;  // ToDo Check if it is still in use otherwise remove it
+	const FORMAT_SOURCES = -3; // ToDo Check if it is still in use otherwise remove it
 
 	const RESPONSE_FORMAT = 'json'; // default resonse format for ocs calls
 

Indentation +49 added lines, -49 removed lines

@@ -31,57 +31,57 @@
 
 class Constants {
 
-	/**
-	 * @deprecated 17.0.0 - use IShare::TYPE_USER instead
-	 */
-	const SHARE_TYPE_USER = 0;
-	/**
-	 * @deprecated 17.0.0 - use IShare::TYPE_GROUP instead
-	 */
-	const SHARE_TYPE_GROUP = 1;
-	// const SHARE_TYPE_USERGROUP = 2; // Internal type used by DefaultShareProvider
-	/**
-	 * @deprecated 17.0.0 - use IShare::TYPE_LINK instead
-	 */
-	const SHARE_TYPE_LINK = 3;
-	/**
-	 * @deprecated 17.0.0 - use IShare::TYPE_EMAIL instead
-	 */
-	const SHARE_TYPE_EMAIL = 4;
-	const SHARE_TYPE_CONTACT = 5; // ToDo Check if it is still in use otherwise remove it
-	/**
-	 * @deprecated 17.0.0 - use IShare::TYPE_REMOTE instead
-	 */
-	const SHARE_TYPE_REMOTE = 6;
-	/**
-	 * @deprecated 17.0.0 - use IShare::TYPE_CIRCLE instead
-	 */
-	const SHARE_TYPE_CIRCLE = 7;
-	/**
-	 * @deprecated 17.0.0 - use IShare::TYPE_GUEST instead
-	 */
-	const SHARE_TYPE_GUEST = 8;
-	/**
-	 * @deprecated 17.0.0 - use IShare::REMOTE_GROUP instead
-	 */
-	const SHARE_TYPE_REMOTE_GROUP = 9;
-	/**
-	 * @deprecated 17.0.0 - use IShare::TYPE_ROOM instead
-	 */
-	const SHARE_TYPE_ROOM = 10;
-	// const SHARE_TYPE_USERROOM = 11; // Internal type used by RoomShareProvider
+    /**
+     * @deprecated 17.0.0 - use IShare::TYPE_USER instead
+     */
+    const SHARE_TYPE_USER = 0;
+    /**
+     * @deprecated 17.0.0 - use IShare::TYPE_GROUP instead
+     */
+    const SHARE_TYPE_GROUP = 1;
+    // const SHARE_TYPE_USERGROUP = 2; // Internal type used by DefaultShareProvider
+    /**
+     * @deprecated 17.0.0 - use IShare::TYPE_LINK instead
+     */
+    const SHARE_TYPE_LINK = 3;
+    /**
+     * @deprecated 17.0.0 - use IShare::TYPE_EMAIL instead
+     */
+    const SHARE_TYPE_EMAIL = 4;
+    const SHARE_TYPE_CONTACT = 5; // ToDo Check if it is still in use otherwise remove it
+    /**
+     * @deprecated 17.0.0 - use IShare::TYPE_REMOTE instead
+     */
+    const SHARE_TYPE_REMOTE = 6;
+    /**
+     * @deprecated 17.0.0 - use IShare::TYPE_CIRCLE instead
+     */
+    const SHARE_TYPE_CIRCLE = 7;
+    /**
+     * @deprecated 17.0.0 - use IShare::TYPE_GUEST instead
+     */
+    const SHARE_TYPE_GUEST = 8;
+    /**
+     * @deprecated 17.0.0 - use IShare::REMOTE_GROUP instead
+     */
+    const SHARE_TYPE_REMOTE_GROUP = 9;
+    /**
+     * @deprecated 17.0.0 - use IShare::TYPE_ROOM instead
+     */
+    const SHARE_TYPE_ROOM = 10;
+    // const SHARE_TYPE_USERROOM = 11; // Internal type used by RoomShareProvider
 
-	const FORMAT_NONE = -1;
-	const FORMAT_STATUSES = -2;
-	const FORMAT_SOURCES = -3;  // ToDo Check if it is still in use otherwise remove it
+    const FORMAT_NONE = -1;
+    const FORMAT_STATUSES = -2;
+    const FORMAT_SOURCES = -3;  // ToDo Check if it is still in use otherwise remove it
 
-	const RESPONSE_FORMAT = 'json'; // default resonse format for ocs calls
+    const RESPONSE_FORMAT = 'json'; // default resonse format for ocs calls
 
-	const TOKEN_LENGTH = 15; // old (oc7) length is 32, keep token length in db at least that for compatibility
+    const TOKEN_LENGTH = 15; // old (oc7) length is 32, keep token length in db at least that for compatibility
 
-	protected static $shareTypeUserAndGroups = -1;
-	protected static $shareTypeGroupUserUnique = 2;
-	protected static $backends = array();
-	protected static $backendTypes = array();
-	protected static $isResharingAllowed;
+    protected static $shareTypeUserAndGroups = -1;
+    protected static $shareTypeGroupUserUnique = 2;
+    protected static $backends = array();
+    protected static $backendTypes = array();
+    protected static $isResharingAllowed;
 }

lib/private/Repair/MoveUpdaterStepFile.php

Indentation +39 added lines, -39 removed lines

@@ -28,53 +28,53 @@
 
 class MoveUpdaterStepFile implements IRepairStep {
 
-	/** @var \OCP\IConfig */
-	protected $config;
+    /** @var \OCP\IConfig */
+    protected $config;
 
-	/**
-	 * @param \OCP\IConfig $config
-	 */
-	public function __construct($config) {
-		$this->config = $config;
-	}
+    /**
+     * @param \OCP\IConfig $config
+     */
+    public function __construct($config) {
+        $this->config = $config;
+    }
 
-	public function getName() {
-		return 'Move .step file of updater to backup location';
-	}
+    public function getName() {
+        return 'Move .step file of updater to backup location';
+    }
 
-	public function run(IOutput $output) {
+    public function run(IOutput $output) {
 
-		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
-		$instanceId = $this->config->getSystemValue('instanceid', null);
+        $dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
+        $instanceId = $this->config->getSystemValue('instanceid', null);
 
-		if(!is_string($instanceId) || empty($instanceId)) {
-			return;
-		}
+        if(!is_string($instanceId) || empty($instanceId)) {
+            return;
+        }
 
-		$updaterFolderPath = $dataDir . '/updater-' . $instanceId;
-		$stepFile = $updaterFolderPath . '/.step';
-		if(file_exists($stepFile)) {
-			$output->info('.step file exists');
+        $updaterFolderPath = $dataDir . '/updater-' . $instanceId;
+        $stepFile = $updaterFolderPath . '/.step';
+        if(file_exists($stepFile)) {
+            $output->info('.step file exists');
 
-			$previousStepFile = $updaterFolderPath . '/.step-previous-update';
+            $previousStepFile = $updaterFolderPath . '/.step-previous-update';
 
-			// cleanup
-			if(file_exists($previousStepFile)) {
-				if(\OC_Helper::rmdirr($previousStepFile)) {
-					$output->info('.step-previous-update removed');
-				} else {
-					$output->info('.step-previous-update can\'t be removed - abort move of .step file');
-					return;
-				}
-			}
+            // cleanup
+            if(file_exists($previousStepFile)) {
+                if(\OC_Helper::rmdirr($previousStepFile)) {
+                    $output->info('.step-previous-update removed');
+                } else {
+                    $output->info('.step-previous-update can\'t be removed - abort move of .step file');
+                    return;
+                }
+            }
 
-			// move step file
-			if(rename($stepFile, $previousStepFile)) {
-				$output->info('.step file moved to .step-previous-update');
-			} else {
-				$output->warning('.step file can\'t be moved');
-			}
-		}
-	}
+            // move step file
+            if(rename($stepFile, $previousStepFile)) {
+                $output->info('.step file moved to .step-previous-update');
+            } else {
+                $output->warning('.step file can\'t be moved');
+            }
+        }
+    }
 }
 

Spacing +9 added lines, -9 removed lines

@@ -44,23 +44,23 @@ 
 
 	public function run(IOutput $output) {
 
-		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
+		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
 		$instanceId = $this->config->getSystemValue('instanceid', null);
 
-		if(!is_string($instanceId) || empty($instanceId)) {
+		if (!is_string($instanceId) || empty($instanceId)) {
 			return;
 		}
 
-		$updaterFolderPath = $dataDir . '/updater-' . $instanceId;
-		$stepFile = $updaterFolderPath . '/.step';
-		if(file_exists($stepFile)) {
+		$updaterFolderPath = $dataDir.'/updater-'.$instanceId;
+		$stepFile = $updaterFolderPath.'/.step';
+		if (file_exists($stepFile)) {
 			$output->info('.step file exists');
 
-			$previousStepFile = $updaterFolderPath . '/.step-previous-update';
+			$previousStepFile = $updaterFolderPath.'/.step-previous-update';
 
 			// cleanup
-			if(file_exists($previousStepFile)) {
-				if(\OC_Helper::rmdirr($previousStepFile)) {
+			if (file_exists($previousStepFile)) {
+				if (\OC_Helper::rmdirr($previousStepFile)) {
 					$output->info('.step-previous-update removed');
 				} else {
 					$output->info('.step-previous-update can\'t be removed - abort move of .step file');
@@ -69,7 +69,7 @@ 
 			}
 
 			// move step file
-			if(rename($stepFile, $previousStepFile)) {
+			if (rename($stepFile, $previousStepFile)) {
 				$output->info('.step file moved to .step-previous-update');
 			} else {
 				$output->warning('.step file can\'t be moved');