nextcloud / server

lib/public/AppFramework/OCS/OCSBadRequestException.php

Indentation +10 added lines, -10 removed lines

@@ -32,14 +32,14 @@
  * @since 9.1.0
  */
 class OCSBadRequestException extends OCSException {
-	/**
-	 * OCSBadRequestException constructor.
-	 *
-	 * @param string $message
-	 * @param Exception|null $previous
-	 * @since 9.1.0
-	 */
-	public function __construct($message = '', Exception $previous = null) {
-		parent::__construct($message, Http::STATUS_BAD_REQUEST, $previous);
-	}
+    /**
+     * OCSBadRequestException constructor.
+     *
+     * @param string $message
+     * @param Exception|null $previous
+     * @since 9.1.0
+     */
+    public function __construct($message = '', Exception $previous = null) {
+        parent::__construct($message, Http::STATUS_BAD_REQUEST, $previous);
+    }
 }

lib/public/AppFramework/Http/DownloadResponse.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 		$this->filename = $filename;
 		$this->contentType = $contentType;
 
-		$this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
+		$this->addHeader('Content-Disposition', 'attachment; filename="'.$filename.'"');
 		$this->addHeader('Content-Type', $contentType);
 	}
 }

Indentation +15 added lines, -15 removed lines

@@ -30,22 +30,22 @@
  * @since 7.0.0
  */
 class DownloadResponse extends Response {
-	private $filename;
-	private $contentType;
+    private $filename;
+    private $contentType;
 
-	/**
-	 * Creates a response that prompts the user to download the file
-	 * @param string $filename the name that the downloaded file should have
-	 * @param string $contentType the mimetype that the downloaded file should have
-	 * @since 7.0.0
-	 */
-	public function __construct($filename, $contentType) {
-		parent::__construct();
+    /**
+     * Creates a response that prompts the user to download the file
+     * @param string $filename the name that the downloaded file should have
+     * @param string $contentType the mimetype that the downloaded file should have
+     * @since 7.0.0
+     */
+    public function __construct($filename, $contentType) {
+        parent::__construct();
 
-		$this->filename = $filename;
-		$this->contentType = $contentType;
+        $this->filename = $filename;
+        $this->contentType = $contentType;
 
-		$this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
-		$this->addHeader('Content-Type', $contentType);
-	}
+        $this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
+        $this->addHeader('Content-Type', $contentType);
+    }
 }

lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php

Spacing +8 added lines, -8 removed lines

@@ -35,17 +35,17 @@
 		}
 
 		$excludedFolders = [
-			rtrim($root . '/data', '/'),
-			rtrim($root . '/themes', '/'),
-			rtrim($root . '/config', '/'),
-			rtrim($root . '/apps', '/'),
-			rtrim($root . '/assets', '/'),
-			rtrim($root . '/lost+found', '/'),
+			rtrim($root.'/data', '/'),
+			rtrim($root.'/themes', '/'),
+			rtrim($root.'/config', '/'),
+			rtrim($root.'/apps', '/'),
+			rtrim($root.'/assets', '/'),
+			rtrim($root.'/lost+found', '/'),
 			// Ignore folders generated by updater since the updater is replaced
 			// after the integrity check is run.
 			// See https://github.com/owncloud/updater/issues/318#issuecomment-212497846
-			rtrim($root . '/updater', '/'),
-			rtrim($root . '/_oc_upgrade', '/'),
+			rtrim($root.'/updater', '/'),
+			rtrim($root.'/_oc_upgrade', '/'),
 		];
 		$customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', '');
 		if ($customDataDir !== '') {

Indentation +36 added lines, -36 removed lines

@@ -28,45 +28,45 @@
 namespace OC\IntegrityCheck\Iterator;
 
 class ExcludeFoldersByPathFilterIterator extends \RecursiveFilterIterator {
-	private $excludedFolders;
+    private $excludedFolders;
 
-	public function __construct(\RecursiveIterator $iterator, $root = '') {
-		parent::__construct($iterator);
+    public function __construct(\RecursiveIterator $iterator, $root = '') {
+        parent::__construct($iterator);
 
-		$appFolders = \OC::$APPSROOTS;
-		foreach ($appFolders as $key => $appFolder) {
-			$appFolders[$key] = rtrim($appFolder['path'], '/');
-		}
+        $appFolders = \OC::$APPSROOTS;
+        foreach ($appFolders as $key => $appFolder) {
+            $appFolders[$key] = rtrim($appFolder['path'], '/');
+        }
 
-		$excludedFolders = [
-			rtrim($root . '/data', '/'),
-			rtrim($root . '/themes', '/'),
-			rtrim($root . '/config', '/'),
-			rtrim($root . '/apps', '/'),
-			rtrim($root . '/assets', '/'),
-			rtrim($root . '/lost+found', '/'),
-			// Ignore folders generated by updater since the updater is replaced
-			// after the integrity check is run.
-			// See https://github.com/owncloud/updater/issues/318#issuecomment-212497846
-			rtrim($root . '/updater', '/'),
-			rtrim($root . '/_oc_upgrade', '/'),
-		];
-		$customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', '');
-		if ($customDataDir !== '') {
-			$excludedFolders[] = rtrim($customDataDir, '/');
-		}
+        $excludedFolders = [
+            rtrim($root . '/data', '/'),
+            rtrim($root . '/themes', '/'),
+            rtrim($root . '/config', '/'),
+            rtrim($root . '/apps', '/'),
+            rtrim($root . '/assets', '/'),
+            rtrim($root . '/lost+found', '/'),
+            // Ignore folders generated by updater since the updater is replaced
+            // after the integrity check is run.
+            // See https://github.com/owncloud/updater/issues/318#issuecomment-212497846
+            rtrim($root . '/updater', '/'),
+            rtrim($root . '/_oc_upgrade', '/'),
+        ];
+        $customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', '');
+        if ($customDataDir !== '') {
+            $excludedFolders[] = rtrim($customDataDir, '/');
+        }
 
-		$this->excludedFolders = array_merge($excludedFolders, $appFolders);
-	}
+        $this->excludedFolders = array_merge($excludedFolders, $appFolders);
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function accept() {
-		return !\in_array(
-			$this->current()->getPathName(),
-			$this->excludedFolders,
-			true
-		);
-	}
+    /**
+     * @return bool
+     */
+    public function accept() {
+        return !\in_array(
+            $this->current()->getPathName(),
+            $this->excludedFolders,
+            true
+        );
+    }
 }

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

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 	 * @return bool
 	 */
 	private function isValidVersionString($versionString) {
-		return (bool)preg_match('/^[0-9.]+$/', $versionString);
+		return (bool) preg_match('/^[0-9.]+$/', $versionString);
 	}
 
 	/**

Indentation +48 added lines, -48 removed lines

@@ -30,56 +30,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
+            )
+        );
+    }
 }

lib/private/App/AppStore/Bundles/Bundle.php

Indentation +28 added lines, -28 removed lines

@@ -24,36 +24,36 @@
 use OCP\IL10N;
 
 abstract class Bundle {
-	/** @var IL10N */
-	protected $l10n;
+    /** @var IL10N */
+    protected $l10n;
 
-	/**
-	 * @param IL10N $l10n
-	 */
-	public function __construct(IL10N $l10n) {
-		$this->l10n = $l10n;
-	}
+    /**
+     * @param IL10N $l10n
+     */
+    public function __construct(IL10N $l10n) {
+        $this->l10n = $l10n;
+    }
 
-	/**
-	 * Get the identifier of the bundle
-	 *
-	 * @return string
-	 */
-	final public function getIdentifier() {
-		return substr(strrchr(get_class($this), '\\'), 1);
-	}
+    /**
+     * Get the identifier of the bundle
+     *
+     * @return string
+     */
+    final public function getIdentifier() {
+        return substr(strrchr(get_class($this), '\\'), 1);
+    }
 
-	/**
-	 * Get the name of the bundle
-	 *
-	 * @return string
-	 */
-	abstract public function getName();
+    /**
+     * Get the name of the bundle
+     *
+     * @return string
+     */
+    abstract public function getName();
 
-	/**
-	 * Get the list of app identifiers in the bundle
-	 *
-	 * @return array
-	 */
-	abstract public function getAppIdentifiers();
+    /**
+     * Get the list of app identifiers in the bundle
+     *
+     * @return array
+     */
+    abstract public function getAppIdentifiers();
 }

lib/private/Share20/LegacyHooks.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 		/** @var IShare[] $deletedShares */
 		$deletedShares = $e->getArgument('deletedShares');
 
-		$formattedDeletedShares = array_map(function ($share) {
+		$formattedDeletedShares = array_map(function($share) {
 			return $this->formatHookParams($share);
 		}, $deletedShares);
 

Indentation +140 added lines, -140 removed lines

@@ -34,144 +34,144 @@
 
 class LegacyHooks {
 
-	/** @var EventDispatcherInterface */
-	private $eventDispatcher;
-
-	/**
-	 * LegacyHooks constructor.
-	 *
-	 * @param EventDispatcherInterface $eventDispatcher
-	 */
-	public function __construct(EventDispatcherInterface $eventDispatcher) {
-		$this->eventDispatcher = $eventDispatcher;
-
-		$this->eventDispatcher->addListener('OCP\Share::preUnshare', [$this, 'preUnshare']);
-		$this->eventDispatcher->addListener('OCP\Share::postUnshare', [$this, 'postUnshare']);
-		$this->eventDispatcher->addListener('OCP\Share::postUnshareFromSelf', [$this, 'postUnshareFromSelf']);
-		$this->eventDispatcher->addListener('OCP\Share::preShare', [$this, 'preShare']);
-		$this->eventDispatcher->addListener('OCP\Share::postShare', [$this, 'postShare']);
-	}
-
-	/**
-	 * @param GenericEvent $e
-	 */
-	public function preUnshare(GenericEvent $e) {
-		/** @var IShare $share */
-		$share = $e->getSubject();
-
-		$formatted = $this->formatHookParams($share);
-		\OC_Hook::emit(Share::class, 'pre_unshare', $formatted);
-	}
-
-	/**
-	 * @param GenericEvent $e
-	 */
-	public function postUnshare(GenericEvent $e) {
-		/** @var IShare $share */
-		$share = $e->getSubject();
-
-		$formatted = $this->formatHookParams($share);
-
-		/** @var IShare[] $deletedShares */
-		$deletedShares = $e->getArgument('deletedShares');
-
-		$formattedDeletedShares = array_map(function ($share) {
-			return $this->formatHookParams($share);
-		}, $deletedShares);
-
-		$formatted['deletedShares'] = $formattedDeletedShares;
-
-		\OC_Hook::emit(Share::class, 'post_unshare', $formatted);
-	}
-
-	/**
-	 * @param GenericEvent $e
-	 */
-	public function postUnshareFromSelf(GenericEvent $e) {
-		/** @var IShare $share */
-		$share = $e->getSubject();
-
-		$formatted = $this->formatHookParams($share);
-		$formatted['itemTarget'] = $formatted['fileTarget'];
-		$formatted['unsharedItems'] = [$formatted];
-
-		\OC_Hook::emit(Share::class, 'post_unshareFromSelf', $formatted);
-	}
-
-	private function formatHookParams(IShare $share) {
-		// Prepare hook
-		$shareType = $share->getShareType();
-		$sharedWith = '';
-		if ($shareType === IShare::TYPE_USER ||
-			$shareType === IShare::TYPE_GROUP ||
-			$shareType === IShare::TYPE_REMOTE) {
-			$sharedWith = $share->getSharedWith();
-		}
-
-		$hookParams = [
-			'id' => $share->getId(),
-			'itemType' => $share->getNodeType(),
-			'itemSource' => $share->getNodeId(),
-			'shareType' => $shareType,
-			'shareWith' => $sharedWith,
-			'itemparent' => method_exists($share, 'getParent') ? $share->getParent() : '',
-			'uidOwner' => $share->getSharedBy(),
-			'fileSource' => $share->getNodeId(),
-			'fileTarget' => $share->getTarget()
-		];
-		return $hookParams;
-	}
-
-	public function preShare(GenericEvent $e) {
-		/** @var IShare $share */
-		$share = $e->getSubject();
-
-		// Pre share hook
-		$run = true;
-		$error = '';
-		$preHookData = [
-			'itemType' => $share->getNode() instanceof File ? 'file' : 'folder',
-			'itemSource' => $share->getNode()->getId(),
-			'shareType' => $share->getShareType(),
-			'uidOwner' => $share->getSharedBy(),
-			'permissions' => $share->getPermissions(),
-			'fileSource' => $share->getNode()->getId(),
-			'expiration' => $share->getExpirationDate(),
-			'token' => $share->getToken(),
-			'itemTarget' => $share->getTarget(),
-			'shareWith' => $share->getSharedWith(),
-			'run' => &$run,
-			'error' => &$error,
-		];
-		\OC_Hook::emit(Share::class, 'pre_shared', $preHookData);
-
-		if ($run === false) {
-			$e->setArgument('error', $error);
-			$e->stopPropagation();
-		}
-
-		return $e;
-	}
-
-	public function postShare(GenericEvent $e) {
-		/** @var IShare $share */
-		$share = $e->getSubject();
-
-		$postHookData = [
-			'itemType' => $share->getNode() instanceof File ? 'file' : 'folder',
-			'itemSource' => $share->getNode()->getId(),
-			'shareType' => $share->getShareType(),
-			'uidOwner' => $share->getSharedBy(),
-			'permissions' => $share->getPermissions(),
-			'fileSource' => $share->getNode()->getId(),
-			'expiration' => $share->getExpirationDate(),
-			'token' => $share->getToken(),
-			'id' => $share->getId(),
-			'shareWith' => $share->getSharedWith(),
-			'itemTarget' => $share->getTarget(),
-			'fileTarget' => $share->getTarget(),
-		];
-
-		\OC_Hook::emit(Share::class, 'post_shared', $postHookData);
-	}
+    /** @var EventDispatcherInterface */
+    private $eventDispatcher;
+
+    /**
+     * LegacyHooks constructor.
+     *
+     * @param EventDispatcherInterface $eventDispatcher
+     */
+    public function __construct(EventDispatcherInterface $eventDispatcher) {
+        $this->eventDispatcher = $eventDispatcher;
+
+        $this->eventDispatcher->addListener('OCP\Share::preUnshare', [$this, 'preUnshare']);
+        $this->eventDispatcher->addListener('OCP\Share::postUnshare', [$this, 'postUnshare']);
+        $this->eventDispatcher->addListener('OCP\Share::postUnshareFromSelf', [$this, 'postUnshareFromSelf']);
+        $this->eventDispatcher->addListener('OCP\Share::preShare', [$this, 'preShare']);
+        $this->eventDispatcher->addListener('OCP\Share::postShare', [$this, 'postShare']);
+    }
+
+    /**
+     * @param GenericEvent $e
+     */
+    public function preUnshare(GenericEvent $e) {
+        /** @var IShare $share */
+        $share = $e->getSubject();
+
+        $formatted = $this->formatHookParams($share);
+        \OC_Hook::emit(Share::class, 'pre_unshare', $formatted);
+    }
+
+    /**
+     * @param GenericEvent $e
+     */
+    public function postUnshare(GenericEvent $e) {
+        /** @var IShare $share */
+        $share = $e->getSubject();
+
+        $formatted = $this->formatHookParams($share);
+
+        /** @var IShare[] $deletedShares */
+        $deletedShares = $e->getArgument('deletedShares');
+
+        $formattedDeletedShares = array_map(function ($share) {
+            return $this->formatHookParams($share);
+        }, $deletedShares);
+
+        $formatted['deletedShares'] = $formattedDeletedShares;
+
+        \OC_Hook::emit(Share::class, 'post_unshare', $formatted);
+    }
+
+    /**
+     * @param GenericEvent $e
+     */
+    public function postUnshareFromSelf(GenericEvent $e) {
+        /** @var IShare $share */
+        $share = $e->getSubject();
+
+        $formatted = $this->formatHookParams($share);
+        $formatted['itemTarget'] = $formatted['fileTarget'];
+        $formatted['unsharedItems'] = [$formatted];
+
+        \OC_Hook::emit(Share::class, 'post_unshareFromSelf', $formatted);
+    }
+
+    private function formatHookParams(IShare $share) {
+        // Prepare hook
+        $shareType = $share->getShareType();
+        $sharedWith = '';
+        if ($shareType === IShare::TYPE_USER ||
+            $shareType === IShare::TYPE_GROUP ||
+            $shareType === IShare::TYPE_REMOTE) {
+            $sharedWith = $share->getSharedWith();
+        }
+
+        $hookParams = [
+            'id' => $share->getId(),
+            'itemType' => $share->getNodeType(),
+            'itemSource' => $share->getNodeId(),
+            'shareType' => $shareType,
+            'shareWith' => $sharedWith,
+            'itemparent' => method_exists($share, 'getParent') ? $share->getParent() : '',
+            'uidOwner' => $share->getSharedBy(),
+            'fileSource' => $share->getNodeId(),
+            'fileTarget' => $share->getTarget()
+        ];
+        return $hookParams;
+    }
+
+    public function preShare(GenericEvent $e) {
+        /** @var IShare $share */
+        $share = $e->getSubject();
+
+        // Pre share hook
+        $run = true;
+        $error = '';
+        $preHookData = [
+            'itemType' => $share->getNode() instanceof File ? 'file' : 'folder',
+            'itemSource' => $share->getNode()->getId(),
+            'shareType' => $share->getShareType(),
+            'uidOwner' => $share->getSharedBy(),
+            'permissions' => $share->getPermissions(),
+            'fileSource' => $share->getNode()->getId(),
+            'expiration' => $share->getExpirationDate(),
+            'token' => $share->getToken(),
+            'itemTarget' => $share->getTarget(),
+            'shareWith' => $share->getSharedWith(),
+            'run' => &$run,
+            'error' => &$error,
+        ];
+        \OC_Hook::emit(Share::class, 'pre_shared', $preHookData);
+
+        if ($run === false) {
+            $e->setArgument('error', $error);
+            $e->stopPropagation();
+        }
+
+        return $e;
+    }
+
+    public function postShare(GenericEvent $e) {
+        /** @var IShare $share */
+        $share = $e->getSubject();
+
+        $postHookData = [
+            'itemType' => $share->getNode() instanceof File ? 'file' : 'folder',
+            'itemSource' => $share->getNode()->getId(),
+            'shareType' => $share->getShareType(),
+            'uidOwner' => $share->getSharedBy(),
+            'permissions' => $share->getPermissions(),
+            'fileSource' => $share->getNode()->getId(),
+            'expiration' => $share->getExpirationDate(),
+            'token' => $share->getToken(),
+            'id' => $share->getId(),
+            'shareWith' => $share->getSharedWith(),
+            'itemTarget' => $share->getTarget(),
+            'fileTarget' => $share->getTarget(),
+        ];
+
+        \OC_Hook::emit(Share::class, 'post_shared', $postHookData);
+    }
 }

lib/private/Share20/Share.php

Spacing +3 added lines, -3 removed lines

@@ -86,7 +86,7 @@ 
 	 */
 	public function setId($id) {
 		if (is_int($id)) {
-			$id = (string)$id;
+			$id = (string) $id;
 		}
 
 		if (!is_string($id)) {
@@ -115,7 +115,7 @@ 
 		if ($this->providerId === null || $this->id === null) {
 			throw new \UnexpectedValueException;
 		}
-		return $this->providerId . ':' . $this->id;
+		return $this->providerId.':'.$this->id;
 	}
 
 	/**
@@ -163,7 +163,7 @@ 
 
 			$nodes = $userFolder->getById($this->fileId);
 			if (empty($nodes)) {
-				throw new NotFoundException('Node for share not found, fileid: ' . $this->fileId);
+				throw new NotFoundException('Node for share not found, fileid: '.$this->fileId);
 			}
 
 			$this->node = $nodes[0];

Indentation +534 added lines, -534 removed lines

@@ -40,538 +40,538 @@
 
 class Share implements \OCP\Share\IShare {
 
-	/** @var string */
-	private $id;
-	/** @var string */
-	private $providerId;
-	/** @var Node */
-	private $node;
-	/** @var int */
-	private $fileId;
-	/** @var string */
-	private $nodeType;
-	/** @var int */
-	private $shareType;
-	/** @var string */
-	private $sharedWith;
-	/** @var string */
-	private $sharedWithDisplayName;
-	/** @var string */
-	private $sharedWithAvatar;
-	/** @var string */
-	private $sharedBy;
-	/** @var string */
-	private $shareOwner;
-	/** @var int */
-	private $permissions;
-	/** @var int */
-	private $status;
-	/** @var string */
-	private $note = '';
-	/** @var \DateTime */
-	private $expireDate;
-	/** @var string */
-	private $password;
-	/** @var bool */
-	private $sendPasswordByTalk = false;
-	/** @var string */
-	private $token;
-	/** @var int */
-	private $parent;
-	/** @var string */
-	private $target;
-	/** @var \DateTime */
-	private $shareTime;
-	/** @var bool */
-	private $mailSend;
-	/** @var string */
-	private $label = '';
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var ICacheEntry|null */
-	private $nodeCacheEntry;
-
-	/** @var bool */
-	private $hideDownload = false;
-
-	public function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
-		$this->rootFolder = $rootFolder;
-		$this->userManager = $userManager;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setId($id) {
-		if (is_int($id)) {
-			$id = (string)$id;
-		}
-
-		if (!is_string($id)) {
-			throw new \InvalidArgumentException('String expected.');
-		}
-
-		if ($this->id !== null) {
-			throw new IllegalIDChangeException('Not allowed to assign a new internal id to a share');
-		}
-
-		$this->id = trim($id);
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getId() {
-		return $this->id;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getFullId() {
-		if ($this->providerId === null || $this->id === null) {
-			throw new \UnexpectedValueException;
-		}
-		return $this->providerId . ':' . $this->id;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setProviderId($id) {
-		if (!is_string($id)) {
-			throw new \InvalidArgumentException('String expected.');
-		}
-
-		if ($this->providerId !== null) {
-			throw new IllegalIDChangeException('Not allowed to assign a new provider id to a share');
-		}
-
-		$this->providerId = trim($id);
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setNode(Node $node) {
-		$this->fileId = null;
-		$this->nodeType = null;
-		$this->node = $node;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getNode() {
-		if ($this->node === null) {
-			if ($this->shareOwner === null || $this->fileId === null) {
-				throw new NotFoundException();
-			}
-
-			// for federated shares the owner can be a remote user, in this
-			// case we use the initiator
-			if ($this->userManager->userExists($this->shareOwner)) {
-				$userFolder = $this->rootFolder->getUserFolder($this->shareOwner);
-			} else {
-				$userFolder = $this->rootFolder->getUserFolder($this->sharedBy);
-			}
-
-			$nodes = $userFolder->getById($this->fileId);
-			if (empty($nodes)) {
-				throw new NotFoundException('Node for share not found, fileid: ' . $this->fileId);
-			}
-
-			$this->node = $nodes[0];
-		}
-
-		return $this->node;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setNodeId($fileId) {
-		$this->node = null;
-		$this->fileId = $fileId;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getNodeId() {
-		if ($this->fileId === null) {
-			$this->fileId = $this->getNode()->getId();
-		}
-
-		return $this->fileId;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setNodeType($type) {
-		if ($type !== 'file' && $type !== 'folder') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->nodeType = $type;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getNodeType() {
-		if ($this->nodeType === null) {
-			$node = $this->getNode();
-			$this->nodeType = $node instanceof File ? 'file' : 'folder';
-		}
-
-		return $this->nodeType;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setShareType($shareType) {
-		$this->shareType = $shareType;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareType() {
-		return $this->shareType;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setSharedWith($sharedWith) {
-		if (!is_string($sharedWith)) {
-			throw new \InvalidArgumentException();
-		}
-		$this->sharedWith = $sharedWith;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWith() {
-		return $this->sharedWith;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setSharedWithDisplayName($displayName) {
-		if (!is_string($displayName)) {
-			throw new \InvalidArgumentException();
-		}
-		$this->sharedWithDisplayName = $displayName;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWithDisplayName() {
-		return $this->sharedWithDisplayName;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setSharedWithAvatar($src) {
-		if (!is_string($src)) {
-			throw new \InvalidArgumentException();
-		}
-		$this->sharedWithAvatar = $src;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWithAvatar() {
-		return $this->sharedWithAvatar;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setPermissions($permissions) {
-		//TODO checkes
-
-		$this->permissions = $permissions;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getPermissions() {
-		return $this->permissions;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setStatus(int $status): IShare {
-		$this->status = $status;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getStatus(): int {
-		return $this->status;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setNote($note) {
-		$this->note = $note;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getNote() {
-		if (is_string($this->note)) {
-			return $this->note;
-		}
-		return '';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setLabel($label) {
-		$this->label = $label;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getLabel() {
-		return $this->label;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setExpirationDate($expireDate) {
-		//TODO checks
-
-		$this->expireDate = $expireDate;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getExpirationDate() {
-		return $this->expireDate;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function isExpired() {
-		return $this->getExpirationDate() !== null &&
-			$this->getExpirationDate() <= new \DateTime();
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setSharedBy($sharedBy) {
-		if (!is_string($sharedBy)) {
-			throw new \InvalidArgumentException();
-		}
-		//TODO checks
-		$this->sharedBy = $sharedBy;
-
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedBy() {
-		//TODO check if set
-		return $this->sharedBy;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setShareOwner($shareOwner) {
-		if (!is_string($shareOwner)) {
-			throw new \InvalidArgumentException();
-		}
-		//TODO checks
-
-		$this->shareOwner = $shareOwner;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareOwner() {
-		//TODO check if set
-		return $this->shareOwner;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setPassword($password) {
-		$this->password = $password;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getPassword() {
-		return $this->password;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setSendPasswordByTalk(bool $sendPasswordByTalk) {
-		$this->sendPasswordByTalk = $sendPasswordByTalk;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSendPasswordByTalk(): bool {
-		return $this->sendPasswordByTalk;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setToken($token) {
-		$this->token = $token;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getToken() {
-		return $this->token;
-	}
-
-	/**
-	 * Set the parent of this share
-	 *
-	 * @param int parent
-	 * @return \OCP\Share\IShare
-	 * @deprecated The new shares do not have parents. This is just here for legacy reasons.
-	 */
-	public function setParent($parent) {
-		$this->parent = $parent;
-		return $this;
-	}
-
-	/**
-	 * Get the parent of this share.
-	 *
-	 * @return int
-	 * @deprecated The new shares do not have parents. This is just here for legacy reasons.
-	 */
-	public function getParent() {
-		return $this->parent;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setTarget($target) {
-		$this->target = $target;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getTarget() {
-		return $this->target;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setShareTime(\DateTime $shareTime) {
-		$this->shareTime = $shareTime;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareTime() {
-		return $this->shareTime;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setMailSend($mailSend) {
-		$this->mailSend = $mailSend;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getMailSend() {
-		return $this->mailSend;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setNodeCacheEntry(ICacheEntry $entry) {
-		$this->nodeCacheEntry = $entry;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getNodeCacheEntry() {
-		return $this->nodeCacheEntry;
-	}
-
-	public function setHideDownload(bool $hide): IShare {
-		$this->hideDownload = $hide;
-		return $this;
-	}
-
-	public function getHideDownload(): bool {
-		return $this->hideDownload;
-	}
+    /** @var string */
+    private $id;
+    /** @var string */
+    private $providerId;
+    /** @var Node */
+    private $node;
+    /** @var int */
+    private $fileId;
+    /** @var string */
+    private $nodeType;
+    /** @var int */
+    private $shareType;
+    /** @var string */
+    private $sharedWith;
+    /** @var string */
+    private $sharedWithDisplayName;
+    /** @var string */
+    private $sharedWithAvatar;
+    /** @var string */
+    private $sharedBy;
+    /** @var string */
+    private $shareOwner;
+    /** @var int */
+    private $permissions;
+    /** @var int */
+    private $status;
+    /** @var string */
+    private $note = '';
+    /** @var \DateTime */
+    private $expireDate;
+    /** @var string */
+    private $password;
+    /** @var bool */
+    private $sendPasswordByTalk = false;
+    /** @var string */
+    private $token;
+    /** @var int */
+    private $parent;
+    /** @var string */
+    private $target;
+    /** @var \DateTime */
+    private $shareTime;
+    /** @var bool */
+    private $mailSend;
+    /** @var string */
+    private $label = '';
+
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var ICacheEntry|null */
+    private $nodeCacheEntry;
+
+    /** @var bool */
+    private $hideDownload = false;
+
+    public function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
+        $this->rootFolder = $rootFolder;
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setId($id) {
+        if (is_int($id)) {
+            $id = (string)$id;
+        }
+
+        if (!is_string($id)) {
+            throw new \InvalidArgumentException('String expected.');
+        }
+
+        if ($this->id !== null) {
+            throw new IllegalIDChangeException('Not allowed to assign a new internal id to a share');
+        }
+
+        $this->id = trim($id);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getId() {
+        return $this->id;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFullId() {
+        if ($this->providerId === null || $this->id === null) {
+            throw new \UnexpectedValueException;
+        }
+        return $this->providerId . ':' . $this->id;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setProviderId($id) {
+        if (!is_string($id)) {
+            throw new \InvalidArgumentException('String expected.');
+        }
+
+        if ($this->providerId !== null) {
+            throw new IllegalIDChangeException('Not allowed to assign a new provider id to a share');
+        }
+
+        $this->providerId = trim($id);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setNode(Node $node) {
+        $this->fileId = null;
+        $this->nodeType = null;
+        $this->node = $node;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getNode() {
+        if ($this->node === null) {
+            if ($this->shareOwner === null || $this->fileId === null) {
+                throw new NotFoundException();
+            }
+
+            // for federated shares the owner can be a remote user, in this
+            // case we use the initiator
+            if ($this->userManager->userExists($this->shareOwner)) {
+                $userFolder = $this->rootFolder->getUserFolder($this->shareOwner);
+            } else {
+                $userFolder = $this->rootFolder->getUserFolder($this->sharedBy);
+            }
+
+            $nodes = $userFolder->getById($this->fileId);
+            if (empty($nodes)) {
+                throw new NotFoundException('Node for share not found, fileid: ' . $this->fileId);
+            }
+
+            $this->node = $nodes[0];
+        }
+
+        return $this->node;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setNodeId($fileId) {
+        $this->node = null;
+        $this->fileId = $fileId;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getNodeId() {
+        if ($this->fileId === null) {
+            $this->fileId = $this->getNode()->getId();
+        }
+
+        return $this->fileId;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setNodeType($type) {
+        if ($type !== 'file' && $type !== 'folder') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->nodeType = $type;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getNodeType() {
+        if ($this->nodeType === null) {
+            $node = $this->getNode();
+            $this->nodeType = $node instanceof File ? 'file' : 'folder';
+        }
+
+        return $this->nodeType;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setShareType($shareType) {
+        $this->shareType = $shareType;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareType() {
+        return $this->shareType;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSharedWith($sharedWith) {
+        if (!is_string($sharedWith)) {
+            throw new \InvalidArgumentException();
+        }
+        $this->sharedWith = $sharedWith;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWith() {
+        return $this->sharedWith;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSharedWithDisplayName($displayName) {
+        if (!is_string($displayName)) {
+            throw new \InvalidArgumentException();
+        }
+        $this->sharedWithDisplayName = $displayName;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWithDisplayName() {
+        return $this->sharedWithDisplayName;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSharedWithAvatar($src) {
+        if (!is_string($src)) {
+            throw new \InvalidArgumentException();
+        }
+        $this->sharedWithAvatar = $src;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWithAvatar() {
+        return $this->sharedWithAvatar;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setPermissions($permissions) {
+        //TODO checkes
+
+        $this->permissions = $permissions;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPermissions() {
+        return $this->permissions;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setStatus(int $status): IShare {
+        $this->status = $status;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getStatus(): int {
+        return $this->status;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setNote($note) {
+        $this->note = $note;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getNote() {
+        if (is_string($this->note)) {
+            return $this->note;
+        }
+        return '';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setLabel($label) {
+        $this->label = $label;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getLabel() {
+        return $this->label;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setExpirationDate($expireDate) {
+        //TODO checks
+
+        $this->expireDate = $expireDate;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getExpirationDate() {
+        return $this->expireDate;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isExpired() {
+        return $this->getExpirationDate() !== null &&
+            $this->getExpirationDate() <= new \DateTime();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSharedBy($sharedBy) {
+        if (!is_string($sharedBy)) {
+            throw new \InvalidArgumentException();
+        }
+        //TODO checks
+        $this->sharedBy = $sharedBy;
+
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedBy() {
+        //TODO check if set
+        return $this->sharedBy;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setShareOwner($shareOwner) {
+        if (!is_string($shareOwner)) {
+            throw new \InvalidArgumentException();
+        }
+        //TODO checks
+
+        $this->shareOwner = $shareOwner;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareOwner() {
+        //TODO check if set
+        return $this->shareOwner;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setPassword($password) {
+        $this->password = $password;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPassword() {
+        return $this->password;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSendPasswordByTalk(bool $sendPasswordByTalk) {
+        $this->sendPasswordByTalk = $sendPasswordByTalk;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSendPasswordByTalk(): bool {
+        return $this->sendPasswordByTalk;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setToken($token) {
+        $this->token = $token;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getToken() {
+        return $this->token;
+    }
+
+    /**
+     * Set the parent of this share
+     *
+     * @param int parent
+     * @return \OCP\Share\IShare
+     * @deprecated The new shares do not have parents. This is just here for legacy reasons.
+     */
+    public function setParent($parent) {
+        $this->parent = $parent;
+        return $this;
+    }
+
+    /**
+     * Get the parent of this share.
+     *
+     * @return int
+     * @deprecated The new shares do not have parents. This is just here for legacy reasons.
+     */
+    public function getParent() {
+        return $this->parent;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setTarget($target) {
+        $this->target = $target;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getTarget() {
+        return $this->target;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setShareTime(\DateTime $shareTime) {
+        $this->shareTime = $shareTime;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareTime() {
+        return $this->shareTime;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setMailSend($mailSend) {
+        $this->mailSend = $mailSend;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMailSend() {
+        return $this->mailSend;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setNodeCacheEntry(ICacheEntry $entry) {
+        $this->nodeCacheEntry = $entry;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getNodeCacheEntry() {
+        return $this->nodeCacheEntry;
+    }
+
+    public function setHideDownload(bool $hide): IShare {
+        $this->hideDownload = $hide;
+        return $this;
+    }
+
+    public function getHideDownload(): bool {
+        return $this->hideDownload;
+    }
 }

lib/private/AppConfig.php

Spacing +1 added lines, -1 removed lines

@@ -275,7 +275,7 @@
 			return $this->getAppValues($app);
 		} else {
 			$appIds = $this->getApps();
-			$values = array_map(function ($appId) use ($key) {
+			$values = array_map(function($appId) use ($key) {
 				return isset($this->cache[$appId][$key]) ? $this->cache[$appId][$key] : null;
 			}, $appIds);
 			$result = array_combine($appIds, $values);

Indentation +297 added lines, -297 removed lines

@@ -43,305 +43,305 @@
  */
 class AppConfig implements IAppConfig {
 
-	/** @var array[] */
-	protected $sensitiveValues = [
-		'external' => [
-			'/^sites$/',
-		],
-		'spreed' => [
-			'/^bridge_bot_password/',
-			'/^signaling_servers$/',
-			'/^signaling_ticket_secret$/',
-			'/^stun_servers$/',
-			'/^turn_servers$/',
-			'/^turn_server_secret$/',
-		],
-		'theming' => [
-			'/^imprintUrl$/',
-			'/^privacyUrl$/',
-			'/^slogan$/',
-			'/^url$/',
-		],
-		'user_ldap' => [
-			'/^(s..)?ldap_agent_password$/',
-		],
-	];
-
-	/** @var \OCP\IDBConnection */
-	protected $conn;
-
-	/** @var array[] */
-	private $cache = [];
-
-	/** @var bool */
-	private $configLoaded = false;
-
-	/**
-	 * @param IDBConnection $conn
-	 */
-	public function __construct(IDBConnection $conn) {
-		$this->conn = $conn;
-		$this->configLoaded = false;
-	}
-
-	/**
-	 * @param string $app
-	 * @return array
-	 */
-	private function getAppValues($app) {
-		$this->loadConfigValues();
-
-		if (isset($this->cache[$app])) {
-			return $this->cache[$app];
-		}
-
-		return [];
-	}
-
-	/**
-	 * Get all apps using the config
-	 *
-	 * @return array an array of app ids
-	 *
-	 * This function returns a list of all apps that have at least one
-	 * entry in the appconfig table.
-	 */
-	public function getApps() {
-		$this->loadConfigValues();
-
-		return $this->getSortedKeys($this->cache);
-	}
-
-	/**
-	 * Get the available keys for an app
-	 *
-	 * @param string $app the app we are looking for
-	 * @return array an array of key names
-	 *
-	 * This function gets all keys of an app. Please note that the values are
-	 * not returned.
-	 */
-	public function getKeys($app) {
-		$this->loadConfigValues();
-
-		if (isset($this->cache[$app])) {
-			return $this->getSortedKeys($this->cache[$app]);
-		}
-
-		return [];
-	}
-
-	public function getSortedKeys($data) {
-		$keys = array_keys($data);
-		sort($keys);
-		return $keys;
-	}
-
-	/**
-	 * Gets the config value
-	 *
-	 * @param string $app app
-	 * @param string $key key
-	 * @param string $default = null, default value if the key does not exist
-	 * @return string the value or $default
-	 *
-	 * This function gets a value from the appconfig table. If the key does
-	 * not exist the default value will be returned
-	 */
-	public function getValue($app, $key, $default = null) {
-		$this->loadConfigValues();
-
-		if ($this->hasKey($app, $key)) {
-			return $this->cache[$app][$key];
-		}
-
-		return $default;
-	}
-
-	/**
-	 * check if a key is set in the appconfig
-	 *
-	 * @param string $app
-	 * @param string $key
-	 * @return bool
-	 */
-	public function hasKey($app, $key) {
-		$this->loadConfigValues();
-
-		return isset($this->cache[$app][$key]);
-	}
-
-	/**
-	 * Sets a value. If the key did not exist before it will be created.
-	 *
-	 * @param string $app app
-	 * @param string $key key
-	 * @param string|float|int $value value
-	 * @return bool True if the value was inserted or updated, false if the value was the same
-	 */
-	public function setValue($app, $key, $value) {
-		if (!$this->hasKey($app, $key)) {
-			$inserted = (bool) $this->conn->insertIfNotExist('*PREFIX*appconfig', [
-				'appid' => $app,
-				'configkey' => $key,
-				'configvalue' => $value,
-			], [
-				'appid',
-				'configkey',
-			]);
-
-			if ($inserted) {
-				if (!isset($this->cache[$app])) {
-					$this->cache[$app] = [];
-				}
-
-				$this->cache[$app][$key] = $value;
-				return true;
-			}
-		}
-
-		$sql = $this->conn->getQueryBuilder();
-		$sql->update('appconfig')
-			->set('configvalue', $sql->createParameter('configvalue'))
-			->where($sql->expr()->eq('appid', $sql->createParameter('app')))
-			->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
-			->setParameter('configvalue', $value)
-			->setParameter('app', $app)
-			->setParameter('configkey', $key);
-
-		/*
+    /** @var array[] */
+    protected $sensitiveValues = [
+        'external' => [
+            '/^sites$/',
+        ],
+        'spreed' => [
+            '/^bridge_bot_password/',
+            '/^signaling_servers$/',
+            '/^signaling_ticket_secret$/',
+            '/^stun_servers$/',
+            '/^turn_servers$/',
+            '/^turn_server_secret$/',
+        ],
+        'theming' => [
+            '/^imprintUrl$/',
+            '/^privacyUrl$/',
+            '/^slogan$/',
+            '/^url$/',
+        ],
+        'user_ldap' => [
+            '/^(s..)?ldap_agent_password$/',
+        ],
+    ];
+
+    /** @var \OCP\IDBConnection */
+    protected $conn;
+
+    /** @var array[] */
+    private $cache = [];
+
+    /** @var bool */
+    private $configLoaded = false;
+
+    /**
+     * @param IDBConnection $conn
+     */
+    public function __construct(IDBConnection $conn) {
+        $this->conn = $conn;
+        $this->configLoaded = false;
+    }
+
+    /**
+     * @param string $app
+     * @return array
+     */
+    private function getAppValues($app) {
+        $this->loadConfigValues();
+
+        if (isset($this->cache[$app])) {
+            return $this->cache[$app];
+        }
+
+        return [];
+    }
+
+    /**
+     * Get all apps using the config
+     *
+     * @return array an array of app ids
+     *
+     * This function returns a list of all apps that have at least one
+     * entry in the appconfig table.
+     */
+    public function getApps() {
+        $this->loadConfigValues();
+
+        return $this->getSortedKeys($this->cache);
+    }
+
+    /**
+     * Get the available keys for an app
+     *
+     * @param string $app the app we are looking for
+     * @return array an array of key names
+     *
+     * This function gets all keys of an app. Please note that the values are
+     * not returned.
+     */
+    public function getKeys($app) {
+        $this->loadConfigValues();
+
+        if (isset($this->cache[$app])) {
+            return $this->getSortedKeys($this->cache[$app]);
+        }
+
+        return [];
+    }
+
+    public function getSortedKeys($data) {
+        $keys = array_keys($data);
+        sort($keys);
+        return $keys;
+    }
+
+    /**
+     * Gets the config value
+     *
+     * @param string $app app
+     * @param string $key key
+     * @param string $default = null, default value if the key does not exist
+     * @return string the value or $default
+     *
+     * This function gets a value from the appconfig table. If the key does
+     * not exist the default value will be returned
+     */
+    public function getValue($app, $key, $default = null) {
+        $this->loadConfigValues();
+
+        if ($this->hasKey($app, $key)) {
+            return $this->cache[$app][$key];
+        }
+
+        return $default;
+    }
+
+    /**
+     * check if a key is set in the appconfig
+     *
+     * @param string $app
+     * @param string $key
+     * @return bool
+     */
+    public function hasKey($app, $key) {
+        $this->loadConfigValues();
+
+        return isset($this->cache[$app][$key]);
+    }
+
+    /**
+     * Sets a value. If the key did not exist before it will be created.
+     *
+     * @param string $app app
+     * @param string $key key
+     * @param string|float|int $value value
+     * @return bool True if the value was inserted or updated, false if the value was the same
+     */
+    public function setValue($app, $key, $value) {
+        if (!$this->hasKey($app, $key)) {
+            $inserted = (bool) $this->conn->insertIfNotExist('*PREFIX*appconfig', [
+                'appid' => $app,
+                'configkey' => $key,
+                'configvalue' => $value,
+            ], [
+                'appid',
+                'configkey',
+            ]);
+
+            if ($inserted) {
+                if (!isset($this->cache[$app])) {
+                    $this->cache[$app] = [];
+                }
+
+                $this->cache[$app][$key] = $value;
+                return true;
+            }
+        }
+
+        $sql = $this->conn->getQueryBuilder();
+        $sql->update('appconfig')
+            ->set('configvalue', $sql->createParameter('configvalue'))
+            ->where($sql->expr()->eq('appid', $sql->createParameter('app')))
+            ->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
+            ->setParameter('configvalue', $value)
+            ->setParameter('app', $app)
+            ->setParameter('configkey', $key);
+
+        /*
 		 * Only limit to the existing value for non-Oracle DBs:
 		 * http://docs.oracle.com/cd/E11882_01/server.112/e26088/conditions002.htm#i1033286
 		 * > Large objects (LOBs) are not supported in comparison conditions.
 		 */
-		if (!($this->conn instanceof OracleConnection)) {
-			// Only update the value when it is not the same
-			$sql->andWhere($sql->expr()->neq('configvalue', $sql->createParameter('configvalue')))
-				->setParameter('configvalue', $value);
-		}
-
-		$changedRow = (bool) $sql->execute();
-
-		$this->cache[$app][$key] = $value;
-
-		return $changedRow;
-	}
-
-	/**
-	 * Deletes a key
-	 *
-	 * @param string $app app
-	 * @param string $key key
-	 * @return boolean
-	 */
-	public function deleteKey($app, $key) {
-		$this->loadConfigValues();
-
-		$sql = $this->conn->getQueryBuilder();
-		$sql->delete('appconfig')
-			->where($sql->expr()->eq('appid', $sql->createParameter('app')))
-			->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
-			->setParameter('app', $app)
-			->setParameter('configkey', $key);
-		$sql->execute();
-
-		unset($this->cache[$app][$key]);
-		return false;
-	}
-
-	/**
-	 * Remove app from appconfig
-	 *
-	 * @param string $app app
-	 * @return boolean
-	 *
-	 * Removes all keys in appconfig belonging to the app.
-	 */
-	public function deleteApp($app) {
-		$this->loadConfigValues();
-
-		$sql = $this->conn->getQueryBuilder();
-		$sql->delete('appconfig')
-			->where($sql->expr()->eq('appid', $sql->createParameter('app')))
-			->setParameter('app', $app);
-		$sql->execute();
-
-		unset($this->cache[$app]);
-		return false;
-	}
-
-	/**
-	 * get multiple values, either the app or key can be used as wildcard by setting it to false
-	 *
-	 * @param string|false $app
-	 * @param string|false $key
-	 * @return array|false
-	 */
-	public function getValues($app, $key) {
-		if (($app !== false) === ($key !== false)) {
-			return false;
-		}
-
-		if ($key === false) {
-			return $this->getAppValues($app);
-		} else {
-			$appIds = $this->getApps();
-			$values = array_map(function ($appId) use ($key) {
-				return isset($this->cache[$appId][$key]) ? $this->cache[$appId][$key] : null;
-			}, $appIds);
-			$result = array_combine($appIds, $values);
-
-			return array_filter($result);
-		}
-	}
-
-	/**
-	 * get all values of the app or and filters out sensitive data
-	 *
-	 * @param string $app
-	 * @return array
-	 */
-	public function getFilteredValues($app) {
-		$values = $this->getValues($app, false);
-
-		if (isset($this->sensitiveValues[$app])) {
-			foreach ($this->sensitiveValues[$app] as $sensitiveKeyExp) {
-				$sensitiveKeys = preg_grep($sensitiveKeyExp, array_keys($values));
-				foreach ($sensitiveKeys as $sensitiveKey) {
-					$values[$sensitiveKey] = IConfig::SENSITIVE_VALUE;
-				}
-			}
-		}
-
-		return $values;
-	}
-
-	/**
-	 * Load all the app config values
-	 */
-	protected function loadConfigValues() {
-		if ($this->configLoaded) {
-			return;
-		}
-
-		$this->cache = [];
-
-		$sql = $this->conn->getQueryBuilder();
-		$sql->select('*')
-			->from('appconfig');
-		$result = $sql->execute();
-
-		// we are going to store the result in memory anyway
-		$rows = $result->fetchAll();
-		foreach ($rows as $row) {
-			if (!isset($this->cache[$row['appid']])) {
-				$this->cache[$row['appid']] = [];
-			}
-
-			$this->cache[$row['appid']][$row['configkey']] = $row['configvalue'];
-		}
-		$result->closeCursor();
-
-		$this->configLoaded = true;
-	}
+        if (!($this->conn instanceof OracleConnection)) {
+            // Only update the value when it is not the same
+            $sql->andWhere($sql->expr()->neq('configvalue', $sql->createParameter('configvalue')))
+                ->setParameter('configvalue', $value);
+        }
+
+        $changedRow = (bool) $sql->execute();
+
+        $this->cache[$app][$key] = $value;
+
+        return $changedRow;
+    }
+
+    /**
+     * Deletes a key
+     *
+     * @param string $app app
+     * @param string $key key
+     * @return boolean
+     */
+    public function deleteKey($app, $key) {
+        $this->loadConfigValues();
+
+        $sql = $this->conn->getQueryBuilder();
+        $sql->delete('appconfig')
+            ->where($sql->expr()->eq('appid', $sql->createParameter('app')))
+            ->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
+            ->setParameter('app', $app)
+            ->setParameter('configkey', $key);
+        $sql->execute();
+
+        unset($this->cache[$app][$key]);
+        return false;
+    }
+
+    /**
+     * Remove app from appconfig
+     *
+     * @param string $app app
+     * @return boolean
+     *
+     * Removes all keys in appconfig belonging to the app.
+     */
+    public function deleteApp($app) {
+        $this->loadConfigValues();
+
+        $sql = $this->conn->getQueryBuilder();
+        $sql->delete('appconfig')
+            ->where($sql->expr()->eq('appid', $sql->createParameter('app')))
+            ->setParameter('app', $app);
+        $sql->execute();
+
+        unset($this->cache[$app]);
+        return false;
+    }
+
+    /**
+     * get multiple values, either the app or key can be used as wildcard by setting it to false
+     *
+     * @param string|false $app
+     * @param string|false $key
+     * @return array|false
+     */
+    public function getValues($app, $key) {
+        if (($app !== false) === ($key !== false)) {
+            return false;
+        }
+
+        if ($key === false) {
+            return $this->getAppValues($app);
+        } else {
+            $appIds = $this->getApps();
+            $values = array_map(function ($appId) use ($key) {
+                return isset($this->cache[$appId][$key]) ? $this->cache[$appId][$key] : null;
+            }, $appIds);
+            $result = array_combine($appIds, $values);
+
+            return array_filter($result);
+        }
+    }
+
+    /**
+     * get all values of the app or and filters out sensitive data
+     *
+     * @param string $app
+     * @return array
+     */
+    public function getFilteredValues($app) {
+        $values = $this->getValues($app, false);
+
+        if (isset($this->sensitiveValues[$app])) {
+            foreach ($this->sensitiveValues[$app] as $sensitiveKeyExp) {
+                $sensitiveKeys = preg_grep($sensitiveKeyExp, array_keys($values));
+                foreach ($sensitiveKeys as $sensitiveKey) {
+                    $values[$sensitiveKey] = IConfig::SENSITIVE_VALUE;
+                }
+            }
+        }
+
+        return $values;
+    }
+
+    /**
+     * Load all the app config values
+     */
+    protected function loadConfigValues() {
+        if ($this->configLoaded) {
+            return;
+        }
+
+        $this->cache = [];
+
+        $sql = $this->conn->getQueryBuilder();
+        $sql->select('*')
+            ->from('appconfig');
+        $result = $sql->execute();
+
+        // we are going to store the result in memory anyway
+        $rows = $result->fetchAll();
+        foreach ($rows as $row) {
+            if (!isset($this->cache[$row['appid']])) {
+                $this->cache[$row['appid']] = [];
+            }
+
+            $this->cache[$row['appid']][$row['configkey']] = $row['configvalue'];
+        }
+        $result->closeCursor();
+
+        $this->configLoaded = true;
+    }
 }

lib/private/Repair/MoveUpdaterStepFile.php

Indentation +39 added lines, -39 removed lines

@@ -28,51 +28,51 @@
 
 class MoveUpdaterStepFile implements IRepairStep {
 
-	/** @var \OCP\IConfig */
-	protected $config;
+    /** @var \OCP\IConfig */
+    protected $config;
 
-	/**
-	 * @param \OCP\IConfig $config
-	 */
-	public function __construct($config) {
-		$this->config = $config;
-	}
+    /**
+     * @param \OCP\IConfig $config
+     */
+    public function __construct($config) {
+        $this->config = $config;
+    }
 
-	public function getName() {
-		return 'Move .step file of updater to backup location';
-	}
+    public function getName() {
+        return 'Move .step file of updater to backup location';
+    }
 
-	public function run(IOutput $output) {
-		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
-		$instanceId = $this->config->getSystemValue('instanceid', null);
+    public function run(IOutput $output) {
+        $dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
+        $instanceId = $this->config->getSystemValue('instanceid', null);
 
-		if (!is_string($instanceId) || empty($instanceId)) {
-			return;
-		}
+        if (!is_string($instanceId) || empty($instanceId)) {
+            return;
+        }
 
-		$updaterFolderPath = $dataDir . '/updater-' . $instanceId;
-		$stepFile = $updaterFolderPath . '/.step';
-		if (file_exists($stepFile)) {
-			$output->info('.step file exists');
+        $updaterFolderPath = $dataDir . '/updater-' . $instanceId;
+        $stepFile = $updaterFolderPath . '/.step';
+        if (file_exists($stepFile)) {
+            $output->info('.step file exists');
 
-			$previousStepFile = $updaterFolderPath . '/.step-previous-update';
+            $previousStepFile = $updaterFolderPath . '/.step-previous-update';
 
-			// cleanup
-			if (file_exists($previousStepFile)) {
-				if (\OC_Helper::rmdirr($previousStepFile)) {
-					$output->info('.step-previous-update removed');
-				} else {
-					$output->info('.step-previous-update can\'t be removed - abort move of .step file');
-					return;
-				}
-			}
+            // cleanup
+            if (file_exists($previousStepFile)) {
+                if (\OC_Helper::rmdirr($previousStepFile)) {
+                    $output->info('.step-previous-update removed');
+                } else {
+                    $output->info('.step-previous-update can\'t be removed - abort move of .step file');
+                    return;
+                }
+            }
 
-			// move step file
-			if (rename($stepFile, $previousStepFile)) {
-				$output->info('.step file moved to .step-previous-update');
-			} else {
-				$output->warning('.step file can\'t be moved');
-			}
-		}
-	}
+            // move step file
+            if (rename($stepFile, $previousStepFile)) {
+                $output->info('.step file moved to .step-previous-update');
+            } else {
+                $output->warning('.step file can\'t be moved');
+            }
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -43,19 +43,19 @@
 	}
 
 	public function run(IOutput $output) {
-		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
+		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
 		$instanceId = $this->config->getSystemValue('instanceid', null);
 
 		if (!is_string($instanceId) || empty($instanceId)) {
 			return;
 		}
 
-		$updaterFolderPath = $dataDir . '/updater-' . $instanceId;
-		$stepFile = $updaterFolderPath . '/.step';
+		$updaterFolderPath = $dataDir.'/updater-'.$instanceId;
+		$stepFile = $updaterFolderPath.'/.step';
 		if (file_exists($stepFile)) {
 			$output->info('.step file exists');
 
-			$previousStepFile = $updaterFolderPath . '/.step-previous-update';
+			$previousStepFile = $updaterFolderPath.'/.step-previous-update';
 
 			// cleanup
 			if (file_exists($previousStepFile)) {