Inspection of "Merge pull request #16416 from nextcloud/enh/log-d..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 4a52d9...223a91 )

by Morris

created 2019-07-17 09:43 UTC

Status

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -41,7 +41,7 @@
 block discarded – undo
 									<?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>

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -18,21 +18,21 @@
 block discarded – undo
 		<?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'; ?>
 		<?php foreach ($_['initialStates'] as $app => $initialState) { ?>
 			<input type="hidden" id="initial-state-<?php p($app); ?>" value="<?php p(base64_encode($initialState)); ?>">
 		<?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; ?>

Please login to merge, or discard this patch.

lib/private/Config.php 2 patches

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -85,7 +85,7 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 			}
 
 			// 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 @@  discard block
 block discarded – undo
 		$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);

Please login to merge, or discard this patch.

Indentation +202 added lines, -202 removed lines patch added patch discarded remove patch

@@ -41,233 +41,233 @@
 block discarded – undo
  */
 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);
 
-		if (function_exists('opcache_invalidate')) {
-			@opcache_invalidate($this->configFilePath, true);
-		}
-	}
+        if (function_exists('opcache_invalidate')) {
+            @opcache_invalidate($this->configFilePath, true);
+        }
+    }
 }
 

Please login to merge, or discard this patch.

lib/private/App/CodeChecker/LanguageParseChecker.php 2 patches

Indentation +32 added lines, -32 removed lines patch added patch discarded remove patch

@@ -25,36 +25,36 @@
 block discarded – undo
 
 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;
+    }
 }

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -35,12 +35,12 @@  discard block
 block discarded – undo
 			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 @@  discard block
 block discarded – undo
 			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();
 			}
 		}
 

Please login to merge, or discard this patch.

apps/lookup_server_connector/appinfo/app.php 1 patch

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -22,10 +22,10 @@
 block discarded – undo
 $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);
 });

Please login to merge, or discard this patch.

apps/files_external/lib/Command/Import.php 2 patches

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -112,7 +112,7 @@  discard block
 block discarded – undo
 			$json = file_get_contents('php://stdin');
 		} else {
 			if (!file_exists($path)) {
-				$output->writeln('<error>File not found: ' . $path . '</error>');
+				$output->writeln('<error>File not found: '.$path.'</error>');
 				return 1;
 			}
 			$json = file_get_contents($path);
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
 					$existingMount->getApplicableUsers() === $mount->getApplicableUsers() &&
 					$existingMount->getBackendOptions() === $mount->getBackendOptions()
 				) {
-					$output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>");
+					$output->writeln("<error>Duplicate mount (".$mount->getMountPoint().")</error>");
 					return 1;
 				}
 			}

Please login to merge, or discard this patch.

Indentation +183 added lines, -183 removed lines patch added patch discarded remove patch

@@ -39,187 +39,187 @@
 block discarded – undo
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Import extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	private $globalService;
-
-	/**
-	 * @var UserStoragesService
-	 */
-	private $userService;
-
-	/**
-	 * @var IUserSession
-	 */
-	private $userSession;
-
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
-
-	/** @var ImportLegacyStoragesService */
-	private $importLegacyStorageService;
-
-	/** @var BackendService */
-	private $backendService;
-
-	function __construct(GlobalStoragesService $globalService,
-						 UserStoragesService $userService,
-						 IUserSession $userSession,
-						 IUserManager $userManager,
-						 ImportLegacyStoragesService $importLegacyStorageService,
-						 BackendService $backendService
-	) {
-		parent::__construct();
-		$this->globalService = $globalService;
-		$this->userService = $userService;
-		$this->userSession = $userSession;
-		$this->userManager = $userManager;
-		$this->importLegacyStorageService = $importLegacyStorageService;
-		$this->backendService = $backendService;
-	}
-
-	protected function configure() {
-		$this
-			->setName('files_external:import')
-			->setDescription('Import mount configurations')
-			->addOption(
-				'user',
-				'',
-				InputOption::VALUE_OPTIONAL,
-				'user to add the mount configurations for, if not set the mount will be added as system mount'
-			)
-			->addArgument(
-				'path',
-				InputArgument::REQUIRED,
-				'path to a json file containing the mounts to import, use "-" to read from stdin'
-			)
-			->addOption(
-				'dry',
-				'',
-				InputOption::VALUE_NONE,
-				'Don\'t save the imported mounts, only list the new mounts'
-			);
-		parent::configure();
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$user = $input->getOption('user');
-		$path = $input->getArgument('path');
-		if ($path === '-') {
-			$json = file_get_contents('php://stdin');
-		} else {
-			if (!file_exists($path)) {
-				$output->writeln('<error>File not found: ' . $path . '</error>');
-				return 1;
-			}
-			$json = file_get_contents($path);
-		}
-		if (!is_string($json) || strlen($json) < 2) {
-			$output->writeln('<error>Error while reading json</error>');
-			return 1;
-		}
-		$data = json_decode($json, true);
-		if (!is_array($data)) {
-			$output->writeln('<error>Error while parsing json</error>');
-			return 1;
-		}
-
-		$isLegacy = isset($data['user']) || isset($data['group']);
-		if ($isLegacy) {
-			$this->importLegacyStorageService->setData($data);
-			$mounts = $this->importLegacyStorageService->getAllStorages();
-			foreach ($mounts as $mount) {
-				if ($mount->getBackendOption('password') === false) {
-					$output->writeln('<error>Failed to decrypt password</error>');
-					return 1;
-				}
-			}
-		} else {
-			if (!isset($data[0])) { //normalize to an array of mounts
-				$data = [$data];
-			}
-			$mounts = array_map([$this, 'parseData'], $data);
-		}
-
-		if ($user) {
-			// ensure applicables are correct for personal mounts
-			foreach ($mounts as $mount) {
-				$mount->setApplicableGroups([]);
-				$mount->setApplicableUsers([$user]);
-			}
-		}
-
-		$storageService = $this->getStorageService($user);
-
-		$existingMounts = $storageService->getAllStorages();
-
-		foreach ($mounts as $mount) {
-			foreach ($existingMounts as $existingMount) {
-				if (
-					$existingMount->getMountPoint() === $mount->getMountPoint() &&
-					$existingMount->getApplicableGroups() === $mount->getApplicableGroups() &&
-					$existingMount->getApplicableUsers() === $mount->getApplicableUsers() &&
-					$existingMount->getBackendOptions() === $mount->getBackendOptions()
-				) {
-					$output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>");
-					return 1;
-				}
-			}
-		}
-
-		if ($input->getOption('dry')) {
-			if (count($mounts) === 0) {
-				$output->writeln('<error>No mounts to be imported</error>');
-				return 1;
-			}
-			$listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
-			$listInput = new ArrayInput([], $listCommand->getDefinition());
-			$listInput->setOption('output', $input->getOption('output'));
-			$listInput->setOption('show-password', true);
-			$listCommand->listMounts($user, $mounts, $listInput, $output);
-		} else {
-			foreach ($mounts as $mount) {
-				$storageService->addStorage($mount);
-			}
-		}
-		return 0;
-	}
-
-	private function parseData(array $data) {
-		$mount = new StorageConfig($data['mount_id']);
-		$mount->setMountPoint($data['mount_point']);
-		$mount->setBackend($this->getBackendByClass($data['storage']));
-		$authBackend = $this->backendService->getAuthMechanism($data['authentication_type']);
-		$mount->setAuthMechanism($authBackend);
-		$mount->setBackendOptions($data['configuration']);
-		$mount->setMountOptions($data['options']);
-		$mount->setApplicableUsers(isset($data['applicable_users']) ? $data['applicable_users'] : []);
-		$mount->setApplicableGroups(isset($data['applicable_groups']) ? $data['applicable_groups'] : []);
-		return $mount;
-	}
-
-	private function getBackendByClass($className) {
-		$backends = $this->backendService->getBackends();
-		foreach ($backends as $backend) {
-			if ($backend->getStorageClass() === $className) {
-				return $backend;
-			}
-		}
-	}
-
-	protected function getStorageService($userId) {
-		if (!empty($userId)) {
-			$user = $this->userManager->get($userId);
-			if (is_null($user)) {
-				throw new NoUserException("user $userId not found");
-			}
-			$this->userSession->setUser($user);
-			return $this->userService;
-		} else {
-			return $this->globalService;
-		}
-	}
+    /**
+     * @var GlobalStoragesService
+     */
+    private $globalService;
+
+    /**
+     * @var UserStoragesService
+     */
+    private $userService;
+
+    /**
+     * @var IUserSession
+     */
+    private $userSession;
+
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
+
+    /** @var ImportLegacyStoragesService */
+    private $importLegacyStorageService;
+
+    /** @var BackendService */
+    private $backendService;
+
+    function __construct(GlobalStoragesService $globalService,
+                            UserStoragesService $userService,
+                            IUserSession $userSession,
+                            IUserManager $userManager,
+                            ImportLegacyStoragesService $importLegacyStorageService,
+                            BackendService $backendService
+    ) {
+        parent::__construct();
+        $this->globalService = $globalService;
+        $this->userService = $userService;
+        $this->userSession = $userSession;
+        $this->userManager = $userManager;
+        $this->importLegacyStorageService = $importLegacyStorageService;
+        $this->backendService = $backendService;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('files_external:import')
+            ->setDescription('Import mount configurations')
+            ->addOption(
+                'user',
+                '',
+                InputOption::VALUE_OPTIONAL,
+                'user to add the mount configurations for, if not set the mount will be added as system mount'
+            )
+            ->addArgument(
+                'path',
+                InputArgument::REQUIRED,
+                'path to a json file containing the mounts to import, use "-" to read from stdin'
+            )
+            ->addOption(
+                'dry',
+                '',
+                InputOption::VALUE_NONE,
+                'Don\'t save the imported mounts, only list the new mounts'
+            );
+        parent::configure();
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $user = $input->getOption('user');
+        $path = $input->getArgument('path');
+        if ($path === '-') {
+            $json = file_get_contents('php://stdin');
+        } else {
+            if (!file_exists($path)) {
+                $output->writeln('<error>File not found: ' . $path . '</error>');
+                return 1;
+            }
+            $json = file_get_contents($path);
+        }
+        if (!is_string($json) || strlen($json) < 2) {
+            $output->writeln('<error>Error while reading json</error>');
+            return 1;
+        }
+        $data = json_decode($json, true);
+        if (!is_array($data)) {
+            $output->writeln('<error>Error while parsing json</error>');
+            return 1;
+        }
+
+        $isLegacy = isset($data['user']) || isset($data['group']);
+        if ($isLegacy) {
+            $this->importLegacyStorageService->setData($data);
+            $mounts = $this->importLegacyStorageService->getAllStorages();
+            foreach ($mounts as $mount) {
+                if ($mount->getBackendOption('password') === false) {
+                    $output->writeln('<error>Failed to decrypt password</error>');
+                    return 1;
+                }
+            }
+        } else {
+            if (!isset($data[0])) { //normalize to an array of mounts
+                $data = [$data];
+            }
+            $mounts = array_map([$this, 'parseData'], $data);
+        }
+
+        if ($user) {
+            // ensure applicables are correct for personal mounts
+            foreach ($mounts as $mount) {
+                $mount->setApplicableGroups([]);
+                $mount->setApplicableUsers([$user]);
+            }
+        }
+
+        $storageService = $this->getStorageService($user);
+
+        $existingMounts = $storageService->getAllStorages();
+
+        foreach ($mounts as $mount) {
+            foreach ($existingMounts as $existingMount) {
+                if (
+                    $existingMount->getMountPoint() === $mount->getMountPoint() &&
+                    $existingMount->getApplicableGroups() === $mount->getApplicableGroups() &&
+                    $existingMount->getApplicableUsers() === $mount->getApplicableUsers() &&
+                    $existingMount->getBackendOptions() === $mount->getBackendOptions()
+                ) {
+                    $output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>");
+                    return 1;
+                }
+            }
+        }
+
+        if ($input->getOption('dry')) {
+            if (count($mounts) === 0) {
+                $output->writeln('<error>No mounts to be imported</error>');
+                return 1;
+            }
+            $listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
+            $listInput = new ArrayInput([], $listCommand->getDefinition());
+            $listInput->setOption('output', $input->getOption('output'));
+            $listInput->setOption('show-password', true);
+            $listCommand->listMounts($user, $mounts, $listInput, $output);
+        } else {
+            foreach ($mounts as $mount) {
+                $storageService->addStorage($mount);
+            }
+        }
+        return 0;
+    }
+
+    private function parseData(array $data) {
+        $mount = new StorageConfig($data['mount_id']);
+        $mount->setMountPoint($data['mount_point']);
+        $mount->setBackend($this->getBackendByClass($data['storage']));
+        $authBackend = $this->backendService->getAuthMechanism($data['authentication_type']);
+        $mount->setAuthMechanism($authBackend);
+        $mount->setBackendOptions($data['configuration']);
+        $mount->setMountOptions($data['options']);
+        $mount->setApplicableUsers(isset($data['applicable_users']) ? $data['applicable_users'] : []);
+        $mount->setApplicableGroups(isset($data['applicable_groups']) ? $data['applicable_groups'] : []);
+        return $mount;
+    }
+
+    private function getBackendByClass($className) {
+        $backends = $this->backendService->getBackends();
+        foreach ($backends as $backend) {
+            if ($backend->getStorageClass() === $className) {
+                return $backend;
+            }
+        }
+    }
+
+    protected function getStorageService($userId) {
+        if (!empty($userId)) {
+            $user = $this->userManager->get($userId);
+            if (is_null($user)) {
+                throw new NoUserException("user $userId not found");
+            }
+            $this->userSession->setUser($user);
+            return $this->userService;
+        } else {
+            return $this->globalService;
+        }
+    }
 }

Please login to merge, or discard this patch.

apps/files/ajax/download.php 2 patches

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -37,7 +37,7 @@  discard block
 block discarded – undo
 $files_list = json_decode($files);
 // in case we get only a single file
 if (!is_array($files_list)) {
-	$files_list = array($files);
+    $files_list = array($files);
 }
 
 /**
@@ -46,9 +46,9 @@  discard block
 block discarded – undo
  * alphanumeric characters
  */
 if(isset($_GET['downloadStartSecret'])
-	&& !isset($_GET['downloadStartSecret'][32])
-	&& preg_match('!^[a-zA-Z0-9]+$!', $_GET['downloadStartSecret']) === 1) {
-	setcookie('ocDownloadStarted', $_GET['downloadStartSecret'], time() + 20, '/');
+    && !isset($_GET['downloadStartSecret'][32])
+    && preg_match('!^[a-zA-Z0-9]+$!', $_GET['downloadStartSecret']) === 1) {
+    setcookie('ocDownloadStarted', $_GET['downloadStartSecret'], time() + 20, '/');
 }
 
 $server_params = array( 'head' => \OC::$server->getRequest()->getMethod() === 'HEAD' );
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
  * Http range requests support
  */
 if (isset($_SERVER['HTTP_RANGE'])) {
-	$server_params['range'] = \OC::$server->getRequest()->getHeader('Range');
+    $server_params['range'] = \OC::$server->getRequest()->getHeader('Range');
 }
 
 OC_Files::get($dir, $files_list, $server_params);

Please login to merge, or discard this patch.

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -31,8 +31,8 @@  discard block
 block discarded – undo
 OCP\User::checkLoggedIn();
 \OC::$server->getSession()->close();
 
-$files = isset($_GET['files']) ? (string)$_GET['files'] : '';
-$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : '';
+$files = isset($_GET['files']) ? (string) $_GET['files'] : '';
+$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : '';
 
 $files_list = json_decode($files);
 // in case we get only a single file
@@ -45,13 +45,13 @@  discard block
 block discarded – undo
  * the content must not be longer than 32 characters and must only contain
  * alphanumeric characters
  */
-if(isset($_GET['downloadStartSecret'])
+if (isset($_GET['downloadStartSecret'])
 	&& !isset($_GET['downloadStartSecret'][32])
 	&& preg_match('!^[a-zA-Z0-9]+$!', $_GET['downloadStartSecret']) === 1) {
 	setcookie('ocDownloadStarted', $_GET['downloadStartSecret'], time() + 20, '/');
 }
 
-$server_params = array( 'head' => \OC::$server->getRequest()->getMethod() === 'HEAD' );
+$server_params = array('head' => \OC::$server->getRequest()->getMethod() === 'HEAD');
 
 /**
  * Http range requests support

Please login to merge, or discard this patch.

apps/files_sharing/lib/Migration/OwncloudGuestShareType.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -68,7 +68,7 @@
 block discarded – undo
 
 		$query = $this->connection->getQueryBuilder();
 		$query->update('share')
-			->set('share_type',  $query->createNamedParameter(Share::SHARE_TYPE_GUEST))
+			->set('share_type', $query->createNamedParameter(Share::SHARE_TYPE_GUEST))
 			->where($query->expr()->eq('share_type', $query->createNamedParameter(Share::SHARE_TYPE_EMAIL)));
 		$query->execute();
 	}

Please login to merge, or discard this patch.

Indentation +35 added lines, -35 removed lines patch added patch discarded remove patch

@@ -36,47 +36,47 @@
 block discarded – undo
  */
 class OwncloudGuestShareType implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $connection;
+    /** @var IDBConnection */
+    private $connection;
 
-	/** @var  IConfig */
-	private $config;
+    /** @var  IConfig */
+    private $config;
 
 
-	public function __construct(IDBConnection $connection, IConfig $config) {
-		$this->connection = $connection;
-		$this->config = $config;
-	}
+    public function __construct(IDBConnection $connection, IConfig $config) {
+        $this->connection = $connection;
+        $this->config = $config;
+    }
 
-	/**
-	 * Returns the step's name
-	 *
-	 * @return string
-	 * @since 9.1.0
-	 */
-	public function getName() {
-		return 'Fix the share type of guest shares when migrating from ownCloud';
-	}
+    /**
+     * Returns the step's name
+     *
+     * @return string
+     * @since 9.1.0
+     */
+    public function getName() {
+        return 'Fix the share type of guest shares when migrating from ownCloud';
+    }
 
-	/**
-	 * @param IOutput $output
-	 */
-	public function run(IOutput $output) {
-		if (!$this->shouldRun()) {
-			return;
-		}
+    /**
+     * @param IOutput $output
+     */
+    public function run(IOutput $output) {
+        if (!$this->shouldRun()) {
+            return;
+        }
 
-		$query = $this->connection->getQueryBuilder();
-		$query->update('share')
-			->set('share_type',  $query->createNamedParameter(Share::SHARE_TYPE_GUEST))
-			->where($query->expr()->eq('share_type', $query->createNamedParameter(Share::SHARE_TYPE_EMAIL)));
-		$query->execute();
-	}
+        $query = $this->connection->getQueryBuilder();
+        $query->update('share')
+            ->set('share_type',  $query->createNamedParameter(Share::SHARE_TYPE_GUEST))
+            ->where($query->expr()->eq('share_type', $query->createNamedParameter(Share::SHARE_TYPE_EMAIL)));
+        $query->execute();
+    }
 
-	protected function shouldRun() {
-		$appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0');
-		return $appVersion === '0.10.0' ||
-			$this->config->getAppValue('core', 'vendor', '') === 'owncloud';
-	}
+    protected function shouldRun() {
+        $appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0');
+        return $appVersion === '0.10.0' ||
+            $this->config->getAppValue('core', 'vendor', '') === 'owncloud';
+    }
 
 }

Please login to merge, or discard this patch.

apps/files_sharing/lib/Migration/SetPasswordColumn.php 1 patch

Indentation +57 added lines, -57 removed lines patch added patch discarded remove patch

@@ -36,62 +36,62 @@
 block discarded – undo
  */
 class SetPasswordColumn implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $connection;
-
-	/** @var  IConfig */
-	private $config;
-
-
-	public function __construct(IDBConnection $connection, IConfig $config) {
-		$this->connection = $connection;
-		$this->config = $config;
-	}
-
-	/**
-	 * Returns the step's name
-	 *
-	 * @return string
-	 * @since 9.1.0
-	 */
-	public function getName() {
-		return 'Copy the share password into the dedicated column';
-	}
-
-	/**
-	 * @param IOutput $output
-	 */
-	public function run(IOutput $output) {
-		if (!$this->shouldRun()) {
-			return;
-		}
-
-		$query = $this->connection->getQueryBuilder();
-		$query
-			->update('share')
-			->set('password', 'share_with')
-			->where($query->expr()->eq('share_type', $query->createNamedParameter(Share::SHARE_TYPE_LINK)))
-			->andWhere($query->expr()->isNotNull('share_with'));
-		$result = $query->execute();
-
-		if ($result === 0) {
-			// No link updated, no need to run the second query
-			return;
-		}
-
-		$clearQuery = $this->connection->getQueryBuilder();
-		$clearQuery
-			->update('share')
-			->set('share_with', $clearQuery->createNamedParameter(null))
-			->where($clearQuery->expr()->eq('share_type', $clearQuery->createNamedParameter(Share::SHARE_TYPE_LINK)));
-
-		$clearQuery->execute();
-
-	}
-
-	protected function shouldRun() {
-		$appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0');
-		return version_compare($appVersion, '1.4.0', '<');
-	}
+    /** @var IDBConnection */
+    private $connection;
+
+    /** @var  IConfig */
+    private $config;
+
+
+    public function __construct(IDBConnection $connection, IConfig $config) {
+        $this->connection = $connection;
+        $this->config = $config;
+    }
+
+    /**
+     * Returns the step's name
+     *
+     * @return string
+     * @since 9.1.0
+     */
+    public function getName() {
+        return 'Copy the share password into the dedicated column';
+    }
+
+    /**
+     * @param IOutput $output
+     */
+    public function run(IOutput $output) {
+        if (!$this->shouldRun()) {
+            return;
+        }
+
+        $query = $this->connection->getQueryBuilder();
+        $query
+            ->update('share')
+            ->set('password', 'share_with')
+            ->where($query->expr()->eq('share_type', $query->createNamedParameter(Share::SHARE_TYPE_LINK)))
+            ->andWhere($query->expr()->isNotNull('share_with'));
+        $result = $query->execute();
+
+        if ($result === 0) {
+            // No link updated, no need to run the second query
+            return;
+        }
+
+        $clearQuery = $this->connection->getQueryBuilder();
+        $clearQuery
+            ->update('share')
+            ->set('share_with', $clearQuery->createNamedParameter(null))
+            ->where($clearQuery->expr()->eq('share_type', $clearQuery->createNamedParameter(Share::SHARE_TYPE_LINK)));
+
+        $clearQuery->execute();
+
+    }
+
+    protected function shouldRun() {
+        $appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0');
+        return version_compare($appVersion, '1.4.0', '<');
+    }
 
 }

Please login to merge, or discard this patch.

lib/private/App/AppStore/Fetcher/CategoryFetcher.php 1 patch

Indentation +22 added lines, -22 removed lines patch added patch discarded remove patch

@@ -28,26 +28,26 @@
 block discarded – undo
 use OCP\ILogger;
 
 class CategoryFetcher extends Fetcher {
-	/**
-	 * @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) {
-		parent::__construct(
-			$appDataFactory,
-			$clientService,
-			$timeFactory,
-			$config,
-			$logger
-		);
-		$this->fileName = 'categories.json';
-		$this->endpointUrl = 'https://apps.nextcloud.com/api/v1/categories.json';
-	}
+    /**
+     * @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) {
+        parent::__construct(
+            $appDataFactory,
+            $clientService,
+            $timeFactory,
+            $config,
+            $logger
+        );
+        $this->fileName = 'categories.json';
+        $this->endpointUrl = 'https://apps.nextcloud.com/api/v1/categories.json';
+    }
 }

Please login to merge, or discard this patch.

		@@ -85,7 +85,7 @@ discard block
		block discarded – undo
85	85	* @return mixed the value or $default
86	86	*/
87	87	public function getValue($key, $default = null) {
88		- $envValue = getenv(self::ENV_PREFIX . $key);
	88	+ $envValue = getenv(self::ENV_PREFIX.$key);
89	89	if ($envValue !== false) {
90	90	return $envValue;
91	91	}
		@@ -197,7 +197,7 @@ discard block
		block discarded – undo
197	197	foreach ($configFiles as $file) {
198	198	$fileExistsAndIsReadable = file_exists($file) && is_readable($file);
199	199	$filePointer = $fileExistsAndIsReadable ? fopen($file, 'r') : false;
200		- if($file === $this->configFilePath &&
	200	+ if ($file === $this->configFilePath &&
201	201	$filePointer === false) {
202	202	// Opening the main config might not be possible, e.g. if the wrong
203	203	// permissions are set (likely on a new installation)
		@@ -205,13 +205,13 @@ discard block
		block discarded – undo
205	205	}
206	206
207	207	// Try to acquire a file lock
208		- if(!flock($filePointer, LOCK_SH)) {
	208	+ if (!flock($filePointer, LOCK_SH)) {
209	209	throw new \Exception(sprintf('Could not acquire a shared lock on the config file %s', $file));
210	210	}
211	211
212	212	unset($CONFIG);
213	213	include $file;
214		- if(isset($CONFIG) && is_array($CONFIG)) {
	214	+ if (isset($CONFIG) && is_array($CONFIG)) {
215	215	$this->cache = array_merge($this->cache, $CONFIG);
216	216	}
217	217
		@@ -236,29 +236,29 @@ discard block
		block discarded – undo
236	236	$content .= var_export($this->cache, true);
237	237	$content .= ";\n";
238	238
239		- touch ($this->configFilePath);
	239	+ touch($this->configFilePath);
240	240	$filePointer = fopen($this->configFilePath, 'r+');
241	241
242	242	// Prevent others not to read the config
243	243	chmod($this->configFilePath, 0640);
244	244
245	245	// File does not exist, this can happen when doing a fresh install
246		- if(!is_resource ($filePointer)) {
	246	+ if (!is_resource($filePointer)) {
247	247	// TODO fix this via DI once it is very clear that this doesn't cause side effects due to initialization order
248	248	// currently this breaks app routes but also could have other side effects especially during setup and exception handling
249	249	$url = \OC::$server->getURLGenerator()->linkToDocs('admin-dir_permissions');
250	250	throw new HintException(
251	251	"Can't write into config directory!",
252		- 'This can usually be fixed by giving the webserver write access to the config directory. See ' . $url);
	252	+ 'This can usually be fixed by giving the webserver write access to the config directory. See '.$url);
253	253	}
254	254
255	255	// Try to acquire a file lock
256		- if(!flock($filePointer, LOCK_EX)) {
	256	+ if (!flock($filePointer, LOCK_EX)) {
257	257	throw new \Exception(sprintf('Could not acquire an exclusive lock on the config file %s', $this->configFilePath));
258	258	}
259	259
260	260	// Write the config and release the lock
261		- ftruncate ($filePointer, 0);
	261	+ ftruncate($filePointer, 0);
262	262	fwrite($filePointer, $content);
263	263	fflush($filePointer);
264	264	flock($filePointer, LOCK_UN);

		@@ -112,7 +112,7 @@ discard block
		block discarded – undo
112	112	$json = file_get_contents('php://stdin');
113	113	} else {
114	114	if (!file_exists($path)) {
115		- $output->writeln('<error>File not found: ' . $path . '</error>');
	115	+ $output->writeln('<error>File not found: '.$path.'</error>');
116	116	return 1;
117	117	}
118	118	$json = file_get_contents($path);
		@@ -164,7 +164,7 @@ discard block
		block discarded – undo
164	164	$existingMount->getApplicableUsers() === $mount->getApplicableUsers() &&
165	165	$existingMount->getBackendOptions() === $mount->getBackendOptions()
166	166	) {
167		- $output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>");
	167	+ $output->writeln("<error>Duplicate mount (".$mount->getMountPoint().")</error>");
168	168	return 1;
169	169	}
170	170	}

		@@ -68,7 +68,7 @@
		block discarded – undo
68	68
69	69	$query = $this->connection->getQueryBuilder();
70	70	$query->update('share')
71		- ->set('share_type', $query->createNamedParameter(Share::SHARE_TYPE_GUEST))
	71	+ ->set('share_type', $query->createNamedParameter(Share::SHARE_TYPE_GUEST))
72	72	->where($query->expr()->eq('share_type', $query->createNamedParameter(Share::SHARE_TYPE_EMAIL)));
73	73	$query->execute();
74	74	}

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

		@@ -18,21 +18,21 @@
		block discarded – undo
18	18	<?php emit_script_loading_tags($_); ?>
19	19	<?php print_unescaped($_['headers']); ?>
20	20	</head>
21		- <body id="<?php p($_['bodyid']);?>">
	21	+ <body id="<?php p($_['bodyid']); ?>">
22	22	<?php include 'layout.noscript.warning.php'; ?>
23	23	<?php foreach ($_['initialStates'] as $app => $initialState) { ?>
24	24	<input type="hidden" id="initial-state-<?php p($app); ?>" value="<?php p(base64_encode($initialState)); ?>">
25	25	<?php }?>
26	26	<div class="wrapper">
27	27	<div class="v-align">
28		- <?php if ($_['bodyid'] === 'body-login' ): ?>
	28	+ <?php if ($_['bodyid'] === 'body-login'): ?>
29	29	<header role="banner">
30	30	<div id="header">
31	31	<div class="logo">
32	32	<h1 class="hidden-visually">
33	33	<?php p($theme->getName()); ?>
34	34	</h1>
35		- <?php if(\OC::$server->getConfig()->getSystemValue('installed', false)
	35	+ <?php if (\OC::$server->getConfig()->getSystemValue('installed', false)
36	36	&& \OC::$server->getConfig()->getAppValue('theming', 'logoMime', false)): ?>
37	37	<img src="<?php p($theme->getLogo()); ?>"/>
38	38	<?php endif; ?>

		@@ -41,233 +41,233 @@
		block discarded – undo
41	41	*/
42	42	class Config {
43	43
44		- const ENV_PREFIX = 'NC_';
	44	+ const ENV_PREFIX = 'NC_';
45	45
46		- /** @var array Associative array ($key => $value) */
47		- protected $cache = array();
48		- /** @var string */
49		- protected $configDir;
50		- /** @var string */
51		- protected $configFilePath;
52		- /** @var string */
53		- protected $configFileName;
	46	+ /** @var array Associative array ($key => $value) */
	47	+ protected $cache = array();
	48	+ /** @var string */
	49	+ protected $configDir;
	50	+ /** @var string */
	51	+ protected $configFilePath;
	52	+ /** @var string */
	53	+ protected $configFileName;
54	54
55		- /**
56		- * @param string $configDir Path to the config dir, needs to end with '/'
57		- * @param string $fileName (Optional) Name of the config file. Defaults to config.php
58		- */
59		- public function __construct($configDir, $fileName = 'config.php') {
60		- $this->configDir = $configDir;
61		- $this->configFilePath = $this->configDir.$fileName;
62		- $this->configFileName = $fileName;
63		- $this->readData();
64		- }
	55	+ /**
	56	+ * @param string $configDir Path to the config dir, needs to end with '/'
	57	+ * @param string $fileName (Optional) Name of the config file. Defaults to config.php
	58	+ */
	59	+ public function __construct($configDir, $fileName = 'config.php') {
	60	+ $this->configDir = $configDir;
	61	+ $this->configFilePath = $this->configDir.$fileName;
	62	+ $this->configFileName = $fileName;
	63	+ $this->readData();
	64	+ }
65	65
66		- /**
67		- * Lists all available config keys
68		- *
69		- * Please note that it does not return the values.
70		- *
71		- * @return array an array of key names
72		- */
73		- public function getKeys() {
74		- return array_keys($this->cache);
75		- }
	66	+ /**
	67	+ * Lists all available config keys
	68	+ *
	69	+ * Please note that it does not return the values.
	70	+ *
	71	+ * @return array an array of key names
	72	+ */
	73	+ public function getKeys() {
	74	+ return array_keys($this->cache);
	75	+ }
76	76
77		- /**
78		- * Returns a config value
79		- *
80		- * gets its value from an `NC_` prefixed environment variable
81		- * if it doesn't exist from config.php
82		- * if this doesn't exist either, it will return the given `$default`
83		- *
84		- * @param string $key key
85		- * @param mixed $default = null default value
86		- * @return mixed the value or $default
87		- */
88		- public function getValue($key, $default = null) {
89		- $envValue = getenv(self::ENV_PREFIX . $key);
90		- if ($envValue !== false) {
91		- return $envValue;
92		- }
	77	+ /**
	78	+ * Returns a config value
	79	+ *
	80	+ * gets its value from an `NC_` prefixed environment variable
	81	+ * if it doesn't exist from config.php
	82	+ * if this doesn't exist either, it will return the given `$default`
	83	+ *
	84	+ * @param string $key key
	85	+ * @param mixed $default = null default value
	86	+ * @return mixed the value or $default
	87	+ */
	88	+ public function getValue($key, $default = null) {
	89	+ $envValue = getenv(self::ENV_PREFIX . $key);
	90	+ if ($envValue !== false) {
	91	+ return $envValue;
	92	+ }
93	93
94		- if (isset($this->cache[$key])) {
95		- return $this->cache[$key];
96		- }
	94	+ if (isset($this->cache[$key])) {
	95	+ return $this->cache[$key];
	96	+ }
97	97
98		- return $default;
99		- }
	98	+ return $default;
	99	+ }
100	100
101		- /**
102		- * Sets and deletes values and writes the config.php
103		- *
104		- * @param array $configs Associative array with `key => value` pairs
105		- * If value is null, the config key will be deleted
106		- */
107		- public function setValues(array $configs) {
108		- $needsUpdate = false;
109		- foreach ($configs as $key => $value) {
110		- if ($value !== null) {
111		- $needsUpdate \|= $this->set($key, $value);
112		- } else {
113		- $needsUpdate \|= $this->delete($key);
114		- }
115		- }
	101	+ /**
	102	+ * Sets and deletes values and writes the config.php
	103	+ *
	104	+ * @param array $configs Associative array with `key => value` pairs
	105	+ * If value is null, the config key will be deleted
	106	+ */
	107	+ public function setValues(array $configs) {
	108	+ $needsUpdate = false;
	109	+ foreach ($configs as $key => $value) {
	110	+ if ($value !== null) {
	111	+ $needsUpdate \|= $this->set($key, $value);
	112	+ } else {
	113	+ $needsUpdate \|= $this->delete($key);
	114	+ }
	115	+ }
116	116
117		- if ($needsUpdate) {
118		- // Write changes
119		- $this->writeData();
120		- }
121		- }
	117	+ if ($needsUpdate) {
	118	+ // Write changes
	119	+ $this->writeData();
	120	+ }
	121	+ }
122	122
123		- /**
124		- * Sets the value and writes it to config.php if required
125		- *
126		- * @param string $key key
127		- * @param mixed $value value
128		- */
129		- public function setValue($key, $value) {
130		- if ($this->set($key, $value)) {
131		- // Write changes
132		- $this->writeData();
133		- }
134		- }
	123	+ /**
	124	+ * Sets the value and writes it to config.php if required
	125	+ *
	126	+ * @param string $key key
	127	+ * @param mixed $value value
	128	+ */
	129	+ public function setValue($key, $value) {
	130	+ if ($this->set($key, $value)) {
	131	+ // Write changes
	132	+ $this->writeData();
	133	+ }
	134	+ }
135	135
136		- /**
137		- * This function sets the value
138		- *
139		- * @param string $key key
140		- * @param mixed $value value
141		- * @return bool True if the file needs to be updated, false otherwise
142		- */
143		- protected function set($key, $value) {
144		- if (!isset($this->cache[$key]) \|\| $this->cache[$key] !== $value) {
145		- // Add change
146		- $this->cache[$key] = $value;
147		- return true;
148		- }
	136	+ /**
	137	+ * This function sets the value
	138	+ *
	139	+ * @param string $key key
	140	+ * @param mixed $value value
	141	+ * @return bool True if the file needs to be updated, false otherwise
	142	+ */
	143	+ protected function set($key, $value) {
	144	+ if (!isset($this->cache[$key]) \|\| $this->cache[$key] !== $value) {
	145	+ // Add change
	146	+ $this->cache[$key] = $value;
	147	+ return true;
	148	+ }
149	149
150		- return false;
151		- }
	150	+ return false;
	151	+ }
152	152
153		- /**
154		- * Removes a key from the config and removes it from config.php if required
155		- * @param string $key
156		- */
157		- public function deleteKey($key) {
158		- if ($this->delete($key)) {
159		- // Write changes
160		- $this->writeData();
161		- }
162		- }
	153	+ /**
	154	+ * Removes a key from the config and removes it from config.php if required
	155	+ * @param string $key
	156	+ */
	157	+ public function deleteKey($key) {
	158	+ if ($this->delete($key)) {
	159	+ // Write changes
	160	+ $this->writeData();
	161	+ }
	162	+ }
163	163
164		- /**
165		- * This function removes a key from the config
166		- *
167		- * @param string $key
168		- * @return bool True if the file needs to be updated, false otherwise
169		- */
170		- protected function delete($key) {
171		- if (isset($this->cache[$key])) {
172		- // Delete key from cache
173		- unset($this->cache[$key]);
174		- return true;
175		- }
176		- return false;
177		- }
	164	+ /**
	165	+ * This function removes a key from the config
	166	+ *
	167	+ * @param string $key
	168	+ * @return bool True if the file needs to be updated, false otherwise
	169	+ */
	170	+ protected function delete($key) {
	171	+ if (isset($this->cache[$key])) {
	172	+ // Delete key from cache
	173	+ unset($this->cache[$key]);
	174	+ return true;
	175	+ }
	176	+ return false;
	177	+ }
178	178
179		- /**
180		- * Loads the config file
181		- *
182		- * Reads the config file and saves it to the cache
183		- *
184		- * @throws \Exception If no lock could be acquired or the config file has not been found
185		- */
186		- private function readData() {
187		- // Default config should always get loaded
188		- $configFiles = array($this->configFilePath);
	179	+ /**
	180	+ * Loads the config file
	181	+ *
	182	+ * Reads the config file and saves it to the cache
	183	+ *
	184	+ * @throws \Exception If no lock could be acquired or the config file has not been found
	185	+ */
	186	+ private function readData() {
	187	+ // Default config should always get loaded
	188	+ $configFiles = array($this->configFilePath);
189	189
190		- // Add all files in the config dir ending with the same file name
191		- $extra = glob($this->configDir.'*.'.$this->configFileName);
192		- if (is_array($extra)) {
193		- natsort($extra);
194		- $configFiles = array_merge($configFiles, $extra);
195		- }
	190	+ // Add all files in the config dir ending with the same file name
	191	+ $extra = glob($this->configDir.'*.'.$this->configFileName);
	192	+ if (is_array($extra)) {
	193	+ natsort($extra);
	194	+ $configFiles = array_merge($configFiles, $extra);
	195	+ }
196	196
197		- // Include file and merge config
198		- foreach ($configFiles as $file) {
199		- $fileExistsAndIsReadable = file_exists($file) && is_readable($file);
200		- $filePointer = $fileExistsAndIsReadable ? fopen($file, 'r') : false;
201		- if($file === $this->configFilePath &&
202		- $filePointer === false) {
203		- // Opening the main config might not be possible, e.g. if the wrong
204		- // permissions are set (likely on a new installation)
205		- continue;
206		- }
	197	+ // Include file and merge config
	198	+ foreach ($configFiles as $file) {
	199	+ $fileExistsAndIsReadable = file_exists($file) && is_readable($file);
	200	+ $filePointer = $fileExistsAndIsReadable ? fopen($file, 'r') : false;
	201	+ if($file === $this->configFilePath &&
	202	+ $filePointer === false) {
	203	+ // Opening the main config might not be possible, e.g. if the wrong
	204	+ // permissions are set (likely on a new installation)
	205	+ continue;
	206	+ }
207	207
208		- // Try to acquire a file lock
209		- if(!flock($filePointer, LOCK_SH)) {
210		- throw new \Exception(sprintf('Could not acquire a shared lock on the config file %s', $file));
211		- }
	208	+ // Try to acquire a file lock
	209	+ if(!flock($filePointer, LOCK_SH)) {
	210	+ throw new \Exception(sprintf('Could not acquire a shared lock on the config file %s', $file));
	211	+ }
212	212
213		- unset($CONFIG);
214		- include $file;
215		- if(isset($CONFIG) && is_array($CONFIG)) {
216		- $this->cache = array_merge($this->cache, $CONFIG);
217		- }
	213	+ unset($CONFIG);
	214	+ include $file;
	215	+ if(isset($CONFIG) && is_array($CONFIG)) {
	216	+ $this->cache = array_merge($this->cache, $CONFIG);
	217	+ }
218	218
219		- // Close the file pointer and release the lock
220		- flock($filePointer, LOCK_UN);
221		- fclose($filePointer);
222		- }
223		- }
	219	+ // Close the file pointer and release the lock
	220	+ flock($filePointer, LOCK_UN);
	221	+ fclose($filePointer);
	222	+ }
	223	+ }
224	224
225		- /**
226		- * Writes the config file
227		- *
228		- * Saves the config to the config file.
229		- *
230		- * @throws HintException If the config file cannot be written to
231		- * @throws \Exception If no file lock can be acquired
232		- */
233		- private function writeData() {
234		- // Create a php file ...
235		- $content = "<?php\n";
236		- $content .= '$CONFIG = ';
237		- $content .= var_export($this->cache, true);
238		- $content .= ";\n";
	225	+ /**
	226	+ * Writes the config file
	227	+ *
	228	+ * Saves the config to the config file.
	229	+ *
	230	+ * @throws HintException If the config file cannot be written to
	231	+ * @throws \Exception If no file lock can be acquired
	232	+ */
	233	+ private function writeData() {
	234	+ // Create a php file ...
	235	+ $content = "<?php\n";
	236	+ $content .= '$CONFIG = ';
	237	+ $content .= var_export($this->cache, true);
	238	+ $content .= ";\n";
239	239
240		- touch ($this->configFilePath);
241		- $filePointer = fopen($this->configFilePath, 'r+');
	240	+ touch ($this->configFilePath);
	241	+ $filePointer = fopen($this->configFilePath, 'r+');
242	242
243		- // Prevent others not to read the config
244		- chmod($this->configFilePath, 0640);
	243	+ // Prevent others not to read the config
	244	+ chmod($this->configFilePath, 0640);
245	245
246		- // File does not exist, this can happen when doing a fresh install
247		- if(!is_resource ($filePointer)) {
248		- // TODO fix this via DI once it is very clear that this doesn't cause side effects due to initialization order
249		- // currently this breaks app routes but also could have other side effects especially during setup and exception handling
250		- $url = \OC::$server->getURLGenerator()->linkToDocs('admin-dir_permissions');
251		- throw new HintException(
252		- "Can't write into config directory!",
253		- 'This can usually be fixed by giving the webserver write access to the config directory. See ' . $url);
254		- }
	246	+ // File does not exist, this can happen when doing a fresh install
	247	+ if(!is_resource ($filePointer)) {
	248	+ // TODO fix this via DI once it is very clear that this doesn't cause side effects due to initialization order
	249	+ // currently this breaks app routes but also could have other side effects especially during setup and exception handling
	250	+ $url = \OC::$server->getURLGenerator()->linkToDocs('admin-dir_permissions');
	251	+ throw new HintException(
	252	+ "Can't write into config directory!",
	253	+ 'This can usually be fixed by giving the webserver write access to the config directory. See ' . $url);
	254	+ }
255	255
256		- // Try to acquire a file lock
257		- if(!flock($filePointer, LOCK_EX)) {
258		- throw new \Exception(sprintf('Could not acquire an exclusive lock on the config file %s', $this->configFilePath));
259		- }
	256	+ // Try to acquire a file lock
	257	+ if(!flock($filePointer, LOCK_EX)) {
	258	+ throw new \Exception(sprintf('Could not acquire an exclusive lock on the config file %s', $this->configFilePath));
	259	+ }
260	260
261		- // Write the config and release the lock
262		- ftruncate ($filePointer, 0);
263		- fwrite($filePointer, $content);
264		- fflush($filePointer);
265		- flock($filePointer, LOCK_UN);
266		- fclose($filePointer);
	261	+ // Write the config and release the lock
	262	+ ftruncate ($filePointer, 0);
	263	+ fwrite($filePointer, $content);
	264	+ fflush($filePointer);
	265	+ flock($filePointer, LOCK_UN);
	266	+ fclose($filePointer);
267	267
268		- if (function_exists('opcache_invalidate')) {
269		- @opcache_invalidate($this->configFilePath, true);
270		- }
271		- }
	268	+ if (function_exists('opcache_invalidate')) {
	269	+ @opcache_invalidate($this->configFilePath, true);
	270	+ }
	271	+ }
272	272	}
273	273

		@@ -25,36 +25,36 @@
		block discarded – undo
25	25
26	26	class LanguageParseChecker {
27	27
28		- /**
29		- * @param string $appId
30		- * @return array
31		- */
32		- public function analyse($appId) {
33		- $appPath = \OC_App::getAppPath($appId);
34		- if ($appPath === false) {
35		- throw new \RuntimeException("No app with given id <$appId> known.");
36		- }
37		-
38		- if (!is_dir($appPath . '/l10n/')) {
39		- return [];
40		- }
41		-
42		- $errors = [];
43		- $directory = new \DirectoryIterator($appPath . '/l10n/');
44		-
45		- foreach ($directory as $file) {
46		- if ($file->getExtension() !== 'json') {
47		- continue;
48		- }
49		-
50		- $content = file_get_contents($file->getPathname());
51		- json_decode($content, true);
52		-
53		- if (json_last_error() !== JSON_ERROR_NONE) {
54		- $errors[] = 'Invalid language file found: l10n/' . $file->getFilename() . ': ' . json_last_error_msg();
55		- }
56		- }
57		-
58		- return $errors;
59		- }
	28	+ /**
	29	+ * @param string $appId
	30	+ * @return array
	31	+ */
	32	+ public function analyse($appId) {
	33	+ $appPath = \OC_App::getAppPath($appId);
	34	+ if ($appPath === false) {
	35	+ throw new \RuntimeException("No app with given id <$appId> known.");
	36	+ }
	37	+
	38	+ if (!is_dir($appPath . '/l10n/')) {
	39	+ return [];
	40	+ }
	41	+
	42	+ $errors = [];
	43	+ $directory = new \DirectoryIterator($appPath . '/l10n/');
	44	+
	45	+ foreach ($directory as $file) {
	46	+ if ($file->getExtension() !== 'json') {
	47	+ continue;
	48	+ }
	49	+
	50	+ $content = file_get_contents($file->getPathname());
	51	+ json_decode($content, true);
	52	+
	53	+ if (json_last_error() !== JSON_ERROR_NONE) {
	54	+ $errors[] = 'Invalid language file found: l10n/' . $file->getFilename() . ': ' . json_last_error_msg();
	55	+ }
	56	+ }
	57	+
	58	+ return $errors;
	59	+ }
60	60	}

		@@ -35,12 +35,12 @@ discard block
		block discarded – undo
35	35	throw new \RuntimeException("No app with given id <$appId> known.");
36	36	}
37	37
38		- if (!is_dir($appPath . '/l10n/')) {
	38	+ if (!is_dir($appPath.'/l10n/')) {
39	39	return [];
40	40	}
41	41
42	42	$errors = [];
43		- $directory = new \DirectoryIterator($appPath . '/l10n/');
	43	+ $directory = new \DirectoryIterator($appPath.'/l10n/');
44	44
45	45	foreach ($directory as $file) {
46	46	if ($file->getExtension() !== 'json') {
		@@ -51,7 +51,7 @@ discard block
		block discarded – undo
51	51	json_decode($content, true);
52	52
53	53	if (json_last_error() !== JSON_ERROR_NONE) {
54		- $errors[] = 'Invalid language file found: l10n/' . $file->getFilename() . ': ' . json_last_error_msg();
	54	+ $errors[] = 'Invalid language file found: l10n/'.$file->getFilename().': '.json_last_error_msg();
55	55	}
56	56	}
57	57

		@@ -22,10 +22,10 @@
		block discarded – undo
22	22	$dispatcher = \OC::$server->getEventDispatcher();
23	23
24	24	$dispatcher->addListener('OC\AccountManager::userUpdated', function(\Symfony\Component\EventDispatcher\GenericEvent $event) {
25		- /** @var \OCP\IUser $user */
26		- $user = $event->getSubject();
	25	+ /** @var \OCP\IUser $user */
	26	+ $user = $event->getSubject();
27	27
28		- /** @var \OCA\LookupServerConnector\UpdateLookupServer $updateLookupServer */
29		- $updateLookupServer = \OC::$server->query(\OCA\LookupServerConnector\UpdateLookupServer::class);
30		- $updateLookupServer->userUpdated($user);
	28	+ /** @var \OCA\LookupServerConnector\UpdateLookupServer $updateLookupServer */
	29	+ $updateLookupServer = \OC::$server->query(\OCA\LookupServerConnector\UpdateLookupServer::class);
	30	+ $updateLookupServer->userUpdated($user);
31	31	});

		@@ -39,187 +39,187 @@
		block discarded – undo
39	39	use Symfony\Component\Console\Output\OutputInterface;
40	40
41	41	class Import extends Base {
42		- /**
43		- * @var GlobalStoragesService
44		- */
45		- private $globalService;
46		-
47		- /**
48		- * @var UserStoragesService
49		- */
50		- private $userService;
51		-
52		- /**
53		- * @var IUserSession
54		- */
55		- private $userSession;
56		-
57		- /**
58		- * @var IUserManager
59		- */
60		- private $userManager;
61		-
62		- /** @var ImportLegacyStoragesService */
63		- private $importLegacyStorageService;
64		-
65		- /** @var BackendService */
66		- private $backendService;
67		-
68		- function __construct(GlobalStoragesService $globalService,
69		- UserStoragesService $userService,
70		- IUserSession $userSession,
71		- IUserManager $userManager,
72		- ImportLegacyStoragesService $importLegacyStorageService,
73		- BackendService $backendService
74		- ) {
75		- parent::__construct();
76		- $this->globalService = $globalService;
77		- $this->userService = $userService;
78		- $this->userSession = $userSession;
79		- $this->userManager = $userManager;
80		- $this->importLegacyStorageService = $importLegacyStorageService;
81		- $this->backendService = $backendService;
82		- }
83		-
84		- protected function configure() {
85		- $this
86		- ->setName('files_external:import')
87		- ->setDescription('Import mount configurations')
88		- ->addOption(
89		- 'user',
90		- '',
91		- InputOption::VALUE_OPTIONAL,
92		- 'user to add the mount configurations for, if not set the mount will be added as system mount'
93		- )
94		- ->addArgument(
95		- 'path',
96		- InputArgument::REQUIRED,
97		- 'path to a json file containing the mounts to import, use "-" to read from stdin'
98		- )
99		- ->addOption(
100		- 'dry',
101		- '',
102		- InputOption::VALUE_NONE,
103		- 'Don\'t save the imported mounts, only list the new mounts'
104		- );
105		- parent::configure();
106		- }
107		-
108		- protected function execute(InputInterface $input, OutputInterface $output) {
109		- $user = $input->getOption('user');
110		- $path = $input->getArgument('path');
111		- if ($path === '-') {
112		- $json = file_get_contents('php://stdin');
113		- } else {
114		- if (!file_exists($path)) {
115		- $output->writeln('<error>File not found: ' . $path . '</error>');
116		- return 1;
117		- }
118		- $json = file_get_contents($path);
119		- }
120		- if (!is_string($json) \|\| strlen($json) < 2) {
121		- $output->writeln('<error>Error while reading json</error>');
122		- return 1;
123		- }
124		- $data = json_decode($json, true);
125		- if (!is_array($data)) {
126		- $output->writeln('<error>Error while parsing json</error>');
127		- return 1;
128		- }
129		-
130		- $isLegacy = isset($data['user']) \|\| isset($data['group']);
131		- if ($isLegacy) {
132		- $this->importLegacyStorageService->setData($data);
133		- $mounts = $this->importLegacyStorageService->getAllStorages();
134		- foreach ($mounts as $mount) {
135		- if ($mount->getBackendOption('password') === false) {
136		- $output->writeln('<error>Failed to decrypt password</error>');
137		- return 1;
138		- }
139		- }
140		- } else {
141		- if (!isset($data[0])) { //normalize to an array of mounts
142		- $data = [$data];
143		- }
144		- $mounts = array_map([$this, 'parseData'], $data);
145		- }
146		-
147		- if ($user) {
148		- // ensure applicables are correct for personal mounts
149		- foreach ($mounts as $mount) {
150		- $mount->setApplicableGroups([]);
151		- $mount->setApplicableUsers([$user]);
152		- }
153		- }
154		-
155		- $storageService = $this->getStorageService($user);
156		-
157		- $existingMounts = $storageService->getAllStorages();
158		-
159		- foreach ($mounts as $mount) {
160		- foreach ($existingMounts as $existingMount) {
161		- if (
162		- $existingMount->getMountPoint() === $mount->getMountPoint() &&
163		- $existingMount->getApplicableGroups() === $mount->getApplicableGroups() &&
164		- $existingMount->getApplicableUsers() === $mount->getApplicableUsers() &&
165		- $existingMount->getBackendOptions() === $mount->getBackendOptions()
166		- ) {
167		- $output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>");
168		- return 1;
169		- }
170		- }
171		- }
172		-
173		- if ($input->getOption('dry')) {
174		- if (count($mounts) === 0) {
175		- $output->writeln('<error>No mounts to be imported</error>');
176		- return 1;
177		- }
178		- $listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
179		- $listInput = new ArrayInput([], $listCommand->getDefinition());
180		- $listInput->setOption('output', $input->getOption('output'));
181		- $listInput->setOption('show-password', true);
182		- $listCommand->listMounts($user, $mounts, $listInput, $output);
183		- } else {
184		- foreach ($mounts as $mount) {
185		- $storageService->addStorage($mount);
186		- }
187		- }
188		- return 0;
189		- }
190		-
191		- private function parseData(array $data) {
192		- $mount = new StorageConfig($data['mount_id']);
193		- $mount->setMountPoint($data['mount_point']);
194		- $mount->setBackend($this->getBackendByClass($data['storage']));
195		- $authBackend = $this->backendService->getAuthMechanism($data['authentication_type']);
196		- $mount->setAuthMechanism($authBackend);
197		- $mount->setBackendOptions($data['configuration']);
198		- $mount->setMountOptions($data['options']);
199		- $mount->setApplicableUsers(isset($data['applicable_users']) ? $data['applicable_users'] : []);
200		- $mount->setApplicableGroups(isset($data['applicable_groups']) ? $data['applicable_groups'] : []);
201		- return $mount;
202		- }
203		-
204		- private function getBackendByClass($className) {
205		- $backends = $this->backendService->getBackends();
206		- foreach ($backends as $backend) {
207		- if ($backend->getStorageClass() === $className) {
208		- return $backend;
209		- }
210		- }
211		- }
212		-
213		- protected function getStorageService($userId) {
214		- if (!empty($userId)) {
215		- $user = $this->userManager->get($userId);
216		- if (is_null($user)) {
217		- throw new NoUserException("user $userId not found");
218		- }
219		- $this->userSession->setUser($user);
220		- return $this->userService;
221		- } else {
222		- return $this->globalService;
223		- }
224		- }
	42	+ /**
	43	+ * @var GlobalStoragesService
	44	+ */
	45	+ private $globalService;
	46	+
	47	+ /**
	48	+ * @var UserStoragesService
	49	+ */
	50	+ private $userService;
	51	+
	52	+ /**
	53	+ * @var IUserSession
	54	+ */
	55	+ private $userSession;
	56	+
	57	+ /**
	58	+ * @var IUserManager
	59	+ */
	60	+ private $userManager;
	61	+
	62	+ /** @var ImportLegacyStoragesService */
	63	+ private $importLegacyStorageService;
	64	+
	65	+ /** @var BackendService */
	66	+ private $backendService;
	67	+
	68	+ function __construct(GlobalStoragesService $globalService,
	69	+ UserStoragesService $userService,
	70	+ IUserSession $userSession,
	71	+ IUserManager $userManager,
	72	+ ImportLegacyStoragesService $importLegacyStorageService,
	73	+ BackendService $backendService
	74	+ ) {
	75	+ parent::__construct();
	76	+ $this->globalService = $globalService;
	77	+ $this->userService = $userService;
	78	+ $this->userSession = $userSession;
	79	+ $this->userManager = $userManager;
	80	+ $this->importLegacyStorageService = $importLegacyStorageService;
	81	+ $this->backendService = $backendService;
	82	+ }
	83	+
	84	+ protected function configure() {
	85	+ $this
	86	+ ->setName('files_external:import')
	87	+ ->setDescription('Import mount configurations')
	88	+ ->addOption(
	89	+ 'user',
	90	+ '',
	91	+ InputOption::VALUE_OPTIONAL,
	92	+ 'user to add the mount configurations for, if not set the mount will be added as system mount'
	93	+ )
	94	+ ->addArgument(
	95	+ 'path',
	96	+ InputArgument::REQUIRED,
	97	+ 'path to a json file containing the mounts to import, use "-" to read from stdin'
	98	+ )
	99	+ ->addOption(
	100	+ 'dry',
	101	+ '',
	102	+ InputOption::VALUE_NONE,
	103	+ 'Don\'t save the imported mounts, only list the new mounts'
	104	+ );
	105	+ parent::configure();
	106	+ }
	107	+
	108	+ protected function execute(InputInterface $input, OutputInterface $output) {
	109	+ $user = $input->getOption('user');
	110	+ $path = $input->getArgument('path');
	111	+ if ($path === '-') {
	112	+ $json = file_get_contents('php://stdin');
	113	+ } else {
	114	+ if (!file_exists($path)) {
	115	+ $output->writeln('<error>File not found: ' . $path . '</error>');
	116	+ return 1;
	117	+ }
	118	+ $json = file_get_contents($path);
	119	+ }
	120	+ if (!is_string($json) \|\| strlen($json) < 2) {
	121	+ $output->writeln('<error>Error while reading json</error>');
	122	+ return 1;
	123	+ }
	124	+ $data = json_decode($json, true);
	125	+ if (!is_array($data)) {
	126	+ $output->writeln('<error>Error while parsing json</error>');
	127	+ return 1;
	128	+ }
	129	+
	130	+ $isLegacy = isset($data['user']) \|\| isset($data['group']);
	131	+ if ($isLegacy) {
	132	+ $this->importLegacyStorageService->setData($data);
	133	+ $mounts = $this->importLegacyStorageService->getAllStorages();
	134	+ foreach ($mounts as $mount) {
	135	+ if ($mount->getBackendOption('password') === false) {
	136	+ $output->writeln('<error>Failed to decrypt password</error>');
	137	+ return 1;
	138	+ }
	139	+ }
	140	+ } else {
	141	+ if (!isset($data[0])) { //normalize to an array of mounts
	142	+ $data = [$data];
	143	+ }
	144	+ $mounts = array_map([$this, 'parseData'], $data);
	145	+ }
	146	+
	147	+ if ($user) {
	148	+ // ensure applicables are correct for personal mounts
	149	+ foreach ($mounts as $mount) {
	150	+ $mount->setApplicableGroups([]);
	151	+ $mount->setApplicableUsers([$user]);
	152	+ }
	153	+ }
	154	+
	155	+ $storageService = $this->getStorageService($user);
	156	+
	157	+ $existingMounts = $storageService->getAllStorages();
	158	+
	159	+ foreach ($mounts as $mount) {
	160	+ foreach ($existingMounts as $existingMount) {
	161	+ if (
	162	+ $existingMount->getMountPoint() === $mount->getMountPoint() &&
	163	+ $existingMount->getApplicableGroups() === $mount->getApplicableGroups() &&
	164	+ $existingMount->getApplicableUsers() === $mount->getApplicableUsers() &&
	165	+ $existingMount->getBackendOptions() === $mount->getBackendOptions()
	166	+ ) {
	167	+ $output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>");
	168	+ return 1;
	169	+ }
	170	+ }
	171	+ }
	172	+
	173	+ if ($input->getOption('dry')) {
	174	+ if (count($mounts) === 0) {
	175	+ $output->writeln('<error>No mounts to be imported</error>');
	176	+ return 1;
	177	+ }
	178	+ $listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
	179	+ $listInput = new ArrayInput([], $listCommand->getDefinition());
	180	+ $listInput->setOption('output', $input->getOption('output'));
	181	+ $listInput->setOption('show-password', true);
	182	+ $listCommand->listMounts($user, $mounts, $listInput, $output);
	183	+ } else {
	184	+ foreach ($mounts as $mount) {
	185	+ $storageService->addStorage($mount);
	186	+ }
	187	+ }
	188	+ return 0;
	189	+ }
	190	+
	191	+ private function parseData(array $data) {
	192	+ $mount = new StorageConfig($data['mount_id']);
	193	+ $mount->setMountPoint($data['mount_point']);
	194	+ $mount->setBackend($this->getBackendByClass($data['storage']));
	195	+ $authBackend = $this->backendService->getAuthMechanism($data['authentication_type']);
	196	+ $mount->setAuthMechanism($authBackend);
	197	+ $mount->setBackendOptions($data['configuration']);
	198	+ $mount->setMountOptions($data['options']);
	199	+ $mount->setApplicableUsers(isset($data['applicable_users']) ? $data['applicable_users'] : []);
	200	+ $mount->setApplicableGroups(isset($data['applicable_groups']) ? $data['applicable_groups'] : []);
	201	+ return $mount;
	202	+ }
	203	+
	204	+ private function getBackendByClass($className) {
	205	+ $backends = $this->backendService->getBackends();
	206	+ foreach ($backends as $backend) {
	207	+ if ($backend->getStorageClass() === $className) {
	208	+ return $backend;
	209	+ }
	210	+ }
	211	+ }
	212	+
	213	+ protected function getStorageService($userId) {
	214	+ if (!empty($userId)) {
	215	+ $user = $this->userManager->get($userId);
	216	+ if (is_null($user)) {
	217	+ throw new NoUserException("user $userId not found");
	218	+ }
	219	+ $this->userSession->setUser($user);
	220	+ return $this->userService;
	221	+ } else {
	222	+ return $this->globalService;
	223	+ }
	224	+ }
225	225	}

		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37	$files_list = json_decode($files);
38	38	// in case we get only a single file
39	39	if (!is_array($files_list)) {
40		- $files_list = array($files);
	40	+ $files_list = array($files);
41	41	}
42	42
43	43	/**
		@@ -46,9 +46,9 @@ discard block
		block discarded – undo
46	46	* alphanumeric characters
47	47	*/
48	48	if(isset($_GET['downloadStartSecret'])
49		- && !isset($_GET['downloadStartSecret'][32])
50		- && preg_match('!^[a-zA-Z0-9]+$!', $_GET['downloadStartSecret']) === 1) {
51		- setcookie('ocDownloadStarted', $_GET['downloadStartSecret'], time() + 20, '/');
	49	+ && !isset($_GET['downloadStartSecret'][32])
	50	+ && preg_match('!^[a-zA-Z0-9]+$!', $_GET['downloadStartSecret']) === 1) {
	51	+ setcookie('ocDownloadStarted', $_GET['downloadStartSecret'], time() + 20, '/');
52	52	}
53	53
54	54	$server_params = array( 'head' => \OC::$server->getRequest()->getMethod() === 'HEAD' );
		@@ -57,7 +57,7 @@ discard block
		block discarded – undo
57	57	* Http range requests support
58	58	*/
59	59	if (isset($_SERVER['HTTP_RANGE'])) {
60		- $server_params['range'] = \OC::$server->getRequest()->getHeader('Range');
	60	+ $server_params['range'] = \OC::$server->getRequest()->getHeader('Range');
61	61	}
62	62
63	63	OC_Files::get($dir, $files_list, $server_params);

		@@ -31,8 +31,8 @@ discard block
		block discarded – undo
31	31	OCP\User::checkLoggedIn();
32	32	\OC::$server->getSession()->close();
33	33
34		-$files = isset($_GET['files']) ? (string)$_GET['files'] : '';
35		-$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : '';
	34	+$files = isset($_GET['files']) ? (string) $_GET['files'] : '';
	35	+$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : '';
36	36
37	37	$files_list = json_decode($files);
38	38	// in case we get only a single file
		@@ -45,13 +45,13 @@ discard block
		block discarded – undo
45	45	* the content must not be longer than 32 characters and must only contain
46	46	* alphanumeric characters
47	47	*/
48		-if(isset($_GET['downloadStartSecret'])
	48	+if (isset($_GET['downloadStartSecret'])
49	49	&& !isset($_GET['downloadStartSecret'][32])
50	50	&& preg_match('!^[a-zA-Z0-9]+$!', $_GET['downloadStartSecret']) === 1) {
51	51	setcookie('ocDownloadStarted', $_GET['downloadStartSecret'], time() + 20, '/');
52	52	}
53	53
54		-$server_params = array( 'head' => \OC::$server->getRequest()->getMethod() === 'HEAD' );
	54	+$server_params = array('head' => \OC::$server->getRequest()->getMethod() === 'HEAD');
55	55
56	56	/**
57	57	* Http range requests support

		@@ -36,47 +36,47 @@
		block discarded – undo
36	36	*/
37	37	class OwncloudGuestShareType implements IRepairStep {
38	38
39		- /** @var IDBConnection */
40		- private $connection;
	39	+ /** @var IDBConnection */
	40	+ private $connection;
41	41
42		- /** @var IConfig */
43		- private $config;
	42	+ /** @var IConfig */
	43	+ private $config;
44	44
45	45
46		- public function __construct(IDBConnection $connection, IConfig $config) {
47		- $this->connection = $connection;
48		- $this->config = $config;
49		- }
	46	+ public function __construct(IDBConnection $connection, IConfig $config) {
	47	+ $this->connection = $connection;
	48	+ $this->config = $config;
	49	+ }
50	50
51		- /**
52		- * Returns the step's name
53		- *
54		- * @return string
55		- * @since 9.1.0
56		- */
57		- public function getName() {
58		- return 'Fix the share type of guest shares when migrating from ownCloud';
59		- }
	51	+ /**
	52	+ * Returns the step's name
	53	+ *
	54	+ * @return string
	55	+ * @since 9.1.0
	56	+ */
	57	+ public function getName() {
	58	+ return 'Fix the share type of guest shares when migrating from ownCloud';
	59	+ }
60	60
61		- /**
62		- * @param IOutput $output
63		- */
64		- public function run(IOutput $output) {
65		- if (!$this->shouldRun()) {
66		- return;
67		- }
	61	+ /**
	62	+ * @param IOutput $output
	63	+ */
	64	+ public function run(IOutput $output) {
	65	+ if (!$this->shouldRun()) {
	66	+ return;
	67	+ }
68	68
69		- $query = $this->connection->getQueryBuilder();
70		- $query->update('share')
71		- ->set('share_type', $query->createNamedParameter(Share::SHARE_TYPE_GUEST))
72		- ->where($query->expr()->eq('share_type', $query->createNamedParameter(Share::SHARE_TYPE_EMAIL)));
73		- $query->execute();
74		- }
	69	+ $query = $this->connection->getQueryBuilder();
	70	+ $query->update('share')
	71	+ ->set('share_type', $query->createNamedParameter(Share::SHARE_TYPE_GUEST))
	72	+ ->where($query->expr()->eq('share_type', $query->createNamedParameter(Share::SHARE_TYPE_EMAIL)));
	73	+ $query->execute();
	74	+ }
75	75
76		- protected function shouldRun() {
77		- $appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0');
78		- return $appVersion === '0.10.0' \|\|
79		- $this->config->getAppValue('core', 'vendor', '') === 'owncloud';
80		- }
	76	+ protected function shouldRun() {
	77	+ $appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0');
	78	+ return $appVersion === '0.10.0' \|\|
	79	+ $this->config->getAppValue('core', 'vendor', '') === 'owncloud';
	80	+ }
81	81
82	82	}

		@@ -36,62 +36,62 @@
		block discarded – undo
36	36	*/
37	37	class SetPasswordColumn implements IRepairStep {
38	38
39		- /** @var IDBConnection */
40		- private $connection;
41		-
42		- /** @var IConfig */
43		- private $config;
44		-
45		-
46		- public function __construct(IDBConnection $connection, IConfig $config) {
47		- $this->connection = $connection;
48		- $this->config = $config;
49		- }
50		-
51		- /**
52		- * Returns the step's name
53		- *
54		- * @return string
55		- * @since 9.1.0
56		- */
57		- public function getName() {
58		- return 'Copy the share password into the dedicated column';
59		- }
60		-
61		- /**
62		- * @param IOutput $output
63		- */
64		- public function run(IOutput $output) {
65		- if (!$this->shouldRun()) {
66		- return;
67		- }
68		-
69		- $query = $this->connection->getQueryBuilder();
70		- $query
71		- ->update('share')
72		- ->set('password', 'share_with')
73		- ->where($query->expr()->eq('share_type', $query->createNamedParameter(Share::SHARE_TYPE_LINK)))
74		- ->andWhere($query->expr()->isNotNull('share_with'));
75		- $result = $query->execute();
76		-
77		- if ($result === 0) {
78		- // No link updated, no need to run the second query
79		- return;
80		- }
81		-
82		- $clearQuery = $this->connection->getQueryBuilder();
83		- $clearQuery
84		- ->update('share')
85		- ->set('share_with', $clearQuery->createNamedParameter(null))
86		- ->where($clearQuery->expr()->eq('share_type', $clearQuery->createNamedParameter(Share::SHARE_TYPE_LINK)));
87		-
88		- $clearQuery->execute();
89		-
90		- }
91		-
92		- protected function shouldRun() {
93		- $appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0');
94		- return version_compare($appVersion, '1.4.0', '<');
95		- }
	39	+ /** @var IDBConnection */
	40	+ private $connection;
	41	+
	42	+ /** @var IConfig */
	43	+ private $config;
	44	+
	45	+
	46	+ public function __construct(IDBConnection $connection, IConfig $config) {
	47	+ $this->connection = $connection;
	48	+ $this->config = $config;
	49	+ }
	50	+
	51	+ /**
	52	+ * Returns the step's name
	53	+ *
	54	+ * @return string
	55	+ * @since 9.1.0
	56	+ */
	57	+ public function getName() {
	58	+ return 'Copy the share password into the dedicated column';
	59	+ }
	60	+
	61	+ /**
	62	+ * @param IOutput $output
	63	+ */
	64	+ public function run(IOutput $output) {
	65	+ if (!$this->shouldRun()) {
	66	+ return;
	67	+ }
	68	+
	69	+ $query = $this->connection->getQueryBuilder();
	70	+ $query
	71	+ ->update('share')
	72	+ ->set('password', 'share_with')
	73	+ ->where($query->expr()->eq('share_type', $query->createNamedParameter(Share::SHARE_TYPE_LINK)))
	74	+ ->andWhere($query->expr()->isNotNull('share_with'));
	75	+ $result = $query->execute();
	76	+
	77	+ if ($result === 0) {
	78	+ // No link updated, no need to run the second query
	79	+ return;
	80	+ }
	81	+
	82	+ $clearQuery = $this->connection->getQueryBuilder();
	83	+ $clearQuery
	84	+ ->update('share')
	85	+ ->set('share_with', $clearQuery->createNamedParameter(null))
	86	+ ->where($clearQuery->expr()->eq('share_type', $clearQuery->createNamedParameter(Share::SHARE_TYPE_LINK)));
	87	+
	88	+ $clearQuery->execute();
	89	+
	90	+ }
	91	+
	92	+ protected function shouldRun() {
	93	+ $appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0');
	94	+ return version_compare($appVersion, '1.4.0', '<');
	95	+ }
96	96
97	97	}

		@@ -28,26 +28,26 @@
		block discarded – undo
28	28	use OCP\ILogger;
29	29
30	30	class CategoryFetcher extends Fetcher {
31		- /**
32		- * @param Factory $appDataFactory
33		- * @param IClientService $clientService
34		- * @param ITimeFactory $timeFactory
35		- * @param IConfig $config
36		- * @param ILogger $logger
37		- */
38		- public function __construct(Factory $appDataFactory,
39		- IClientService $clientService,
40		- ITimeFactory $timeFactory,
41		- IConfig $config,
42		- ILogger $logger) {
43		- parent::__construct(
44		- $appDataFactory,
45		- $clientService,
46		- $timeFactory,
47		- $config,
48		- $logger
49		- );
50		- $this->fileName = 'categories.json';
51		- $this->endpointUrl = 'https://apps.nextcloud.com/api/v1/categories.json';
52		- }
	31	+ /**
	32	+ * @param Factory $appDataFactory
	33	+ * @param IClientService $clientService
	34	+ * @param ITimeFactory $timeFactory
	35	+ * @param IConfig $config
	36	+ * @param ILogger $logger
	37	+ */
	38	+ public function __construct(Factory $appDataFactory,
	39	+ IClientService $clientService,
	40	+ ITimeFactory $timeFactory,
	41	+ IConfig $config,
	42	+ ILogger $logger) {
	43	+ parent::__construct(
	44	+ $appDataFactory,
	45	+ $clientService,
	46	+ $timeFactory,
	47	+ $config,
	48	+ $logger
	49	+ );
	50	+ $this->fileName = 'categories.json';
	51	+ $this->endpointUrl = 'https://apps.nextcloud.com/api/v1/categories.json';
	52	+ }
53	53	}

nextcloud / server

Push — master ( 4a52d9...223a91 )

Status

Category

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Indentation +202 added lines, -202 removed lines patch added patch discarded remove patch

Indentation +32 added lines, -32 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +183 added lines, -183 removed lines patch added patch discarded remove patch

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +35 added lines, -35 removed lines patch added patch discarded remove patch

Indentation +57 added lines, -57 removed lines patch added patch discarded remove patch

Indentation +22 added lines, -22 removed lines patch added patch discarded remove patch