nextcloud / server

lib/base.php

Spacing +57 added lines, -57 removed lines

@@ -133,14 +133,14 @@ 
 	 * the app path list is empty or contains an invalid path
 	 */
 	public static function initPaths() {
-		if(defined('PHPUNIT_CONFIG_DIR')) {
-			self::$configDir = OC::$SERVERROOT . '/' . PHPUNIT_CONFIG_DIR . '/';
-		} elseif(defined('PHPUNIT_RUN') and PHPUNIT_RUN and is_dir(OC::$SERVERROOT . '/tests/config/')) {
-			self::$configDir = OC::$SERVERROOT . '/tests/config/';
-		} elseif($dir = getenv('NEXTCLOUD_CONFIG_DIR')) {
-			self::$configDir = rtrim($dir, '/') . '/';
+		if (defined('PHPUNIT_CONFIG_DIR')) {
+			self::$configDir = OC::$SERVERROOT.'/'.PHPUNIT_CONFIG_DIR.'/';
+		} elseif (defined('PHPUNIT_RUN') and PHPUNIT_RUN and is_dir(OC::$SERVERROOT.'/tests/config/')) {
+			self::$configDir = OC::$SERVERROOT.'/tests/config/';
+		} elseif ($dir = getenv('NEXTCLOUD_CONFIG_DIR')) {
+			self::$configDir = rtrim($dir, '/').'/';
 		} else {
-			self::$configDir = OC::$SERVERROOT . '/config/';
+			self::$configDir = OC::$SERVERROOT.'/config/';
 		}
 		self::$config = new \OC\Config(self::$configDir);
 
@@ -162,9 +162,9 @@ 
 			//make sure suburi follows the same rules as scriptName
 			if (substr(OC::$SUBURI, -9) != 'index.php') {
 				if (substr(OC::$SUBURI, -1) != '/') {
-					OC::$SUBURI = OC::$SUBURI . '/';
+					OC::$SUBURI = OC::$SUBURI.'/';
 				}
-				OC::$SUBURI = OC::$SUBURI . 'index.php';
+				OC::$SUBURI = OC::$SUBURI.'index.php';
 			}
 		}
 
@@ -176,7 +176,7 @@ 
 				OC::$WEBROOT = substr($scriptName, 0, 0 - strlen(OC::$SUBURI));
 
 				if (OC::$WEBROOT != '' && OC::$WEBROOT[0] !== '/') {
-					OC::$WEBROOT = '/' . OC::$WEBROOT;
+					OC::$WEBROOT = '/'.OC::$WEBROOT;
 				}
 			} else {
 				// The scriptName is not ending with OC::$SUBURI
@@ -205,11 +205,11 @@ 
 					OC::$APPSROOTS[] = $paths;
 				}
 			}
-		} elseif (file_exists(OC::$SERVERROOT . '/apps')) {
-			OC::$APPSROOTS[] = ['path' => OC::$SERVERROOT . '/apps', 'url' => '/apps', 'writable' => true];
-		} elseif (file_exists(OC::$SERVERROOT . '/../apps')) {
+		} elseif (file_exists(OC::$SERVERROOT.'/apps')) {
+			OC::$APPSROOTS[] = ['path' => OC::$SERVERROOT.'/apps', 'url' => '/apps', 'writable' => true];
+		} elseif (file_exists(OC::$SERVERROOT.'/../apps')) {
 			OC::$APPSROOTS[] = [
-				'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
+				'path' => rtrim(dirname(OC::$SERVERROOT), '/').'/apps',
 				'url' => '/apps',
 				'writable' => true
 			];
@@ -239,8 +239,8 @@ 
 		$l = \OC::$server->getL10N('lib');
 
 		// Create config if it does not already exist
-		$configFilePath = self::$configDir .'/config.php';
-		if(!file_exists($configFilePath)) {
+		$configFilePath = self::$configDir.'/config.php';
+		if (!file_exists($configFilePath)) {
 			@touch($configFilePath);
 		}
 
@@ -256,14 +256,14 @@ 
 				echo $l->t('This can usually be fixed by giving the webserver write access to the config directory')."\n";
 				echo "\n";
 				echo $l->t('Or, if you prefer to keep config.php file read only, set the option "config_is_read_only" to true in it.')."\n";
-				echo $l->t('See %s', [ $urlGenerator->linkToDocs('admin-config') ])."\n";
+				echo $l->t('See %s', [$urlGenerator->linkToDocs('admin-config')])."\n";
 				exit;
 			} else {
 				OC_Template::printErrorPage(
 					$l->t('Cannot write into "config" directory!'),
-					$l->t('This can usually be fixed by giving the webserver write access to the config directory.') . '. '
+					$l->t('This can usually be fixed by giving the webserver write access to the config directory.').'. '
 					. $l->t('Or, if you prefer to keep config.php file read only, set the option "config_is_read_only" to true in it. See %s',
-					[ $urlGenerator->linkToDocs('admin-config') ] ),
+					[$urlGenerator->linkToDocs('admin-config')]),
 					503
 				);
 			}
@@ -279,8 +279,8 @@ 
 			if (OC::$CLI) {
 				throw new Exception('Not installed');
 			} else {
-				$url = OC::$WEBROOT . '/index.php';
-				header('Location: ' . $url);
+				$url = OC::$WEBROOT.'/index.php';
+				header('Location: '.$url);
 			}
 			exit();
 		}
@@ -385,14 +385,14 @@ 
 		$incompatibleShippedApps = [];
 		foreach ($incompatibleApps as $appInfo) {
 			if ($appManager->isShipped($appInfo['id'])) {
-				$incompatibleShippedApps[] = $appInfo['name'] . ' (' . $appInfo['id'] . ')';
+				$incompatibleShippedApps[] = $appInfo['name'].' ('.$appInfo['id'].')';
 			}
 		}
 
 		if (!empty($incompatibleShippedApps)) {
 			$l = \OC::$server->getL10N('core');
 			$hint = $l->t('The files of the app %1$s were not replaced correctly. Make sure it is a version compatible with the server.', [implode(', ', $incompatibleShippedApps)]);
-			throw new \OC\HintException('The files of the app ' . implode(', ', $incompatibleShippedApps) . ' were not replaced correctly. Make sure it is a version compatible with the server.', $hint);
+			throw new \OC\HintException('The files of the app '.implode(', ', $incompatibleShippedApps).' were not replaced correctly. Make sure it is a version compatible with the server.', $hint);
 		}
 
 		$tmpl->assign('appsToUpgrade', $appManager->getAppsNeedingUpgrade($ocVersion));
@@ -403,7 +403,7 @@ 
 	}
 
 	public static function initSession() {
-		if(self::$server->getRequest()->getServerProtocol() === 'https') {
+		if (self::$server->getRequest()->getServerProtocol() === 'https') {
 			ini_set('session.cookie_secure', true);
 		}
 
@@ -411,7 +411,7 @@ 
 		ini_set('session.cookie_httponly', 'true');
 
 		// set the cookie path to the Nextcloud directory
-		$cookie_path = OC::$WEBROOT ? : '/';
+		$cookie_path = OC::$WEBROOT ?: '/';
 		ini_set('session.cookie_path', $cookie_path);
 
 		// Let the session name be changed in the initSession Hook
@@ -444,7 +444,7 @@ 
 		// session timeout
 		if ($session->exists('LAST_ACTIVITY') && (time() - $session->get('LAST_ACTIVITY') > $sessionLifeTime)) {
 			if (isset($_COOKIE[session_name()])) {
-				setcookie(session_name(), '', -1, self::$WEBROOT ? : '/');
+				setcookie(session_name(), '', -1, self::$WEBROOT ?: '/');
 			}
 			\OC::$server->getUserSession()->logout();
 		}
@@ -480,14 +480,14 @@ 
 
 		// Append __Host to the cookie if it meets the requirements
 		$cookiePrefix = '';
-		if($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
+		if ($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
 			$cookiePrefix = '__Host-';
 		}
 
-		foreach($policies as $policy) {
+		foreach ($policies as $policy) {
 			header(
 				sprintf(
-					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
+					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;'.$secureCookie.'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
 					$cookiePrefix,
 					$policy,
 					$cookieParams['path'],
@@ -526,31 +526,31 @@ 
 			];
 		}
 
-		if($request->isUserAgent($incompatibleUserAgents)) {
+		if ($request->isUserAgent($incompatibleUserAgents)) {
 			return;
 		}
 
-		if(count($_COOKIE) > 0) {
+		if (count($_COOKIE) > 0) {
 			$requestUri = $request->getScriptName();
 			$processingScript = explode('/', $requestUri);
-			$processingScript = $processingScript[count($processingScript)-1];
+			$processingScript = $processingScript[count($processingScript) - 1];
 
 			// index.php routes are handled in the middleware
-			if($processingScript === 'index.php') {
+			if ($processingScript === 'index.php') {
 				return;
 			}
 
 			// All other endpoints require the lax and the strict cookie
-			if(!$request->passesStrictCookieCheck()) {
+			if (!$request->passesStrictCookieCheck()) {
 				self::sendSameSiteCookies();
 				// Debug mode gets access to the resources without strict cookie
 				// due to the fact that the SabreDAV browser also lives there.
-				if(!\OC::$server->getConfig()->getSystemValue('debug', false)) {
+				if (!\OC::$server->getConfig()->getSystemValue('debug', false)) {
 					http_response_code(\OCP\AppFramework\Http::STATUS_SERVICE_UNAVAILABLE);
 					exit();
 				}
 			}
-		} elseif(!isset($_COOKIE['nc_sameSiteCookielax']) || !isset($_COOKIE['nc_sameSiteCookiestrict'])) {
+		} elseif (!isset($_COOKIE['nc_sameSiteCookielax']) || !isset($_COOKIE['nc_sameSiteCookiestrict'])) {
 			self::sendSameSiteCookies();
 		}
 	}
@@ -561,12 +561,12 @@ 
 
 		// register autoloader
 		$loaderStart = microtime(true);
-		require_once __DIR__ . '/autoloader.php';
+		require_once __DIR__.'/autoloader.php';
 		self::$loader = new \OC\Autoloader([
-			OC::$SERVERROOT . '/lib/private/legacy',
+			OC::$SERVERROOT.'/lib/private/legacy',
 		]);
 		if (defined('PHPUNIT_RUN')) {
-			self::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
+			self::$loader->addValidRoot(OC::$SERVERROOT.'/tests');
 		}
 		spl_autoload_register([self::$loader, 'load']);
 		$loaderEnd = microtime(true);
@@ -574,12 +574,12 @@ 
 		self::$CLI = (php_sapi_name() == 'cli');
 
 		// Add default composer PSR-4 autoloader
-		self::$composerAutoloader = require_once OC::$SERVERROOT . '/lib/composer/autoload.php';
+		self::$composerAutoloader = require_once OC::$SERVERROOT.'/lib/composer/autoload.php';
 
 		try {
 			self::initPaths();
 			// setup 3rdparty autoloader
-			$vendorAutoLoad = OC::$SERVERROOT. '/3rdparty/autoload.php';
+			$vendorAutoLoad = OC::$SERVERROOT.'/3rdparty/autoload.php';
 			if (!file_exists($vendorAutoLoad)) {
 				throw new \RuntimeException('Composer autoloader not found, unable to continue. Check the folder "3rdparty". Running "git submodule update --init" will initialize the git submodule that handles the subfolder "3rdparty".');
 			}
@@ -609,7 +609,7 @@ 
 		@ini_set('display_errors', '0');
 		@ini_set('log_errors', '1');
 
-		if(!date_default_timezone_set('UTC')) {
+		if (!date_default_timezone_set('UTC')) {
 			throw new \RuntimeException('Could not set timezone to UTC');
 		}
 
@@ -674,11 +674,11 @@ 
 				// Convert l10n string into regular string for usage in database
 				$staticErrors = [];
 				foreach ($errors as $error) {
-					echo $error['error'] . "\n";
-					echo $error['hint'] . "\n\n";
+					echo $error['error']."\n";
+					echo $error['hint']."\n\n";
 					$staticErrors[] = [
-						'error' => (string)$error['error'],
-						'hint' => (string)$error['hint'],
+						'error' => (string) $error['error'],
+						'hint' => (string) $error['hint'],
 					];
 				}
 
@@ -694,7 +694,7 @@ 
 		}
 		//try to set the session lifetime
 		$sessionLifeTime = self::getSessionLifeTime();
-		@ini_set('gc_maxlifetime', (string)$sessionLifeTime);
+		@ini_set('gc_maxlifetime', (string) $sessionLifeTime);
 
 		$systemConfig = \OC::$server->getSystemConfig();
 
@@ -745,7 +745,7 @@ 
 		register_shutdown_function([$lockProvider, 'releaseAll']);
 
 		// Check whether the sample configuration has been copied
-		if($systemConfig->getValue('copied_sample_config', false)) {
+		if ($systemConfig->getValue('copied_sample_config', false)) {
 			$l = \OC::$server->getL10N('lib');
 			OC_Template::printErrorPage(
 				$l->t('Sample configuration detected'),
@@ -767,11 +767,11 @@ 
 		) {
 			// Allow access to CSS resources
 			$isScssRequest = false;
-			if(strpos($request->getPathInfo(), '/css/') === 0) {
+			if (strpos($request->getPathInfo(), '/css/') === 0) {
 				$isScssRequest = true;
 			}
 
-			if(substr($request->getRequestUri(), -11) === '/status.php') {
+			if (substr($request->getRequestUri(), -11) === '/status.php') {
 				http_response_code(400);
 				header('Content-Type: application/json');
 				echo '{"error": "Trusted domain error.", "code": 15}';
@@ -809,7 +809,7 @@ 
 
 			// NOTE: This will be replaced to use OCP
 			$userSession = self::$server->getUserSession();
-			$userSession->listen('\OC\User', 'postLogin', function () use ($userSession) {
+			$userSession->listen('\OC\User', 'postLogin', function() use ($userSession) {
 				if (!defined('PHPUNIT_RUN')) {
 					// reset brute force delay for this IP address and username
 					$uid = \OC::$server->getUserSession()->getUser()->getUID();
@@ -861,7 +861,7 @@ 
 
 	private static function registerAppRestrictionsHooks() {
 		$groupManager = self::$server->query(\OCP\IGroupManager::class);
-		$groupManager->listen ('\OC\Group', 'postDelete', function (\OCP\IGroup $group) {
+		$groupManager->listen('\OC\Group', 'postDelete', function(\OCP\IGroup $group) {
 			$appManager = self::$server->getAppManager();
 			$apps = $appManager->getEnabledAppsForGroup($group);
 			foreach ($apps as $appId) {
@@ -875,7 +875,7 @@ 
 				if (empty($restrictions)) {
 					$appManager->disableApp($appId);
 				}
-				else{
+				else {
 					$appManager->enableAppForGroups($appId, $restrictions);
 				}
 
@@ -971,12 +971,12 @@ 
 		// emergency app disabling
 		if ($requestPath === '/disableapp'
 			&& $request->getMethod() === 'POST'
-			&& ((array)$request->getParam('appid')) !== ''
+			&& ((array) $request->getParam('appid')) !== ''
 		) {
 			\OC_JSON::callCheck();
 			\OC_JSON::checkAdminUser();
-			$appIds = (array)$request->getParam('appid');
-			foreach($appIds as $appId) {
+			$appIds = (array) $request->getParam('appid');
+			foreach ($appIds as $appId) {
 				$appId = \OC_App::cleanAppId($appId);
 				\OC::$server->getAppManager()->disableApp($appId);
 			}
@@ -991,7 +991,7 @@ 
 		if (!\OCP\Util::needUpgrade()
 			&& !((bool) $systemConfig->getValue('maintenance', false))) {
 			// For logged-in users: Load everything
-			if(\OC::$server->getUserSession()->isLoggedIn()) {
+			if (\OC::$server->getUserSession()->isLoggedIn()) {
 				OC_App::loadApps();
 			} else {
 				// For guests: Load only filesystem and logging

lib/private/Config.php

Spacing +8 added lines, -8 removed lines

@@ -87,7 +87,7 @@ 
 	 * @return mixed the value or $default
 	 */
 	public function getValue($key, $default = null) {
-		$envValue = getenv(self::ENV_PREFIX . $key);
+		$envValue = getenv(self::ENV_PREFIX.$key);
 		if ($envValue !== false) {
 			return $envValue;
 		}
@@ -199,7 +199,7 @@ 
 		foreach ($configFiles as $file) {
 			$fileExistsAndIsReadable = file_exists($file) && is_readable($file);
 			$filePointer = $fileExistsAndIsReadable ? fopen($file, 'r') : false;
-			if($file === $this->configFilePath &&
+			if ($file === $this->configFilePath &&
 				$filePointer === false) {
 				// Opening the main config might not be possible, e.g. if the wrong
 				// permissions are set (likely on a new installation)
@@ -207,13 +207,13 @@ 
 			}
 
 			// Try to acquire a file lock
-			if(!flock($filePointer, LOCK_SH)) {
+			if (!flock($filePointer, LOCK_SH)) {
 				throw new \Exception(sprintf('Could not acquire a shared lock on the config file %s', $file));
 			}
 
 			unset($CONFIG);
 			include $file;
-			if(isset($CONFIG) && is_array($CONFIG)) {
+			if (isset($CONFIG) && is_array($CONFIG)) {
 				$this->cache = array_merge($this->cache, $CONFIG);
 			}
 
@@ -238,26 +238,26 @@ 
 		$content .= var_export($this->cache, true);
 		$content .= ";\n";
 
-		touch ($this->configFilePath);
+		touch($this->configFilePath);
 		$filePointer = fopen($this->configFilePath, 'r+');
 
 		// Prevent others not to read the config
 		chmod($this->configFilePath, 0640);
 
 		// File does not exist, this can happen when doing a fresh install
-		if(!is_resource ($filePointer)) {
+		if (!is_resource($filePointer)) {
 			throw new HintException(
 				"Can't write into config directory!",
 				'This can usually be fixed by giving the webserver write access to the config directory.');
 		}
 
 		// Try to acquire a file lock
-		if(!flock($filePointer, LOCK_EX)) {
+		if (!flock($filePointer, LOCK_EX)) {
 			throw new \Exception(sprintf('Could not acquire an exclusive lock on the config file %s', $this->configFilePath));
 		}
 
 		// Write the config and release the lock
-		ftruncate ($filePointer, 0);
+		ftruncate($filePointer, 0);
 		fwrite($filePointer, $content);
 		fflush($filePointer);
 		flock($filePointer, LOCK_UN);