nextcloud / server

themes/example/defaults.php

Spacing +3 added lines, -3 removed lines

@@ -122,7 +122,7 @@ 
 	 */
 	public function getShortFooter() {
 		$footer = '© 2017 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
-			'<br/>' . $this->getSlogan();
+			'<br/>'.$this->getSlogan();
 
 		return $footer;
 	}
@@ -133,13 +133,13 @@ 
 	 */
 	public function getLongFooter() {
 		$footer = '© 2017 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
-			'<br/>' . $this->getSlogan();
+			'<br/>'.$this->getSlogan();
 
 		return $footer;
 	}
 
 	public function buildDocLinkToKey($key) {
-		return $this->getDocBaseUrl() . '/server/12/go.php?to=' . $key;
+		return $this->getDocBaseUrl().'/server/12/go.php?to='.$key;
 	}
 
 

Indentation +109 added lines, -109 removed lines

@@ -20,114 +20,114 @@
 
 class OC_Theme {
 
-	/**
-	 * Returns the base URL
-	 * @return string URL
-	 */
-	public function getBaseUrl() {
-		return 'https://nextcloud.com';
-	}
-
-	/**
-	 * Returns the documentation URL
-	 * @return string URL
-	 */
-	public function getDocBaseUrl() {
-		return 'https://docs.nextcloud.com';
-	}
-
-	/**
-	 * Returns the title
-	 * @return string title
-	 */
-	public function getTitle() {
-		return 'Custom Cloud';
-	}
-
-	/**
-	 * Returns the short name of the software
-	 * @return string title
-	 */
-	public function getName() {
-		return 'Custom Cloud';
-	}
-
-	/**
-	 * Returns the short name of the software containing HTML strings
-	 * @return string title
-	 */
-	public function getHTMLName() {
-		return 'Custom Cloud';
-	}
-
-	/**
-	 * Returns entity (e.g. company name) - used for footer, copyright
-	 * @return string entity name
-	 */
-	public function getEntity() {
-		return 'Custom Cloud Co.';
-	}
-
-	/**
-	 * Returns slogan
-	 * @return string slogan
-	 */
-	public function getSlogan() {
-		return 'Your custom cloud, personalized for you!';
-	}
-
-	/**
-	 * Returns logo claim
-	 * @return string logo claim
-	 * @deprecated 13.0.0 not used anymore
-	 */
-	public function getLogoClaim() {
-		return '';
-	}
-
-	/**
-	 * Returns short version of the footer
-	 * @return string short footer
-	 */
-	public function getShortFooter() {
-		$footer = '© 2017 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
-			'<br/>' . $this->getSlogan();
-
-		return $footer;
-	}
-
-	/**
-	 * Returns long version of the footer
-	 * @return string long footer
-	 */
-	public function getLongFooter() {
-		$footer = '© 2017 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
-			'<br/>' . $this->getSlogan();
-
-		return $footer;
-	}
-
-	public function buildDocLinkToKey($key) {
-		return $this->getDocBaseUrl() . '/server/12/go.php?to=' . $key;
-	}
-
-
-	/**
-	 * Returns mail header color
-	 * @return string
-	 */
-	public function getColorPrimary() {
-		return '#745bca';
-	}
-
-	/**
-	 * Returns variables to overload defaults from core/css/variables.scss
-	 * @return array
-	 */
-	public function getScssVariables() {
-		return [
-			'color-primary' => '#745bca'
-		];
-	}
+    /**
+     * Returns the base URL
+     * @return string URL
+     */
+    public function getBaseUrl() {
+        return 'https://nextcloud.com';
+    }
+
+    /**
+     * Returns the documentation URL
+     * @return string URL
+     */
+    public function getDocBaseUrl() {
+        return 'https://docs.nextcloud.com';
+    }
+
+    /**
+     * Returns the title
+     * @return string title
+     */
+    public function getTitle() {
+        return 'Custom Cloud';
+    }
+
+    /**
+     * Returns the short name of the software
+     * @return string title
+     */
+    public function getName() {
+        return 'Custom Cloud';
+    }
+
+    /**
+     * Returns the short name of the software containing HTML strings
+     * @return string title
+     */
+    public function getHTMLName() {
+        return 'Custom Cloud';
+    }
+
+    /**
+     * Returns entity (e.g. company name) - used for footer, copyright
+     * @return string entity name
+     */
+    public function getEntity() {
+        return 'Custom Cloud Co.';
+    }
+
+    /**
+     * Returns slogan
+     * @return string slogan
+     */
+    public function getSlogan() {
+        return 'Your custom cloud, personalized for you!';
+    }
+
+    /**
+     * Returns logo claim
+     * @return string logo claim
+     * @deprecated 13.0.0 not used anymore
+     */
+    public function getLogoClaim() {
+        return '';
+    }
+
+    /**
+     * Returns short version of the footer
+     * @return string short footer
+     */
+    public function getShortFooter() {
+        $footer = '© 2017 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
+            '<br/>' . $this->getSlogan();
+
+        return $footer;
+    }
+
+    /**
+     * Returns long version of the footer
+     * @return string long footer
+     */
+    public function getLongFooter() {
+        $footer = '© 2017 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
+            '<br/>' . $this->getSlogan();
+
+        return $footer;
+    }
+
+    public function buildDocLinkToKey($key) {
+        return $this->getDocBaseUrl() . '/server/12/go.php?to=' . $key;
+    }
+
+
+    /**
+     * Returns mail header color
+     * @return string
+     */
+    public function getColorPrimary() {
+        return '#745bca';
+    }
+
+    /**
+     * Returns variables to overload defaults from core/css/variables.scss
+     * @return array
+     */
+    public function getScssVariables() {
+        return [
+            'color-primary' => '#745bca'
+        ];
+    }
 
 }

lib/private/App/AppStore/Fetcher/Fetcher.php

Spacing +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
 				if (isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->getVersion()) {
 
 					// If the timestamp is older than 300 seconds request the files new
-					if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) {
+					if ((int) $jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) {
 						return $jsonBlob['data'];
 					}
 

Unused Use Statements -1 removed lines

@@ -36,7 +36,6 @@
 use OCP\Http\Client\IClientService;
 use OCP\IConfig;
 use OCP\ILogger;
-use OCP\Util;
 
 abstract class Fetcher {
 	const INVALIDATE_AFTER_SECONDS = 300;

Indentation +158 added lines, -158 removed lines

@@ -39,162 +39,162 @@
 use OCP\Util;
 
 abstract class Fetcher {
-	const INVALIDATE_AFTER_SECONDS = 300;
-
-	/** @var IAppData */
-	protected $appData;
-	/** @var IClientService */
-	protected $clientService;
-	/** @var ITimeFactory */
-	protected $timeFactory;
-	/** @var IConfig */
-	protected $config;
-	/** @var Ilogger */
-	protected $logger;
-	/** @var string */
-	protected $fileName;
-	/** @var string */
-	protected $endpointUrl;
-	/** @var string */
-	protected $version;
-
-	/**
-	 * @param Factory $appDataFactory
-	 * @param IClientService $clientService
-	 * @param ITimeFactory $timeFactory
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 */
-	public function __construct(Factory $appDataFactory,
-								IClientService $clientService,
-								ITimeFactory $timeFactory,
-								IConfig $config,
-								ILogger $logger) {
-		$this->appData = $appDataFactory->get('appstore');
-		$this->clientService = $clientService;
-		$this->timeFactory = $timeFactory;
-		$this->config = $config;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * Fetches the response from the server
-	 *
-	 * @param string $ETag
-	 * @param string $content
-	 *
-	 * @return array
-	 */
-	protected function fetch($ETag, $content) {
-		$appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
-
-		if (!$appstoreenabled) {
-			return [];
-		}
-
-		$options = [
-			'timeout' => 10,
-		];
-
-		if ($ETag !== '') {
-			$options['headers'] = [
-				'If-None-Match' => $ETag,
-			];
-		}
-
-		$client = $this->clientService->newClient();
-		$response = $client->get($this->endpointUrl, $options);
-
-		$responseJson = [];
-		if ($response->getStatusCode() === Http::STATUS_NOT_MODIFIED) {
-			$responseJson['data'] = json_decode($content, true);
-		} else {
-			$responseJson['data'] = json_decode($response->getBody(), true);
-			$ETag = $response->getHeader('ETag');
-		}
-
-		$responseJson['timestamp'] = $this->timeFactory->getTime();
-		$responseJson['ncversion'] = $this->getVersion();
-		if ($ETag !== '') {
-			$responseJson['ETag'] = $ETag;
-		}
-
-		return $responseJson;
-	}
-
-	/**
-	 * Returns the array with the categories on the appstore server
-	 *
-	 * @return array
-	 */
-	public function get() {
-		$appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
-		$internetavailable = $this->config->getSystemValue('has_internet_connection', true);
-
-		if (!$appstoreenabled || !$internetavailable) {
-			return [];
-		}
-
-		$rootFolder = $this->appData->getFolder('/');
-
-		$ETag = '';
-		$content = '';
-
-		try {
-			// File does already exists
-			$file = $rootFolder->getFile($this->fileName);
-			$jsonBlob = json_decode($file->getContent(), true);
-			if (is_array($jsonBlob)) {
-
-				// No caching when the version has been updated
-				if (isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->getVersion()) {
-
-					// If the timestamp is older than 300 seconds request the files new
-					if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) {
-						return $jsonBlob['data'];
-					}
-
-					if (isset($jsonBlob['ETag'])) {
-						$ETag = $jsonBlob['ETag'];
-						$content = json_encode($jsonBlob['data']);
-					}
-				}
-			}
-		} catch (NotFoundException $e) {
-			// File does not already exists
-			$file = $rootFolder->newFile($this->fileName);
-		}
-
-		// Refresh the file content
-		try {
-			$responseJson = $this->fetch($ETag, $content);
-			$file->putContent(json_encode($responseJson));
-			return json_decode($file->getContent(), true)['data'];
-		} catch (ConnectException $e) {
-			$this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::INFO, 'message' => 'Could not connect to appstore']);
-			return [];
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::INFO]);
-			return [];
-		}
-	}
-
-	/**
-	 * Get the currently Nextcloud version
-	 * @return string
-	 */
-	protected function getVersion() {
-		if ($this->version === null) {
-			$this->version = $this->config->getSystemValue('version', '0.0.0');
-		}
-		return $this->version;
-	}
-
-	/**
-	 * Set the current Nextcloud version
-	 * @param string $version
-	 */
-	public function setVersion(string $version) {
-		$this->version = $version;
-	}
+    const INVALIDATE_AFTER_SECONDS = 300;
+
+    /** @var IAppData */
+    protected $appData;
+    /** @var IClientService */
+    protected $clientService;
+    /** @var ITimeFactory */
+    protected $timeFactory;
+    /** @var IConfig */
+    protected $config;
+    /** @var Ilogger */
+    protected $logger;
+    /** @var string */
+    protected $fileName;
+    /** @var string */
+    protected $endpointUrl;
+    /** @var string */
+    protected $version;
+
+    /**
+     * @param Factory $appDataFactory
+     * @param IClientService $clientService
+     * @param ITimeFactory $timeFactory
+     * @param IConfig $config
+     * @param ILogger $logger
+     */
+    public function __construct(Factory $appDataFactory,
+                                IClientService $clientService,
+                                ITimeFactory $timeFactory,
+                                IConfig $config,
+                                ILogger $logger) {
+        $this->appData = $appDataFactory->get('appstore');
+        $this->clientService = $clientService;
+        $this->timeFactory = $timeFactory;
+        $this->config = $config;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Fetches the response from the server
+     *
+     * @param string $ETag
+     * @param string $content
+     *
+     * @return array
+     */
+    protected function fetch($ETag, $content) {
+        $appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
+
+        if (!$appstoreenabled) {
+            return [];
+        }
+
+        $options = [
+            'timeout' => 10,
+        ];
+
+        if ($ETag !== '') {
+            $options['headers'] = [
+                'If-None-Match' => $ETag,
+            ];
+        }
+
+        $client = $this->clientService->newClient();
+        $response = $client->get($this->endpointUrl, $options);
+
+        $responseJson = [];
+        if ($response->getStatusCode() === Http::STATUS_NOT_MODIFIED) {
+            $responseJson['data'] = json_decode($content, true);
+        } else {
+            $responseJson['data'] = json_decode($response->getBody(), true);
+            $ETag = $response->getHeader('ETag');
+        }
+
+        $responseJson['timestamp'] = $this->timeFactory->getTime();
+        $responseJson['ncversion'] = $this->getVersion();
+        if ($ETag !== '') {
+            $responseJson['ETag'] = $ETag;
+        }
+
+        return $responseJson;
+    }
+
+    /**
+     * Returns the array with the categories on the appstore server
+     *
+     * @return array
+     */
+    public function get() {
+        $appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
+        $internetavailable = $this->config->getSystemValue('has_internet_connection', true);
+
+        if (!$appstoreenabled || !$internetavailable) {
+            return [];
+        }
+
+        $rootFolder = $this->appData->getFolder('/');
+
+        $ETag = '';
+        $content = '';
+
+        try {
+            // File does already exists
+            $file = $rootFolder->getFile($this->fileName);
+            $jsonBlob = json_decode($file->getContent(), true);
+            if (is_array($jsonBlob)) {
+
+                // No caching when the version has been updated
+                if (isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->getVersion()) {
+
+                    // If the timestamp is older than 300 seconds request the files new
+                    if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) {
+                        return $jsonBlob['data'];
+                    }
+
+                    if (isset($jsonBlob['ETag'])) {
+                        $ETag = $jsonBlob['ETag'];
+                        $content = json_encode($jsonBlob['data']);
+                    }
+                }
+            }
+        } catch (NotFoundException $e) {
+            // File does not already exists
+            $file = $rootFolder->newFile($this->fileName);
+        }
+
+        // Refresh the file content
+        try {
+            $responseJson = $this->fetch($ETag, $content);
+            $file->putContent(json_encode($responseJson));
+            return json_decode($file->getContent(), true)['data'];
+        } catch (ConnectException $e) {
+            $this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::INFO, 'message' => 'Could not connect to appstore']);
+            return [];
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::INFO]);
+            return [];
+        }
+    }
+
+    /**
+     * Get the currently Nextcloud version
+     * @return string
+     */
+    protected function getVersion() {
+        if ($this->version === null) {
+            $this->version = $this->config->getSystemValue('version', '0.0.0');
+        }
+        return $this->version;
+    }
+
+    /**
+     * Set the current Nextcloud version
+     * @param string $version
+     */
+    public function setVersion(string $version) {
+        $this->version = $version;
+    }
 }

apps/dav/lib/CardDAV/PhotoCache.php

Indentation +230 added lines, -230 removed lines

@@ -13,234 +13,234 @@
 
 class PhotoCache {
 
-	/** @var IAppData $appData */
-	protected $appData;
-
-	/**
-	 * PhotoCache constructor.
-	 *
-	 * @param IAppData $appData
-	 */
-	public function __construct(IAppData $appData) {
-		$this->appData = $appData;
-	}
-
-	/**
-	 * @param int $addressBookId
-	 * @param string $cardUri
-	 * @param int $size
-	 * @param Card $card
-	 *
-	 * @return ISimpleFile
-	 * @throws NotFoundException
-	 */
-	public function get($addressBookId, $cardUri, $size, Card $card) {
-		$folder = $this->getFolder($addressBookId, $cardUri);
-
-		if ($this->isEmpty($folder)) {
-			$this->init($folder, $card);
-		}
-
-		if (!$this->hasPhoto($folder)) {
-			throw new NotFoundException();
-		}
-
-		if ($size !== -1) {
-			$size = 2 ** ceil(log($size) / log(2));
-		}
-
-		return $this->getFile($folder, $size);
-	}
-
-	/**
-	 * @param ISimpleFolder $folder
-	 * @return bool
-	 */
-	private function isEmpty(ISimpleFolder $folder) {
-		return $folder->getDirectoryListing() === [];
-	}
-
-	/**
-	 * @param ISimpleFolder $folder
-	 * @param Card $card
-	 */
-	private function init(ISimpleFolder $folder, Card $card) {
-		$data = $this->getPhoto($card);
-
-		if ($data === false) {
-			$folder->newFile('nophoto');
-		} else {
-			switch ($data['Content-Type']) {
-				case 'image/png':
-					$ext = 'png';
-					break;
-				case 'image/jpeg':
-					$ext = 'jpg';
-					break;
-				case 'image/gif':
-					$ext = 'gif';
-					break;
-			}
-			$file = $folder->newFile('photo.' . $ext);
-			$file->putContent($data['body']);
-		}
-	}
-
-	private function hasPhoto(ISimpleFolder $folder) {
-		return !$folder->fileExists('nophoto');
-	}
-
-	private function getFile(ISimpleFolder $folder, $size) {
-		$ext = $this->getExtension($folder);
-
-		if ($size === -1) {
-			$path = 'photo.' . $ext;
-		} else {
-			$path = 'photo.' . $size . '.' . $ext;
-		}
-
-		try {
-			$file = $folder->getFile($path);
-		} catch (NotFoundException $e) {
-			if ($size <= 0) {
-				throw new NotFoundException;
-			}
-
-			$photo = new \OC_Image();
-			/** @var ISimpleFile $file */
-			$file = $folder->getFile('photo.' . $ext);
-			$photo->loadFromData($file->getContent());
-
-			$ratio = $photo->width() / $photo->height();
-			if ($ratio < 1) {
-				$ratio = 1/$ratio;
-			}
-			$size = (int)($size * $ratio);
-
-			if ($size !== -1) {
-				$photo->resize($size);
-			}
-			try {
-				$file = $folder->newFile($path);
-				$file->putContent($photo->data());
-			} catch (NotPermittedException $e) {
-
-			}
-		}
-
-		return $file;
-	}
-
-
-	/**
-	 * @param int $addressBookId
-	 * @param string $cardUri
-	 * @return ISimpleFolder
-	 */
-	private function getFolder($addressBookId, $cardUri) {
-		$hash = md5($addressBookId . ' ' . $cardUri);
-		try {
-			return $this->appData->getFolder($hash);
-		} catch (NotFoundException $e) {
-			return $this->appData->newFolder($hash);
-		}
-	}
-
-	/**
-	 * Get the extension of the avatar. If there is no avatar throw Exception
-	 *
-	 * @param ISimpleFolder $folder
-	 * @return string
-	 * @throws NotFoundException
-	 */
-	private function getExtension(ISimpleFolder $folder) {
-		if ($folder->fileExists('photo.jpg')) {
-			return 'jpg';
-		} elseif ($folder->fileExists('photo.png')) {
-			return 'png';
-		} elseif ($folder->fileExists('photo.gif')) {
-			return 'gif';
-		}
-		throw new NotFoundException;
-	}
-
-	private function getPhoto(Card $node) {
-		try {
-			$vObject = $this->readCard($node->get());
-			if (!$vObject->PHOTO) {
-				return false;
-			}
-
-			$photo = $vObject->PHOTO;
-			$type = $this->getType($photo);
-
-			$val = $photo->getValue();
-			if ($photo->getValueType() === 'URI') {
-				$parsed = \Sabre\URI\parse($val);
-				//only allow data://
-				if ($parsed['scheme'] !== 'data') {
-					return false;
-				}
-				if (substr_count($parsed['path'], ';') === 1) {
-					list($type,) = explode(';', $parsed['path']);
-				}
-				$val = file_get_contents($val);
-			}
-
-			$allowedContentTypes = [
-				'image/png',
-				'image/jpeg',
-				'image/gif',
-			];
-
-			if(!in_array($type, $allowedContentTypes, true)) {
-				$type = 'application/octet-stream';
-			}
-
-			return [
-				'Content-Type' => $type,
-				'body' => $val
-			];
-		} catch(\Exception $ex) {
-
-		}
-		return false;
-	}
-
-	/**
-	 * @param string $cardData
-	 * @return \Sabre\VObject\Document
-	 */
-	private function readCard($cardData) {
-		return Reader::read($cardData);
-	}
-
-	/**
-	 * @param Binary $photo
-	 * @return string
-	 */
-	private function getType(Binary $photo) {
-		$params = $photo->parameters();
-		if (isset($params['TYPE']) || isset($params['MEDIATYPE'])) {
-			/** @var Parameter $typeParam */
-			$typeParam = isset($params['TYPE']) ? $params['TYPE'] : $params['MEDIATYPE'];
-			$type = $typeParam->getValue();
-
-			if (strpos($type, 'image/') === 0) {
-				return $type;
-			} else {
-				return 'image/' . strtolower($type);
-			}
-		}
-		return '';
-	}
-
-	/**
-	 * @param int $addressBookId
-	 * @param string $cardUri
-	 */
-	public function delete($addressBookId, $cardUri) {
-		$folder = $this->getFolder($addressBookId, $cardUri);
-		$folder->delete();
-	}
+    /** @var IAppData $appData */
+    protected $appData;
+
+    /**
+     * PhotoCache constructor.
+     *
+     * @param IAppData $appData
+     */
+    public function __construct(IAppData $appData) {
+        $this->appData = $appData;
+    }
+
+    /**
+     * @param int $addressBookId
+     * @param string $cardUri
+     * @param int $size
+     * @param Card $card
+     *
+     * @return ISimpleFile
+     * @throws NotFoundException
+     */
+    public function get($addressBookId, $cardUri, $size, Card $card) {
+        $folder = $this->getFolder($addressBookId, $cardUri);
+
+        if ($this->isEmpty($folder)) {
+            $this->init($folder, $card);
+        }
+
+        if (!$this->hasPhoto($folder)) {
+            throw new NotFoundException();
+        }
+
+        if ($size !== -1) {
+            $size = 2 ** ceil(log($size) / log(2));
+        }
+
+        return $this->getFile($folder, $size);
+    }
+
+    /**
+     * @param ISimpleFolder $folder
+     * @return bool
+     */
+    private function isEmpty(ISimpleFolder $folder) {
+        return $folder->getDirectoryListing() === [];
+    }
+
+    /**
+     * @param ISimpleFolder $folder
+     * @param Card $card
+     */
+    private function init(ISimpleFolder $folder, Card $card) {
+        $data = $this->getPhoto($card);
+
+        if ($data === false) {
+            $folder->newFile('nophoto');
+        } else {
+            switch ($data['Content-Type']) {
+                case 'image/png':
+                    $ext = 'png';
+                    break;
+                case 'image/jpeg':
+                    $ext = 'jpg';
+                    break;
+                case 'image/gif':
+                    $ext = 'gif';
+                    break;
+            }
+            $file = $folder->newFile('photo.' . $ext);
+            $file->putContent($data['body']);
+        }
+    }
+
+    private function hasPhoto(ISimpleFolder $folder) {
+        return !$folder->fileExists('nophoto');
+    }
+
+    private function getFile(ISimpleFolder $folder, $size) {
+        $ext = $this->getExtension($folder);
+
+        if ($size === -1) {
+            $path = 'photo.' . $ext;
+        } else {
+            $path = 'photo.' . $size . '.' . $ext;
+        }
+
+        try {
+            $file = $folder->getFile($path);
+        } catch (NotFoundException $e) {
+            if ($size <= 0) {
+                throw new NotFoundException;
+            }
+
+            $photo = new \OC_Image();
+            /** @var ISimpleFile $file */
+            $file = $folder->getFile('photo.' . $ext);
+            $photo->loadFromData($file->getContent());
+
+            $ratio = $photo->width() / $photo->height();
+            if ($ratio < 1) {
+                $ratio = 1/$ratio;
+            }
+            $size = (int)($size * $ratio);
+
+            if ($size !== -1) {
+                $photo->resize($size);
+            }
+            try {
+                $file = $folder->newFile($path);
+                $file->putContent($photo->data());
+            } catch (NotPermittedException $e) {
+
+            }
+        }
+
+        return $file;
+    }
+
+
+    /**
+     * @param int $addressBookId
+     * @param string $cardUri
+     * @return ISimpleFolder
+     */
+    private function getFolder($addressBookId, $cardUri) {
+        $hash = md5($addressBookId . ' ' . $cardUri);
+        try {
+            return $this->appData->getFolder($hash);
+        } catch (NotFoundException $e) {
+            return $this->appData->newFolder($hash);
+        }
+    }
+
+    /**
+     * Get the extension of the avatar. If there is no avatar throw Exception
+     *
+     * @param ISimpleFolder $folder
+     * @return string
+     * @throws NotFoundException
+     */
+    private function getExtension(ISimpleFolder $folder) {
+        if ($folder->fileExists('photo.jpg')) {
+            return 'jpg';
+        } elseif ($folder->fileExists('photo.png')) {
+            return 'png';
+        } elseif ($folder->fileExists('photo.gif')) {
+            return 'gif';
+        }
+        throw new NotFoundException;
+    }
+
+    private function getPhoto(Card $node) {
+        try {
+            $vObject = $this->readCard($node->get());
+            if (!$vObject->PHOTO) {
+                return false;
+            }
+
+            $photo = $vObject->PHOTO;
+            $type = $this->getType($photo);
+
+            $val = $photo->getValue();
+            if ($photo->getValueType() === 'URI') {
+                $parsed = \Sabre\URI\parse($val);
+                //only allow data://
+                if ($parsed['scheme'] !== 'data') {
+                    return false;
+                }
+                if (substr_count($parsed['path'], ';') === 1) {
+                    list($type,) = explode(';', $parsed['path']);
+                }
+                $val = file_get_contents($val);
+            }
+
+            $allowedContentTypes = [
+                'image/png',
+                'image/jpeg',
+                'image/gif',
+            ];
+
+            if(!in_array($type, $allowedContentTypes, true)) {
+                $type = 'application/octet-stream';
+            }
+
+            return [
+                'Content-Type' => $type,
+                'body' => $val
+            ];
+        } catch(\Exception $ex) {
+
+        }
+        return false;
+    }
+
+    /**
+     * @param string $cardData
+     * @return \Sabre\VObject\Document
+     */
+    private function readCard($cardData) {
+        return Reader::read($cardData);
+    }
+
+    /**
+     * @param Binary $photo
+     * @return string
+     */
+    private function getType(Binary $photo) {
+        $params = $photo->parameters();
+        if (isset($params['TYPE']) || isset($params['MEDIATYPE'])) {
+            /** @var Parameter $typeParam */
+            $typeParam = isset($params['TYPE']) ? $params['TYPE'] : $params['MEDIATYPE'];
+            $type = $typeParam->getValue();
+
+            if (strpos($type, 'image/') === 0) {
+                return $type;
+            } else {
+                return 'image/' . strtolower($type);
+            }
+        }
+        return '';
+    }
+
+    /**
+     * @param int $addressBookId
+     * @param string $cardUri
+     */
+    public function delete($addressBookId, $cardUri) {
+        $folder = $this->getFolder($addressBookId, $cardUri);
+        $folder->delete();
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -81,7 +81,7 @@ 
 					$ext = 'gif';
 					break;
 			}
-			$file = $folder->newFile('photo.' . $ext);
+			$file = $folder->newFile('photo.'.$ext);
 			$file->putContent($data['body']);
 		}
 	}
@@ -94,9 +94,9 @@ 
 		$ext = $this->getExtension($folder);
 
 		if ($size === -1) {
-			$path = 'photo.' . $ext;
+			$path = 'photo.'.$ext;
 		} else {
-			$path = 'photo.' . $size . '.' . $ext;
+			$path = 'photo.'.$size.'.'.$ext;
 		}
 
 		try {
@@ -108,14 +108,14 @@ 
 
 			$photo = new \OC_Image();
 			/** @var ISimpleFile $file */
-			$file = $folder->getFile('photo.' . $ext);
+			$file = $folder->getFile('photo.'.$ext);
 			$photo->loadFromData($file->getContent());
 
 			$ratio = $photo->width() / $photo->height();
 			if ($ratio < 1) {
-				$ratio = 1/$ratio;
+				$ratio = 1 / $ratio;
 			}
-			$size = (int)($size * $ratio);
+			$size = (int) ($size * $ratio);
 
 			if ($size !== -1) {
 				$photo->resize($size);
@@ -138,7 +138,7 @@ 
 	 * @return ISimpleFolder
 	 */
 	private function getFolder($addressBookId, $cardUri) {
-		$hash = md5($addressBookId . ' ' . $cardUri);
+		$hash = md5($addressBookId.' '.$cardUri);
 		try {
 			return $this->appData->getFolder($hash);
 		} catch (NotFoundException $e) {
@@ -193,7 +193,7 @@ 
 				'image/gif',
 			];
 
-			if(!in_array($type, $allowedContentTypes, true)) {
+			if (!in_array($type, $allowedContentTypes, true)) {
 				$type = 'application/octet-stream';
 			}
 
@@ -201,7 +201,7 @@ 
 				'Content-Type' => $type,
 				'body' => $val
 			];
-		} catch(\Exception $ex) {
+		} catch (\Exception $ex) {
 
 		}
 		return false;
@@ -229,7 +229,7 @@ 
 			if (strpos($type, 'image/') === 0) {
 				return $type;
 			} else {
-				return 'image/' . strtolower($type);
+				return 'image/'.strtolower($type);
 			}
 		}
 		return '';

apps/dav/lib/CardDAV/ImageExportPlugin.php

Indentation +81 added lines, -81 removed lines

@@ -32,85 +32,85 @@
 
 class ImageExportPlugin extends ServerPlugin {
 
-	/** @var Server */
-	protected $server;
-	/** @var PhotoCache */
-	private $cache;
-
-	/**
-	 * ImageExportPlugin constructor.
-	 *
-	 * @param PhotoCache $cache
-	 */
-	public function __construct(PhotoCache $cache) {
-		$this->cache = $cache;
-	}
-
-	/**
-	 * Initializes the plugin and registers event handlers
-	 *
-	 * @param Server $server
-	 * @return void
-	 */
-	public function initialize(Server $server) {
-		$this->server = $server;
-		$this->server->on('method:GET', [$this, 'httpGet'], 90);
-	}
-
-	/**
-	 * Intercepts GET requests on addressbook urls ending with ?photo.
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return bool
-	 */
-	public function httpGet(RequestInterface $request, ResponseInterface $response) {
-
-		$queryParams = $request->getQueryParameters();
-		// TODO: in addition to photo we should also add logo some point in time
-		if (!array_key_exists('photo', $queryParams)) {
-			return true;
-		}
-
-		$size = isset($queryParams['size']) ? (int)$queryParams['size'] : -1;
-
-		$path = $request->getPath();
-		$node = $this->server->tree->getNodeForPath($path);
-
-		if (!($node instanceof Card)) {
-			return true;
-		}
-
-		$this->server->transactionType = 'carddav-image-export';
-
-		// Checking ACL, if available.
-		if ($aclPlugin = $this->server->getPlugin('acl')) {
-			/** @var \Sabre\DAVACL\Plugin $aclPlugin */
-			$aclPlugin->checkPrivileges($path, '{DAV:}read');
-		}
-
-		// Fetch addressbook
-		$addressbookpath = explode('/', $path);
-		array_pop($addressbookpath);
-		$addressbookpath = implode('/', $addressbookpath);
-		/** @var AddressBook $addressbook */
-		$addressbook = $this->server->tree->getNodeForPath($addressbookpath);
-
-		$response->setHeader('Cache-Control', 'private, max-age=3600, must-revalidate');
-		$response->setHeader('Etag', $node->getETag() );
-		$response->setHeader('Pragma', 'public');
-
-		try {
-			$file = $this->cache->get($addressbook->getResourceId(), $node->getName(), $size, $node);
-			$response->setHeader('Content-Type', $file->getMimeType());
-			$response->setHeader('Content-Disposition', 'attachment');
-			$response->setStatus(200);
-
-			$response->setBody($file->getContent());
-		} catch (NotFoundException $e) {
-			$response->setStatus(404);
-		}
-
-		return false;
-	}
+    /** @var Server */
+    protected $server;
+    /** @var PhotoCache */
+    private $cache;
+
+    /**
+     * ImageExportPlugin constructor.
+     *
+     * @param PhotoCache $cache
+     */
+    public function __construct(PhotoCache $cache) {
+        $this->cache = $cache;
+    }
+
+    /**
+     * Initializes the plugin and registers event handlers
+     *
+     * @param Server $server
+     * @return void
+     */
+    public function initialize(Server $server) {
+        $this->server = $server;
+        $this->server->on('method:GET', [$this, 'httpGet'], 90);
+    }
+
+    /**
+     * Intercepts GET requests on addressbook urls ending with ?photo.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return bool
+     */
+    public function httpGet(RequestInterface $request, ResponseInterface $response) {
+
+        $queryParams = $request->getQueryParameters();
+        // TODO: in addition to photo we should also add logo some point in time
+        if (!array_key_exists('photo', $queryParams)) {
+            return true;
+        }
+
+        $size = isset($queryParams['size']) ? (int)$queryParams['size'] : -1;
+
+        $path = $request->getPath();
+        $node = $this->server->tree->getNodeForPath($path);
+
+        if (!($node instanceof Card)) {
+            return true;
+        }
+
+        $this->server->transactionType = 'carddav-image-export';
+
+        // Checking ACL, if available.
+        if ($aclPlugin = $this->server->getPlugin('acl')) {
+            /** @var \Sabre\DAVACL\Plugin $aclPlugin */
+            $aclPlugin->checkPrivileges($path, '{DAV:}read');
+        }
+
+        // Fetch addressbook
+        $addressbookpath = explode('/', $path);
+        array_pop($addressbookpath);
+        $addressbookpath = implode('/', $addressbookpath);
+        /** @var AddressBook $addressbook */
+        $addressbook = $this->server->tree->getNodeForPath($addressbookpath);
+
+        $response->setHeader('Cache-Control', 'private, max-age=3600, must-revalidate');
+        $response->setHeader('Etag', $node->getETag() );
+        $response->setHeader('Pragma', 'public');
+
+        try {
+            $file = $this->cache->get($addressbook->getResourceId(), $node->getName(), $size, $node);
+            $response->setHeader('Content-Type', $file->getMimeType());
+            $response->setHeader('Content-Disposition', 'attachment');
+            $response->setStatus(200);
+
+            $response->setBody($file->getContent());
+        } catch (NotFoundException $e) {
+            $response->setStatus(404);
+        }
+
+        return false;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
 			return true;
 		}
 
-		$size = isset($queryParams['size']) ? (int)$queryParams['size'] : -1;
+		$size = isset($queryParams['size']) ? (int) $queryParams['size'] : -1;
 
 		$path = $request->getPath();
 		$node = $this->server->tree->getNodeForPath($path);
@@ -97,7 +97,7 @@ 
 		$addressbook = $this->server->tree->getNodeForPath($addressbookpath);
 
 		$response->setHeader('Cache-Control', 'private, max-age=3600, must-revalidate');
-		$response->setHeader('Etag', $node->getETag() );
+		$response->setHeader('Etag', $node->getETag());
 		$response->setHeader('Pragma', 'public');
 
 		try {

core/templates/layout.guest.php

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 									<?php p($theme->getName()); ?>
 								</h1>
 								<?php if(\OC::$server->getConfig()->getSystemValue('installed', false)
-									&& \OC::$server->getConfig()->getAppValue('theming', 'logoMime', false)): ?>
+                                    && \OC::$server->getConfig()->getAppValue('theming', 'logoMime', false)): ?>
 									<img src="<?php p($theme->getLogo()); ?>"/>
 								<?php endif; ?>
 							</div>

Spacing +3 added lines, -3 removed lines

@@ -18,18 +18,18 @@
 		<?php emit_script_loading_tags($_); ?>
 		<?php print_unescaped($_['headers']); ?>
 	</head>
-	<body id="<?php p($_['bodyid']);?>">
+	<body id="<?php p($_['bodyid']); ?>">
 		<?php include 'layout.noscript.warning.php'; ?>
 		<div class="wrapper">
 			<div class="v-align">
-				<?php if ($_['bodyid'] === 'body-login' ): ?>
+				<?php if ($_['bodyid'] === 'body-login'): ?>
 					<header role="banner">
 						<div id="header">
 							<div class="logo">
 								<h1 class="hidden-visually">
 									<?php p($theme->getName()); ?>
 								</h1>
-								<?php if(\OC::$server->getConfig()->getSystemValue('installed', false)
+								<?php if (\OC::$server->getConfig()->getSystemValue('installed', false)
 									&& \OC::$server->getConfig()->getAppValue('theming', 'logoMime', false)): ?>
 									<img src="<?php p($theme->getLogo()); ?>"/>
 								<?php endif; ?>

lib/private/Config.php

Indentation +204 added lines, -204 removed lines

@@ -40,235 +40,235 @@
  */
 class Config {
 
-	const ENV_PREFIX = 'NC_';
+    const ENV_PREFIX = 'NC_';
 
-	/** @var array Associative array ($key => $value) */
-	protected $cache = array();
-	/** @var string */
-	protected $configDir;
-	/** @var string */
-	protected $configFilePath;
-	/** @var string */
-	protected $configFileName;
+    /** @var array Associative array ($key => $value) */
+    protected $cache = array();
+    /** @var string */
+    protected $configDir;
+    /** @var string */
+    protected $configFilePath;
+    /** @var string */
+    protected $configFileName;
 
-	/**
-	 * @param string $configDir Path to the config dir, needs to end with '/'
-	 * @param string $fileName (Optional) Name of the config file. Defaults to config.php
-	 */
-	public function __construct($configDir, $fileName = 'config.php') {
-		$this->configDir = $configDir;
-		$this->configFilePath = $this->configDir.$fileName;
-		$this->configFileName = $fileName;
-		$this->readData();
-	}
+    /**
+     * @param string $configDir Path to the config dir, needs to end with '/'
+     * @param string $fileName (Optional) Name of the config file. Defaults to config.php
+     */
+    public function __construct($configDir, $fileName = 'config.php') {
+        $this->configDir = $configDir;
+        $this->configFilePath = $this->configDir.$fileName;
+        $this->configFileName = $fileName;
+        $this->readData();
+    }
 
-	/**
-	 * Lists all available config keys
-	 *
-	 * Please note that it does not return the values.
-	 *
-	 * @return array an array of key names
-	 */
-	public function getKeys() {
-		return array_keys($this->cache);
-	}
+    /**
+     * Lists all available config keys
+     *
+     * Please note that it does not return the values.
+     *
+     * @return array an array of key names
+     */
+    public function getKeys() {
+        return array_keys($this->cache);
+    }
 
-	/**
-	 * Returns a config value
-	 *
-	 * gets its value from an `NC_` prefixed environment variable
-	 * if it doesn't exist from config.php
-	 * if this doesn't exist either, it will return the given `$default`
-	 *
-	 * @param string $key key
-	 * @param mixed $default = null default value
-	 * @return mixed the value or $default
-	 */
-	public function getValue($key, $default = null) {
-		$envValue = getenv(self::ENV_PREFIX . $key);
-		if ($envValue !== false) {
-			return $envValue;
-		}
+    /**
+     * Returns a config value
+     *
+     * gets its value from an `NC_` prefixed environment variable
+     * if it doesn't exist from config.php
+     * if this doesn't exist either, it will return the given `$default`
+     *
+     * @param string $key key
+     * @param mixed $default = null default value
+     * @return mixed the value or $default
+     */
+    public function getValue($key, $default = null) {
+        $envValue = getenv(self::ENV_PREFIX . $key);
+        if ($envValue !== false) {
+            return $envValue;
+        }
 
-		if (isset($this->cache[$key])) {
-			return $this->cache[$key];
-		}
+        if (isset($this->cache[$key])) {
+            return $this->cache[$key];
+        }
 
-		return $default;
-	}
+        return $default;
+    }
 
-	/**
-	 * Sets and deletes values and writes the config.php
-	 *
-	 * @param array $configs Associative array with `key => value` pairs
-	 *                       If value is null, the config key will be deleted
-	 */
-	public function setValues(array $configs) {
-		$needsUpdate = false;
-		foreach ($configs as $key => $value) {
-			if ($value !== null) {
-				$needsUpdate |= $this->set($key, $value);
-			} else {
-				$needsUpdate |= $this->delete($key);
-			}
-		}
+    /**
+     * Sets and deletes values and writes the config.php
+     *
+     * @param array $configs Associative array with `key => value` pairs
+     *                       If value is null, the config key will be deleted
+     */
+    public function setValues(array $configs) {
+        $needsUpdate = false;
+        foreach ($configs as $key => $value) {
+            if ($value !== null) {
+                $needsUpdate |= $this->set($key, $value);
+            } else {
+                $needsUpdate |= $this->delete($key);
+            }
+        }
 
-		if ($needsUpdate) {
-			// Write changes
-			$this->writeData();
-		}
-	}
+        if ($needsUpdate) {
+            // Write changes
+            $this->writeData();
+        }
+    }
 
-	/**
-	 * Sets the value and writes it to config.php if required
-	 *
-	 * @param string $key key
-	 * @param mixed $value value
-	 */
-	public function setValue($key, $value) {
-		if ($this->set($key, $value)) {
-			// Write changes
-			$this->writeData();
-		}
-	}
+    /**
+     * Sets the value and writes it to config.php if required
+     *
+     * @param string $key key
+     * @param mixed $value value
+     */
+    public function setValue($key, $value) {
+        if ($this->set($key, $value)) {
+            // Write changes
+            $this->writeData();
+        }
+    }
 
-	/**
-	 * This function sets the value
-	 *
-	 * @param string $key key
-	 * @param mixed $value value
-	 * @return bool True if the file needs to be updated, false otherwise
-	 */
-	protected function set($key, $value) {
-		if (!isset($this->cache[$key]) || $this->cache[$key] !== $value) {
-			// Add change
-			$this->cache[$key] = $value;
-			return true;
-		}
+    /**
+     * This function sets the value
+     *
+     * @param string $key key
+     * @param mixed $value value
+     * @return bool True if the file needs to be updated, false otherwise
+     */
+    protected function set($key, $value) {
+        if (!isset($this->cache[$key]) || $this->cache[$key] !== $value) {
+            // Add change
+            $this->cache[$key] = $value;
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * Removes a key from the config and removes it from config.php if required
-	 * @param string $key
-	 */
-	public function deleteKey($key) {
-		if ($this->delete($key)) {
-			// Write changes
-			$this->writeData();
-		}
-	}
+    /**
+     * Removes a key from the config and removes it from config.php if required
+     * @param string $key
+     */
+    public function deleteKey($key) {
+        if ($this->delete($key)) {
+            // Write changes
+            $this->writeData();
+        }
+    }
 
-	/**
-	 * This function removes a key from the config
-	 *
-	 * @param string $key
-	 * @return bool True if the file needs to be updated, false otherwise
-	 */
-	protected function delete($key) {
-		if (isset($this->cache[$key])) {
-			// Delete key from cache
-			unset($this->cache[$key]);
-			return true;
-		}
-		return false;
-	}
+    /**
+     * This function removes a key from the config
+     *
+     * @param string $key
+     * @return bool True if the file needs to be updated, false otherwise
+     */
+    protected function delete($key) {
+        if (isset($this->cache[$key])) {
+            // Delete key from cache
+            unset($this->cache[$key]);
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * Loads the config file
-	 *
-	 * Reads the config file and saves it to the cache
-	 *
-	 * @throws \Exception If no lock could be acquired or the config file has not been found
-	 */
-	private function readData() {
-		// Default config should always get loaded
-		$configFiles = array($this->configFilePath);
+    /**
+     * Loads the config file
+     *
+     * Reads the config file and saves it to the cache
+     *
+     * @throws \Exception If no lock could be acquired or the config file has not been found
+     */
+    private function readData() {
+        // Default config should always get loaded
+        $configFiles = array($this->configFilePath);
 
-		// Add all files in the config dir ending with the same file name
-		$extra = glob($this->configDir.'*.'.$this->configFileName);
-		if (is_array($extra)) {
-			natsort($extra);
-			$configFiles = array_merge($configFiles, $extra);
-		}
+        // Add all files in the config dir ending with the same file name
+        $extra = glob($this->configDir.'*.'.$this->configFileName);
+        if (is_array($extra)) {
+            natsort($extra);
+            $configFiles = array_merge($configFiles, $extra);
+        }
 
-		// Include file and merge config
-		foreach ($configFiles as $file) {
-			$fileExistsAndIsReadable = file_exists($file) && is_readable($file);
-			$filePointer = $fileExistsAndIsReadable ? fopen($file, 'r') : false;
-			if($file === $this->configFilePath &&
-				$filePointer === false) {
-				// Opening the main config might not be possible, e.g. if the wrong
-				// permissions are set (likely on a new installation)
-				continue;
-			}
+        // Include file and merge config
+        foreach ($configFiles as $file) {
+            $fileExistsAndIsReadable = file_exists($file) && is_readable($file);
+            $filePointer = $fileExistsAndIsReadable ? fopen($file, 'r') : false;
+            if($file === $this->configFilePath &&
+                $filePointer === false) {
+                // Opening the main config might not be possible, e.g. if the wrong
+                // permissions are set (likely on a new installation)
+                continue;
+            }
 
-			// Try to acquire a file lock
-			if(!flock($filePointer, LOCK_SH)) {
-				throw new \Exception(sprintf('Could not acquire a shared lock on the config file %s', $file));
-			}
+            // Try to acquire a file lock
+            if(!flock($filePointer, LOCK_SH)) {
+                throw new \Exception(sprintf('Could not acquire a shared lock on the config file %s', $file));
+            }
 
-			unset($CONFIG);
-			include $file;
-			if(isset($CONFIG) && is_array($CONFIG)) {
-				$this->cache = array_merge($this->cache, $CONFIG);
-			}
+            unset($CONFIG);
+            include $file;
+            if(isset($CONFIG) && is_array($CONFIG)) {
+                $this->cache = array_merge($this->cache, $CONFIG);
+            }
 
-			// Close the file pointer and release the lock
-			flock($filePointer, LOCK_UN);
-			fclose($filePointer);
-		}
-	}
+            // Close the file pointer and release the lock
+            flock($filePointer, LOCK_UN);
+            fclose($filePointer);
+        }
+    }
 
-	/**
-	 * Writes the config file
-	 *
-	 * Saves the config to the config file.
-	 *
-	 * @throws HintException If the config file cannot be written to
-	 * @throws \Exception If no file lock can be acquired
-	 */
-	private function writeData() {
-		// Create a php file ...
-		$content = "<?php\n";
-		$content .= '$CONFIG = ';
-		$content .= var_export($this->cache, true);
-		$content .= ";\n";
+    /**
+     * Writes the config file
+     *
+     * Saves the config to the config file.
+     *
+     * @throws HintException If the config file cannot be written to
+     * @throws \Exception If no file lock can be acquired
+     */
+    private function writeData() {
+        // Create a php file ...
+        $content = "<?php\n";
+        $content .= '$CONFIG = ';
+        $content .= var_export($this->cache, true);
+        $content .= ";\n";
 
-		touch ($this->configFilePath);
-		$filePointer = fopen($this->configFilePath, 'r+');
+        touch ($this->configFilePath);
+        $filePointer = fopen($this->configFilePath, 'r+');
 
-		// Prevent others not to read the config
-		chmod($this->configFilePath, 0640);
+        // Prevent others not to read the config
+        chmod($this->configFilePath, 0640);
 
-		// File does not exist, this can happen when doing a fresh install
-		if(!is_resource ($filePointer)) {
-			// TODO fix this via DI once it is very clear that this doesn't cause side effects due to initialization order
-			// currently this breaks app routes but also could have other side effects especially during setup and exception handling
-			$url = \OC::$server->getURLGenerator()->linkToDocs('admin-dir_permissions');
-			throw new HintException(
-				"Can't write into config directory!",
-				'This can usually be fixed by giving the webserver write access to the config directory. See ' . $url);
-		}
+        // File does not exist, this can happen when doing a fresh install
+        if(!is_resource ($filePointer)) {
+            // TODO fix this via DI once it is very clear that this doesn't cause side effects due to initialization order
+            // currently this breaks app routes but also could have other side effects especially during setup and exception handling
+            $url = \OC::$server->getURLGenerator()->linkToDocs('admin-dir_permissions');
+            throw new HintException(
+                "Can't write into config directory!",
+                'This can usually be fixed by giving the webserver write access to the config directory. See ' . $url);
+        }
 
-		// Try to acquire a file lock
-		if(!flock($filePointer, LOCK_EX)) {
-			throw new \Exception(sprintf('Could not acquire an exclusive lock on the config file %s', $this->configFilePath));
-		}
+        // Try to acquire a file lock
+        if(!flock($filePointer, LOCK_EX)) {
+            throw new \Exception(sprintf('Could not acquire an exclusive lock on the config file %s', $this->configFilePath));
+        }
 
-		// Write the config and release the lock
-		ftruncate ($filePointer, 0);
-		fwrite($filePointer, $content);
-		fflush($filePointer);
-		flock($filePointer, LOCK_UN);
-		fclose($filePointer);
+        // Write the config and release the lock
+        ftruncate ($filePointer, 0);
+        fwrite($filePointer, $content);
+        fflush($filePointer);
+        flock($filePointer, LOCK_UN);
+        fclose($filePointer);
 
-		// Try invalidating the opcache just for the file we wrote...
-		if (!\OC_Util::deleteFromOpcodeCache($this->configFilePath)) {
-			// But if that doesn't work, clear the whole cache.
-			\OC_Util::clearOpcodeCache();
-		}
-	}
+        // Try invalidating the opcache just for the file we wrote...
+        if (!\OC_Util::deleteFromOpcodeCache($this->configFilePath)) {
+            // But if that doesn't work, clear the whole cache.
+            \OC_Util::clearOpcodeCache();
+        }
+    }
 }
 

Spacing +9 added lines, -9 removed lines

@@ -85,7 +85,7 @@ 
 	 * @return mixed the value or $default
 	 */
 	public function getValue($key, $default = null) {
-		$envValue = getenv(self::ENV_PREFIX . $key);
+		$envValue = getenv(self::ENV_PREFIX.$key);
 		if ($envValue !== false) {
 			return $envValue;
 		}
@@ -197,7 +197,7 @@ 
 		foreach ($configFiles as $file) {
 			$fileExistsAndIsReadable = file_exists($file) && is_readable($file);
 			$filePointer = $fileExistsAndIsReadable ? fopen($file, 'r') : false;
-			if($file === $this->configFilePath &&
+			if ($file === $this->configFilePath &&
 				$filePointer === false) {
 				// Opening the main config might not be possible, e.g. if the wrong
 				// permissions are set (likely on a new installation)
@@ -205,13 +205,13 @@ 
 			}
 
 			// Try to acquire a file lock
-			if(!flock($filePointer, LOCK_SH)) {
+			if (!flock($filePointer, LOCK_SH)) {
 				throw new \Exception(sprintf('Could not acquire a shared lock on the config file %s', $file));
 			}
 
 			unset($CONFIG);
 			include $file;
-			if(isset($CONFIG) && is_array($CONFIG)) {
+			if (isset($CONFIG) && is_array($CONFIG)) {
 				$this->cache = array_merge($this->cache, $CONFIG);
 			}
 
@@ -236,29 +236,29 @@ 
 		$content .= var_export($this->cache, true);
 		$content .= ";\n";
 
-		touch ($this->configFilePath);
+		touch($this->configFilePath);
 		$filePointer = fopen($this->configFilePath, 'r+');
 
 		// Prevent others not to read the config
 		chmod($this->configFilePath, 0640);
 
 		// File does not exist, this can happen when doing a fresh install
-		if(!is_resource ($filePointer)) {
+		if (!is_resource($filePointer)) {
 			// TODO fix this via DI once it is very clear that this doesn't cause side effects due to initialization order
 			// currently this breaks app routes but also could have other side effects especially during setup and exception handling
 			$url = \OC::$server->getURLGenerator()->linkToDocs('admin-dir_permissions');
 			throw new HintException(
 				"Can't write into config directory!",
-				'This can usually be fixed by giving the webserver write access to the config directory. See ' . $url);
+				'This can usually be fixed by giving the webserver write access to the config directory. See '.$url);
 		}
 
 		// Try to acquire a file lock
-		if(!flock($filePointer, LOCK_EX)) {
+		if (!flock($filePointer, LOCK_EX)) {
 			throw new \Exception(sprintf('Could not acquire an exclusive lock on the config file %s', $this->configFilePath));
 		}
 
 		// Write the config and release the lock
-		ftruncate ($filePointer, 0);
+		ftruncate($filePointer, 0);
 		fwrite($filePointer, $content);
 		fflush($filePointer);
 		flock($filePointer, LOCK_UN);

lib/private/App/CodeChecker/LanguageParseChecker.php

Indentation +32 added lines, -32 removed lines

@@ -25,36 +25,36 @@
 
 class LanguageParseChecker {
 
-	/**
-	 * @param string $appId
-	 * @return array
-	 */
-	public function analyse($appId) {
-		$appPath = \OC_App::getAppPath($appId);
-		if ($appPath === false) {
-			throw new \RuntimeException("No app with given id <$appId> known.");
-		}
-
-		if (!is_dir($appPath . '/l10n/')) {
-			return [];
-		}
-
-		$errors = [];
-		$directory = new \DirectoryIterator($appPath . '/l10n/');
-
-		foreach ($directory as $file) {
-			if ($file->getExtension() !== 'json') {
-				continue;
-			}
-
-			$content = file_get_contents($file->getPathname());
-			json_decode($content, true);
-
-			if (json_last_error() !== JSON_ERROR_NONE) {
-				$errors[] = 'Invalid language file found: l10n/' . $file->getFilename() . ': ' . json_last_error_msg();
-			}
-		}
-
-		return $errors;
-	}
+    /**
+     * @param string $appId
+     * @return array
+     */
+    public function analyse($appId) {
+        $appPath = \OC_App::getAppPath($appId);
+        if ($appPath === false) {
+            throw new \RuntimeException("No app with given id <$appId> known.");
+        }
+
+        if (!is_dir($appPath . '/l10n/')) {
+            return [];
+        }
+
+        $errors = [];
+        $directory = new \DirectoryIterator($appPath . '/l10n/');
+
+        foreach ($directory as $file) {
+            if ($file->getExtension() !== 'json') {
+                continue;
+            }
+
+            $content = file_get_contents($file->getPathname());
+            json_decode($content, true);
+
+            if (json_last_error() !== JSON_ERROR_NONE) {
+                $errors[] = 'Invalid language file found: l10n/' . $file->getFilename() . ': ' . json_last_error_msg();
+            }
+        }
+
+        return $errors;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -35,12 +35,12 @@ 
 			throw new \RuntimeException("No app with given id <$appId> known.");
 		}
 
-		if (!is_dir($appPath . '/l10n/')) {
+		if (!is_dir($appPath.'/l10n/')) {
 			return [];
 		}
 
 		$errors = [];
-		$directory = new \DirectoryIterator($appPath . '/l10n/');
+		$directory = new \DirectoryIterator($appPath.'/l10n/');
 
 		foreach ($directory as $file) {
 			if ($file->getExtension() !== 'json') {
@@ -51,7 +51,7 @@ 
 			json_decode($content, true);
 
 			if (json_last_error() !== JSON_ERROR_NONE) {
-				$errors[] = 'Invalid language file found: l10n/' . $file->getFilename() . ': ' . json_last_error_msg();
+				$errors[] = 'Invalid language file found: l10n/'.$file->getFilename().': '.json_last_error_msg();
 			}
 		}
 

settings/Application.php

Spacing +6 added lines, -6 removed lines

@@ -52,7 +52,7 @@ 
 	/**
 	 * @param array $urlParams
 	 */
-	public function __construct(array $urlParams=[]){
+	public function __construct(array $urlParams = []) {
 		parent::__construct('settings', $urlParams);
 
 		$container = $this->getContainer();
@@ -72,7 +72,7 @@ 
 		$container->registerService('isSubAdmin', function(IContainer $c) {
 			$userObject = \OC::$server->getUserSession()->getUser();
 			$isSubAdmin = false;
-			if($userObject !== null) {
+			if ($userObject !== null) {
 				$isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
 			}
 			return $isSubAdmin;
@@ -80,17 +80,17 @@ 
 		$container->registerService('userCertificateManager', function(IContainer $c) {
 			return $c->query('ServerContainer')->getCertificateManager();
 		}, false);
-		$container->registerService('systemCertificateManager', function (IContainer $c) {
+		$container->registerService('systemCertificateManager', function(IContainer $c) {
 			return $c->query('ServerContainer')->getCertificateManager(null);
 		}, false);
-		$container->registerService(IProvider::class, function (IContainer $c) {
+		$container->registerService(IProvider::class, function(IContainer $c) {
 			return $c->query('ServerContainer')->query(IProvider::class);
 		});
-		$container->registerService(IManager::class, function (IContainer $c) {
+		$container->registerService(IManager::class, function(IContainer $c) {
 			return $c->query('ServerContainer')->getSettingsManager();
 		});
 
-		$container->registerService(NewUserMailHelper::class, function (IContainer $c) {
+		$container->registerService(NewUserMailHelper::class, function(IContainer $c) {
 			/** @var Server $server */
 			$server = $c->query('ServerContainer');
 			/** @var Defaults $defaults */

Indentation +92 added lines, -92 removed lines

@@ -52,106 +52,106 @@
 class Application extends App {
 
 
-	/**
-	 * @param array $urlParams
-	 */
-	public function __construct(array $urlParams=[]){
-		parent::__construct('settings', $urlParams);
+    /**
+     * @param array $urlParams
+     */
+    public function __construct(array $urlParams=[]){
+        parent::__construct('settings', $urlParams);
 
-		$container = $this->getContainer();
+        $container = $this->getContainer();
 
-		// Register Middleware
-		$container->registerAlias('SubadminMiddleware', SubadminMiddleware::class);
-		$container->registerMiddleWare('SubadminMiddleware');
+        // Register Middleware
+        $container->registerAlias('SubadminMiddleware', SubadminMiddleware::class);
+        $container->registerMiddleWare('SubadminMiddleware');
 
-		/**
-		 * Core class wrappers
-		 */
-		/** FIXME: Remove once OC_User is non-static and mockable */
-		$container->registerService('isAdmin', function() {
-			return \OC_User::isAdminUser(\OC_User::getUser());
-		});
-		/** FIXME: Remove once OC_SubAdmin is non-static and mockable */
-		$container->registerService('isSubAdmin', function(IContainer $c) {
-			$userObject = \OC::$server->getUserSession()->getUser();
-			$isSubAdmin = false;
-			if($userObject !== null) {
-				$isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
-			}
-			return $isSubAdmin;
-		});
-		$container->registerService('userCertificateManager', function(IContainer $c) {
-			return $c->query('ServerContainer')->getCertificateManager();
-		}, false);
-		$container->registerService('systemCertificateManager', function (IContainer $c) {
-			return $c->query('ServerContainer')->getCertificateManager(null);
-		}, false);
-		$container->registerService(IProvider::class, function (IContainer $c) {
-			return $c->query('ServerContainer')->query(IProvider::class);
-		});
-		$container->registerService(IManager::class, function (IContainer $c) {
-			return $c->query('ServerContainer')->getSettingsManager();
-		});
+        /**
+         * Core class wrappers
+         */
+        /** FIXME: Remove once OC_User is non-static and mockable */
+        $container->registerService('isAdmin', function() {
+            return \OC_User::isAdminUser(\OC_User::getUser());
+        });
+        /** FIXME: Remove once OC_SubAdmin is non-static and mockable */
+        $container->registerService('isSubAdmin', function(IContainer $c) {
+            $userObject = \OC::$server->getUserSession()->getUser();
+            $isSubAdmin = false;
+            if($userObject !== null) {
+                $isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
+            }
+            return $isSubAdmin;
+        });
+        $container->registerService('userCertificateManager', function(IContainer $c) {
+            return $c->query('ServerContainer')->getCertificateManager();
+        }, false);
+        $container->registerService('systemCertificateManager', function (IContainer $c) {
+            return $c->query('ServerContainer')->getCertificateManager(null);
+        }, false);
+        $container->registerService(IProvider::class, function (IContainer $c) {
+            return $c->query('ServerContainer')->query(IProvider::class);
+        });
+        $container->registerService(IManager::class, function (IContainer $c) {
+            return $c->query('ServerContainer')->getSettingsManager();
+        });
 
-		$container->registerService(NewUserMailHelper::class, function (IContainer $c) {
-			/** @var Server $server */
-			$server = $c->query('ServerContainer');
-			/** @var Defaults $defaults */
-			$defaults = $server->query(Defaults::class);
+        $container->registerService(NewUserMailHelper::class, function (IContainer $c) {
+            /** @var Server $server */
+            $server = $c->query('ServerContainer');
+            /** @var Defaults $defaults */
+            $defaults = $server->query(Defaults::class);
 
-			return new NewUserMailHelper(
-				$defaults,
-				$server->getURLGenerator(),
-				$server->getL10N('settings'),
-				$server->getMailer(),
-				$server->getSecureRandom(),
-				new TimeFactory(),
-				$server->getConfig(),
-				$server->getCrypto(),
-				Util::getDefaultEmailAddress('no-reply')
-			);
-		});
-	}
+            return new NewUserMailHelper(
+                $defaults,
+                $server->getURLGenerator(),
+                $server->getL10N('settings'),
+                $server->getMailer(),
+                $server->getSecureRandom(),
+                new TimeFactory(),
+                $server->getConfig(),
+                $server->getCrypto(),
+                Util::getDefaultEmailAddress('no-reply')
+            );
+        });
+    }
 
-	public function register() {
-		$activityManager = $this->getContainer()->getServer()->getActivityManager();
-		$activityManager->registerSetting(Setting::class); // FIXME move to info.xml
-		$activityManager->registerProvider(Provider::class); // FIXME move to info.xml
-		$activityManager->registerFilter(SecurityFilter::class); // FIXME move to info.xml
-		$activityManager->registerSetting(SecuritySetting::class); // FIXME move to info.xml
-		$activityManager->registerProvider(SecurityProvider::class); // FIXME move to info.xml
+    public function register() {
+        $activityManager = $this->getContainer()->getServer()->getActivityManager();
+        $activityManager->registerSetting(Setting::class); // FIXME move to info.xml
+        $activityManager->registerProvider(Provider::class); // FIXME move to info.xml
+        $activityManager->registerFilter(SecurityFilter::class); // FIXME move to info.xml
+        $activityManager->registerSetting(SecuritySetting::class); // FIXME move to info.xml
+        $activityManager->registerProvider(SecurityProvider::class); // FIXME move to info.xml
 
-		Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword');
-		Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');
-	}
+        Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword');
+        Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');
+    }
 
-	/**
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 * @throws \BadMethodCallException
-	 * @throws \Exception
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public function onChangePassword(array $parameters) {
-		/** @var Hooks $hooks */
-		$hooks = $this->getContainer()->query(Hooks::class);
-		$hooks->onChangePassword($parameters['uid']);
-	}
+    /**
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     * @throws \Exception
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public function onChangePassword(array $parameters) {
+        /** @var Hooks $hooks */
+        $hooks = $this->getContainer()->query(Hooks::class);
+        $hooks->onChangePassword($parameters['uid']);
+    }
 
-	/**
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 * @throws \BadMethodCallException
-	 * @throws \Exception
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public function onChangeInfo(array $parameters) {
-		if ($parameters['feature'] !== 'eMailAddress') {
-			return;
-		}
+    /**
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     * @throws \Exception
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public function onChangeInfo(array $parameters) {
+        if ($parameters['feature'] !== 'eMailAddress') {
+            return;
+        }
 
-		/** @var Hooks $hooks */
-		$hooks = $this->getContainer()->query(Hooks::class);
-		$hooks->onChangeEmail($parameters['user'], $parameters['old_value']);
-	}
+        /** @var Hooks $hooks */
+        $hooks = $this->getContainer()->query(Hooks::class);
+        $hooks->onChangeEmail($parameters['user'], $parameters['old_value']);
+    }
 }

apps/lookup_server_connector/appinfo/app.php

Indentation +5 added lines, -5 removed lines

@@ -22,10 +22,10 @@
 $dispatcher = \OC::$server->getEventDispatcher();
 
 $dispatcher->addListener('OC\AccountManager::userUpdated', function(\Symfony\Component\EventDispatcher\GenericEvent $event) {
-	/** @var \OCP\IUser $user */
-	$user = $event->getSubject();
+    /** @var \OCP\IUser $user */
+    $user = $event->getSubject();
 
-	/** @var \OCA\LookupServerConnector\UpdateLookupServer $updateLookupServer */
-	$updateLookupServer = \OC::$server->query(\OCA\LookupServerConnector\UpdateLookupServer::class);
-	$updateLookupServer->userUpdated($user);
+    /** @var \OCA\LookupServerConnector\UpdateLookupServer $updateLookupServer */
+    $updateLookupServer = \OC::$server->query(\OCA\LookupServerConnector\UpdateLookupServer::class);
+    $updateLookupServer->userUpdated($user);
 });