nextcloud / server

lib/private/legacy/api.php

Spacing +32 added lines, -32 removed lines

@@ -92,7 +92,7 @@ 
 				$requirements = array()) {
 		$name = strtolower($method).$url;
 		$name = str_replace(array('/', '{', '}'), '_', $name);
-		if(!isset(self::$actions[$name])) {
+		if (!isset(self::$actions[$name])) {
 			$oldCollection = OC::$server->getRouter()->getCurrentCollection();
 			OC::$server->getRouter()->useCollection('ocs');
 			OC::$server->getRouter()->create($name, $url)
@@ -115,17 +115,17 @@ 
 		$method = $request->getMethod();
 
 		// Prepare the request variables
-		if($method === 'PUT') {
+		if ($method === 'PUT') {
 			$parameters['_put'] = $request->getParams();
-		} else if($method === 'DELETE') {
+		} else if ($method === 'DELETE') {
 			$parameters['_delete'] = $request->getParams();
 		}
 		$name = $parameters['_route'];
 		// Foreach registered action
 		$responses = array();
-		foreach(self::$actions[$name] as $action) {
+		foreach (self::$actions[$name] as $action) {
 			// Check authentication and availability
-			if(!self::isAuthorised($action)) {
+			if (!self::isAuthorised($action)) {
 				$responses[] = array(
 					'app' => $action['app'],
 					'response' => new OC_OCS_Result(null, API::RESPOND_UNAUTHORISED, 'Unauthorised'),
@@ -133,7 +133,7 @@ 
 					);
 				continue;
 			}
-			if(!is_callable($action['action'])) {
+			if (!is_callable($action['action'])) {
 				$responses[] = array(
 					'app' => $action['app'],
 					'response' => new OC_OCS_Result(null, API::RESPOND_NOT_FOUND, 'Api method not found'),
@@ -173,15 +173,15 @@ 
 			'failed' => array(),
 			);
 
-		foreach($responses as $response) {
-			if($response['shipped'] || ($response['app'] === 'core')) {
-				if($response['response']->succeeded()) {
+		foreach ($responses as $response) {
+			if ($response['shipped'] || ($response['app'] === 'core')) {
+				if ($response['response']->succeeded()) {
 					$shipped['succeeded'][$response['app']] = $response;
 				} else {
 					$shipped['failed'][$response['app']] = $response;
 				}
 			} else {
-				if($response['response']->succeeded()) {
+				if ($response['response']->succeeded()) {
 					$thirdparty['succeeded'][$response['app']] = $response;
 				} else {
 					$thirdparty['failed'][$response['app']] = $response;
@@ -190,14 +190,14 @@ 
 		}
 
 		// Remove any error responses if there is one shipped response that succeeded
-		if(!empty($shipped['failed'])) {
+		if (!empty($shipped['failed'])) {
 			// Which shipped response do we use if they all failed?
 			// They may have failed for different reasons (different status codes)
 			// Which response code should we return?
 			// Maybe any that are not \OCP\API::RESPOND_SERVER_ERROR
 			// Merge failed responses if more than one
 			$data = array();
-			foreach($shipped['failed'] as $failure) {
+			foreach ($shipped['failed'] as $failure) {
 				$data = array_merge_recursive($data, $failure['response']->getData());
 			}
 			$picked = reset($shipped['failed']);
@@ -206,12 +206,12 @@ 
 			$headers = $picked['response']->getHeaders();
 			$response = new OC_OCS_Result($data, $code, $meta['message'], $headers);
 			return $response;
-		} elseif(!empty($shipped['succeeded'])) {
+		} elseif (!empty($shipped['succeeded'])) {
 			$responses = array_merge($shipped['succeeded'], $thirdparty['succeeded']);
-		} elseif(!empty($thirdparty['failed'])) {
+		} elseif (!empty($thirdparty['failed'])) {
 			// Merge failed responses if more than one
 			$data = array();
-			foreach($thirdparty['failed'] as $failure) {
+			foreach ($thirdparty['failed'] as $failure) {
 				$data = array_merge_recursive($data, $failure['response']->getData());
 			}
 			$picked = reset($thirdparty['failed']);
@@ -228,8 +228,8 @@ 
 		$codes = [];
 		$header = [];
 
-		foreach($responses as $response) {
-			if($response['shipped']) {
+		foreach ($responses as $response) {
+			if ($response['shipped']) {
 				$data = array_merge_recursive($response['response']->getData(), $data);
 			} else {
 				$data = array_merge_recursive($data, $response['response']->getData());
@@ -242,8 +242,8 @@ 
 		// Use any non 100 status codes
 		$statusCode = 100;
 		$statusMessage = null;
-		foreach($codes as $code) {
-			if($code['code'] != 100) {
+		foreach ($codes as $code) {
+			if ($code['code'] != 100) {
 				$statusCode = $code['code'];
 				$statusMessage = $code['meta']['message'];
 				break;
@@ -260,7 +260,7 @@ 
 	 */
 	private static function isAuthorised($action) {
 		$level = $action['authlevel'];
-		switch($level) {
+		switch ($level) {
 			case API::GUEST_AUTH:
 				// Anyone can access
 				return true;
@@ -270,16 +270,16 @@ 
 			case API::SUBADMIN_AUTH:
 				// Check for subadmin
 				$user = self::loginUser();
-				if(!$user) {
+				if (!$user) {
 					return false;
 				} else {
 					$userObject = \OC::$server->getUserSession()->getUser();
-					if($userObject === null) {
+					if ($userObject === null) {
 						return false;
 					}
 					$isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
 					$admin = OC_User::isAdminUser($user);
-					if($isSubAdmin || $admin) {
+					if ($isSubAdmin || $admin) {
 						return true;
 					} else {
 						return false;
@@ -288,7 +288,7 @@ 
 			case API::ADMIN_AUTH:
 				// Check for admin
 				$user = self::loginUser();
-				if(!$user) {
+				if (!$user) {
 					return false;
 				} else {
 					return OC_User::isAdminUser($user);
@@ -304,7 +304,7 @@ 
 	 * @return string|false (username, or false on failure)
 	 */
 	private static function loginUser() {
-		if(self::$isLoggedIn === true) {
+		if (self::$isLoggedIn === true) {
 			return \OC_User::getUser();
 		}
 
@@ -358,13 +358,13 @@ 
 	 * @param OC_OCS_Result $result
 	 * @param string $format the format xml|json
 	 */
-	public static function respond($result, $format='xml') {
+	public static function respond($result, $format = 'xml') {
 		$request = \OC::$server->getRequest();
 
 		// Send 401 headers if unauthorised
-		if($result->getStatusCode() === API::RESPOND_UNAUTHORISED) {
+		if ($result->getStatusCode() === API::RESPOND_UNAUTHORISED) {
 			// If request comes from JS return dummy auth request
-			if($request->getHeader('X-Requested-With') === 'XMLHttpRequest') {
+			if ($request->getHeader('X-Requested-With') === 'XMLHttpRequest') {
 				header('WWW-Authenticate: DummyBasic realm="Authorisation Required"');
 			} else {
 				header('WWW-Authenticate: Basic realm="Authorisation Required"');
@@ -372,8 +372,8 @@ 
 			header('HTTP/1.0 401 Unauthorized');
 		}
 
-		foreach($result->getHeaders() as $name => $value) {
-			header($name . ': ' . $value);
+		foreach ($result->getHeaders() as $name => $value) {
+			header($name.': '.$value);
 		}
 
 		$meta = $result->getMeta();
@@ -395,14 +395,14 @@ 
 	 * @param XMLWriter $writer
 	 */
 	private static function toXML($array, $writer) {
-		foreach($array as $k => $v) {
+		foreach ($array as $k => $v) {
 			if ($k[0] === '@') {
 				$writer->writeAttribute(substr($k, 1), $v);
 				continue;
 			} else if (is_numeric($k)) {
 				$k = 'element';
 			}
-			if(is_array($v)) {
+			if (is_array($v)) {
 				$writer->startElement($k);
 				self::toXML($v, $writer);
 				$writer->endElement();

lib/private/legacy/user.php

Spacing +9 added lines, -9 removed lines

@@ -94,7 +94,7 @@ 
 				case 'database':
 				case 'mysql':
 				case 'sqlite':
-					\OCP\Util::writeLog('core', 'Adding user backend ' . $backend . '.', \OCP\Util::DEBUG);
+					\OCP\Util::writeLog('core', 'Adding user backend '.$backend.'.', \OCP\Util::DEBUG);
 					self::$_usedBackends[$backend] = new \OC\User\Database();
 					\OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
 					break;
@@ -103,8 +103,8 @@ 
 					\OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
 					break;
 				default:
-					\OCP\Util::writeLog('core', 'Adding default user backend ' . $backend . '.', \OCP\Util::DEBUG);
-					$className = 'OC_USER_' . strtoupper($backend);
+					\OCP\Util::writeLog('core', 'Adding default user backend '.$backend.'.', \OCP\Util::DEBUG);
+					$className = 'OC_USER_'.strtoupper($backend);
 					self::$_usedBackends[$backend] = new $className();
 					\OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
 					break;
@@ -147,10 +147,10 @@ 
 					self::useBackend($backend);
 					self::$_setupedBackends[] = $i;
 				} else {
-					\OCP\Util::writeLog('core', 'User backend ' . $class . ' already initialized.', \OCP\Util::DEBUG);
+					\OCP\Util::writeLog('core', 'User backend '.$class.' already initialized.', \OCP\Util::DEBUG);
 				}
 			} else {
-				\OCP\Util::writeLog('core', 'User backend ' . $class . ' not found.', \OCP\Util::ERROR);
+				\OCP\Util::writeLog('core', 'User backend '.$class.' not found.', \OCP\Util::ERROR);
 			}
 		}
 	}
@@ -188,15 +188,15 @@ 
 			if (self::getUser() !== $uid) {
 				self::setUserId($uid);
 				$setUidAsDisplayName = true;
-				if($backend instanceof \OCP\UserInterface
+				if ($backend instanceof \OCP\UserInterface
 					&& $backend->implementsActions(OC_User_Backend::GET_DISPLAYNAME)) {
 
 					$backendDisplayName = $backend->getDisplayName($uid);
-					if(is_string($backendDisplayName) && trim($backendDisplayName) !== '') {
+					if (is_string($backendDisplayName) && trim($backendDisplayName) !== '') {
 						$setUidAsDisplayName = false;
 					}
 				}
-				if($setUidAsDisplayName) {
+				if ($setUidAsDisplayName) {
 					self::setDisplayName($uid);
 				}
 				self::getUserSession()->setLoginName($uid);
@@ -490,7 +490,7 @@ 
 		if ($user) {
 			return $user->getHome();
 		} else {
-			return \OC::$server->getSystemConfig()->getValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $uid;
+			return \OC::$server->getSystemConfig()->getValue('datadirectory', OC::$SERVERROOT.'/data').'/'.$uid;
 		}
 	}
 

lib/private/legacy/util.php

Spacing +63 added lines, -63 removed lines

@@ -76,7 +76,7 @@ 
 
 	private static function initLocalStorageRootFS() {
 		// mount local file backend as root
-		$configDataDirectory = \OC::$server->getSystemConfig()->getValue("datadirectory", OC::$SERVERROOT . "/data");
+		$configDataDirectory = \OC::$server->getSystemConfig()->getValue("datadirectory", OC::$SERVERROOT."/data");
 		//first set up the local "root" storage
 		\OC\Files\Filesystem::initMountManager();
 		if (!self::$rootMounted) {
@@ -154,7 +154,7 @@ 
 		\OC\Files\Filesystem::initMountManager();
 
 		\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
-		\OC\Files\Filesystem::addStorageWrapper('mount_options', function ($mountPoint, \OCP\Files\Storage $storage, \OCP\Files\Mount\IMountPoint $mount) {
+		\OC\Files\Filesystem::addStorageWrapper('mount_options', function($mountPoint, \OCP\Files\Storage $storage, \OCP\Files\Mount\IMountPoint $mount) {
 			if ($storage->instanceOfStorage('\OC\Files\Storage\Common')) {
 				/** @var \OC\Files\Storage\Common $storage */
 				$storage->setMountOptions($mount->getOptions());
@@ -162,7 +162,7 @@ 
 			return $storage;
 		});
 
-		\OC\Files\Filesystem::addStorageWrapper('enable_sharing', function ($mountPoint, \OCP\Files\Storage $storage, \OCP\Files\Mount\IMountPoint $mount) {
+		\OC\Files\Filesystem::addStorageWrapper('enable_sharing', function($mountPoint, \OCP\Files\Storage $storage, \OCP\Files\Mount\IMountPoint $mount) {
 			if (!$mount->getOption('enable_sharing', true)) {
 				return new \OC\Files\Storage\Wrapper\PermissionsMask([
 					'storage' => $storage,
@@ -173,21 +173,21 @@ 
 		});
 
 		// install storage availability wrapper, before most other wrappers
-		\OC\Files\Filesystem::addStorageWrapper('oc_availability', function ($mountPoint, $storage) {
+		\OC\Files\Filesystem::addStorageWrapper('oc_availability', function($mountPoint, $storage) {
 			if (!$storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage') && !$storage->isLocal()) {
 				return new \OC\Files\Storage\Wrapper\Availability(['storage' => $storage]);
 			}
 			return $storage;
 		});
 
-		\OC\Files\Filesystem::addStorageWrapper('oc_encoding', function ($mountPoint, \OCP\Files\Storage $storage, \OCP\Files\Mount\IMountPoint $mount) {
+		\OC\Files\Filesystem::addStorageWrapper('oc_encoding', function($mountPoint, \OCP\Files\Storage $storage, \OCP\Files\Mount\IMountPoint $mount) {
 			if ($mount->getOption('encoding_compatibility', false) && !$storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage') && !$storage->isLocal()) {
 				return new \OC\Files\Storage\Wrapper\Encoding(['storage' => $storage]);
 			}
 			return $storage;
 		});
 
-		\OC\Files\Filesystem::addStorageWrapper('oc_quota', function ($mountPoint, $storage) {
+		\OC\Files\Filesystem::addStorageWrapper('oc_quota', function($mountPoint, $storage) {
 			// set up quota for home storages, even for other users
 			// which can happen when using sharing
 
@@ -229,7 +229,7 @@ 
 		//if we aren't logged in, there is no use to set up the filesystem
 		if ($user != "") {
 
-			$userDir = '/' . $user . '/files';
+			$userDir = '/'.$user.'/files';
 
 			//jail the user into his "home" directory
 			\OC\Files\Filesystem::init($user, $userDir);
@@ -308,7 +308,7 @@ 
 			return \OCP\Files\FileInfo::SPACE_UNLIMITED;
 		}
 		$userQuota = $user->getQuota();
-		if($userQuota === 'none') {
+		if ($userQuota === 'none') {
 			return \OCP\Files\FileInfo::SPACE_UNLIMITED;
 		}
 		return OC_Helper::computerFileSize($userQuota);
@@ -323,15 +323,15 @@ 
 	 */
 	public static function copySkeleton($userId, \OCP\Files\Folder $userDirectory) {
 
-		$skeletonDirectory = \OC::$server->getConfig()->getSystemValue('skeletondirectory', \OC::$SERVERROOT . '/core/skeleton');
+		$skeletonDirectory = \OC::$server->getConfig()->getSystemValue('skeletondirectory', \OC::$SERVERROOT.'/core/skeleton');
 		$instanceId = \OC::$server->getConfig()->getSystemValue('instanceid', '');
 
 		if ($instanceId === null) {
 			throw new \RuntimeException('no instance id!');
 		}
-		$appdata = 'appdata_' . $instanceId;
+		$appdata = 'appdata_'.$instanceId;
 		if ($userId === $appdata) {
-			throw new \RuntimeException('username is reserved name: ' . $appdata);
+			throw new \RuntimeException('username is reserved name: '.$appdata);
 		}
 
 		if (!empty($skeletonDirectory)) {
@@ -358,7 +358,7 @@ 
 
 		// Verify if folder exists
 		$dir = opendir($source);
-		if($dir === false) {
+		if ($dir === false) {
 			$logger->error(sprintf('Could not opendir "%s"', $source), ['app' => 'core']);
 			return;
 		}
@@ -366,14 +366,14 @@ 
 		// Copy the files
 		while (false !== ($file = readdir($dir))) {
 			if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
-				if (is_dir($source . '/' . $file)) {
+				if (is_dir($source.'/'.$file)) {
 					$child = $target->newFolder($file);
-					self::copyr($source . '/' . $file, $child);
+					self::copyr($source.'/'.$file, $child);
 				} else {
 					$child = $target->newFile($file);
-					$sourceStream = fopen($source . '/' . $file, 'r');
-					if($sourceStream === false) {
-						$logger->error(sprintf('Could not fopen "%s"', $source . '/' . $file), ['app' => 'core']);
+					$sourceStream = fopen($source.'/'.$file, 'r');
+					if ($sourceStream === false) {
+						$logger->error(sprintf('Could not fopen "%s"', $source.'/'.$file), ['app' => 'core']);
 						closedir($dir);
 						return;
 					}
@@ -448,8 +448,8 @@ 
 			return;
 		}
 
-		$timestamp = filemtime(OC::$SERVERROOT . '/version.php');
-		require OC::$SERVERROOT . '/version.php';
+		$timestamp = filemtime(OC::$SERVERROOT.'/version.php');
+		require OC::$SERVERROOT.'/version.php';
 		/** @var $timestamp int */
 		self::$versionCache['OC_Version_Timestamp'] = $timestamp;
 		/** @var $OC_Version string */
@@ -496,7 +496,7 @@ 
 
 		// core js files need separate handling
 		if ($application !== 'core' && $file !== null) {
-			self::addTranslations ( $application );
+			self::addTranslations($application);
 		}
 		self::addExternalResource($application, $prepend, $path, "script");
 	}
@@ -573,7 +573,7 @@ 
 		if ($type === "style") {
 			if (!in_array($path, self::$styles)) {
 				if ($prepend === true) {
-					array_unshift ( self::$styles, $path );
+					array_unshift(self::$styles, $path);
 				} else {
 					self::$styles[] = $path;
 				}
@@ -581,7 +581,7 @@ 
 		} elseif ($type === "script") {
 			if (!in_array($path, self::$scripts)) {
 				if ($prepend === true) {
-					array_unshift ( self::$scripts, $path );
+					array_unshift(self::$scripts, $path);
 				} else {
 					self::$scripts [] = $path;
 				}
@@ -597,7 +597,7 @@ 
 	 * @param array $attributes array of attributes for the element
 	 * @param string $text the text content for the element
 	 */
-	public static function addHeader($tag, $attributes, $text=null) {
+	public static function addHeader($tag, $attributes, $text = null) {
 		self::$headers[] = array(
 			'tag' => $tag,
 			'attributes' => $attributes,
@@ -637,7 +637,7 @@ 
 	public static function checkServer(\OCP\IConfig $config) {
 		$l = \OC::$server->getL10N('lib');
 		$errors = array();
-		$CONFIG_DATADIRECTORY = $config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data');
+		$CONFIG_DATADIRECTORY = $config->getSystemValue('datadirectory', OC::$SERVERROOT.'/data');
 
 		if (!self::needUpgrade($config) && $config->getSystemValue('installed', false)) {
 			// this check needs to be done every time
@@ -665,13 +665,13 @@ 
 		}
 
 		// Check if config folder is writable.
-		if(!OC_Helper::isReadOnlyConfigEnabled()) {
+		if (!OC_Helper::isReadOnlyConfigEnabled()) {
 			if (!is_writable(OC::$configDir) or !is_readable(OC::$configDir)) {
 				$errors[] = array(
 					'error' => $l->t('Cannot write into "config" directory'),
 					'hint' => $l->t('This can usually be fixed by '
 						. '%sgiving the webserver write access to the config directory%s.',
-						array('<a href="' . $urlGenerator->linkToDocs('admin-dir_permissions') . '" target="_blank" rel="noreferrer">', '</a>'))
+						array('<a href="'.$urlGenerator->linkToDocs('admin-dir_permissions').'" target="_blank" rel="noreferrer">', '</a>'))
 				);
 			}
 		}
@@ -687,7 +687,7 @@ 
 					'hint' => $l->t('This can usually be fixed by '
 						. '%sgiving the webserver write access to the apps directory%s'
 						. ' or disabling the appstore in the config file.',
-						array('<a href="' . $urlGenerator->linkToDocs('admin-dir_permissions') . '" target="_blank" rel="noreferrer">', '</a>'))
+						array('<a href="'.$urlGenerator->linkToDocs('admin-dir_permissions').'" target="_blank" rel="noreferrer">', '</a>'))
 				);
 			}
 		}
@@ -709,9 +709,9 @@ 
 				//common hint for all file permissions error messages
 				$permissionsHint = $l->t('Permissions can usually be fixed by '
 					. '%sgiving the webserver write access to the root directory%s.',
-					array('<a href="' . $urlGenerator->linkToDocs('admin-dir_permissions') . '" target="_blank" rel="noreferrer">', '</a>'));
+					array('<a href="'.$urlGenerator->linkToDocs('admin-dir_permissions').'" target="_blank" rel="noreferrer">', '</a>'));
 				$errors[] = array(
-					'error' => 'Data directory (' . $CONFIG_DATADIRECTORY . ') not writable',
+					'error' => 'Data directory ('.$CONFIG_DATADIRECTORY.') not writable',
 					'hint' => $permissionsHint
 				);
 			} else {
@@ -809,15 +809,15 @@ 
 			}
 		}
 
-		foreach($missingDependencies as $missingDependency) {
+		foreach ($missingDependencies as $missingDependency) {
 			$errors[] = array(
 				'error' => $l->t('PHP module %s not installed.', array($missingDependency)),
 				'hint' => $moduleHint
 			);
 			$webServerRestart = true;
 		}
-		foreach($invalidIniSettings as $setting) {
-			if(is_bool($setting[1])) {
+		foreach ($invalidIniSettings as $setting) {
+			if (is_bool($setting[1])) {
 				$setting[1] = ($setting[1]) ? 'on' : 'off';
 			}
 			$errors[] = [
@@ -835,7 +835,7 @@ 
 		 * TODO: Should probably be implemented in the above generic dependency
 		 *       check somehow in the long-term.
 		 */
-		if($iniWrapper->getBool('mbstring.func_overload') !== null &&
+		if ($iniWrapper->getBool('mbstring.func_overload') !== null &&
 			$iniWrapper->getBool('mbstring.func_overload') === true) {
 			$errors[] = array(
 				'error' => $l->t('mbstring.func_overload is set to "%s" instead of the expected value "0"', [$iniWrapper->getString('mbstring.func_overload')]),
@@ -843,16 +843,16 @@ 
 			);
 		}
 
-		if(function_exists('xml_parser_create') &&
-			LIBXML_LOADED_VERSION < 20700 ) {
+		if (function_exists('xml_parser_create') &&
+			LIBXML_LOADED_VERSION < 20700) {
 			$version = LIBXML_LOADED_VERSION;
-			$major = floor($version/10000);
+			$major = floor($version / 10000);
 			$version -= ($major * 10000);
-			$minor = floor($version/100);
+			$minor = floor($version / 100);
 			$version -= ($minor * 100);
 			$patch = $version;
 			$errors[] = array(
-				'error' => $l->t('libxml2 2.7.0 is at least required. Currently %s is installed.', [$major . '.' . $minor . '.' . $patch]),
+				'error' => $l->t('libxml2 2.7.0 is at least required. Currently %s is installed.', [$major.'.'.$minor.'.'.$patch]),
 				'hint' => $l->t('To fix this issue update your libxml2 version and restart your web server.')
 			);
 		}
@@ -953,10 +953,10 @@ 
 				'hint' => $l->t('Check the value of "datadirectory" in your configuration')
 			];
 		}
-		if (!file_exists($dataDirectory . '/.ocdata')) {
+		if (!file_exists($dataDirectory.'/.ocdata')) {
 			$errors[] = [
 				'error' => $l->t('Data directory (%s) is invalid', [$dataDirectory]),
-				'hint' => $l->t('Please check that the data directory contains a file' .
+				'hint' => $l->t('Please check that the data directory contains a file'.
 					' ".ocdata" in its root.')
 			];
 		}
@@ -972,7 +972,7 @@ 
 	public static function checkLoggedIn() {
 		// Check if we are a user
 		if (!OC_User::isLoggedIn()) {
-			header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute(
+			header('Location: '.\OC::$server->getURLGenerator()->linkToRoute(
 						'core.login.showLoginForm',
 						[
 							'redirect_url' => \OC::$server->getRequest()->getRequestUri(),
@@ -983,7 +983,7 @@ 
 		}
 		// Redirect to index page if 2FA challenge was not solved yet
 		if (\OC::$server->getTwoFactorAuthManager()->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
-			header('Location: ' . \OCP\Util::linkToAbsolute('', 'index.php'));
+			header('Location: '.\OCP\Util::linkToAbsolute('', 'index.php'));
 			exit();
 		}
 	}
@@ -996,7 +996,7 @@ 
 	public static function checkAdminUser() {
 		OC_Util::checkLoggedIn();
 		if (!OC_User::isAdminUser(OC_User::getUser())) {
-			header('Location: ' . \OCP\Util::linkToAbsolute('', 'index.php'));
+			header('Location: '.\OCP\Util::linkToAbsolute('', 'index.php'));
 			exit();
 		}
 	}
@@ -1010,12 +1010,12 @@ 
 		OC_Util::checkLoggedIn();
 		$userObject = \OC::$server->getUserSession()->getUser();
 		$isSubAdmin = false;
-		if($userObject !== null) {
+		if ($userObject !== null) {
 			$isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
 		}
 
 		if (!$isSubAdmin) {
-			header('Location: ' . \OCP\Util::linkToAbsolute('', 'index.php'));
+			header('Location: '.\OCP\Util::linkToAbsolute('', 'index.php'));
 			exit();
 		}
 		return true;
@@ -1050,10 +1050,10 @@ 
 					}
 				}
 
-				if(\OC::$server->getConfig()->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true') {
-					$location = $urlGenerator->getAbsoluteURL('/apps/' . $appId . '/');
+				if (\OC::$server->getConfig()->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true') {
+					$location = $urlGenerator->getAbsoluteURL('/apps/'.$appId.'/');
 				} else {
-					$location = $urlGenerator->getAbsoluteURL('/index.php/apps/' . $appId . '/');
+					$location = $urlGenerator->getAbsoluteURL('/index.php/apps/'.$appId.'/');
 				}
 			}
 		}
@@ -1067,7 +1067,7 @@ 
 	 */
 	public static function redirectToDefaultPage() {
 		$location = self::getDefaultPageUrl();
-		header('Location: ' . $location);
+		header('Location: '.$location);
 		exit();
 	}
 
@@ -1080,7 +1080,7 @@ 
 		$id = \OC::$server->getSystemConfig()->getValue('instanceid', null);
 		if (is_null($id)) {
 			// We need to guarantee at least one letter in instanceid so it can be used as the session_name
-			$id = 'oc' . \OC::$server->getSecureRandom()->generate(10, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
+			$id = 'oc'.\OC::$server->getSecureRandom()->generate(10, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
 			\OC::$server->getSystemConfig()->setValue('instanceid', $id);
 		}
 		return $id;
@@ -1102,7 +1102,7 @@ 
 			}, $value);
 		} else {
 			// Specify encoding for PHP<5.4
-			$value = htmlspecialchars((string)$value, ENT_QUOTES, 'UTF-8');
+			$value = htmlspecialchars((string) $value, ENT_QUOTES, 'UTF-8');
 		}
 		return $value;
 	}
@@ -1135,7 +1135,7 @@ 
 		$testContent = 'This is used for testing whether htaccess is properly enabled to disallow access from the outside. This file can be safely removed.';
 
 		// creating a test file
-		$testFile = $config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $fileName;
+		$testFile = $config->getSystemValue('datadirectory', OC::$SERVERROOT.'/data').'/'.$fileName;
 
 		if (file_exists($testFile)) {// already running this test, possible recursive call
 			return false;
@@ -1144,7 +1144,7 @@ 
 		$fp = @fopen($testFile, 'w');
 		if (!$fp) {
 			throw new OC\HintException('Can\'t create test file to check for working .htaccess file.',
-				'Make sure it is possible for the webserver to write to ' . $testFile);
+				'Make sure it is possible for the webserver to write to '.$testFile);
 		}
 		fwrite($fp, $testContent);
 		fclose($fp);
@@ -1171,10 +1171,10 @@ 
 		}
 
 		$fileName = '/htaccesstest.txt';
-		$testFile = $config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $fileName;
+		$testFile = $config->getSystemValue('datadirectory', OC::$SERVERROOT.'/data').'/'.$fileName;
 
 		// accessing the file via http
-		$url = \OC::$server->getURLGenerator()->getAbsoluteURL(OC::$WEBROOT . '/data' . $fileName);
+		$url = \OC::$server->getURLGenerator()->getAbsoluteURL(OC::$WEBROOT.'/data'.$fileName);
 		try {
 			$content = \OC::$server->getHTTPClientService()->newClient()->get($url)->getBody();
 		} catch (\Exception $e) {
@@ -1265,7 +1265,7 @@ 
 		$theme = \OC::$server->getSystemConfig()->getValue("theme", '');
 
 		if ($theme === '') {
-			if (is_dir(OC::$SERVERROOT . '/themes/default')) {
+			if (is_dir(OC::$SERVERROOT.'/themes/default')) {
 				$theme = 'default';
 			}
 		}
@@ -1336,13 +1336,13 @@ 
 	 * @return bool|string
 	 */
 	public static function normalizeUnicode($value) {
-		if(Normalizer::isNormalized($value)) {
+		if (Normalizer::isNormalized($value)) {
 			return $value;
 		}
 
 		$normalizedValue = Normalizer::normalize($value);
 		if ($normalizedValue === null || $normalizedValue === false) {
-			\OC::$server->getLogger()->warning('normalizing failed for "' . $value . '"', ['app' => 'core']);
+			\OC::$server->getLogger()->warning('normalizing failed for "'.$value.'"', ['app' => 'core']);
 			return $value;
 		}
 
@@ -1368,7 +1368,7 @@ 
 		$version = OC_Util::getVersionString();
 		$build = OC_Util::getBuild();
 		if (!empty($build) and OC_Util::getChannel() === 'daily') {
-			$version .= ' Build:' . $build;
+			$version .= ' Build:'.$build;
 		}
 		return $version;
 	}
@@ -1415,19 +1415,19 @@ 
 			} else if ($config->getSystemValue('debug', false) && $versionDiff < 0) {
 				// downgrade with debug
 				$installedMajor = explode('.', $installedVersion);
-				$installedMajor = $installedMajor[0] . '.' . $installedMajor[1];
+				$installedMajor = $installedMajor[0].'.'.$installedMajor[1];
 				$currentMajor = explode('.', $currentVersion);
-				$currentMajor = $currentMajor[0] . '.' . $currentMajor[1];
+				$currentMajor = $currentMajor[0].'.'.$currentMajor[1];
 				if ($installedMajor === $currentMajor) {
 					// Same major, allow downgrade for developers
 					return true;
 				} else {
 					// downgrade attempt, throw exception
-					throw new \OC\HintException('Downgrading is not supported and is likely to cause unpredictable issues (from ' . $installedVersion . ' to ' . $currentVersion . ')');
+					throw new \OC\HintException('Downgrading is not supported and is likely to cause unpredictable issues (from '.$installedVersion.' to '.$currentVersion.')');
 				}
 			} else if ($versionDiff < 0) {
 				// downgrade attempt, throw exception
-				throw new \OC\HintException('Downgrading is not supported and is likely to cause unpredictable issues (from ' . $installedVersion . ' to ' . $currentVersion . ')');
+				throw new \OC\HintException('Downgrading is not supported and is likely to cause unpredictable issues (from '.$installedVersion.' to '.$currentVersion.')');
 			}
 
 			// also check for upgrades for apps (independently from the user)

lib/private/legacy/app.php

Spacing +59 added lines, -59 removed lines

@@ -111,9 +111,9 @@ 
 		$apps = self::getEnabledApps();
 
 		// Add each apps' folder as allowed class path
-		foreach($apps as $app) {
+		foreach ($apps as $app) {
 			$path = self::getAppPath($app);
-			if($path !== false) {
+			if ($path !== false) {
 				self::registerAutoloading($app, $path);
 			}
 		}
@@ -140,15 +140,15 @@ 
 	public static function loadApp($app, $checkUpgrade = true) {
 		self::$loadedApps[] = $app;
 		$appPath = self::getAppPath($app);
-		if($appPath === false) {
+		if ($appPath === false) {
 			return;
 		}
 
 		// in case someone calls loadApp() directly
 		self::registerAutoloading($app, $appPath);
 
-		if (is_file($appPath . '/appinfo/app.php')) {
-			\OC::$server->getEventLogger()->start('load_app_' . $app, 'Load app: ' . $app);
+		if (is_file($appPath.'/appinfo/app.php')) {
+			\OC::$server->getEventLogger()->start('load_app_'.$app, 'Load app: '.$app);
 			if ($checkUpgrade and self::shouldUpgrade($app)) {
 				throw new \OC\NeedsUpdateException();
 			}
@@ -160,7 +160,7 @@ 
 				// enabled for groups
 				self::$enabledAppsCache = array();
 			}
-			\OC::$server->getEventLogger()->end('load_app_' . $app);
+			\OC::$server->getEventLogger()->end('load_app_'.$app);
 		}
 
 		$info = self::getAppInfo($app);
@@ -187,16 +187,16 @@ 
 	 * @param string $path
 	 */
 	public static function registerAutoloading($app, $path) {
-		$key = $app . '-' . $path;
-		if(isset(self::$alreadyRegistered[$key])) {
+		$key = $app.'-'.$path;
+		if (isset(self::$alreadyRegistered[$key])) {
 			return;
 		}
 		self::$alreadyRegistered[$key] = true;
 		// Register on PSR-4 composer autoloader
 		$appNamespace = \OC\AppFramework\App::buildAppNamespace($app);
-		\OC::$composerAutoloader->addPsr4($appNamespace . '\\', $path . '/lib/', true);
+		\OC::$composerAutoloader->addPsr4($appNamespace.'\\', $path.'/lib/', true);
 		if (defined('PHPUNIT_RUN') || defined('CLI_TEST_RUN')) {
-			\OC::$composerAutoloader->addPsr4($appNamespace . '\\Tests\\', $path . '/tests/', true);
+			\OC::$composerAutoloader->addPsr4($appNamespace.'\\Tests\\', $path.'/tests/', true);
 		}
 
 		// Register on legacy autoloader
@@ -211,7 +211,7 @@ 
 	private static function requireAppFile($app) {
 		try {
 			// encapsulated here to avoid variable scope conflicts
-			require_once $app . '/appinfo/app.php';
+			require_once $app.'/appinfo/app.php';
 		} catch (Error $ex) {
 			\OC::$server->getLogger()->logException($ex);
 			$blacklist = \OC::$server->getAppManager()->getAlwaysEnabledApps();
@@ -265,7 +265,7 @@ 
 	 */
 	public static function setAppTypes($app) {
 		$appData = self::getAppInfo($app);
-		if(!is_array($appData)) {
+		if (!is_array($appData)) {
 			return;
 		}
 
@@ -329,8 +329,8 @@ 
 		} else {
 			$apps = $appManager->getEnabledAppsForUser($user);
 		}
-		$apps = array_filter($apps, function ($app) {
-			return $app !== 'files';//we add this manually
+		$apps = array_filter($apps, function($app) {
+			return $app !== 'files'; //we add this manually
 		});
 		sort($apps);
 		array_unshift($apps, 'files');
@@ -374,7 +374,7 @@ 
 		);
 		$isDownloaded = $installer->isDownloaded($appId);
 
-		if(!$isDownloaded) {
+		if (!$isDownloaded) {
 			$installer->downloadApp($appId);
 		}
 
@@ -412,7 +412,7 @@ 
 		}
 
 		$info = self::getAppInfo($appId);
-		if(isset($info['settings']) && is_array($info['settings'])) {
+		if (isset($info['settings']) && is_array($info['settings'])) {
 			$appPath = self::getAppPath($appId);
 			self::registerAutoloading($appId, $appPath);
 			\OC::$server->getSettingsManager()->setupSettings($info['settings']);
@@ -501,7 +501,7 @@ 
 			//SubAdmins are also allowed to access user management
 			$userObject = \OC::$server->getUserSession()->getUser();
 			$isSubAdmin = false;
-			if($userObject !== null) {
+			if ($userObject !== null) {
 				$isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
 			}
 			if ($isSubAdmin) {
@@ -586,7 +586,7 @@ 
 	 */
 	public static function findAppInDirectories($appId) {
 		$sanitizedAppId = self::cleanAppId($appId);
-		if($sanitizedAppId !== $appId) {
+		if ($sanitizedAppId !== $appId) {
 			return false;
 		}
 		static $app_dir = array();
@@ -597,7 +597,7 @@ 
 
 		$possibleApps = array();
 		foreach (OC::$APPSROOTS as $dir) {
-			if (file_exists($dir['path'] . '/' . $appId)) {
+			if (file_exists($dir['path'].'/'.$appId)) {
 				$possibleApps[] = $dir;
 			}
 		}
@@ -638,7 +638,7 @@ 
 		}
 
 		if (($dir = self::findAppInDirectories($appId)) != false) {
-			return $dir['path'] . '/' . $appId;
+			return $dir['path'].'/'.$appId;
 		}
 		return false;
 	}
@@ -652,7 +652,7 @@ 
 	 */
 	public static function getAppWebPath($appId) {
 		if (($dir = self::findAppInDirectories($appId)) != false) {
-			return OC::$WEBROOT . $dir['url'] . '/' . $appId;
+			return OC::$WEBROOT.$dir['url'].'/'.$appId;
 		}
 		return false;
 	}
@@ -665,7 +665,7 @@ 
 	 * @return string
 	 */
 	public static function getAppVersion($appId, $useCache = true) {
-		if($useCache && isset(self::$appVersion[$appId])) {
+		if ($useCache && isset(self::$appVersion[$appId])) {
 			return self::$appVersion[$appId];
 		}
 
@@ -681,7 +681,7 @@ 
 	 * @return string
 	 */
 	public static function getAppVersionByPath($path) {
-		$infoFile = $path . '/appinfo/info.xml';
+		$infoFile = $path.'/appinfo/info.xml';
 		$appData = self::getAppInfo($infoFile, true);
 		return isset($appData['version']) ? $appData['version'] : '';
 	}
@@ -704,10 +704,10 @@ 
 				return self::$appInfo[$appId];
 			}
 			$appPath = self::getAppPath($appId);
-			if($appPath === false) {
+			if ($appPath === false) {
 				return null;
 			}
-			$file = $appPath . '/appinfo/info.xml';
+			$file = $appPath.'/appinfo/info.xml';
 		}
 
 		$parser = new InfoParser(\OC::$server->getMemCacheFactory()->create('core.appinfo'));
@@ -716,9 +716,9 @@ 
 		if (is_array($data)) {
 			$data = OC_App::parseAppInfo($data, $lang);
 		}
-		if(isset($data['ocsid'])) {
+		if (isset($data['ocsid'])) {
 			$storedId = \OC::$server->getConfig()->getAppValue($appId, 'ocsid');
-			if($storedId !== '' && $storedId !== $data['ocsid']) {
+			if ($storedId !== '' && $storedId !== $data['ocsid']) {
 				$data['ocsid'] = $storedId;
 			}
 		}
@@ -798,7 +798,7 @@ 
 	 * @param string $page
 	 */
 	public static function registerAdmin($app, $page) {
-		self::$adminForms[] = $app . '/' . $page . '.php';
+		self::$adminForms[] = $app.'/'.$page.'.php';
 	}
 
 	/**
@@ -807,7 +807,7 @@ 
 	 * @param string $page
 	 */
 	public static function registerPersonal($app, $page) {
-		self::$personalForms[] = $app . '/' . $page . '.php';
+		self::$personalForms[] = $app.'/'.$page.'.php';
 	}
 
 	/**
@@ -836,7 +836,7 @@ 
 
 		foreach (OC::$APPSROOTS as $apps_dir) {
 			if (!is_readable($apps_dir['path'])) {
-				\OCP\Util::writeLog('core', 'unable to read app folder : ' . $apps_dir['path'], \OCP\Util::WARN);
+				\OCP\Util::writeLog('core', 'unable to read app folder : '.$apps_dir['path'], \OCP\Util::WARN);
 				continue;
 			}
 			$dh = opendir($apps_dir['path']);
@@ -844,7 +844,7 @@ 
 			if (is_resource($dh)) {
 				while (($file = readdir($dh)) !== false) {
 
-					if ($file[0] != '.' and is_dir($apps_dir['path'] . '/' . $file) and is_file($apps_dir['path'] . '/' . $file . '/appinfo/info.xml')) {
+					if ($file[0] != '.' and is_dir($apps_dir['path'].'/'.$file) and is_file($apps_dir['path'].'/'.$file.'/appinfo/info.xml')) {
 
 						$apps[] = $file;
 					}
@@ -874,12 +874,12 @@ 
 
 				$info = OC_App::getAppInfo($app, false, $langCode);
 				if (!is_array($info)) {
-					\OCP\Util::writeLog('core', 'Could not read app info file for app "' . $app . '"', \OCP\Util::ERROR);
+					\OCP\Util::writeLog('core', 'Could not read app info file for app "'.$app.'"', \OCP\Util::ERROR);
 					continue;
 				}
 
 				if (!isset($info['name'])) {
-					\OCP\Util::writeLog('core', 'App id "' . $app . '" has no name in appinfo', \OCP\Util::ERROR);
+					\OCP\Util::writeLog('core', 'App id "'.$app.'" has no name in appinfo', \OCP\Util::ERROR);
 					continue;
 				}
 
@@ -906,13 +906,13 @@ 
 				}
 
 				$appPath = self::getAppPath($app);
-				if($appPath !== false) {
-					$appIcon = $appPath . '/img/' . $app . '.svg';
+				if ($appPath !== false) {
+					$appIcon = $appPath.'/img/'.$app.'.svg';
 					if (file_exists($appIcon)) {
-						$info['preview'] = \OC::$server->getURLGenerator()->imagePath($app, $app . '.svg');
+						$info['preview'] = \OC::$server->getURLGenerator()->imagePath($app, $app.'.svg');
 						$info['previewAsIcon'] = true;
 					} else {
-						$appIcon = $appPath . '/img/app.svg';
+						$appIcon = $appPath.'/img/app.svg';
 						if (file_exists($appIcon)) {
 							$info['preview'] = \OC::$server->getURLGenerator()->imagePath($app, 'app.svg');
 							$info['previewAsIcon'] = true;
@@ -946,9 +946,9 @@ 
 	 * @return string|false
 	 */
 	public static function getInternalAppIdByOcs($ocsID) {
-		if(is_numeric($ocsID)) {
+		if (is_numeric($ocsID)) {
 			$idArray = \OC::$server->getAppConfig()->getValues(false, 'ocsid');
-			if(array_search($ocsID, $idArray)) {
+			if (array_search($ocsID, $idArray)) {
 				return array_search($ocsID, $idArray);
 			}
 		}
@@ -1052,7 +1052,7 @@ 
 	public static function getAppVersions() {
 		static $versions;
 
-		if(!$versions) {
+		if (!$versions) {
 			$appConfig = \OC::$server->getAppConfig();
 			$versions = $appConfig->getValues(false, 'installed_version');
 		}
@@ -1074,7 +1074,7 @@ 
 		if ($app !== false) {
 			// check if the app is compatible with this version of ownCloud
 			$info = self::getAppInfo($app);
-			if(!is_array($info)) {
+			if (!is_array($info)) {
 				throw new \Exception(
 					$l->t('App "%s" cannot be installed because appinfo file cannot be read.',
 						[$info['name']]
@@ -1099,7 +1099,7 @@ 
 				$config->setAppValue($app, 'ocsid', $appData['id']);
 			}
 
-			if(isset($info['settings']) && is_array($info['settings'])) {
+			if (isset($info['settings']) && is_array($info['settings'])) {
 				$appPath = self::getAppPath($app);
 				self::registerAutoloading($app, $appPath);
 				\OC::$server->getSettingsManager()->setupSettings($info['settings']);
@@ -1107,7 +1107,7 @@ 
 
 			\OC_Hook::emit('OC_App', 'post_enable', array('app' => $app));
 		} else {
-			if(empty($appName) ) {
+			if (empty($appName)) {
 				throw new \Exception($l->t("No app name specified"));
 			} else {
 				throw new \Exception($l->t("App '%s' could not be installed!", $appName));
@@ -1125,24 +1125,24 @@ 
 	 */
 	public static function updateApp($appId) {
 		$appPath = self::getAppPath($appId);
-		if($appPath === false) {
+		if ($appPath === false) {
 			return false;
 		}
 		$appData = self::getAppInfo($appId);
 		self::executeRepairSteps($appId, $appData['repair-steps']['pre-migration']);
-		if (file_exists($appPath . '/appinfo/database.xml')) {
-			OC_DB::updateDbFromStructure($appPath . '/appinfo/database.xml');
+		if (file_exists($appPath.'/appinfo/database.xml')) {
+			OC_DB::updateDbFromStructure($appPath.'/appinfo/database.xml');
 		}
 		self::executeRepairSteps($appId, $appData['repair-steps']['post-migration']);
 		self::setupLiveMigrations($appId, $appData['repair-steps']['live-migration']);
 		unset(self::$appVersion[$appId]);
 		// run upgrade code
-		if (file_exists($appPath . '/appinfo/update.php')) {
+		if (file_exists($appPath.'/appinfo/update.php')) {
 			self::loadApp($appId, false);
-			include $appPath . '/appinfo/update.php';
+			include $appPath.'/appinfo/update.php';
 		}
 		self::setupBackgroundJobs($appData['background-jobs']);
-		if(isset($appData['settings']) && is_array($appData['settings'])) {
+		if (isset($appData['settings']) && is_array($appData['settings'])) {
 			$appPath = self::getAppPath($appId);
 			self::registerAutoloading($appId, $appPath);
 			\OC::$server->getSettingsManager()->setupSettings($appData['settings']);
@@ -1151,14 +1151,14 @@ 
 		//set remote/public handlers
 		if (array_key_exists('ocsid', $appData)) {
 			\OC::$server->getConfig()->setAppValue($appId, 'ocsid', $appData['ocsid']);
-		} elseif(\OC::$server->getConfig()->getAppValue($appId, 'ocsid', null) !== null) {
+		} elseif (\OC::$server->getConfig()->getAppValue($appId, 'ocsid', null) !== null) {
 			\OC::$server->getConfig()->deleteAppValue($appId, 'ocsid');
 		}
 		foreach ($appData['remote'] as $name => $path) {
-			\OC::$server->getConfig()->setAppValue('core', 'remote_' . $name, $appId . '/' . $path);
+			\OC::$server->getConfig()->setAppValue('core', 'remote_'.$name, $appId.'/'.$path);
 		}
 		foreach ($appData['public'] as $name => $path) {
-			\OC::$server->getConfig()->setAppValue('core', 'public_' . $name, $appId . '/' . $path);
+			\OC::$server->getConfig()->setAppValue('core', 'public_'.$name, $appId.'/'.$path);
 		}
 
 		self::setAppTypes($appId);
@@ -1228,17 +1228,17 @@ 
 	public static function getStorage($appId) {
 		if (OC_App::isEnabled($appId)) { //sanity check
 			if (OC_User::isLoggedIn()) {
-				$view = new \OC\Files\View('/' . OC_User::getUser());
+				$view = new \OC\Files\View('/'.OC_User::getUser());
 				if (!$view->file_exists($appId)) {
 					$view->mkdir($appId);
 				}
-				return new \OC\Files\View('/' . OC_User::getUser() . '/' . $appId);
+				return new \OC\Files\View('/'.OC_User::getUser().'/'.$appId);
 			} else {
-				\OCP\Util::writeLog('core', 'Can\'t get app storage, app ' . $appId . ', user not logged in', \OCP\Util::ERROR);
+				\OCP\Util::writeLog('core', 'Can\'t get app storage, app '.$appId.', user not logged in', \OCP\Util::ERROR);
 				return false;
 			}
 		} else {
-			\OCP\Util::writeLog('core', 'Can\'t get app storage, app ' . $appId . ' not enabled', \OCP\Util::ERROR);
+			\OCP\Util::writeLog('core', 'Can\'t get app storage, app '.$appId.' not enabled', \OCP\Util::ERROR);
 			return false;
 		}
 	}
@@ -1270,9 +1270,9 @@ 
 
 				if ($attributeLang === $similarLang) {
 					$similarLangFallback = $option['@value'];
-				} else if (strpos($attributeLang, $similarLang . '_') === 0) {
+				} else if (strpos($attributeLang, $similarLang.'_') === 0) {
 					if ($similarLangFallback === false) {
-						$similarLangFallback =  $option['@value'];
+						$similarLangFallback = $option['@value'];
 					}
 				}
 			} else {
@@ -1307,7 +1307,7 @@ 
 			$data['description'] = trim(self::findBestL10NOption($data['description'], $lang));
 		} else if (isset($data['description']) && is_string($data['description'])) {
 			$data['description'] = trim($data['description']);
-		} else  {
+		} else {
 			$data['description'] = '';
 		}
 

lib/private/legacy/json.php

Spacing +19 added lines, -19 removed lines

@@ -34,16 +34,16 @@ 
  * Class OC_JSON
  * @deprecated Use a AppFramework JSONResponse instead
  */
-class OC_JSON{
+class OC_JSON {
 	static protected $send_content_type_header = false;
 	/**
 	 * set Content-Type header to jsonrequest
 	 * @deprecated Use a AppFramework JSONResponse instead
 	 */
-	public static function setContentTypeHeader($type='application/json') {
+	public static function setContentTypeHeader($type = 'application/json') {
 		if (!self::$send_content_type_header) {
 			// We send json data
-			header( 'Content-Type: '.$type . '; charset=utf-8');
+			header('Content-Type: '.$type.'; charset=utf-8');
 			self::$send_content_type_header = true;
 		}
 	}
@@ -54,9 +54,9 @@ 
 	 * @deprecated Use the AppFramework instead. It will automatically check if the app is enabled.
 	 */
 	public static function checkAppEnabled($app) {
-		if( !OC_App::isEnabled($app)) {
+		if (!OC_App::isEnabled($app)) {
 			$l = \OC::$server->getL10N('lib');
-			self::error(array( 'data' => array( 'message' => $l->t('Application is not enabled'), 'error' => 'application_not_enabled' )));
+			self::error(array('data' => array('message' => $l->t('Application is not enabled'), 'error' => 'application_not_enabled')));
 			exit();
 		}
 	}
@@ -67,11 +67,11 @@ 
 	 */
 	public static function checkLoggedIn() {
 		$twoFactorAuthManger = \OC::$server->getTwoFactorAuthManager();
-		if( !OC_User::isLoggedIn()
+		if (!OC_User::isLoggedIn()
 			|| $twoFactorAuthManger->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
 			$l = \OC::$server->getL10N('lib');
 			http_response_code(\OCP\AppFramework\Http::STATUS_UNAUTHORIZED);
-			self::error(array( 'data' => array( 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' )));
+			self::error(array('data' => array('message' => $l->t('Authentication error'), 'error' => 'authentication_error')));
 			exit();
 		}
 	}
@@ -81,14 +81,14 @@ 
 	 * @deprecated Use annotation based CSRF checks from the AppFramework instead
 	 */
 	public static function callCheck() {
-		if(!\OC::$server->getRequest()->passesStrictCookieCheck()) {
+		if (!\OC::$server->getRequest()->passesStrictCookieCheck()) {
 			header('Location: '.\OC::$WEBROOT);
 			exit();
 		}
 
-		if( !(\OC::$server->getRequest()->passesCSRFCheck())) {
+		if (!(\OC::$server->getRequest()->passesCSRFCheck())) {
 			$l = \OC::$server->getL10N('lib');
-			self::error(array( 'data' => array( 'message' => $l->t('Token expired. Please reload page.'), 'error' => 'token_expired' )));
+			self::error(array('data' => array('message' => $l->t('Token expired. Please reload page.'), 'error' => 'token_expired')));
 			exit();
 		}
 	}
@@ -98,9 +98,9 @@ 
 	 * @deprecated Use annotation based ACLs from the AppFramework instead
 	 */
 	public static function checkAdminUser() {
-		if( !OC_User::isAdminUser(OC_User::getUser())) {
+		if (!OC_User::isAdminUser(OC_User::getUser())) {
 			$l = \OC::$server->getL10N('lib');
-			self::error(array( 'data' => array( 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' )));
+			self::error(array('data' => array('message' => $l->t('Authentication error'), 'error' => 'authentication_error')));
 			exit();
 		}
 	}
@@ -113,7 +113,7 @@ 
 	public static function checkUserExists($user) {
 		if (!OCP\User::userExists($user)) {
 			$l = \OC::$server->getL10N('lib');
-			OCP\JSON::error(array('data' => array('message' => $l->t('Unknown user'), 'error' => 'unknown_user' )));
+			OCP\JSON::error(array('data' => array('message' => $l->t('Unknown user'), 'error' => 'unknown_user')));
 			exit;
 		}
 	}
@@ -126,13 +126,13 @@ 
 	public static function checkSubAdminUser() {
 		$userObject = \OC::$server->getUserSession()->getUser();
 		$isSubAdmin = false;
-		if($userObject !== null) {
+		if ($userObject !== null) {
 			$isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
 		}
 
-		if(!$isSubAdmin) {
+		if (!$isSubAdmin) {
 			$l = \OC::$server->getL10N('lib');
-			self::error(array( 'data' => array( 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' )));
+			self::error(array('data' => array('message' => $l->t('Authentication error'), 'error' => 'authentication_error')));
 			exit();
 		}
 	}
@@ -160,7 +160,7 @@ 
 	 */
 	protected static function to_string(&$value) {
 		if ($value instanceof OC_L10N_String) {
-			$value = (string)$value;
+			$value = (string) $value;
 		}
 	}
 
@@ -168,8 +168,8 @@ 
 	 * Encode and print $data in json format
 	 * @deprecated Use a AppFramework JSONResponse instead
 	 */
-	public static function encodedPrint($data, $setContentType=true) {
-		if($setContentType) {
+	public static function encodedPrint($data, $setContentType = true) {
+		if ($setContentType) {
 			self::setContentTypeHeader();
 		}
 		echo self::encode($data);

lib/private/legacy/db.php

Spacing +12 added lines, -12 removed lines

@@ -53,7 +53,7 @@ 
 	 *
 	 * SQL query via Doctrine prepare(), needs to be execute()'d!
 	 */
-	static public function prepare( $query , $limit = null, $offset = null, $isManipulation = null) {
+	static public function prepare($query, $limit = null, $offset = null, $isManipulation = null) {
 		$connection = \OC::$server->getDatabaseConnection();
 
 		if ($isManipulation === null) {
@@ -63,7 +63,7 @@ 
 
 		// return the result
 		try {
-			$result =$connection->prepare($query, $limit, $offset);
+			$result = $connection->prepare($query, $limit, $offset);
 		} catch (\Doctrine\DBAL\DBALException $e) {
 			throw new \OC\DatabaseException($e->getMessage(), $query);
 		}
@@ -79,7 +79,7 @@ 
 	 * @param string $sql
 	 * @return bool
 	 */
-	static public function isManipulation( $sql ) {
+	static public function isManipulation($sql) {
 		$selectOccurrence = stripos($sql, 'SELECT');
 		if ($selectOccurrence !== false && $selectOccurrence < 10) {
 			return false;
@@ -108,7 +108,7 @@ 
 	 * @return OC_DB_StatementWrapper
 	 * @throws \OC\DatabaseException
 	 */
-	static public function executeAudited( $stmt, array $parameters = null) {
+	static public function executeAudited($stmt, array $parameters = null) {
 		if (is_string($stmt)) {
 			// convert to an array with 'sql'
 			if (stripos($stmt, 'LIMIT') !== false) { //OFFSET requires LIMIT, so we only need to check for LIMIT
@@ -121,14 +121,14 @@ 
 		}
 		if (is_array($stmt)) {
 			// convert to prepared statement
-			if ( ! array_key_exists('sql', $stmt) ) {
+			if (!array_key_exists('sql', $stmt)) {
 				$message = 'statement array must at least contain key \'sql\'';
 				throw new \OC\DatabaseException($message);
 			}
-			if ( ! array_key_exists('limit', $stmt) ) {
+			if (!array_key_exists('limit', $stmt)) {
 				$stmt['limit'] = null;
 			}
-			if ( ! array_key_exists('limit', $stmt) ) {
+			if (!array_key_exists('limit', $stmt)) {
 				$stmt['offset'] = null;
 			}
 			$stmt = self::prepare($stmt['sql'], $stmt['limit'], $stmt['offset']);
@@ -139,9 +139,9 @@ 
 			self::raiseExceptionOnError($result, 'Could not execute statement');
 		} else {
 			if (is_object($stmt)) {
-				$message = 'Expected a prepared statement or array got ' . get_class($stmt);
+				$message = 'Expected a prepared statement or array got '.get_class($stmt);
 			} else {
-				$message = 'Expected a prepared statement or array got ' . gettype($stmt);
+				$message = 'Expected a prepared statement or array got '.gettype($stmt);
 			}
 			throw new \OC\DatabaseException($message);
 		}
@@ -168,7 +168,7 @@ 
 	 *
 	 * TODO: write more documentation
 	 */
-	public static function createDbFromStructure( $file ) {
+	public static function createDbFromStructure($file) {
 		$schemaManager = self::getMDB2SchemaManager();
 		$result = $schemaManager->createDbFromStructure($file);
 		return $result;
@@ -208,11 +208,11 @@ 
 	 * @throws \OC\DatabaseException
 	 */
 	public static function raiseExceptionOnError($result, $message = null) {
-		if($result === false) {
+		if ($result === false) {
 			if ($message === null) {
 				$message = self::getErrorMessage();
 			} else {
-				$message .= ', Root cause:' . self::getErrorMessage();
+				$message .= ', Root cause:'.self::getErrorMessage();
 			}
 			throw new \OC\DatabaseException($message, \OC::$server->getDatabaseConnection()->errorCode());
 		}

lib/private/legacy/user/backend.php

Spacing +9 added lines, -9 removed lines

@@ -31,27 +31,27 @@
  * error code for functions not provided by the user backend
  * @deprecated Use \OC_User_Backend::NOT_IMPLEMENTED instead
  */
-define('OC_USER_BACKEND_NOT_IMPLEMENTED',   -501);
+define('OC_USER_BACKEND_NOT_IMPLEMENTED', -501);
 
 /**
  * actions that user backends can define
  */
 /** @deprecated Use \OC_User_Backend::CREATE_USER instead */
-define('OC_USER_BACKEND_CREATE_USER',       1 << 0);
+define('OC_USER_BACKEND_CREATE_USER', 1 << 0);
 /** @deprecated Use \OC_User_Backend::SET_PASSWORD instead */
-define('OC_USER_BACKEND_SET_PASSWORD',      1 << 4);
+define('OC_USER_BACKEND_SET_PASSWORD', 1 << 4);
 /** @deprecated Use \OC_User_Backend::CHECK_PASSWORD instead */
-define('OC_USER_BACKEND_CHECK_PASSWORD',    1 << 8);
+define('OC_USER_BACKEND_CHECK_PASSWORD', 1 << 8);
 /** @deprecated Use \OC_User_Backend::GET_HOME instead */
-define('OC_USER_BACKEND_GET_HOME',          1 << 12);
+define('OC_USER_BACKEND_GET_HOME', 1 << 12);
 /** @deprecated Use \OC_User_Backend::GET_DISPLAYNAME instead */
-define('OC_USER_BACKEND_GET_DISPLAYNAME',   1 << 16);
+define('OC_USER_BACKEND_GET_DISPLAYNAME', 1 << 16);
 /** @deprecated Use \OC_User_Backend::SET_DISPLAYNAME instead */
-define('OC_USER_BACKEND_SET_DISPLAYNAME',   1 << 20);
+define('OC_USER_BACKEND_SET_DISPLAYNAME', 1 << 20);
 /** @deprecated Use \OC_User_Backend::PROVIDE_AVATAR instead */
-define('OC_USER_BACKEND_PROVIDE_AVATAR',    1 << 24);
+define('OC_USER_BACKEND_PROVIDE_AVATAR', 1 << 24);
 /** @deprecated Use \OC_User_Backend::COUNT_USERS instead */
-define('OC_USER_BACKEND_COUNT_USERS',       1 << 28);
+define('OC_USER_BACKEND_COUNT_USERS', 1 << 28);
 
 /**
  * Abstract base class for user management. Provides methods for querying backend

lib/private/legacy/defaults.php

Spacing +5 added lines, -5 removed lines

@@ -65,7 +65,7 @@ 
 		$this->defaultLogoClaim = '';
 		$this->defaultMailHeaderColor = '#0082c9'; /* header color of mail notifications */
 
-		$themePath = OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php';
+		$themePath = OC::$SERVERROOT.'/themes/'.OC_Util::getTheme().'/defaults.php';
 		if (file_exists($themePath)) {
 			// prevent defaults.php from printing output
 			ob_start();
@@ -239,9 +239,9 @@ 
 		if ($this->themeExist('getShortFooter')) {
 			$footer = $this->theme->getShortFooter();
 		} else {
-			$footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
-				' rel="noreferrer">' .$this->getEntity() . '</a>'.
-				' – ' . $this->getSlogan();
+			$footer = '<a href="'.$this->getBaseUrl().'" target="_blank"'.
+				' rel="noreferrer">'.$this->getEntity().'</a>'.
+				' – '.$this->getSlogan();
 		}
 
 		return $footer;
@@ -268,7 +268,7 @@ 
 		if ($this->themeExist('buildDocLinkToKey')) {
 			return $this->theme->buildDocLinkToKey($key);
 		}
-		return $this->getDocBaseUrl() . '/server/' . $this->defaultDocVersion . '/go.php?to=' . $key;
+		return $this->getDocBaseUrl().'/server/'.$this->defaultDocVersion.'/go.php?to='.$key;
 	}
 
 	/**

lib/private/legacy/ocs.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	 */
 	public static function notFound() {
 		$format = \OC::$server->getRequest()->getParam('format', 'xml');
-		$txt='Invalid query, please check the syntax. API specifications are here:'
+		$txt = 'Invalid query, please check the syntax. API specifications are here:'
 			.' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n";
 		OC_API::respond(new OC_OCS_Result(null, API::RESPOND_NOT_FOUND, $txt), $format);
 	}