nextcloud / server

lib/private/Security/CertificateManager.php

Indentation +248 added lines, -248 removed lines

@@ -38,253 +38,253 @@
  * Manage trusted certificates for users
  */
 class CertificateManager implements ICertificateManager {
-	/**
-	 * @var string
-	 */
-	protected $uid;
-
-	/**
-	 * @var \OC\Files\View
-	 */
-	protected $view;
-
-	/**
-	 * @var IConfig
-	 */
-	protected $config;
-
-	/**
-	 * @var ILogger
-	 */
-	protected $logger;
-
-	/** @var ISecureRandom */
-	protected $random;
-
-	/**
-	 * @param string $uid
-	 * @param \OC\Files\View $view relative to data/
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 * @param ISecureRandom $random
-	 */
-	public function __construct($uid,
-								\OC\Files\View $view,
-								IConfig $config,
-								ILogger $logger,
-								ISecureRandom $random) {
-		$this->uid = $uid;
-		$this->view = $view;
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->random = $random;
-	}
-
-	/**
-	 * Returns all certificates trusted by the user
-	 *
-	 * @return \OCP\ICertificate[]
-	 */
-	public function listCertificates() {
-
-		if (!$this->config->getSystemValue('installed', false)) {
-			return array();
-		}
-
-		$path = $this->getPathToCertificates() . 'uploads/';
-		if (!$this->view->is_dir($path)) {
-			return array();
-		}
-		$result = array();
-		$handle = $this->view->opendir($path);
-		if (!is_resource($handle)) {
-			return array();
-		}
-		while (false !== ($file = readdir($handle))) {
-			if ($file != '.' && $file != '..') {
-				try {
-					$result[] = new Certificate($this->view->file_get_contents($path . $file), $file);
-				} catch (\Exception $e) {
-				}
-			}
-		}
-		closedir($handle);
-		return $result;
-	}
-
-	/**
-	 * create the certificate bundle of all trusted certificated
-	 */
-	public function createCertificateBundle() {
-		$path = $this->getPathToCertificates();
-		$certs = $this->listCertificates();
-
-		if (!$this->view->file_exists($path)) {
-			$this->view->mkdir($path);
-		}
-
-		$defaultCertificates = file_get_contents(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
-		if (strlen($defaultCertificates) < 1024) { // sanity check to verify that we have some content for our bundle
-			// log as exception so we have a stacktrace
-			$this->logger->logException(new \Exception('Shipped ca-bundle is empty, refusing to create certificate bundle'));
-			return;
-		}
-
-		$certPath = $path . 'rootcerts.crt';
-		$tmpPath = $certPath . '.tmp' . $this->random->generate(10, ISecureRandom::CHAR_DIGITS);
-		$fhCerts = $this->view->fopen($tmpPath, 'w');
-
-		// Write user certificates
-		foreach ($certs as $cert) {
-			$file = $path . '/uploads/' . $cert->getName();
-			$data = $this->view->file_get_contents($file);
-			if (strpos($data, 'BEGIN CERTIFICATE')) {
-				fwrite($fhCerts, $data);
-				fwrite($fhCerts, "\r\n");
-			}
-		}
-
-		// Append the default certificates
-		fwrite($fhCerts, $defaultCertificates);
-
-		// Append the system certificate bundle
-		$systemBundle = $this->getCertificateBundle(null);
-		if ($systemBundle !== $certPath && $this->view->file_exists($systemBundle)) {
-			$systemCertificates = $this->view->file_get_contents($systemBundle);
-			fwrite($fhCerts, $systemCertificates);
-		}
-
-		fclose($fhCerts);
-
-		$this->view->rename($tmpPath, $certPath);
-	}
-
-	/**
-	 * Save the certificate and re-generate the certificate bundle
-	 *
-	 * @param string $certificate the certificate data
-	 * @param string $name the filename for the certificate
-	 * @return \OCP\ICertificate
-	 * @throws \Exception If the certificate could not get added
-	 */
-	public function addCertificate($certificate, $name) {
-		if (!Filesystem::isValidPath($name) or Filesystem::isFileBlacklisted($name)) {
-			throw new \Exception('Filename is not valid');
-		}
-
-		$dir = $this->getPathToCertificates() . 'uploads/';
-		if (!$this->view->file_exists($dir)) {
-			$this->view->mkdir($dir);
-		}
-
-		try {
-			$file = $dir . $name;
-			$certificateObject = new Certificate($certificate, $name);
-			$this->view->file_put_contents($file, $certificate);
-			$this->createCertificateBundle();
-			return $certificateObject;
-		} catch (\Exception $e) {
-			throw $e;
-		}
-
-	}
-
-	/**
-	 * Remove the certificate and re-generate the certificate bundle
-	 *
-	 * @param string $name
-	 * @return bool
-	 */
-	public function removeCertificate($name) {
-		if (!Filesystem::isValidPath($name)) {
-			return false;
-		}
-		$path = $this->getPathToCertificates() . 'uploads/';
-		if ($this->view->file_exists($path . $name)) {
-			$this->view->unlink($path . $name);
-			$this->createCertificateBundle();
-		}
-		return true;
-	}
-
-	/**
-	 * Get the path to the certificate bundle for this user
-	 *
-	 * @param string|null $uid (optional) user to get the certificate bundle for, use `null` to get the system bundle
-	 * @return string
-	 */
-	public function getCertificateBundle($uid = '') {
-		if ($uid === '') {
-			$uid = $this->uid;
-		}
-		return $this->getPathToCertificates($uid) . 'rootcerts.crt';
-	}
-
-	/**
-	 * Get the full local path to the certificate bundle for this user
-	 *
-	 * @param string $uid (optional) user to get the certificate bundle for, use `null` to get the system bundle
-	 * @return string
-	 */
-	public function getAbsoluteBundlePath($uid = '') {
-		if ($uid === '') {
-			$uid = $this->uid;
-		}
-		if ($this->needsRebundling($uid)) {
-			if (is_null($uid)) {
-				$manager = new CertificateManager(null, $this->view, $this->config, $this->logger, $this->random);
-				$manager->createCertificateBundle();
-			} else {
-				$this->createCertificateBundle();
-			}
-		}
-		return $this->view->getLocalFile($this->getCertificateBundle($uid));
-	}
-
-	/**
-	 * @param string|null $uid (optional) user to get the certificate path for, use `null` to get the system path
-	 * @return string
-	 */
-	private function getPathToCertificates($uid = '') {
-		if ($uid === '') {
-			$uid = $this->uid;
-		}
-		return is_null($uid) ? '/files_external/' : '/' . $uid . '/files_external/';
-	}
-
-	/**
-	 * Check if we need to re-bundle the certificates because one of the sources has updated
-	 *
-	 * @param string $uid (optional) user to get the certificate path for, use `null` to get the system path
-	 * @return bool
-	 */
-	private function needsRebundling($uid = '') {
-		if ($uid === '') {
-			$uid = $this->uid;
-		}
-		$sourceMTimes = [$this->getFilemtimeOfCaBundle()];
-		$targetBundle = $this->getCertificateBundle($uid);
-		if (!$this->view->file_exists($targetBundle)) {
-			return true;
-		}
-
-		if (!is_null($uid)) { // also depend on the system bundle
-			$sourceMTimes[] = $this->view->filemtime($this->getCertificateBundle(null));
-		}
-
-		$sourceMTime = array_reduce($sourceMTimes, function ($max, $mtime) {
-			return max($max, $mtime);
-		}, 0);
-		return $sourceMTime > $this->view->filemtime($targetBundle);
-	}
-
-	/**
-	 * get mtime of ca-bundle shipped by Nextcloud
-	 *
-	 * @return int
-	 */
-	protected function getFilemtimeOfCaBundle() {
-		return filemtime(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
-	}
+    /**
+     * @var string
+     */
+    protected $uid;
+
+    /**
+     * @var \OC\Files\View
+     */
+    protected $view;
+
+    /**
+     * @var IConfig
+     */
+    protected $config;
+
+    /**
+     * @var ILogger
+     */
+    protected $logger;
+
+    /** @var ISecureRandom */
+    protected $random;
+
+    /**
+     * @param string $uid
+     * @param \OC\Files\View $view relative to data/
+     * @param IConfig $config
+     * @param ILogger $logger
+     * @param ISecureRandom $random
+     */
+    public function __construct($uid,
+                                \OC\Files\View $view,
+                                IConfig $config,
+                                ILogger $logger,
+                                ISecureRandom $random) {
+        $this->uid = $uid;
+        $this->view = $view;
+        $this->config = $config;
+        $this->logger = $logger;
+        $this->random = $random;
+    }
+
+    /**
+     * Returns all certificates trusted by the user
+     *
+     * @return \OCP\ICertificate[]
+     */
+    public function listCertificates() {
+
+        if (!$this->config->getSystemValue('installed', false)) {
+            return array();
+        }
+
+        $path = $this->getPathToCertificates() . 'uploads/';
+        if (!$this->view->is_dir($path)) {
+            return array();
+        }
+        $result = array();
+        $handle = $this->view->opendir($path);
+        if (!is_resource($handle)) {
+            return array();
+        }
+        while (false !== ($file = readdir($handle))) {
+            if ($file != '.' && $file != '..') {
+                try {
+                    $result[] = new Certificate($this->view->file_get_contents($path . $file), $file);
+                } catch (\Exception $e) {
+                }
+            }
+        }
+        closedir($handle);
+        return $result;
+    }
+
+    /**
+     * create the certificate bundle of all trusted certificated
+     */
+    public function createCertificateBundle() {
+        $path = $this->getPathToCertificates();
+        $certs = $this->listCertificates();
+
+        if (!$this->view->file_exists($path)) {
+            $this->view->mkdir($path);
+        }
+
+        $defaultCertificates = file_get_contents(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
+        if (strlen($defaultCertificates) < 1024) { // sanity check to verify that we have some content for our bundle
+            // log as exception so we have a stacktrace
+            $this->logger->logException(new \Exception('Shipped ca-bundle is empty, refusing to create certificate bundle'));
+            return;
+        }
+
+        $certPath = $path . 'rootcerts.crt';
+        $tmpPath = $certPath . '.tmp' . $this->random->generate(10, ISecureRandom::CHAR_DIGITS);
+        $fhCerts = $this->view->fopen($tmpPath, 'w');
+
+        // Write user certificates
+        foreach ($certs as $cert) {
+            $file = $path . '/uploads/' . $cert->getName();
+            $data = $this->view->file_get_contents($file);
+            if (strpos($data, 'BEGIN CERTIFICATE')) {
+                fwrite($fhCerts, $data);
+                fwrite($fhCerts, "\r\n");
+            }
+        }
+
+        // Append the default certificates
+        fwrite($fhCerts, $defaultCertificates);
+
+        // Append the system certificate bundle
+        $systemBundle = $this->getCertificateBundle(null);
+        if ($systemBundle !== $certPath && $this->view->file_exists($systemBundle)) {
+            $systemCertificates = $this->view->file_get_contents($systemBundle);
+            fwrite($fhCerts, $systemCertificates);
+        }
+
+        fclose($fhCerts);
+
+        $this->view->rename($tmpPath, $certPath);
+    }
+
+    /**
+     * Save the certificate and re-generate the certificate bundle
+     *
+     * @param string $certificate the certificate data
+     * @param string $name the filename for the certificate
+     * @return \OCP\ICertificate
+     * @throws \Exception If the certificate could not get added
+     */
+    public function addCertificate($certificate, $name) {
+        if (!Filesystem::isValidPath($name) or Filesystem::isFileBlacklisted($name)) {
+            throw new \Exception('Filename is not valid');
+        }
+
+        $dir = $this->getPathToCertificates() . 'uploads/';
+        if (!$this->view->file_exists($dir)) {
+            $this->view->mkdir($dir);
+        }
+
+        try {
+            $file = $dir . $name;
+            $certificateObject = new Certificate($certificate, $name);
+            $this->view->file_put_contents($file, $certificate);
+            $this->createCertificateBundle();
+            return $certificateObject;
+        } catch (\Exception $e) {
+            throw $e;
+        }
+
+    }
+
+    /**
+     * Remove the certificate and re-generate the certificate bundle
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function removeCertificate($name) {
+        if (!Filesystem::isValidPath($name)) {
+            return false;
+        }
+        $path = $this->getPathToCertificates() . 'uploads/';
+        if ($this->view->file_exists($path . $name)) {
+            $this->view->unlink($path . $name);
+            $this->createCertificateBundle();
+        }
+        return true;
+    }
+
+    /**
+     * Get the path to the certificate bundle for this user
+     *
+     * @param string|null $uid (optional) user to get the certificate bundle for, use `null` to get the system bundle
+     * @return string
+     */
+    public function getCertificateBundle($uid = '') {
+        if ($uid === '') {
+            $uid = $this->uid;
+        }
+        return $this->getPathToCertificates($uid) . 'rootcerts.crt';
+    }
+
+    /**
+     * Get the full local path to the certificate bundle for this user
+     *
+     * @param string $uid (optional) user to get the certificate bundle for, use `null` to get the system bundle
+     * @return string
+     */
+    public function getAbsoluteBundlePath($uid = '') {
+        if ($uid === '') {
+            $uid = $this->uid;
+        }
+        if ($this->needsRebundling($uid)) {
+            if (is_null($uid)) {
+                $manager = new CertificateManager(null, $this->view, $this->config, $this->logger, $this->random);
+                $manager->createCertificateBundle();
+            } else {
+                $this->createCertificateBundle();
+            }
+        }
+        return $this->view->getLocalFile($this->getCertificateBundle($uid));
+    }
+
+    /**
+     * @param string|null $uid (optional) user to get the certificate path for, use `null` to get the system path
+     * @return string
+     */
+    private function getPathToCertificates($uid = '') {
+        if ($uid === '') {
+            $uid = $this->uid;
+        }
+        return is_null($uid) ? '/files_external/' : '/' . $uid . '/files_external/';
+    }
+
+    /**
+     * Check if we need to re-bundle the certificates because one of the sources has updated
+     *
+     * @param string $uid (optional) user to get the certificate path for, use `null` to get the system path
+     * @return bool
+     */
+    private function needsRebundling($uid = '') {
+        if ($uid === '') {
+            $uid = $this->uid;
+        }
+        $sourceMTimes = [$this->getFilemtimeOfCaBundle()];
+        $targetBundle = $this->getCertificateBundle($uid);
+        if (!$this->view->file_exists($targetBundle)) {
+            return true;
+        }
+
+        if (!is_null($uid)) { // also depend on the system bundle
+            $sourceMTimes[] = $this->view->filemtime($this->getCertificateBundle(null));
+        }
+
+        $sourceMTime = array_reduce($sourceMTimes, function ($max, $mtime) {
+            return max($max, $mtime);
+        }, 0);
+        return $sourceMTime > $this->view->filemtime($targetBundle);
+    }
+
+    /**
+     * get mtime of ca-bundle shipped by Nextcloud
+     *
+     * @return int
+     */
+    protected function getFilemtimeOfCaBundle() {
+        return filemtime(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
+    }
 
 }

lib/private/legacy/db/statementwrapper.php

Indentation +72 added lines, -72 removed lines

@@ -37,83 +37,83 @@
  * @method array fetchAll(integer $fetchMode = null);
  */
 class OC_DB_StatementWrapper {
-	/**
-	 * @var \Doctrine\DBAL\Driver\Statement
-	 */
-	private $statement = null;
-	private $isManipulation = false;
-	private $lastArguments = array();
+    /**
+     * @var \Doctrine\DBAL\Driver\Statement
+     */
+    private $statement = null;
+    private $isManipulation = false;
+    private $lastArguments = array();
 
-	/**
-	 * @param boolean $isManipulation
-	 */
-	public function __construct($statement, $isManipulation) {
-		$this->statement = $statement;
-		$this->isManipulation = $isManipulation;
-	}
+    /**
+     * @param boolean $isManipulation
+     */
+    public function __construct($statement, $isManipulation) {
+        $this->statement = $statement;
+        $this->isManipulation = $isManipulation;
+    }
 
-	/**
-	 * pass all other function directly to the \Doctrine\DBAL\Driver\Statement
-	 */
-	public function __call($name,$arguments) {
-		return call_user_func_array(array($this->statement,$name), $arguments);
-	}
+    /**
+     * pass all other function directly to the \Doctrine\DBAL\Driver\Statement
+     */
+    public function __call($name,$arguments) {
+        return call_user_func_array(array($this->statement,$name), $arguments);
+    }
 
-	/**
-	 * make execute return the result instead of a bool
-	 *
-	 * @param array $input
-	 * @return \OC_DB_StatementWrapper|int|bool
-	 */
-	public function execute($input= []) {
-		$this->lastArguments = $input;
-		if (count($input) > 0) {
-			$result = $this->statement->execute($input);
-		} else {
-			$result = $this->statement->execute();
-		}
+    /**
+     * make execute return the result instead of a bool
+     *
+     * @param array $input
+     * @return \OC_DB_StatementWrapper|int|bool
+     */
+    public function execute($input= []) {
+        $this->lastArguments = $input;
+        if (count($input) > 0) {
+            $result = $this->statement->execute($input);
+        } else {
+            $result = $this->statement->execute();
+        }
 
-		if ($result === false) {
-			return false;
-		}
-		if ($this->isManipulation) {
-			return $this->statement->rowCount();
-		} else {
-			return $this;
-		}
-	}
+        if ($result === false) {
+            return false;
+        }
+        if ($this->isManipulation) {
+            return $this->statement->rowCount();
+        } else {
+            return $this;
+        }
+    }
 
-	/**
-	 * provide an alias for fetch
-	 *
-	 * @return mixed
-	 */
-	public function fetchRow() {
-		return $this->statement->fetch();
-	}
+    /**
+     * provide an alias for fetch
+     *
+     * @return mixed
+     */
+    public function fetchRow() {
+        return $this->statement->fetch();
+    }
 
-	/**
-	 * Provide a simple fetchOne.
-	 *
-	 * fetch single column from the next row
-	 * @param int $column the column number to fetch
-	 * @return string
-	 */
-	public function fetchOne($column = 0) {
-		return $this->statement->fetchColumn($column);
-	}
+    /**
+     * Provide a simple fetchOne.
+     *
+     * fetch single column from the next row
+     * @param int $column the column number to fetch
+     * @return string
+     */
+    public function fetchOne($column = 0) {
+        return $this->statement->fetchColumn($column);
+    }
 
-	/**
-	 * Binds a PHP variable to a corresponding named or question mark placeholder in the
-	 * SQL statement that was use to prepare the statement.
-	 *
-	 * @param mixed $column Either the placeholder name or the 1-indexed placeholder index
-	 * @param mixed $variable The variable to bind
-	 * @param integer|null $type one of the  PDO::PARAM_* constants
-	 * @param integer|null $length max length when using an OUT bind
-	 * @return boolean
-	 */
-	public function bindParam($column, &$variable, $type = null, $length = null){
-		return $this->statement->bindParam($column, $variable, $type, $length);
-	}
+    /**
+     * Binds a PHP variable to a corresponding named or question mark placeholder in the
+     * SQL statement that was use to prepare the statement.
+     *
+     * @param mixed $column Either the placeholder name or the 1-indexed placeholder index
+     * @param mixed $variable The variable to bind
+     * @param integer|null $type one of the  PDO::PARAM_* constants
+     * @param integer|null $length max length when using an OUT bind
+     * @return boolean
+     */
+    public function bindParam($column, &$variable, $type = null, $length = null){
+        return $this->statement->bindParam($column, $variable, $type, $length);
+    }
 }

core/Command/Config/Import.php

Indentation +189 added lines, -189 removed lines

@@ -33,193 +33,193 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Import extends Command implements CompletionAwareInterface  {
-	protected $validRootKeys = ['system', 'apps'];
-
-	/** @var IConfig */
-	protected $config;
-
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		parent::__construct();
-		$this->config = $config;
-	}
-
-	protected function configure() {
-		$this
-			->setName('config:import')
-			->setDescription('Import a list of configs')
-			->addArgument(
-				'file',
-				InputArgument::OPTIONAL,
-				'File with the json array to import'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$importFile = $input->getArgument('file');
-		if ($importFile !== null) {
-			$content = $this->getArrayFromFile($importFile);
-		} else {
-			$content = $this->getArrayFromStdin();
-		}
-
-		try {
-			$configs = $this->validateFileContent($content);
-		} catch (\UnexpectedValueException $e) {
-			$output->writeln('<error>' . $e->getMessage(). '</error>');
-			return;
-		}
-
-		if (!empty($configs['system'])) {
-			$this->config->setSystemValues($configs['system']);
-		}
-
-		if (!empty($configs['apps'])) {
-			foreach ($configs['apps'] as $app => $appConfigs) {
-				foreach ($appConfigs as $key => $value) {
-					if ($value === null) {
-						$this->config->deleteAppValue($app, $key);
-					} else {
-						$this->config->setAppValue($app, $key, $value);
-					}
-				}
-			}
-		}
-
-		$output->writeln('<info>Config successfully imported from: ' . $importFile . '</info>');
-	}
-
-	/**
-	 * Get the content from stdin ("config:import < file.json")
-	 *
-	 * @return string
-	 */
-	protected function getArrayFromStdin() {
-		// Read from stdin. stream_set_blocking is used to prevent blocking
-		// when nothing is passed via stdin.
-		stream_set_blocking(STDIN, 0);
-		$content = file_get_contents('php://stdin');
-		stream_set_blocking(STDIN, 1);
-		return $content;
-	}
-
-	/**
-	 * Get the content of the specified file ("config:import file.json")
-	 *
-	 * @param string $importFile
-	 * @return string
-	 */
-	protected function getArrayFromFile($importFile) {
-		return file_get_contents($importFile);
-	}
-
-	/**
-	 * @param string $content
-	 * @return array
-	 * @throws \UnexpectedValueException when the array is invalid
-	 */
-	protected function validateFileContent($content) {
-		$decodedContent = json_decode($content, true);
-		if (!is_array($decodedContent) || empty($decodedContent)) {
-			throw new \UnexpectedValueException('The file must contain a valid json array');
-		}
-
-		$this->validateArray($decodedContent);
-
-		return $decodedContent;
-	}
-
-	/**
-	 * Validates that the array only contains `system` and `apps`
-	 *
-	 * @param array $array
-	 */
-	protected function validateArray($array) {
-		$arrayKeys = array_keys($array);
-		$additionalKeys = array_diff($arrayKeys, $this->validRootKeys);
-		$commonKeys = array_intersect($arrayKeys, $this->validRootKeys);
-		if (!empty($additionalKeys)) {
-			throw new \UnexpectedValueException('Found invalid entries in root: ' . implode(', ', $additionalKeys));
-		}
-		if (empty($commonKeys)) {
-			throw new \UnexpectedValueException('At least one key of the following is expected: ' . implode(', ', $this->validRootKeys));
-		}
-
-		if (isset($array['system'])) {
-			if (is_array($array['system'])) {
-				foreach ($array['system'] as $name => $value) {
-					$this->checkTypeRecursively($value, $name);
-				}
-			} else {
-				throw new \UnexpectedValueException('The system config array is not an array');
-			}
-		}
-
-		if (isset($array['apps'])) {
-			if (is_array($array['apps'])) {
-				$this->validateAppsArray($array['apps']);
-			} else {
-				throw new \UnexpectedValueException('The apps config array is not an array');
-			}
-		}
-	}
-
-	/**
-	 * @param mixed $configValue
-	 * @param string $configName
-	 */
-	protected function checkTypeRecursively($configValue, $configName) {
-		if (!is_array($configValue) && !is_bool($configValue) && !is_int($configValue) && !is_string($configValue) && !is_null($configValue)) {
-			throw new \UnexpectedValueException('Invalid system config value for "' . $configName . '". Only arrays, bools, integers, strings and null (delete) are allowed.');
-		}
-		if (is_array($configValue)) {
-			foreach ($configValue as $key => $value) {
-				$this->checkTypeRecursively($value, $configName);
-			}
-		}
-	}
-
-	/**
-	 * Validates that app configs are only integers and strings
-	 *
-	 * @param array $array
-	 */
-	protected function validateAppsArray($array) {
-		foreach ($array as $app => $configs) {
-			foreach ($configs as $name => $value) {
-				if (!is_int($value) && !is_string($value) && !is_null($value)) {
-					throw new \UnexpectedValueException('Invalid app config value for "' . $app . '":"' . $name . '". Only integers, strings and null (delete) are allowed.');
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'file') {
-			$helper = new ShellPathCompletion(
-				$this->getName(),
-				'file',
-				Completion::TYPE_ARGUMENT
-			);
-			return $helper->run();
-		}
-		return [];
-	}
+    protected $validRootKeys = ['system', 'apps'];
+
+    /** @var IConfig */
+    protected $config;
+
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        parent::__construct();
+        $this->config = $config;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('config:import')
+            ->setDescription('Import a list of configs')
+            ->addArgument(
+                'file',
+                InputArgument::OPTIONAL,
+                'File with the json array to import'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $importFile = $input->getArgument('file');
+        if ($importFile !== null) {
+            $content = $this->getArrayFromFile($importFile);
+        } else {
+            $content = $this->getArrayFromStdin();
+        }
+
+        try {
+            $configs = $this->validateFileContent($content);
+        } catch (\UnexpectedValueException $e) {
+            $output->writeln('<error>' . $e->getMessage(). '</error>');
+            return;
+        }
+
+        if (!empty($configs['system'])) {
+            $this->config->setSystemValues($configs['system']);
+        }
+
+        if (!empty($configs['apps'])) {
+            foreach ($configs['apps'] as $app => $appConfigs) {
+                foreach ($appConfigs as $key => $value) {
+                    if ($value === null) {
+                        $this->config->deleteAppValue($app, $key);
+                    } else {
+                        $this->config->setAppValue($app, $key, $value);
+                    }
+                }
+            }
+        }
+
+        $output->writeln('<info>Config successfully imported from: ' . $importFile . '</info>');
+    }
+
+    /**
+     * Get the content from stdin ("config:import < file.json")
+     *
+     * @return string
+     */
+    protected function getArrayFromStdin() {
+        // Read from stdin. stream_set_blocking is used to prevent blocking
+        // when nothing is passed via stdin.
+        stream_set_blocking(STDIN, 0);
+        $content = file_get_contents('php://stdin');
+        stream_set_blocking(STDIN, 1);
+        return $content;
+    }
+
+    /**
+     * Get the content of the specified file ("config:import file.json")
+     *
+     * @param string $importFile
+     * @return string
+     */
+    protected function getArrayFromFile($importFile) {
+        return file_get_contents($importFile);
+    }
+
+    /**
+     * @param string $content
+     * @return array
+     * @throws \UnexpectedValueException when the array is invalid
+     */
+    protected function validateFileContent($content) {
+        $decodedContent = json_decode($content, true);
+        if (!is_array($decodedContent) || empty($decodedContent)) {
+            throw new \UnexpectedValueException('The file must contain a valid json array');
+        }
+
+        $this->validateArray($decodedContent);
+
+        return $decodedContent;
+    }
+
+    /**
+     * Validates that the array only contains `system` and `apps`
+     *
+     * @param array $array
+     */
+    protected function validateArray($array) {
+        $arrayKeys = array_keys($array);
+        $additionalKeys = array_diff($arrayKeys, $this->validRootKeys);
+        $commonKeys = array_intersect($arrayKeys, $this->validRootKeys);
+        if (!empty($additionalKeys)) {
+            throw new \UnexpectedValueException('Found invalid entries in root: ' . implode(', ', $additionalKeys));
+        }
+        if (empty($commonKeys)) {
+            throw new \UnexpectedValueException('At least one key of the following is expected: ' . implode(', ', $this->validRootKeys));
+        }
+
+        if (isset($array['system'])) {
+            if (is_array($array['system'])) {
+                foreach ($array['system'] as $name => $value) {
+                    $this->checkTypeRecursively($value, $name);
+                }
+            } else {
+                throw new \UnexpectedValueException('The system config array is not an array');
+            }
+        }
+
+        if (isset($array['apps'])) {
+            if (is_array($array['apps'])) {
+                $this->validateAppsArray($array['apps']);
+            } else {
+                throw new \UnexpectedValueException('The apps config array is not an array');
+            }
+        }
+    }
+
+    /**
+     * @param mixed $configValue
+     * @param string $configName
+     */
+    protected function checkTypeRecursively($configValue, $configName) {
+        if (!is_array($configValue) && !is_bool($configValue) && !is_int($configValue) && !is_string($configValue) && !is_null($configValue)) {
+            throw new \UnexpectedValueException('Invalid system config value for "' . $configName . '". Only arrays, bools, integers, strings and null (delete) are allowed.');
+        }
+        if (is_array($configValue)) {
+            foreach ($configValue as $key => $value) {
+                $this->checkTypeRecursively($value, $configName);
+            }
+        }
+    }
+
+    /**
+     * Validates that app configs are only integers and strings
+     *
+     * @param array $array
+     */
+    protected function validateAppsArray($array) {
+        foreach ($array as $app => $configs) {
+            foreach ($configs as $name => $value) {
+                if (!is_int($value) && !is_string($value) && !is_null($value)) {
+                    throw new \UnexpectedValueException('Invalid app config value for "' . $app . '":"' . $name . '". Only integers, strings and null (delete) are allowed.');
+                }
+            }
+        }
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'file') {
+            $helper = new ShellPathCompletion(
+                $this->getName(),
+                'file',
+                Completion::TYPE_ARGUMENT
+            );
+            return $helper->run();
+        }
+        return [];
+    }
 }

lib/private/App/AppStore/Version/VersionParser.php

Indentation +48 added lines, -48 removed lines

@@ -29,56 +29,56 @@
  * @package OC\App\AppStore
  */
 class VersionParser {
-	/**
-	 * @param string $versionString
-	 * @return bool
-	 */
-	private function isValidVersionString($versionString) {
-		return (bool)preg_match('/^[0-9.]+$/', $versionString);
-	}
+    /**
+     * @param string $versionString
+     * @return bool
+     */
+    private function isValidVersionString($versionString) {
+        return (bool)preg_match('/^[0-9.]+$/', $versionString);
+    }
 
-	/**
-	 * Returns the version for a version string
-	 *
-	 * @param string $versionSpec
-	 * @return Version
-	 * @throws \Exception If the version cannot be parsed
-	 */
-	public function getVersion($versionSpec) {
-		// * indicates that the version is compatible with all versions
-		if($versionSpec === '*') {
-			return new Version('', '');
-		}
+    /**
+     * Returns the version for a version string
+     *
+     * @param string $versionSpec
+     * @return Version
+     * @throws \Exception If the version cannot be parsed
+     */
+    public function getVersion($versionSpec) {
+        // * indicates that the version is compatible with all versions
+        if($versionSpec === '*') {
+            return new Version('', '');
+        }
 
-		// Count the amount of =, if it is one then it's either maximum or minimum
-		// version. If it is two then it is maximum and minimum.
-		$versionElements = explode(' ', $versionSpec);
-		$firstVersion = isset($versionElements[0]) ? $versionElements[0] : '';
-		$firstVersionNumber = substr($firstVersion, 2);
-		$secondVersion = isset($versionElements[1]) ? $versionElements[1] : '';
-		$secondVersionNumber = substr($secondVersion, 2);
+        // Count the amount of =, if it is one then it's either maximum or minimum
+        // version. If it is two then it is maximum and minimum.
+        $versionElements = explode(' ', $versionSpec);
+        $firstVersion = isset($versionElements[0]) ? $versionElements[0] : '';
+        $firstVersionNumber = substr($firstVersion, 2);
+        $secondVersion = isset($versionElements[1]) ? $versionElements[1] : '';
+        $secondVersionNumber = substr($secondVersion, 2);
 
-		switch(count($versionElements)) {
-			case 1:
-				if(!$this->isValidVersionString($firstVersionNumber)) {
-					break;
-				}
-				if(strpos($firstVersion, '>') === 0) {
-					return new Version($firstVersionNumber, '');
-				}
-				return new Version('', $firstVersionNumber);
-			case 2:
-				if(!$this->isValidVersionString($firstVersionNumber) || !$this->isValidVersionString($secondVersionNumber)) {
-					break;
-				}
-				return new Version($firstVersionNumber, $secondVersionNumber);
-		}
+        switch(count($versionElements)) {
+            case 1:
+                if(!$this->isValidVersionString($firstVersionNumber)) {
+                    break;
+                }
+                if(strpos($firstVersion, '>') === 0) {
+                    return new Version($firstVersionNumber, '');
+                }
+                return new Version('', $firstVersionNumber);
+            case 2:
+                if(!$this->isValidVersionString($firstVersionNumber) || !$this->isValidVersionString($secondVersionNumber)) {
+                    break;
+                }
+                return new Version($firstVersionNumber, $secondVersionNumber);
+        }
 
-		throw new \Exception(
-			sprintf(
-				'Version cannot be parsed: %s',
-				$versionSpec
-			)
-		);
-	}
+        throw new \Exception(
+            sprintf(
+                'Version cannot be parsed: %s',
+                $versionSpec
+            )
+        );
+    }
 }

apps/dav/lib/DAV/Sharing/Plugin.php

Indentation +162 added lines, -162 removed lines

@@ -37,167 +37,167 @@
 
 class Plugin extends ServerPlugin {
 
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	const NS_NEXTCLOUD = 'http://nextcloud.com/ns';
-
-	/** @var Auth */
-	private $auth;
-
-	/** @var IRequest */
-	private $request;
-
-	/**
-	 * Plugin constructor.
-	 *
-	 * @param Auth $authBackEnd
-	 * @param IRequest $request
-	 */
-	public function __construct(Auth $authBackEnd, IRequest $request) {
-		$this->auth = $authBackEnd;
-		$this->request = $request;
-	}
-
-	/**
-	 * Reference to SabreDAV server object.
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	protected $server;
-
-	/**
-	 * This method should return a list of server-features.
-	 *
-	 * This is for example 'versioning' and is added to the DAV: header
-	 * in an OPTIONS response.
-	 *
-	 * @return string[]
-	 */
-	function getFeatures() {
-		return ['oc-resource-sharing'];
-	}
-
-	/**
-	 * Returns a plugin name.
-	 *
-	 * Using this name other plugins will be able to access other plugins
-	 * using Sabre\DAV\Server::getPlugin
-	 *
-	 * @return string
-	 */
-	function getPluginName() {
-		return 'oc-resource-sharing';
-	}
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param Server $server
-	 * @return void
-	 */
-	function initialize(Server $server) {
-		$this->server = $server;
-		$this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}share'] = ShareRequest::class;
-		$this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}invite'] = Invite::class;
-
-		$this->server->on('method:POST', [$this, 'httpPost']);
-		$this->server->on('propFind',    [$this, 'propFind']);
-	}
-
-	/**
-	 * We intercept this to handle POST requests on a dav resource.
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return null|false
-	 */
-	function httpPost(RequestInterface $request, ResponseInterface $response) {
-
-		$path = $request->getPath();
-
-		// Only handling xml
-		$contentType = $request->getHeader('Content-Type');
-		if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false)
-			return;
-
-		// Making sure the node exists
-		try {
-			$node = $this->server->tree->getNodeForPath($path);
-		} catch (NotFound $e) {
-			return;
-		}
-
-		$requestBody = $request->getBodyAsString();
-
-		// If this request handler could not deal with this POST request, it
-		// will return 'null' and other plugins get a chance to handle the
-		// request.
-		//
-		// However, we already requested the full body. This is a problem,
-		// because a body can only be read once. This is why we preemptively
-		// re-populated the request body with the existing data.
-		$request->setBody($requestBody);
-
-		$message = $this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
-
-		switch ($documentType) {
-
-			// Dealing with the 'share' document, which modified invitees on a
-			// calendar.
-			case '{' . self::NS_OWNCLOUD . '}share' :
-
-				// We can only deal with IShareableCalendar objects
-				if (!$node instanceof IShareable) {
-					return;
-				}
-
-				$this->server->transactionType = 'post-oc-resource-share';
-
-				// Getting ACL info
-				$acl = $this->server->getPlugin('acl');
-
-				// If there's no ACL support, we allow everything
-				if ($acl) {
-					/** @var \Sabre\DAVACL\Plugin $acl */
-					$acl->checkPrivileges($path, '{DAV:}write');
-				}
-
-				$node->updateShares($message->set, $message->remove);
-
-				$response->setStatus(200);
-				// Adding this because sending a response body may cause issues,
-				// and I wanted some type of indicator the response was handled.
-				$response->setHeader('X-Sabre-Status', 'everything-went-well');
-
-				// Breaking the event chain
-				return false;
-		}
-	}
-
-	/**
-	 * This event is triggered when properties are requested for a certain
-	 * node.
-	 *
-	 * This allows us to inject any properties early.
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	function propFind(PropFind $propFind, INode $node) {
-		if ($node instanceof IShareable) {
-
-			$propFind->handle('{' . Plugin::NS_OWNCLOUD . '}invite', function() use ($node) {
-				return new Invite(
-					$node->getShares()
-				);
-			});
-
-		}
-	}
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    const NS_NEXTCLOUD = 'http://nextcloud.com/ns';
+
+    /** @var Auth */
+    private $auth;
+
+    /** @var IRequest */
+    private $request;
+
+    /**
+     * Plugin constructor.
+     *
+     * @param Auth $authBackEnd
+     * @param IRequest $request
+     */
+    public function __construct(Auth $authBackEnd, IRequest $request) {
+        $this->auth = $authBackEnd;
+        $this->request = $request;
+    }
+
+    /**
+     * Reference to SabreDAV server object.
+     *
+     * @var \Sabre\DAV\Server
+     */
+    protected $server;
+
+    /**
+     * This method should return a list of server-features.
+     *
+     * This is for example 'versioning' and is added to the DAV: header
+     * in an OPTIONS response.
+     *
+     * @return string[]
+     */
+    function getFeatures() {
+        return ['oc-resource-sharing'];
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre\DAV\Server::getPlugin
+     *
+     * @return string
+     */
+    function getPluginName() {
+        return 'oc-resource-sharing';
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param Server $server
+     * @return void
+     */
+    function initialize(Server $server) {
+        $this->server = $server;
+        $this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}share'] = ShareRequest::class;
+        $this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}invite'] = Invite::class;
+
+        $this->server->on('method:POST', [$this, 'httpPost']);
+        $this->server->on('propFind',    [$this, 'propFind']);
+    }
+
+    /**
+     * We intercept this to handle POST requests on a dav resource.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return null|false
+     */
+    function httpPost(RequestInterface $request, ResponseInterface $response) {
+
+        $path = $request->getPath();
+
+        // Only handling xml
+        $contentType = $request->getHeader('Content-Type');
+        if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false)
+            return;
+
+        // Making sure the node exists
+        try {
+            $node = $this->server->tree->getNodeForPath($path);
+        } catch (NotFound $e) {
+            return;
+        }
+
+        $requestBody = $request->getBodyAsString();
+
+        // If this request handler could not deal with this POST request, it
+        // will return 'null' and other plugins get a chance to handle the
+        // request.
+        //
+        // However, we already requested the full body. This is a problem,
+        // because a body can only be read once. This is why we preemptively
+        // re-populated the request body with the existing data.
+        $request->setBody($requestBody);
+
+        $message = $this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
+
+        switch ($documentType) {
+
+            // Dealing with the 'share' document, which modified invitees on a
+            // calendar.
+            case '{' . self::NS_OWNCLOUD . '}share' :
+
+                // We can only deal with IShareableCalendar objects
+                if (!$node instanceof IShareable) {
+                    return;
+                }
+
+                $this->server->transactionType = 'post-oc-resource-share';
+
+                // Getting ACL info
+                $acl = $this->server->getPlugin('acl');
+
+                // If there's no ACL support, we allow everything
+                if ($acl) {
+                    /** @var \Sabre\DAVACL\Plugin $acl */
+                    $acl->checkPrivileges($path, '{DAV:}write');
+                }
+
+                $node->updateShares($message->set, $message->remove);
+
+                $response->setStatus(200);
+                // Adding this because sending a response body may cause issues,
+                // and I wanted some type of indicator the response was handled.
+                $response->setHeader('X-Sabre-Status', 'everything-went-well');
+
+                // Breaking the event chain
+                return false;
+        }
+    }
+
+    /**
+     * This event is triggered when properties are requested for a certain
+     * node.
+     *
+     * This allows us to inject any properties early.
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    function propFind(PropFind $propFind, INode $node) {
+        if ($node instanceof IShareable) {
+
+            $propFind->handle('{' . Plugin::NS_OWNCLOUD . '}invite', function() use ($node) {
+                return new Invite(
+                    $node->getShares()
+                );
+            });
+
+        }
+    }
 
 }

apps/files_external/lib/Controller/AjaxController.php

Indentation +73 added lines, -73 removed lines

@@ -39,84 +39,84 @@
 use OCP\IUserSession;
 
 class AjaxController extends Controller {
-	/** @var RSA */
-	private $rsaMechanism;
-	/** @var GlobalAuth  */
-	private $globalAuth;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IGroupManager */
-	private $groupManager;
+    /** @var RSA */
+    private $rsaMechanism;
+    /** @var GlobalAuth  */
+    private $globalAuth;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IGroupManager */
+    private $groupManager;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param RSA $rsaMechanism
-	 * @param GlobalAuth $globalAuth
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								RSA $rsaMechanism,
-								GlobalAuth $globalAuth,
-								IUserSession $userSession,
-								IGroupManager $groupManager) {
-		parent::__construct($appName, $request);
-		$this->rsaMechanism = $rsaMechanism;
-		$this->globalAuth = $globalAuth;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param RSA $rsaMechanism
+     * @param GlobalAuth $globalAuth
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                RSA $rsaMechanism,
+                                GlobalAuth $globalAuth,
+                                IUserSession $userSession,
+                                IGroupManager $groupManager) {
+        parent::__construct($appName, $request);
+        $this->rsaMechanism = $rsaMechanism;
+        $this->globalAuth = $globalAuth;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+    }
 
-	/**
-	 * @param int $keyLength
-	 * @return array
-	 */
-	private function generateSshKeys($keyLength) {
-		$key = $this->rsaMechanism->createKey($keyLength);
-		// Replace the placeholder label with a more meaningful one
-		$key['publickey'] = str_replace('phpseclib-generated-key', gethostname(), $key['publickey']);
+    /**
+     * @param int $keyLength
+     * @return array
+     */
+    private function generateSshKeys($keyLength) {
+        $key = $this->rsaMechanism->createKey($keyLength);
+        // Replace the placeholder label with a more meaningful one
+        $key['publickey'] = str_replace('phpseclib-generated-key', gethostname(), $key['publickey']);
 
-		return $key;
-	}
+        return $key;
+    }
 
-	/**
-	 * Generates an SSH public/private key pair.
-	 *
-	 * @NoAdminRequired
-	 * @param int $keyLength
-	 */
-	public function getSshKeys($keyLength = 1024) {
-		$key = $this->generateSshKeys($keyLength);
-		return new JSONResponse(
-			array('data' => array(
-				'private_key' => $key['privatekey'],
-				'public_key' => $key['publickey']
-			),
-			'status' => 'success'
-		));
-	}
+    /**
+     * Generates an SSH public/private key pair.
+     *
+     * @NoAdminRequired
+     * @param int $keyLength
+     */
+    public function getSshKeys($keyLength = 1024) {
+        $key = $this->generateSshKeys($keyLength);
+        return new JSONResponse(
+            array('data' => array(
+                'private_key' => $key['privatekey'],
+                'public_key' => $key['publickey']
+            ),
+            'status' => 'success'
+        ));
+    }
 
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $uid
-	 * @param string $user
-	 * @param string $password
-	 * @return bool
-	 */
-	public function saveGlobalCredentials($uid, $user, $password) {
-		$currentUser = $this->userSession->getUser();
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $uid
+     * @param string $user
+     * @param string $password
+     * @return bool
+     */
+    public function saveGlobalCredentials($uid, $user, $password) {
+        $currentUser = $this->userSession->getUser();
 
-		// Non-admins can only edit their own credentials
-		$allowedToEdit = ($this->groupManager->isAdmin($currentUser->getUID()) || $currentUser->getUID() === $uid);
+        // Non-admins can only edit their own credentials
+        $allowedToEdit = ($this->groupManager->isAdmin($currentUser->getUID()) || $currentUser->getUID() === $uid);
 
-		if ($allowedToEdit) {
-			$this->globalAuth->saveAuth($uid, $user, $password);
-			return true;
-		} else {
-			return false;
-		}
-	}
+        if ($allowedToEdit) {
+            $this->globalAuth->saveAuth($uid, $user, $password);
+            return true;
+        } else {
+            return false;
+        }
+    }
 }

lib/private/Memcache/Redis.php

Indentation +146 added lines, -146 removed lines

@@ -31,151 +31,151 @@
 use OCP\IMemcacheTTL;
 
 class Redis extends Cache implements IMemcacheTTL {
-	/**
-	 * @var \Redis $cache
-	 */
-	private static $cache = null;
-
-	public function __construct($prefix = '') {
-		parent::__construct($prefix);
-		if (is_null(self::$cache)) {
-			self::$cache = \OC::$server->getGetRedisFactory()->getInstance();
-		}
-	}
-
-	/**
-	 * entries in redis get namespaced to prevent collisions between ownCloud instances and users
-	 */
-	protected function getNameSpace() {
-		return $this->prefix;
-	}
-
-	public function get($key) {
-		$result = self::$cache->get($this->getNameSpace() . $key);
-		if ($result === false && !self::$cache->exists($this->getNameSpace() . $key)) {
-			return null;
-		} else {
-			return json_decode($result, true);
-		}
-	}
-
-	public function set($key, $value, $ttl = 0) {
-		if ($ttl > 0) {
-			return self::$cache->setex($this->getNameSpace() . $key, $ttl, json_encode($value));
-		} else {
-			return self::$cache->set($this->getNameSpace() . $key, json_encode($value));
-		}
-	}
-
-	public function hasKey($key) {
-		return self::$cache->exists($this->getNameSpace() . $key);
-	}
-
-	public function remove($key) {
-		if (self::$cache->del($this->getNameSpace() . $key)) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	public function clear($prefix = '') {
-		$prefix = $this->getNameSpace() . $prefix . '*';
-		$keys = self::$cache->keys($prefix);
-		$deleted = self::$cache->del($keys);
-
-		return count($keys) === $deleted;
-	}
-
-	/**
-	 * Set a value in the cache if it's not already stored
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
-	 * @return bool
-	 */
-	public function add($key, $value, $ttl = 0) {
-		// don't encode ints for inc/dec
-		if (!is_int($value)) {
-			$value = json_encode($value);
-		}
-		return self::$cache->setnx($this->getPrefix() . $key, $value);
-	}
-
-	/**
-	 * Increase a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function inc($key, $step = 1) {
-		return self::$cache->incrBy($this->getNameSpace() . $key, $step);
-	}
-
-	/**
-	 * Decrease a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function dec($key, $step = 1) {
-		if (!$this->hasKey($key)) {
-			return false;
-		}
-		return self::$cache->decrBy($this->getNameSpace() . $key, $step);
-	}
-
-	/**
-	 * Compare and set
-	 *
-	 * @param string $key
-	 * @param mixed $old
-	 * @param mixed $new
-	 * @return bool
-	 */
-	public function cas($key, $old, $new) {
-		if (!is_int($new)) {
-			$new = json_encode($new);
-		}
-		self::$cache->watch($this->getNameSpace() . $key);
-		if ($this->get($key) === $old) {
-			$result = self::$cache->multi()
-				->set($this->getNameSpace() . $key, $new)
-				->exec();
-			return $result !== false;
-		}
-		self::$cache->unwatch();
-		return false;
-	}
-
-	/**
-	 * Compare and delete
-	 *
-	 * @param string $key
-	 * @param mixed $old
-	 * @return bool
-	 */
-	public function cad($key, $old) {
-		self::$cache->watch($this->getNameSpace() . $key);
-		if ($this->get($key) === $old) {
-			$result = self::$cache->multi()
-				->del($this->getNameSpace() . $key)
-				->exec();
-			return $result !== false;
-		}
-		self::$cache->unwatch();
-		return false;
-	}
-
-	public function setTTL($key, $ttl) {
-		self::$cache->expire($this->getNameSpace() . $key, $ttl);
-	}
-
-	static public function isAvailable() {
-		return \OC::$server->getGetRedisFactory()->isAvailable();
-	}
+    /**
+     * @var \Redis $cache
+     */
+    private static $cache = null;
+
+    public function __construct($prefix = '') {
+        parent::__construct($prefix);
+        if (is_null(self::$cache)) {
+            self::$cache = \OC::$server->getGetRedisFactory()->getInstance();
+        }
+    }
+
+    /**
+     * entries in redis get namespaced to prevent collisions between ownCloud instances and users
+     */
+    protected function getNameSpace() {
+        return $this->prefix;
+    }
+
+    public function get($key) {
+        $result = self::$cache->get($this->getNameSpace() . $key);
+        if ($result === false && !self::$cache->exists($this->getNameSpace() . $key)) {
+            return null;
+        } else {
+            return json_decode($result, true);
+        }
+    }
+
+    public function set($key, $value, $ttl = 0) {
+        if ($ttl > 0) {
+            return self::$cache->setex($this->getNameSpace() . $key, $ttl, json_encode($value));
+        } else {
+            return self::$cache->set($this->getNameSpace() . $key, json_encode($value));
+        }
+    }
+
+    public function hasKey($key) {
+        return self::$cache->exists($this->getNameSpace() . $key);
+    }
+
+    public function remove($key) {
+        if (self::$cache->del($this->getNameSpace() . $key)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public function clear($prefix = '') {
+        $prefix = $this->getNameSpace() . $prefix . '*';
+        $keys = self::$cache->keys($prefix);
+        $deleted = self::$cache->del($keys);
+
+        return count($keys) === $deleted;
+    }
+
+    /**
+     * Set a value in the cache if it's not already stored
+     *
+     * @param string $key
+     * @param mixed $value
+     * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
+     * @return bool
+     */
+    public function add($key, $value, $ttl = 0) {
+        // don't encode ints for inc/dec
+        if (!is_int($value)) {
+            $value = json_encode($value);
+        }
+        return self::$cache->setnx($this->getPrefix() . $key, $value);
+    }
+
+    /**
+     * Increase a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function inc($key, $step = 1) {
+        return self::$cache->incrBy($this->getNameSpace() . $key, $step);
+    }
+
+    /**
+     * Decrease a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function dec($key, $step = 1) {
+        if (!$this->hasKey($key)) {
+            return false;
+        }
+        return self::$cache->decrBy($this->getNameSpace() . $key, $step);
+    }
+
+    /**
+     * Compare and set
+     *
+     * @param string $key
+     * @param mixed $old
+     * @param mixed $new
+     * @return bool
+     */
+    public function cas($key, $old, $new) {
+        if (!is_int($new)) {
+            $new = json_encode($new);
+        }
+        self::$cache->watch($this->getNameSpace() . $key);
+        if ($this->get($key) === $old) {
+            $result = self::$cache->multi()
+                ->set($this->getNameSpace() . $key, $new)
+                ->exec();
+            return $result !== false;
+        }
+        self::$cache->unwatch();
+        return false;
+    }
+
+    /**
+     * Compare and delete
+     *
+     * @param string $key
+     * @param mixed $old
+     * @return bool
+     */
+    public function cad($key, $old) {
+        self::$cache->watch($this->getNameSpace() . $key);
+        if ($this->get($key) === $old) {
+            $result = self::$cache->multi()
+                ->del($this->getNameSpace() . $key)
+                ->exec();
+            return $result !== false;
+        }
+        self::$cache->unwatch();
+        return false;
+    }
+
+    public function setTTL($key, $ttl) {
+        self::$cache->expire($this->getNameSpace() . $key, $ttl);
+    }
+
+    static public function isAvailable() {
+        return \OC::$server->getGetRedisFactory()->isAvailable();
+    }
 }
 

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

Indentation +217 added lines, -217 removed lines

@@ -51,246 +51,246 @@
 class TagsPlugin extends \Sabre\DAV\ServerPlugin
 {
 
-	// namespace
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	const TAGS_PROPERTYNAME = '{http://owncloud.org/ns}tags';
-	const FAVORITE_PROPERTYNAME = '{http://owncloud.org/ns}favorite';
-	const TAG_FAVORITE = '_$!<Favorite>!$_';
+    // namespace
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    const TAGS_PROPERTYNAME = '{http://owncloud.org/ns}tags';
+    const FAVORITE_PROPERTYNAME = '{http://owncloud.org/ns}favorite';
+    const TAG_FAVORITE = '_$!<Favorite>!$_';
 
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
 
-	/**
-	 * @var \OCP\ITagManager
-	 */
-	private $tagManager;
+    /**
+     * @var \OCP\ITagManager
+     */
+    private $tagManager;
 
-	/**
-	 * @var \OCP\ITags
-	 */
-	private $tagger;
+    /**
+     * @var \OCP\ITags
+     */
+    private $tagger;
 
-	/**
-	 * Array of file id to tags array
-	 * The null value means the cache wasn't initialized.
-	 *
-	 * @var array
-	 */
-	private $cachedTags;
+    /**
+     * Array of file id to tags array
+     * The null value means the cache wasn't initialized.
+     *
+     * @var array
+     */
+    private $cachedTags;
 
-	/**
-	 * @var \Sabre\DAV\Tree
-	 */
-	private $tree;
+    /**
+     * @var \Sabre\DAV\Tree
+     */
+    private $tree;
 
-	/**
-	 * @param \Sabre\DAV\Tree $tree tree
-	 * @param \OCP\ITagManager $tagManager tag manager
-	 */
-	public function __construct(\Sabre\DAV\Tree $tree, \OCP\ITagManager $tagManager) {
-		$this->tree = $tree;
-		$this->tagManager = $tagManager;
-		$this->tagger = null;
-		$this->cachedTags = array();
-	}
+    /**
+     * @param \Sabre\DAV\Tree $tree tree
+     * @param \OCP\ITagManager $tagManager tag manager
+     */
+    public function __construct(\Sabre\DAV\Tree $tree, \OCP\ITagManager $tagManager) {
+        $this->tree = $tree;
+        $this->tagManager = $tagManager;
+        $this->tagger = null;
+        $this->cachedTags = array();
+    }
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by \Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by \Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param \Sabre\DAV\Server $server
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
 
-		$server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
-		$server->xml->elementMap[self::TAGS_PROPERTYNAME] = TagList::class;
+        $server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
+        $server->xml->elementMap[self::TAGS_PROPERTYNAME] = TagList::class;
 
-		$this->server = $server;
-		$this->server->on('propFind', array($this, 'handleGetProperties'));
-		$this->server->on('propPatch', array($this, 'handleUpdateProperties'));
-	}
+        $this->server = $server;
+        $this->server->on('propFind', array($this, 'handleGetProperties'));
+        $this->server->on('propPatch', array($this, 'handleUpdateProperties'));
+    }
 
-	/**
-	 * Returns the tagger
-	 *
-	 * @return \OCP\ITags tagger
-	 */
-	private function getTagger() {
-		if (!$this->tagger) {
-			$this->tagger = $this->tagManager->load('files');
-		}
-		return $this->tagger;
-	}
+    /**
+     * Returns the tagger
+     *
+     * @return \OCP\ITags tagger
+     */
+    private function getTagger() {
+        if (!$this->tagger) {
+            $this->tagger = $this->tagManager->load('files');
+        }
+        return $this->tagger;
+    }
 
-	/**
-	 * Returns tags and favorites.
-	 *
-	 * @param integer $fileId file id
-	 * @return array list($tags, $favorite) with $tags as tag array
-	 * and $favorite is a boolean whether the file was favorited
-	 */
-	private function getTagsAndFav($fileId) {
-		$isFav = false;
-		$tags = $this->getTags($fileId);
-		if ($tags) {
-			$favPos = array_search(self::TAG_FAVORITE, $tags);
-			if ($favPos !== false) {
-				$isFav = true;
-				unset($tags[$favPos]);
-			}
-		}
-		return array($tags, $isFav);
-	}
+    /**
+     * Returns tags and favorites.
+     *
+     * @param integer $fileId file id
+     * @return array list($tags, $favorite) with $tags as tag array
+     * and $favorite is a boolean whether the file was favorited
+     */
+    private function getTagsAndFav($fileId) {
+        $isFav = false;
+        $tags = $this->getTags($fileId);
+        if ($tags) {
+            $favPos = array_search(self::TAG_FAVORITE, $tags);
+            if ($favPos !== false) {
+                $isFav = true;
+                unset($tags[$favPos]);
+            }
+        }
+        return array($tags, $isFav);
+    }
 
-	/**
-	 * Returns tags for the given file id
-	 *
-	 * @param integer $fileId file id
-	 * @return array list of tags for that file
-	 */
-	private function getTags($fileId) {
-		if (isset($this->cachedTags[$fileId])) {
-			return $this->cachedTags[$fileId];
-		} else {
-			$tags = $this->getTagger()->getTagsForObjects(array($fileId));
-			if ($tags !== false) {
-				if (empty($tags)) {
-					return array();
-				}
-				return current($tags);
-			}
-		}
-		return null;
-	}
+    /**
+     * Returns tags for the given file id
+     *
+     * @param integer $fileId file id
+     * @return array list of tags for that file
+     */
+    private function getTags($fileId) {
+        if (isset($this->cachedTags[$fileId])) {
+            return $this->cachedTags[$fileId];
+        } else {
+            $tags = $this->getTagger()->getTagsForObjects(array($fileId));
+            if ($tags !== false) {
+                if (empty($tags)) {
+                    return array();
+                }
+                return current($tags);
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Updates the tags of the given file id
-	 *
-	 * @param int $fileId
-	 * @param array $tags array of tag strings
-	 */
-	private function updateTags($fileId, $tags) {
-		$tagger = $this->getTagger();
-		$currentTags = $this->getTags($fileId);
+    /**
+     * Updates the tags of the given file id
+     *
+     * @param int $fileId
+     * @param array $tags array of tag strings
+     */
+    private function updateTags($fileId, $tags) {
+        $tagger = $this->getTagger();
+        $currentTags = $this->getTags($fileId);
 
-		$newTags = array_diff($tags, $currentTags);
-		foreach ($newTags as $tag) {
-			if ($tag === self::TAG_FAVORITE) {
-				continue;
-			}
-			$tagger->tagAs($fileId, $tag);
-		}
-		$deletedTags = array_diff($currentTags, $tags);
-		foreach ($deletedTags as $tag) {
-			if ($tag === self::TAG_FAVORITE) {
-				continue;
-			}
-			$tagger->unTag($fileId, $tag);
-		}
-	}
+        $newTags = array_diff($tags, $currentTags);
+        foreach ($newTags as $tag) {
+            if ($tag === self::TAG_FAVORITE) {
+                continue;
+            }
+            $tagger->tagAs($fileId, $tag);
+        }
+        $deletedTags = array_diff($currentTags, $tags);
+        foreach ($deletedTags as $tag) {
+            if ($tag === self::TAG_FAVORITE) {
+                continue;
+            }
+            $tagger->unTag($fileId, $tag);
+        }
+    }
 
-	/**
-	 * Adds tags and favorites properties to the response,
-	 * if requested.
-	 *
-	 * @param PropFind $propFind
-	 * @param \Sabre\DAV\INode $node
-	 * @return void
-	 */
-	public function handleGetProperties(
-		PropFind $propFind,
-		\Sabre\DAV\INode $node
-	) {
-		if (!($node instanceof \OCA\DAV\Connector\Sabre\Node)) {
-			return;
-		}
+    /**
+     * Adds tags and favorites properties to the response,
+     * if requested.
+     *
+     * @param PropFind $propFind
+     * @param \Sabre\DAV\INode $node
+     * @return void
+     */
+    public function handleGetProperties(
+        PropFind $propFind,
+        \Sabre\DAV\INode $node
+    ) {
+        if (!($node instanceof \OCA\DAV\Connector\Sabre\Node)) {
+            return;
+        }
 
-		// need prefetch ?
-		if ($node instanceof \OCA\DAV\Connector\Sabre\Directory
-			&& $propFind->getDepth() !== 0
-			&& (!is_null($propFind->getStatus(self::TAGS_PROPERTYNAME))
-			|| !is_null($propFind->getStatus(self::FAVORITE_PROPERTYNAME))
-		)) {
-			// note: pre-fetching only supported for depth <= 1
-			$folderContent = $node->getChildren();
-			$fileIds[] = (int)$node->getId();
-			foreach ($folderContent as $info) {
-				$fileIds[] = (int)$info->getId();
-			}
-			$tags = $this->getTagger()->getTagsForObjects($fileIds);
-			if ($tags === false) {
-				// the tags API returns false on error...
-				$tags = array();
-			}
+        // need prefetch ?
+        if ($node instanceof \OCA\DAV\Connector\Sabre\Directory
+            && $propFind->getDepth() !== 0
+            && (!is_null($propFind->getStatus(self::TAGS_PROPERTYNAME))
+            || !is_null($propFind->getStatus(self::FAVORITE_PROPERTYNAME))
+        )) {
+            // note: pre-fetching only supported for depth <= 1
+            $folderContent = $node->getChildren();
+            $fileIds[] = (int)$node->getId();
+            foreach ($folderContent as $info) {
+                $fileIds[] = (int)$info->getId();
+            }
+            $tags = $this->getTagger()->getTagsForObjects($fileIds);
+            if ($tags === false) {
+                // the tags API returns false on error...
+                $tags = array();
+            }
 
-			$this->cachedTags = $this->cachedTags + $tags;
-			$emptyFileIds = array_diff($fileIds, array_keys($tags));
-			// also cache the ones that were not found
-			foreach ($emptyFileIds as $fileId) {
-				$this->cachedTags[$fileId] = [];
-			}
-		}
+            $this->cachedTags = $this->cachedTags + $tags;
+            $emptyFileIds = array_diff($fileIds, array_keys($tags));
+            // also cache the ones that were not found
+            foreach ($emptyFileIds as $fileId) {
+                $this->cachedTags[$fileId] = [];
+            }
+        }
 
-		$isFav = null;
+        $isFav = null;
 
-		$propFind->handle(self::TAGS_PROPERTYNAME, function() use (&$isFav, $node) {
-			list($tags, $isFav) = $this->getTagsAndFav($node->getId());
-			return new TagList($tags);
-		});
+        $propFind->handle(self::TAGS_PROPERTYNAME, function() use (&$isFav, $node) {
+            list($tags, $isFav) = $this->getTagsAndFav($node->getId());
+            return new TagList($tags);
+        });
 
-		$propFind->handle(self::FAVORITE_PROPERTYNAME, function() use ($isFav, $node) {
-			if (is_null($isFav)) {
-				list(, $isFav) = $this->getTagsAndFav($node->getId());
-			}
-			if ($isFav) {
-				return 1;
-			} else {
-				return 0;
-			}
-		});
-	}
+        $propFind->handle(self::FAVORITE_PROPERTYNAME, function() use ($isFav, $node) {
+            if (is_null($isFav)) {
+                list(, $isFav) = $this->getTagsAndFav($node->getId());
+            }
+            if ($isFav) {
+                return 1;
+            } else {
+                return 0;
+            }
+        });
+    }
 
-	/**
-	 * Updates tags and favorites properties, if applicable.
-	 *
-	 * @param string $path
-	 * @param PropPatch $propPatch
-	 *
-	 * @return void
-	 */
-	public function handleUpdateProperties($path, PropPatch $propPatch) {
-		$node = $this->tree->getNodeForPath($path);
-		if (!($node instanceof \OCA\DAV\Connector\Sabre\Node)) {
-			return;
-		}
+    /**
+     * Updates tags and favorites properties, if applicable.
+     *
+     * @param string $path
+     * @param PropPatch $propPatch
+     *
+     * @return void
+     */
+    public function handleUpdateProperties($path, PropPatch $propPatch) {
+        $node = $this->tree->getNodeForPath($path);
+        if (!($node instanceof \OCA\DAV\Connector\Sabre\Node)) {
+            return;
+        }
 
-		$propPatch->handle(self::TAGS_PROPERTYNAME, function($tagList) use ($node) {
-			$this->updateTags($node->getId(), $tagList->getTags());
-			return true;
-		});
+        $propPatch->handle(self::TAGS_PROPERTYNAME, function($tagList) use ($node) {
+            $this->updateTags($node->getId(), $tagList->getTags());
+            return true;
+        });
 
-		$propPatch->handle(self::FAVORITE_PROPERTYNAME, function($favState) use ($node) {
-			if ((int)$favState === 1 || $favState === 'true') {
-				$this->getTagger()->tagAs($node->getId(), self::TAG_FAVORITE);
-			} else {
-				$this->getTagger()->unTag($node->getId(), self::TAG_FAVORITE);
-			}
+        $propPatch->handle(self::FAVORITE_PROPERTYNAME, function($favState) use ($node) {
+            if ((int)$favState === 1 || $favState === 'true') {
+                $this->getTagger()->tagAs($node->getId(), self::TAG_FAVORITE);
+            } else {
+                $this->getTagger()->unTag($node->getId(), self::TAG_FAVORITE);
+            }
 
-			if (is_null($favState)) {
-				// confirm deletion
-				return 204;
-			}
+            if (is_null($favState)) {
+                // confirm deletion
+                return 204;
+            }
 
-			return 200;
-		});
-	}
+            return 200;
+        });
+    }
 }

apps/files/lib/App.php

Indentation +32 added lines, -32 removed lines

@@ -28,40 +28,40 @@
 namespace OCA\Files;
 
 class App {
-	/**
-	 * @var \OCP\INavigationManager
-	 */
-	private static $navigationManager;
+    /**
+     * @var \OCP\INavigationManager
+     */
+    private static $navigationManager;
 
-	/**
-	 * Returns the app's navigation manager
-	 *
-	 * @return \OCP\INavigationManager
-	 */
-	public static function getNavigationManager() {
-		// TODO: move this into a service in the Application class
-		if (self::$navigationManager === null) {
-			self::$navigationManager = new \OC\NavigationManager(
-				\OC::$server->getAppManager(),
-				\OC::$server->getURLGenerator(),
-				\OC::$server->getL10NFactory(),
-				\OC::$server->getUserSession(),
-				\OC::$server->getGroupManager(),
-				\OC::$server->getConfig()
-			);
-			self::$navigationManager->clear(false);
-		}
-		return self::$navigationManager;
-	}
+    /**
+     * Returns the app's navigation manager
+     *
+     * @return \OCP\INavigationManager
+     */
+    public static function getNavigationManager() {
+        // TODO: move this into a service in the Application class
+        if (self::$navigationManager === null) {
+            self::$navigationManager = new \OC\NavigationManager(
+                \OC::$server->getAppManager(),
+                \OC::$server->getURLGenerator(),
+                \OC::$server->getL10NFactory(),
+                \OC::$server->getUserSession(),
+                \OC::$server->getGroupManager(),
+                \OC::$server->getConfig()
+            );
+            self::$navigationManager->clear(false);
+        }
+        return self::$navigationManager;
+    }
 
-	public static function extendJsConfig($settings) {
-		$appConfig = json_decode($settings['array']['oc_appconfig'], true);
+    public static function extendJsConfig($settings) {
+        $appConfig = json_decode($settings['array']['oc_appconfig'], true);
 
-		$maxChunkSize = (int)\OC::$server->getConfig()->getAppValue('files', 'max_chunk_size', 10 * 1024 * 1024);
-		$appConfig['files'] = [
-			'max_chunk_size' => $maxChunkSize
-		];
+        $maxChunkSize = (int)\OC::$server->getConfig()->getAppValue('files', 'max_chunk_size', 10 * 1024 * 1024);
+        $appConfig['files'] = [
+            'max_chunk_size' => $maxChunkSize
+        ];
 
-		$settings['array']['oc_appconfig'] = json_encode($appConfig);
-	}
+        $settings['array']['oc_appconfig'] = json_encode($appConfig);
+    }
 }