nextcloud / server

core/Controller/OCSController.php

Indentation +107 added lines, -107 removed lines

@@ -30,122 +30,122 @@
 
 class OCSController extends \OCP\AppFramework\OCSController {
 
-	/** @var CapabilitiesManager */
-	private $capabilitiesManager;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var Manager */
-	private $keyManager;
+    /** @var CapabilitiesManager */
+    private $capabilitiesManager;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var Manager */
+    private $keyManager;
 
-	/**
-	 * OCSController constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param CapabilitiesManager $capabilitiesManager
-	 * @param IUserSession $userSession
-	 * @param IUserManager $userManager
-	 * @param Manager $keyManager
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								CapabilitiesManager $capabilitiesManager,
-								IUserSession $userSession,
-								IUserManager $userManager,
-								Manager $keyManager) {
-		parent::__construct($appName, $request);
-		$this->capabilitiesManager = $capabilitiesManager;
-		$this->userSession = $userSession;
-		$this->userManager = $userManager;
-		$this->keyManager = $keyManager;
-	}
+    /**
+     * OCSController constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param CapabilitiesManager $capabilitiesManager
+     * @param IUserSession $userSession
+     * @param IUserManager $userManager
+     * @param Manager $keyManager
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                CapabilitiesManager $capabilitiesManager,
+                                IUserSession $userSession,
+                                IUserManager $userManager,
+                                Manager $keyManager) {
+        parent::__construct($appName, $request);
+        $this->capabilitiesManager = $capabilitiesManager;
+        $this->userSession = $userSession;
+        $this->userManager = $userManager;
+        $this->keyManager = $keyManager;
+    }
 
-	/**
-	 * @PublicPage
-	 *
-	 * @return DataResponse
-	 */
-	public function getConfig() {
-		$data = [
-			'version' => '1.7',
-			'website' => 'Nextcloud',
-			'host' => $this->request->getServerHost(),
-			'contact' => '',
-			'ssl' => 'false',
-		];
+    /**
+     * @PublicPage
+     *
+     * @return DataResponse
+     */
+    public function getConfig() {
+        $data = [
+            'version' => '1.7',
+            'website' => 'Nextcloud',
+            'host' => $this->request->getServerHost(),
+            'contact' => '',
+            'ssl' => 'false',
+        ];
 
-		return new DataResponse($data);
-	}
+        return new DataResponse($data);
+    }
 
-	/**
-	 * @PublicPage
-	 *
-	 * @return DataResponse
-	 */
-	public function getCapabilities() {
-		$result = [];
-		list($major, $minor, $micro) = \OCP\Util::getVersion();
-		$result['version'] = array(
-			'major' => $major,
-			'minor' => $minor,
-			'micro' => $micro,
-			'string' => \OC_Util::getVersionString(),
-			'edition' => '',
-		);
+    /**
+     * @PublicPage
+     *
+     * @return DataResponse
+     */
+    public function getCapabilities() {
+        $result = [];
+        list($major, $minor, $micro) = \OCP\Util::getVersion();
+        $result['version'] = array(
+            'major' => $major,
+            'minor' => $minor,
+            'micro' => $micro,
+            'string' => \OC_Util::getVersionString(),
+            'edition' => '',
+        );
 
-		if($this->userSession->isLoggedIn()) {
-			$result['capabilities'] = $this->capabilitiesManager->getCapabilities();
-		} else {
-			$result['capabilities'] = $this->capabilitiesManager->getCapabilities(true);
-		}
+        if($this->userSession->isLoggedIn()) {
+            $result['capabilities'] = $this->capabilitiesManager->getCapabilities();
+        } else {
+            $result['capabilities'] = $this->capabilitiesManager->getCapabilities(true);
+        }
 
-		return new DataResponse($result);
-	}
+        return new DataResponse($result);
+    }
 
-	/**
-	 * @PublicPage
-	 * @BruteForceProtection(action=login)
-	 *
-	 * @param string $login
-	 * @param string $password
-	 * @return DataResponse
-	 */
-	public function personCheck($login = '', $password = '') {
-		if ($login !== '' && $password !== '') {
-			if ($this->userManager->checkPassword($login, $password)) {
-				return new DataResponse([
-					'person' => [
-						'personid' => $login
-					]
-				]);
-			}
+    /**
+     * @PublicPage
+     * @BruteForceProtection(action=login)
+     *
+     * @param string $login
+     * @param string $password
+     * @return DataResponse
+     */
+    public function personCheck($login = '', $password = '') {
+        if ($login !== '' && $password !== '') {
+            if ($this->userManager->checkPassword($login, $password)) {
+                return new DataResponse([
+                    'person' => [
+                        'personid' => $login
+                    ]
+                ]);
+            }
 
-			$response = new DataResponse(null, 102);
-			$response->throttle();
-			return $response;
-		}
-		return new DataResponse(null, 101);
-	}
+            $response = new DataResponse(null, 102);
+            $response->throttle();
+            return $response;
+        }
+        return new DataResponse(null, 101);
+    }
 
-	/**
-	 * @PublicPage
-	 *
-	 * @param string $cloudId
-	 * @return DataResponse
-	 */
-	public function getIdentityProof($cloudId) {
-		$userObject = $this->userManager->get($cloudId);
+    /**
+     * @PublicPage
+     *
+     * @param string $cloudId
+     * @return DataResponse
+     */
+    public function getIdentityProof($cloudId) {
+        $userObject = $this->userManager->get($cloudId);
 
-		if($userObject !== null) {
-			$key = $this->keyManager->getKey($userObject);
-			$data = [
-				'public' => $key->getPublic(),
-			];
-			return new DataResponse($data);
-		}
+        if($userObject !== null) {
+            $key = $this->keyManager->getKey($userObject);
+            $data = [
+                'public' => $key->getPublic(),
+            ];
+            return new DataResponse($data);
+        }
 
-		return new DataResponse('User not found', 404);
-	}
+        return new DataResponse('User not found', 404);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
 			'edition' => '',
 		);
 
-		if($this->userSession->isLoggedIn()) {
+		if ($this->userSession->isLoggedIn()) {
 			$result['capabilities'] = $this->capabilitiesManager->getCapabilities();
 		} else {
 			$result['capabilities'] = $this->capabilitiesManager->getCapabilities(true);
@@ -138,7 +138,7 @@ 
 	public function getIdentityProof($cloudId) {
 		$userObject = $this->userManager->get($cloudId);
 
-		if($userObject !== null) {
+		if ($userObject !== null) {
 			$key = $this->keyManager->getKey($userObject);
 			$data = [
 				'public' => $key->getPublic(),

apps/theming/lib/Capabilities.php

Indentation +36 added lines, -36 removed lines

@@ -34,45 +34,45 @@
  */
 class Capabilities implements IPublicCapability {
 
-	/** @var ThemingDefaults */
-	protected $theming;
+    /** @var ThemingDefaults */
+    protected $theming;
 
-	/** @var IURLGenerator */
-	protected $url;
+    /** @var IURLGenerator */
+    protected $url;
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/**
-	 * @param ThemingDefaults $theming
-	 * @param IURLGenerator $url
-	 * @param IConfig $config
-	 */
-	public function __construct(ThemingDefaults $theming, IURLGenerator $url, IConfig $config) {
-		$this->theming = $theming;
-		$this->url = $url;
-		$this->config = $config;
-	}
+    /**
+     * @param ThemingDefaults $theming
+     * @param IURLGenerator $url
+     * @param IConfig $config
+     */
+    public function __construct(ThemingDefaults $theming, IURLGenerator $url, IConfig $config) {
+        $this->theming = $theming;
+        $this->url = $url;
+        $this->config = $config;
+    }
 
-	/**
-	 * Return this classes capabilities
-	 *
-	 * @return array
-	 */
-	public function getCapabilities() {
-		$backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime', false);
+    /**
+     * Return this classes capabilities
+     *
+     * @return array
+     */
+    public function getCapabilities() {
+        $backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime', false);
 
-		return [
-			'theming' => [
-				'name' => $this->theming->getName(),
-				'url' => $this->theming->getBaseUrl(),
-				'slogan' => $this->theming->getSlogan(),
-				'color' => $this->theming->getColorPrimary(),
-				'logo' => $this->url->getAbsoluteURL($this->theming->getLogo()),
-				'background' => $backgroundLogo === 'backgroundColor' ?
-					$this->theming->getColorPrimary() :
-					$this->url->getAbsoluteURL($this->theming->getBackground()),
-			],
-		];
-	}
+        return [
+            'theming' => [
+                'name' => $this->theming->getName(),
+                'url' => $this->theming->getBaseUrl(),
+                'slogan' => $this->theming->getSlogan(),
+                'color' => $this->theming->getColorPrimary(),
+                'logo' => $this->url->getAbsoluteURL($this->theming->getLogo()),
+                'background' => $backgroundLogo === 'backgroundColor' ?
+                    $this->theming->getColorPrimary() :
+                    $this->url->getAbsoluteURL($this->theming->getBackground()),
+            ],
+        ];
+    }
 }

lib/private/CapabilitiesManager.php

Indentation +43 added lines, -43 removed lines

@@ -29,54 +29,54 @@
 
 class CapabilitiesManager {
 
-	/** @var \Closure[] */
-	private $capabilities = array();
+    /** @var \Closure[] */
+    private $capabilities = array();
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	public function __construct(ILogger $logger) {
-		$this->logger = $logger;
-	}
+    public function __construct(ILogger $logger) {
+        $this->logger = $logger;
+    }
 
-	/**
-	 * Get an array of al the capabilities that are registered at this manager
+    /**
+     * Get an array of al the capabilities that are registered at this manager
      *
-	 * @param bool $public get public capabilities only
-	 * @throws \InvalidArgumentException
-	 * @return array
-	 */
-	public function getCapabilities($public = false) {
-		$capabilities = [];
-		foreach($this->capabilities as $capability) {
-			try {
-				$c = $capability();
-			} catch (QueryException $e) {
-				$this->logger->error('CapabilitiesManager: {message}', ['app' => 'core', 'message' => $e->getMessage()]);
-				continue;
-			}
+     * @param bool $public get public capabilities only
+     * @throws \InvalidArgumentException
+     * @return array
+     */
+    public function getCapabilities($public = false) {
+        $capabilities = [];
+        foreach($this->capabilities as $capability) {
+            try {
+                $c = $capability();
+            } catch (QueryException $e) {
+                $this->logger->error('CapabilitiesManager: {message}', ['app' => 'core', 'message' => $e->getMessage()]);
+                continue;
+            }
 
-			if ($c instanceof ICapability) {
-				if(!$public || $c instanceof IPublicCapability) {
-					$capabilities = array_replace_recursive($capabilities, $c->getCapabilities());
-				}
-			} else {
-				throw new \InvalidArgumentException('The given Capability (' . get_class($c) . ') does not implement the ICapability interface');
-			}
-		}
+            if ($c instanceof ICapability) {
+                if(!$public || $c instanceof IPublicCapability) {
+                    $capabilities = array_replace_recursive($capabilities, $c->getCapabilities());
+                }
+            } else {
+                throw new \InvalidArgumentException('The given Capability (' . get_class($c) . ') does not implement the ICapability interface');
+            }
+        }
 
-		return $capabilities;
-	}
+        return $capabilities;
+    }
 
-	/**
-	 * In order to improve lazy loading a closure can be registered which will be called in case
-	 * capabilities are actually requested
-	 *
-	 * $callable has to return an instance of OCP\Capabilities\ICapability
-	 *
-	 * @param \Closure $callable
-	 */
-	public function registerCapability(\Closure $callable) {
-		array_push($this->capabilities, $callable);
-	}
+    /**
+     * In order to improve lazy loading a closure can be registered which will be called in case
+     * capabilities are actually requested
+     *
+     * $callable has to return an instance of OCP\Capabilities\ICapability
+     *
+     * @param \Closure $callable
+     */
+    public function registerCapability(\Closure $callable) {
+        array_push($this->capabilities, $callable);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
 	 */
 	public function getCapabilities($public = false) {
 		$capabilities = [];
-		foreach($this->capabilities as $capability) {
+		foreach ($this->capabilities as $capability) {
 			try {
 				$c = $capability();
 			} catch (QueryException $e) {
@@ -57,11 +57,11 @@ 
 			}
 
 			if ($c instanceof ICapability) {
-				if(!$public || $c instanceof IPublicCapability) {
+				if (!$public || $c instanceof IPublicCapability) {
 					$capabilities = array_replace_recursive($capabilities, $c->getCapabilities());
 				}
 			} else {
-				throw new \InvalidArgumentException('The given Capability (' . get_class($c) . ') does not implement the ICapability interface');
+				throw new \InvalidArgumentException('The given Capability ('.get_class($c).') does not implement the ICapability interface');
 			}
 		}