nextcloud / server

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

Indentation +183 added lines, -183 removed lines

@@ -40,187 +40,187 @@
 use OCP\ILogger;
 
 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 $endpointName;
-	/** @var string */
-	protected $version;
-	/** @var string */
-	protected $channel;
-
-	/**
-	 * @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->getEndpoint(), $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->warning('Could not connect to appstore: ' . $e->getMessage(), ['app' => 'appstoreFetcher']);
-			return [];
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::WARN]);
-			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;
-	}
-
-	/**
-	 * Get the currently Nextcloud update channel
-	 * @return string
-	 */
-	protected function getChannel() {
-		if ($this->channel === null) {
-			$this->channel = \OC_Util::getChannel();
-		}
-		return $this->channel;
-	}
-
-	/**
-	 * Set the current Nextcloud update channel
-	 * @param string $channel
-	 */
-	public function setChannel(string $channel) {
-		$this->channel = $channel;
-	}
-
-	protected function getEndpoint(): string {
-		return $this->config->getSystemValue('appstoreurl', 'https://apps.nextcloud.com/api/v1') . '/' . $this->endpointName;
-	}
+    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 $endpointName;
+    /** @var string */
+    protected $version;
+    /** @var string */
+    protected $channel;
+
+    /**
+     * @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->getEndpoint(), $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->warning('Could not connect to appstore: ' . $e->getMessage(), ['app' => 'appstoreFetcher']);
+            return [];
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::WARN]);
+            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;
+    }
+
+    /**
+     * Get the currently Nextcloud update channel
+     * @return string
+     */
+    protected function getChannel() {
+        if ($this->channel === null) {
+            $this->channel = \OC_Util::getChannel();
+        }
+        return $this->channel;
+    }
+
+    /**
+     * Set the current Nextcloud update channel
+     * @param string $channel
+     */
+    public function setChannel(string $channel) {
+        $this->channel = $channel;
+    }
+
+    protected function getEndpoint(): string {
+        return $this->config->getSystemValue('appstoreurl', 'https://apps.nextcloud.com/api/v1') . '/' . $this->endpointName;
+    }
 }

lib/private/DB/AdapterPgSql.php

Indentation +35 added lines, -35 removed lines

@@ -28,46 +28,46 @@
 
 
 class AdapterPgSql extends Adapter {
-	protected $compatModePre9_5 = null;
+    protected $compatModePre9_5 = null;
 
-	public function lastInsertId($table) {
-		return $this->conn->fetchColumn('SELECT lastval()');
-	}
+    public function lastInsertId($table) {
+        return $this->conn->fetchColumn('SELECT lastval()');
+    }
 
-	const UNIX_TIMESTAMP_REPLACEMENT = 'cast(extract(epoch from current_timestamp) as integer)';
-	public function fixupStatement($statement) {
-		$statement = str_replace( '`', '"', $statement );
-		$statement = str_ireplace( 'UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement );
-		return $statement;
-	}
+    const UNIX_TIMESTAMP_REPLACEMENT = 'cast(extract(epoch from current_timestamp) as integer)';
+    public function fixupStatement($statement) {
+        $statement = str_replace( '`', '"', $statement );
+        $statement = str_ireplace( 'UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement );
+        return $statement;
+    }
 
-	/**
-	 * @suppress SqlInjectionChecker
-	 */
-	public function insertIgnoreConflict(string $table,array $values) : int {
-		if($this->isPre9_5CompatMode() === true) {
-			return parent::insertIgnoreConflict($table, $values);
-		}
+    /**
+     * @suppress SqlInjectionChecker
+     */
+    public function insertIgnoreConflict(string $table,array $values) : int {
+        if($this->isPre9_5CompatMode() === true) {
+            return parent::insertIgnoreConflict($table, $values);
+        }
 
-		// "upsert" is only available since PgSQL 9.5, but the generic way
-		// would leave error logs in the DB.
-		$builder = $this->conn->getQueryBuilder();
-		$builder->insert($table);
-		foreach ($values as $key => $value) {
-			$builder->setValue($key, $builder->createNamedParameter($value));
-		}
-		$queryString = $builder->getSQL() . ' ON CONFLICT DO NOTHING';
-		return $this->conn->executeUpdate($queryString, $builder->getParameters(), $builder->getParameterTypes());
-	}
+        // "upsert" is only available since PgSQL 9.5, but the generic way
+        // would leave error logs in the DB.
+        $builder = $this->conn->getQueryBuilder();
+        $builder->insert($table);
+        foreach ($values as $key => $value) {
+            $builder->setValue($key, $builder->createNamedParameter($value));
+        }
+        $queryString = $builder->getSQL() . ' ON CONFLICT DO NOTHING';
+        return $this->conn->executeUpdate($queryString, $builder->getParameters(), $builder->getParameterTypes());
+    }
 
-	protected function isPre9_5CompatMode(): bool {
-		if($this->compatModePre9_5 !== null) {
-			return $this->compatModePre9_5;
-		}
+    protected function isPre9_5CompatMode(): bool {
+        if($this->compatModePre9_5 !== null) {
+            return $this->compatModePre9_5;
+        }
 
-		$version = $this->conn->fetchColumn('SHOW SERVER_VERSION');
-		$this->compatModePre9_5 = version_compare($version, '9.5', '<');
+        $version = $this->conn->fetchColumn('SHOW SERVER_VERSION');
+        $this->compatModePre9_5 = version_compare($version, '9.5', '<');
 
-		return $this->compatModePre9_5;
-	}
+        return $this->compatModePre9_5;
+    }
 }

lib/private/AppFramework/OCS/BaseResponse.php

Spacing +1 added lines, -1 removed lines

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

apps/dav/lib/Connector/Sabre/ShareeList.php

Indentation +24 added lines, -24 removed lines

@@ -35,28 +35,28 @@
  * This property contains multiple "sharee" elements, each containing a share sharee
  */
 class ShareeList implements XmlSerializable {
-	const NS_NEXTCLOUD = 'http://nextcloud.org/ns';
-
-	/** @var IShare[] */
-	private $shares;
-
-	public function __construct(array $shares) {
-		$this->shares = $shares;
-	}
-
-	/**
-	 * The xmlSerialize metod is called during xml writing.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	function xmlSerialize(Writer $writer) {
-		foreach ($this->shares as $share) {
-			$writer->startElement('{' . self::NS_NEXTCLOUD . '}sharee');
-			$writer->writeElement('{' . self::NS_NEXTCLOUD . '}id', $share->getSharedWith());
-			$writer->writeElement('{' . self::NS_NEXTCLOUD . '}display-name', $share->getSharedWithDisplayName());
-			$writer->writeElement('{' . self::NS_NEXTCLOUD . '}type', $share->getShareType());
-			$writer->endElement();
-		}
-	}
+    const NS_NEXTCLOUD = 'http://nextcloud.org/ns';
+
+    /** @var IShare[] */
+    private $shares;
+
+    public function __construct(array $shares) {
+        $this->shares = $shares;
+    }
+
+    /**
+     * The xmlSerialize metod is called during xml writing.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    function xmlSerialize(Writer $writer) {
+        foreach ($this->shares as $share) {
+            $writer->startElement('{' . self::NS_NEXTCLOUD . '}sharee');
+            $writer->writeElement('{' . self::NS_NEXTCLOUD . '}id', $share->getSharedWith());
+            $writer->writeElement('{' . self::NS_NEXTCLOUD . '}display-name', $share->getSharedWithDisplayName());
+            $writer->writeElement('{' . self::NS_NEXTCLOUD . '}type', $share->getShareType());
+            $writer->endElement();
+        }
+    }
 }

apps/files_trashbin/lib/AppInfo/Application.php

Indentation +47 added lines, -47 removed lines

@@ -36,64 +36,64 @@
 use OCP\AppFramework\IAppContainer;
 
 class Application extends App {
-	public function __construct (array $urlParams = []) {
-		parent::__construct('files_trashbin', $urlParams);
+    public function __construct (array $urlParams = []) {
+        parent::__construct('files_trashbin', $urlParams);
 
-		$container = $this->getContainer();
-		/*
+        $container = $this->getContainer();
+        /*
 		 * Register capabilities
 		 */
-		$container->registerCapability(Capabilities::class);
+        $container->registerCapability(Capabilities::class);
 
-		/*
+        /*
 		 * Register expiration
 		 */
-		$container->registerAlias('Expiration', Expiration::class);
+        $container->registerAlias('Expiration', Expiration::class);
 
-		/*
+        /*
 		 * Register $principalBackend for the DAV collection
 		 */
-		$container->registerService('principalBackend', function () {
-			return new Principal(
-				\OC::$server->getUserManager(),
-				\OC::$server->getGroupManager(),
-				\OC::$server->getShareManager(),
-				\OC::$server->getUserSession(),
-				\OC::$server->getAppManager(),
-				\OC::$server->query(ProxyMapper::class),
-				\OC::$server->getConfig()
-			);
-		});
+        $container->registerService('principalBackend', function () {
+            return new Principal(
+                \OC::$server->getUserManager(),
+                \OC::$server->getGroupManager(),
+                \OC::$server->getShareManager(),
+                \OC::$server->getUserSession(),
+                \OC::$server->getAppManager(),
+                \OC::$server->query(ProxyMapper::class),
+                \OC::$server->getConfig()
+            );
+        });
 
-		$container->registerService(ITrashManager::class, function(IAppContainer $c) {
-			return new TrashManager();
-		});
+        $container->registerService(ITrashManager::class, function(IAppContainer $c) {
+            return new TrashManager();
+        });
 
-		$this->registerTrashBackends();
-	}
+        $this->registerTrashBackends();
+    }
 
-	public function registerTrashBackends() {
-		$server = $this->getContainer()->getServer();
-		$logger = $server->getLogger();
-		$appManager = $server->getAppManager();
-		/** @var ITrashManager $trashManager */
-		$trashManager = $this->getContainer()->getServer()->query(ITrashManager::class);
-		foreach($appManager->getInstalledApps() as $app) {
-			$appInfo = $appManager->getAppInfo($app);
-			if (isset($appInfo['trash'])) {
-				$backends = $appInfo['trash'];
-				foreach($backends as $backend) {
-					$class = $backend['@value'];
-					$for = $backend['@attributes']['for'];
+    public function registerTrashBackends() {
+        $server = $this->getContainer()->getServer();
+        $logger = $server->getLogger();
+        $appManager = $server->getAppManager();
+        /** @var ITrashManager $trashManager */
+        $trashManager = $this->getContainer()->getServer()->query(ITrashManager::class);
+        foreach($appManager->getInstalledApps() as $app) {
+            $appInfo = $appManager->getAppInfo($app);
+            if (isset($appInfo['trash'])) {
+                $backends = $appInfo['trash'];
+                foreach($backends as $backend) {
+                    $class = $backend['@value'];
+                    $for = $backend['@attributes']['for'];
 
-					try {
-						$backendObject = $server->query($class);
-						$trashManager->registerBackend($for, $backendObject);
-					} catch (\Exception $e) {
-						$logger->logException($e);
-					}
-				}
-			}
-		}
-	}
+                    try {
+                        $backendObject = $server->query($class);
+                        $trashManager->registerBackend($for, $backendObject);
+                    } catch (\Exception $e) {
+                        $logger->logException($e);
+                    }
+                }
+            }
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -36,7 +36,7 @@ 
 use OCP\AppFramework\IAppContainer;
 
 class Application extends App {
-	public function __construct (array $urlParams = []) {
+	public function __construct(array $urlParams = []) {
 		parent::__construct('files_trashbin', $urlParams);
 
 		$container = $this->getContainer();
@@ -53,7 +53,7 @@ 
 		/*
 		 * Register $principalBackend for the DAV collection
 		 */
-		$container->registerService('principalBackend', function () {
+		$container->registerService('principalBackend', function() {
 			return new Principal(
 				\OC::$server->getUserManager(),
 				\OC::$server->getGroupManager(),
@@ -78,11 +78,11 @@ 
 		$appManager = $server->getAppManager();
 		/** @var ITrashManager $trashManager */
 		$trashManager = $this->getContainer()->getServer()->query(ITrashManager::class);
-		foreach($appManager->getInstalledApps() as $app) {
+		foreach ($appManager->getInstalledApps() as $app) {
 			$appInfo = $appManager->getAppInfo($app);
 			if (isset($appInfo['trash'])) {
 				$backends = $appInfo['trash'];
-				foreach($backends as $backend) {
+				foreach ($backends as $backend) {
 					$class = $backend['@value'];
 					$for = $backend['@attributes']['for'];
 

apps/files_trashbin/lib/Sabre/AbstractTrash.php

Indentation +48 added lines, -48 removed lines

@@ -31,67 +31,67 @@
 use OCP\Files\FileInfo;
 
 abstract class AbstractTrash implements ITrash {
-	/** @var ITrashItem */
-	protected $data;
+    /** @var ITrashItem */
+    protected $data;
 
-	/** @var ITrashManager */
-	protected $trashManager;
+    /** @var ITrashManager */
+    protected $trashManager;
 
-	public function __construct(ITrashManager $trashManager, ITrashItem $data) {
-		$this->trashManager = $trashManager;
-		$this->data = $data;
-	}
+    public function __construct(ITrashManager $trashManager, ITrashItem $data) {
+        $this->trashManager = $trashManager;
+        $this->data = $data;
+    }
 
-	public function getFilename(): string {
-		return $this->data->getName();
-	}
+    public function getFilename(): string {
+        return $this->data->getName();
+    }
 
-	public function getDeletionTime(): int {
-		return $this->data->getDeletedTime();
-	}
+    public function getDeletionTime(): int {
+        return $this->data->getDeletedTime();
+    }
 
-	public function getFileId(): int {
-		return $this->data->getId();
-	}
+    public function getFileId(): int {
+        return $this->data->getId();
+    }
 
-	public function getFileInfo(): FileInfo {
-		return $this->data;
-	}
+    public function getFileInfo(): FileInfo {
+        return $this->data;
+    }
 
-	public function getSize(): int {
-		return $this->data->getSize();
-	}
+    public function getSize(): int {
+        return $this->data->getSize();
+    }
 
-	public function getLastModified(): int {
-		return $this->data->getMtime();
-	}
+    public function getLastModified(): int {
+        return $this->data->getMtime();
+    }
 
-	public function getContentType(): string {
-		return $this->data->getMimetype();
-	}
+    public function getContentType(): string {
+        return $this->data->getMimetype();
+    }
 
-	public function getETag(): string {
-		return $this->data->getEtag();
-	}
+    public function getETag(): string {
+        return $this->data->getEtag();
+    }
 
-	public function getName(): string {
-		return $this->data->getName();
-	}
+    public function getName(): string {
+        return $this->data->getName();
+    }
 
-	public function getOriginalLocation(): string {
-		return $this->data->getOriginalLocation();
-	}
+    public function getOriginalLocation(): string {
+        return $this->data->getOriginalLocation();
+    }
 
-	public function getTitle(): string {
-		return $this->data->getTitle();
-	}
+    public function getTitle(): string {
+        return $this->data->getTitle();
+    }
 
-	public function delete() {
-		$this->trashManager->removeItem($this->data);
-	}
+    public function delete() {
+        $this->trashManager->removeItem($this->data);
+    }
 
-	public function restore(): bool {
-		$this->trashManager->restoreItem($this->data);
-		return true;
-	}
+    public function restore(): bool {
+        $this->trashManager->restoreItem($this->data);
+        return true;
+    }
 }

core/Controller/SetupController.php

Indentation +113 added lines, -113 removed lines

@@ -36,117 +36,117 @@
 use OCP\ILogger;
 
 class SetupController {
-	/** @var Setup */
-	protected $setupHelper;
-	/** @var string */
-	private $autoConfigFile;
-
-	/**
-	 * @param Setup $setupHelper
-	 */
-	function __construct(Setup $setupHelper) {
-		$this->autoConfigFile = \OC::$configDir.'autoconfig.php';
-		$this->setupHelper = $setupHelper;
-	}
-
-	/**
-	 * @param $post
-	 */
-	public function run($post) {
-		// Check for autosetup:
-		$post = $this->loadAutoConfig($post);
-		$opts = $this->setupHelper->getSystemInfo();
-
-		// convert 'abcpassword' to 'abcpass'
-		if (isset($post['adminpassword'])) {
-			$post['adminpass'] = $post['adminpassword'];
-		}
-		if (isset($post['dbpassword'])) {
-			$post['dbpass'] = $post['dbpassword'];
-		}
-
-		if (!is_file(\OC::$configDir.'/CAN_INSTALL')) {
-			$this->displaySetupForbidden();
-			return;
-		}
-
-		if(isset($post['install']) AND $post['install']=='true') {
-			// We have to launch the installation process :
-			$e = $this->setupHelper->install($post);
-			$errors = ['errors' => $e];
-
-			if(count($e) > 0) {
-				$options = array_merge($opts, $post, $errors);
-				$this->display($options);
-			} else {
-				$this->finishSetup(isset($post['install-recommended-apps']));
-			}
-		} else {
-			$options = array_merge($opts, $post);
-			$this->display($options);
-		}
-	}
-
-	private function displaySetupForbidden() {
-		\OC_Template::printGuestPage('', 'installation_forbidden');
-	}
-
-	public function display($post) {
-		$defaults = [
-			'adminlogin' => '',
-			'adminpass' => '',
-			'dbuser' => '',
-			'dbpass' => '',
-			'dbname' => '',
-			'dbtablespace' => '',
-			'dbhost' => 'localhost',
-			'dbtype' => '',
-		];
-		$parameters = array_merge($defaults, $post);
-
-		\OC_Util::addScript('setup');
-		\OC_Template::printGuestPage('', 'installation', $parameters);
-	}
-
-	private function finishSetup(bool $installRecommended) {
-		if( file_exists( $this->autoConfigFile )) {
-			unlink($this->autoConfigFile);
-		}
-		\OC::$server->getIntegrityCodeChecker()->runInstanceVerification();
-
-		if (\OC_Util::getChannel() !== 'git' && is_file(\OC::$configDir.'/CAN_INSTALL')) {
-			if (!unlink(\OC::$configDir.'/CAN_INSTALL')) {
-				\OC_Template::printGuestPage('', 'installation_incomplete');
-			}
-		}
-
-		if ($installRecommended) {
-			$urlGenerator = \OC::$server->getURLGenerator();
-			$location = $urlGenerator->getAbsoluteURL('index.php/core/apps/recommended');
-			header('Location: ' . $location);
-			exit();
-		}
-		\OC_Util::redirectToDefaultPage();
-	}
-
-	public function loadAutoConfig($post) {
-		if( file_exists($this->autoConfigFile)) {
-			\OCP\Util::writeLog('core', 'Autoconfig file found, setting up Nextcloud…', ILogger::INFO);
-			$AUTOCONFIG = [];
-			include $this->autoConfigFile;
-			$post = array_merge ($post, $AUTOCONFIG);
-		}
-
-		$dbIsSet = isset($post['dbtype']);
-		$directoryIsSet = isset($post['directory']);
-		$adminAccountIsSet = isset($post['adminlogin']);
-
-		if ($dbIsSet AND $directoryIsSet AND $adminAccountIsSet) {
-			$post['install'] = 'true';
-		}
-		$post['dbIsSet'] = $dbIsSet;
-		$post['directoryIsSet'] = $directoryIsSet;
-
-		return $post;
-	}
+    /** @var Setup */
+    protected $setupHelper;
+    /** @var string */
+    private $autoConfigFile;
+
+    /**
+     * @param Setup $setupHelper
+     */
+    function __construct(Setup $setupHelper) {
+        $this->autoConfigFile = \OC::$configDir.'autoconfig.php';
+        $this->setupHelper = $setupHelper;
+    }
+
+    /**
+     * @param $post
+     */
+    public function run($post) {
+        // Check for autosetup:
+        $post = $this->loadAutoConfig($post);
+        $opts = $this->setupHelper->getSystemInfo();
+
+        // convert 'abcpassword' to 'abcpass'
+        if (isset($post['adminpassword'])) {
+            $post['adminpass'] = $post['adminpassword'];
+        }
+        if (isset($post['dbpassword'])) {
+            $post['dbpass'] = $post['dbpassword'];
+        }
+
+        if (!is_file(\OC::$configDir.'/CAN_INSTALL')) {
+            $this->displaySetupForbidden();
+            return;
+        }
+
+        if(isset($post['install']) AND $post['install']=='true') {
+            // We have to launch the installation process :
+            $e = $this->setupHelper->install($post);
+            $errors = ['errors' => $e];
+
+            if(count($e) > 0) {
+                $options = array_merge($opts, $post, $errors);
+                $this->display($options);
+            } else {
+                $this->finishSetup(isset($post['install-recommended-apps']));
+            }
+        } else {
+            $options = array_merge($opts, $post);
+            $this->display($options);
+        }
+    }
+
+    private function displaySetupForbidden() {
+        \OC_Template::printGuestPage('', 'installation_forbidden');
+    }
+
+    public function display($post) {
+        $defaults = [
+            'adminlogin' => '',
+            'adminpass' => '',
+            'dbuser' => '',
+            'dbpass' => '',
+            'dbname' => '',
+            'dbtablespace' => '',
+            'dbhost' => 'localhost',
+            'dbtype' => '',
+        ];
+        $parameters = array_merge($defaults, $post);
+
+        \OC_Util::addScript('setup');
+        \OC_Template::printGuestPage('', 'installation', $parameters);
+    }
+
+    private function finishSetup(bool $installRecommended) {
+        if( file_exists( $this->autoConfigFile )) {
+            unlink($this->autoConfigFile);
+        }
+        \OC::$server->getIntegrityCodeChecker()->runInstanceVerification();
+
+        if (\OC_Util::getChannel() !== 'git' && is_file(\OC::$configDir.'/CAN_INSTALL')) {
+            if (!unlink(\OC::$configDir.'/CAN_INSTALL')) {
+                \OC_Template::printGuestPage('', 'installation_incomplete');
+            }
+        }
+
+        if ($installRecommended) {
+            $urlGenerator = \OC::$server->getURLGenerator();
+            $location = $urlGenerator->getAbsoluteURL('index.php/core/apps/recommended');
+            header('Location: ' . $location);
+            exit();
+        }
+        \OC_Util::redirectToDefaultPage();
+    }
+
+    public function loadAutoConfig($post) {
+        if( file_exists($this->autoConfigFile)) {
+            \OCP\Util::writeLog('core', 'Autoconfig file found, setting up Nextcloud…', ILogger::INFO);
+            $AUTOCONFIG = [];
+            include $this->autoConfigFile;
+            $post = array_merge ($post, $AUTOCONFIG);
+        }
+
+        $dbIsSet = isset($post['dbtype']);
+        $directoryIsSet = isset($post['directory']);
+        $adminAccountIsSet = isset($post['adminlogin']);
+
+        if ($dbIsSet AND $directoryIsSet AND $adminAccountIsSet) {
+            $post['install'] = 'true';
+        }
+        $post['dbIsSet'] = $dbIsSet;
+        $post['directoryIsSet'] = $directoryIsSet;
+
+        return $post;
+    }
 }