nextcloud / server

lib/private/BackgroundJob/Job.php

Spacing +3 added lines, -3 removed lines

@@ -55,17 +55,17 @@
 
 		try {
 			$jobStartTime = time();
-			$logger->debug('Run ' . get_class($this) . ' job with ID ' . $this->getId(), ['app' => 'cron']);
+			$logger->debug('Run '.get_class($this).' job with ID '.$this->getId(), ['app' => 'cron']);
 			$this->run($this->argument);
 			$timeTaken = time() - $jobStartTime;
 
-			$logger->debug('Finished ' . get_class($this) . ' job with ID ' . $this->getId() . ' in ' . $timeTaken . ' seconds', ['app' => 'cron']);
+			$logger->debug('Finished '.get_class($this).' job with ID '.$this->getId().' in '.$timeTaken.' seconds', ['app' => 'cron']);
 			$jobList->setExecutionTime($this, $timeTaken);
 		} catch (\Exception $e) {
 			if ($logger) {
 				$logger->logException($e, [
 					'app' => 'core',
-					'message' => 'Error while running background job (class: ' . get_class($this) . ', arguments: ' . print_r($this->argument, true) . ')'
+					'message' => 'Error while running background job (class: '.get_class($this).', arguments: '.print_r($this->argument, true).')'
 				]);
 			}
 		}

apps/dav/lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php

Spacing +11 added lines, -11 removed lines

@@ -107,32 +107,32 @@ 
 				case '{DAV:}prop':
 					$newProps['properties'] = array_keys($elem['value']);
 					break;
-				case '{' . SearchPlugin::NS_Nextcloud . '}filter':
+				case '{'.SearchPlugin::NS_Nextcloud.'}filter':
 					foreach ($elem['value'] as $subElem) {
-						if ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}comp-filter') {
+						if ($subElem['name'] === '{'.SearchPlugin::NS_Nextcloud.'}comp-filter') {
 							if (!isset($newProps['filters']['comps']) || !is_array($newProps['filters']['comps'])) {
 								$newProps['filters']['comps'] = [];
 							}
 							$newProps['filters']['comps'][] = $subElem['value'];
-						} elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}prop-filter') {
+						} elseif ($subElem['name'] === '{'.SearchPlugin::NS_Nextcloud.'}prop-filter') {
 							if (!isset($newProps['filters']['props']) || !is_array($newProps['filters']['props'])) {
 								$newProps['filters']['props'] = [];
 							}
 							$newProps['filters']['props'][] = $subElem['value'];
-						} elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}param-filter') {
+						} elseif ($subElem['name'] === '{'.SearchPlugin::NS_Nextcloud.'}param-filter') {
 							if (!isset($newProps['filters']['params']) || !is_array($newProps['filters']['params'])) {
 								$newProps['filters']['params'] = [];
 							}
 							$newProps['filters']['params'][] = $subElem['value'];
-						} elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}search-term') {
+						} elseif ($subElem['name'] === '{'.SearchPlugin::NS_Nextcloud.'}search-term') {
 							$newProps['filters']['search-term'] = $subElem['value'];
 						}
 					}
 					break;
-				case '{' . SearchPlugin::NS_Nextcloud . '}limit':
+				case '{'.SearchPlugin::NS_Nextcloud.'}limit':
 					$newProps['limit'] = $elem['value'];
 					break;
-				case '{' . SearchPlugin::NS_Nextcloud . '}offset':
+				case '{'.SearchPlugin::NS_Nextcloud.'}offset':
 					$newProps['offset'] = $elem['value'];
 					break;
 
@@ -140,21 +140,21 @@ 
 		}
 
 		if (empty($newProps['filters'])) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}filter element is required for this request');
+			throw new BadRequest('The {'.SearchPlugin::NS_Nextcloud.'}filter element is required for this request');
 		}
 
 		$propsOrParamsDefined = (!empty($newProps['filters']['props']) || !empty($newProps['filters']['params']));
 		$noCompsDefined = empty($newProps['filters']['comps']);
 		if ($propsOrParamsDefined && $noCompsDefined) {
-			throw new BadRequest('{' . SearchPlugin::NS_Nextcloud . '}prop-filter or {' . SearchPlugin::NS_Nextcloud . '}param-filter given without any {' . SearchPlugin::NS_Nextcloud . '}comp-filter');
+			throw new BadRequest('{'.SearchPlugin::NS_Nextcloud.'}prop-filter or {'.SearchPlugin::NS_Nextcloud.'}param-filter given without any {'.SearchPlugin::NS_Nextcloud.'}comp-filter');
 		}
 
 		if (!isset($newProps['filters']['search-term'])) {
-			throw new BadRequest('{' . SearchPlugin::NS_Nextcloud . '}search-term is required for this request');
+			throw new BadRequest('{'.SearchPlugin::NS_Nextcloud.'}search-term is required for this request');
 		}
 
 		if (empty($newProps['filters']['props']) && empty($newProps['filters']['params'])) {
-			throw new BadRequest('At least one{' . SearchPlugin::NS_Nextcloud . '}prop-filter or {' . SearchPlugin::NS_Nextcloud . '}param-filter is required for this request');
+			throw new BadRequest('At least one{'.SearchPlugin::NS_Nextcloud.'}prop-filter or {'.SearchPlugin::NS_Nextcloud.'}param-filter is required for this request');
 		}
 
 

settings/ajax/disableapp.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
 $lastConfirm = (int) \OC::$server->getSession()->get('last-password-confirm');
 if ($lastConfirm < (time() - 30 * 60 + 15)) { // allow 15 seconds delay
 	$l = \OC::$server->getL10N('core');
-	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Password confirmation is required'))));
+	OC_JSON::error(array('data' => array('message' => $l->t('Password confirmation is required'))));
 	exit();
 }
 
@@ -36,8 +36,8 @@ 
 	exit;
 }
 
-$appIds = (array)$_POST['appid'];
-foreach($appIds as $appId) {
+$appIds = (array) $_POST['appid'];
+foreach ($appIds as $appId) {
 	$appId = OC_App::cleanAppId($appId);
 	OC_App::disable($appId);
 }

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

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	 * {@inheritDoc}
 	 */
 	public function getName() {
-		return (string)$this->l10n->t('Groupware bundle');
+		return (string) $this->l10n->t('Groupware bundle');
 	}
 
 	/**

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

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	 * {@inheritDoc}
 	 */
 	public function getName() {
-		return (string)$this->l10n->t('Enterprise bundle');
+		return (string) $this->l10n->t('Enterprise bundle');
 	}
 
 	/**

lib/private/Repair/NC12/InstallCoreBundle.php

Spacing +2 added lines, -2 removed lines

@@ -66,12 +66,12 @@
 		}
 
 		$defaultBundle = $this->bundleFetcher->getDefaultInstallationBundle();
-		foreach($defaultBundle as $bundle) {
+		foreach ($defaultBundle as $bundle) {
 			try {
 				$this->installer->installAppBundle($bundle);
 				$output->info('Successfully installed core app bundle.');
 			} catch (\Exception $e) {
-				$output->warning('Could not install core app bundle: ' . $e->getMessage());
+				$output->warning('Could not install core app bundle: '.$e->getMessage());
 			}
 		}
 	}

settings/Controller/AppSettingsController.php

Spacing +46 added lines, -46 removed lines

@@ -131,13 +131,13 @@ 
 		$currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
 
 		$formattedCategories = [
-			['id' => self::CAT_ALL_INSTALLED, 'ident' => 'installed', 'displayName' => (string)$this->l10n->t('Your apps')],
-			['id' => self::CAT_ENABLED, 'ident' => 'enabled', 'displayName' => (string)$this->l10n->t('Enabled apps')],
-			['id' => self::CAT_DISABLED, 'ident' => 'disabled', 'displayName' => (string)$this->l10n->t('Disabled apps')],
-			['id' => self::CAT_APP_BUNDLES, 'ident' => 'app-bundles', 'displayName' => (string)$this->l10n->t('App bundles')],
+			['id' => self::CAT_ALL_INSTALLED, 'ident' => 'installed', 'displayName' => (string) $this->l10n->t('Your apps')],
+			['id' => self::CAT_ENABLED, 'ident' => 'enabled', 'displayName' => (string) $this->l10n->t('Enabled apps')],
+			['id' => self::CAT_DISABLED, 'ident' => 'disabled', 'displayName' => (string) $this->l10n->t('Disabled apps')],
+			['id' => self::CAT_APP_BUNDLES, 'ident' => 'app-bundles', 'displayName' => (string) $this->l10n->t('App bundles')],
 		];
 		$categories = $this->categoryFetcher->get();
-		foreach($categories as $category) {
+		foreach ($categories as $category) {
 			$formattedCategories[] = [
 				'id' => $category['id'],
 				'ident' => $category['id'],
@@ -167,46 +167,46 @@ 
 		$versionParser = new VersionParser();
 		$formattedApps = [];
 		$apps = $this->appFetcher->get();
-		foreach($apps as $app) {
+		foreach ($apps as $app) {
 			if (isset($app['isFeatured'])) {
 				$app['featured'] = $app['isFeatured'];
 			}
 
 			// Skip all apps not in the requested category
 			$isInCategory = false;
-			foreach($app['categories'] as $category) {
-				if($category === $requestedCategory) {
+			foreach ($app['categories'] as $category) {
+				if ($category === $requestedCategory) {
 					$isInCategory = true;
 				}
 			}
-			if(!$isInCategory) {
+			if (!$isInCategory) {
 				continue;
 			}
 
 			$nextCloudVersion = $versionParser->getVersion($app['releases'][0]['rawPlatformVersionSpec']);
 			$nextCloudVersionDependencies = [];
-			if($nextCloudVersion->getMinimumVersion() !== '') {
+			if ($nextCloudVersion->getMinimumVersion() !== '') {
 				$nextCloudVersionDependencies['nextcloud']['@attributes']['min-version'] = $nextCloudVersion->getMinimumVersion();
 			}
-			if($nextCloudVersion->getMaximumVersion() !== '') {
+			if ($nextCloudVersion->getMaximumVersion() !== '') {
 				$nextCloudVersionDependencies['nextcloud']['@attributes']['max-version'] = $nextCloudVersion->getMaximumVersion();
 			}
 			$phpVersion = $versionParser->getVersion($app['releases'][0]['rawPhpVersionSpec']);
 			$existsLocally = (\OC_App::getAppPath($app['id']) !== false) ? true : false;
 			$phpDependencies = [];
-			if($phpVersion->getMinimumVersion() !== '') {
+			if ($phpVersion->getMinimumVersion() !== '') {
 				$phpDependencies['php']['@attributes']['min-version'] = $phpVersion->getMinimumVersion();
 			}
-			if($phpVersion->getMaximumVersion() !== '') {
+			if ($phpVersion->getMaximumVersion() !== '') {
 				$phpDependencies['php']['@attributes']['max-version'] = $phpVersion->getMaximumVersion();
 			}
-			if(isset($app['releases'][0]['minIntSize'])) {
+			if (isset($app['releases'][0]['minIntSize'])) {
 				$phpDependencies['php']['@attributes']['min-int-size'] = $app['releases'][0]['minIntSize'];
 			}
 			$authors = '';
-			foreach($app['authors'] as $key => $author) {
+			foreach ($app['authors'] as $key => $author) {
 				$authors .= $author['name'];
-				if($key !== count($app['authors']) - 1) {
+				if ($key !== count($app['authors']) - 1) {
 					$authors .= ', ';
 				}
 			}
@@ -214,12 +214,12 @@ 
 			$currentLanguage = substr(\OC::$server->getL10NFactory()->findLanguage(), 0, 2);
 			$enabledValue = $this->config->getAppValue($app['id'], 'enabled', 'no');
 			$groups = null;
-			if($enabledValue !== 'no' && $enabledValue !== 'yes') {
+			if ($enabledValue !== 'no' && $enabledValue !== 'yes') {
 				$groups = $enabledValue;
 			}
 
 			$currentVersion = '';
-			if($this->appManager->isInstalled($app['id'])) {
+			if ($this->appManager->isInstalled($app['id'])) {
 				$currentVersion = \OC_App::getAppVersion($app['id']);
 			} else {
 				$currentLanguage = $app['releases'][0]['version'];
@@ -265,8 +265,8 @@ 
 
 			$appFetcher = \OC::$server->getAppFetcher();
 			$newVersion = \OC\Installer::isUpdateAvailable($app['id'], $appFetcher);
-			if($newVersion && $this->appManager->isInstalled($app['id'])) {
-				$formattedApps[count($formattedApps)-1]['update'] = $newVersion;
+			if ($newVersion && $this->appManager->isInstalled($app['id'])) {
+				$formattedApps[count($formattedApps) - 1]['update'] = $newVersion;
 			}
 		}
 
@@ -287,14 +287,14 @@ 
 			case 'installed':
 				$apps = $appClass->listAllApps();
 
-				foreach($apps as $key => $app) {
+				foreach ($apps as $key => $app) {
 					$newVersion = \OC\Installer::isUpdateAvailable($app['id'], $this->appFetcher);
 					$apps[$key]['update'] = $newVersion;
 				}
 
-				usort($apps, function ($a, $b) {
-					$a = (string)$a['name'];
-					$b = (string)$b['name'];
+				usort($apps, function($a, $b) {
+					$a = (string) $a['name'];
+					$b = (string) $b['name'];
 					if ($a === $b) {
 						return 0;
 					}
@@ -304,18 +304,18 @@ 
 			// enabled apps
 			case 'enabled':
 				$apps = $appClass->listAllApps();
-				$apps = array_filter($apps, function ($app) {
+				$apps = array_filter($apps, function($app) {
 					return $app['active'];
 				});
 
-				foreach($apps as $key => $app) {
+				foreach ($apps as $key => $app) {
 					$newVersion = \OC\Installer::isUpdateAvailable($app['id'], $this->appFetcher);
 					$apps[$key]['update'] = $newVersion;
 				}
 
-				usort($apps, function ($a, $b) {
-					$a = (string)$a['name'];
-					$b = (string)$b['name'];
+				usort($apps, function($a, $b) {
+					$a = (string) $a['name'];
+					$b = (string) $b['name'];
 					if ($a === $b) {
 						return 0;
 					}
@@ -325,11 +325,11 @@ 
 			// disabled  apps
 			case 'disabled':
 				$apps = $appClass->listAllApps();
-				$apps = array_filter($apps, function ($app) {
+				$apps = array_filter($apps, function($app) {
 					return !$app['active'];
 				});
 
-				$apps = array_map(function ($app) {
+				$apps = array_map(function($app) {
 					$newVersion = \OC\Installer::isUpdateAvailable($app['id'], $this->appFetcher);
 					if ($newVersion !== false) {
 						$app['update'] = $newVersion;
@@ -337,9 +337,9 @@ 
 					return $app;
 				}, $apps);
 
-				usort($apps, function ($a, $b) {
-					$a = (string)$a['name'];
-					$b = (string)$b['name'];
+				usort($apps, function($a, $b) {
+					$a = (string) $a['name'];
+					$b = (string) $b['name'];
 					if ($a === $b) {
 						return 0;
 					}
@@ -349,15 +349,15 @@ 
 			case 'app-bundles':
 				$bundles = $this->bundleFetcher->getBundles();
 				$apps = [];
-				foreach($bundles as $bundle) {
+				foreach ($bundles as $bundle) {
 					$newCategory = true;
 					$allApps = $appClass->listAllApps();
 					$categories = $this->getAllCategories();
-					foreach($categories as $singleCategory) {
+					foreach ($categories as $singleCategory) {
 						$newApps = $this->getAppsForCategory($singleCategory['id']);
-						foreach($allApps as $app) {
-							foreach($newApps as $key => $newApp) {
-								if($app['id'] === $newApp['id']) {
+						foreach ($allApps as $app) {
+							foreach ($newApps as $key => $newApp) {
+								if ($app['id'] === $newApp['id']) {
 									unset($newApps[$key]);
 								}
 							}
@@ -365,10 +365,10 @@ 
 						$allApps = array_merge($allApps, $newApps);
 					}
 
-					foreach($bundle->getAppIdentifiers() as $identifier) {
-						foreach($allApps as $app) {
-							if($app['id'] === $identifier) {
-								if($newCategory) {
+					foreach ($bundle->getAppIdentifiers() as $identifier) {
+						foreach ($allApps as $app) {
+							if ($app['id'] === $identifier) {
+								if ($newCategory) {
 									$app['newCategory'] = true;
 									$app['categoryName'] = $bundle->getName();
 								}
@@ -385,9 +385,9 @@ 
 				$apps = $this->getAppsForCategory($category);
 
 				// sort by score
-				usort($apps, function ($a, $b) {
-					$a = (int)$a['score'];
-					$b = (int)$b['score'];
+				usort($apps, function($a, $b) {
+					$a = (int) $a['score'];
+					$b = (int) $b['score'];
 					if ($a === $b) {
 						return 0;
 					}

lib/private/Accounts/AccountManager.php

Spacing +6 added lines, -6 removed lines

@@ -195,38 +195,38 @@
 		$emailVerified = isset($oldData[self::PROPERTY_EMAIL]['verified']) && $oldData[self::PROPERTY_EMAIL]['verified'] === self::VERIFIED;
 
 		// keep old verification status if we don't have a new one
-		if(!isset($newData[self::PROPERTY_TWITTER]['verified'])) {
+		if (!isset($newData[self::PROPERTY_TWITTER]['verified'])) {
 			// keep old verification status if value didn't changed and an old value exists
 			$keepOldStatus = $newData[self::PROPERTY_TWITTER]['value'] === $oldData[self::PROPERTY_TWITTER]['value'] && isset($oldData[self::PROPERTY_TWITTER]['verified']);
 			$newData[self::PROPERTY_TWITTER]['verified'] = $keepOldStatus ? $oldData[self::PROPERTY_TWITTER]['verified'] : self::NOT_VERIFIED;
 		}
 
-		if(!isset($newData[self::PROPERTY_WEBSITE]['verified'])) {
+		if (!isset($newData[self::PROPERTY_WEBSITE]['verified'])) {
 			// keep old verification status if value didn't changed and an old value exists
 			$keepOldStatus = $newData[self::PROPERTY_WEBSITE]['value'] === $oldData[self::PROPERTY_WEBSITE]['value'] && isset($oldData[self::PROPERTY_WEBSITE]['verified']);
 			$newData[self::PROPERTY_WEBSITE]['verified'] = $keepOldStatus ? $oldData[self::PROPERTY_WEBSITE]['verified'] : self::NOT_VERIFIED;
 		}
 
-		if(!isset($newData[self::PROPERTY_EMAIL]['verified'])) {
+		if (!isset($newData[self::PROPERTY_EMAIL]['verified'])) {
 			// keep old verification status if value didn't changed and an old value exists
 			$keepOldStatus = $newData[self::PROPERTY_EMAIL]['value'] === $oldData[self::PROPERTY_EMAIL]['value'] && isset($oldData[self::PROPERTY_EMAIL]['verified']);
 			$newData[self::PROPERTY_EMAIL]['verified'] = $keepOldStatus ? $oldData[self::PROPERTY_EMAIL]['verified'] : self::VERIFICATION_IN_PROGRESS;
 		}
 
 		// reset verification status if a value from a previously verified data was changed
-		if($twitterVerified &&
+		if ($twitterVerified &&
 			$oldData[self::PROPERTY_TWITTER]['value'] !== $newData[self::PROPERTY_TWITTER]['value']
 		) {
 			$newData[self::PROPERTY_TWITTER]['verified'] = self::NOT_VERIFIED;
 		}
 
-		if($websiteVerified &&
+		if ($websiteVerified &&
 			$oldData[self::PROPERTY_WEBSITE]['value'] !== $newData[self::PROPERTY_WEBSITE]['value']
 		) {
 			$newData[self::PROPERTY_WEBSITE]['verified'] = self::NOT_VERIFIED;
 		}
 
-		if($emailVerified &&
+		if ($emailVerified &&
 			$oldData[self::PROPERTY_EMAIL]['value'] !== $newData[self::PROPERTY_EMAIL]['value']
 		) {
 			$newData[self::PROPERTY_EMAIL]['verified'] = self::NOT_VERIFIED;

lib/private/DB/Connection.php

Spacing +12 added lines, -12 removed lines

@@ -58,7 +58,7 @@ 
 			return parent::connect();
 		} catch (DBALException $e) {
 			// throw a new exception to prevent leaking info from the stacktrace
-			throw new DBALException('Failed to connect to the database: ' . $e->getMessage(), $e->getCode());
+			throw new DBALException('Failed to connect to the database: '.$e->getMessage(), $e->getCode());
 		}
 	}
 
@@ -110,7 +110,7 @@ 
 		// 0 is the method where we use `getCallerBacktrace`
 		// 1 is the target method which uses the method we want to log
 		if (isset($traces[1])) {
-			return $traces[1]['file'] . ':' . $traces[1]['line'];
+			return $traces[1]['file'].':'.$traces[1]['line'];
 		}
 
 		return '';
@@ -156,7 +156,7 @@ 
 	 * @param int $offset
 	 * @return \Doctrine\DBAL\Driver\Statement The prepared statement.
 	 */
-	public function prepare( $statement, $limit=null, $offset=null ) {
+	public function prepare($statement, $limit = null, $offset = null) {
 		if ($limit === -1) {
 			$limit = null;
 		}
@@ -321,7 +321,7 @@ 
 			throw new \BadMethodCallException('Can not lock a new table until the previous lock is released.');
 		}
 
-		$tableName = $this->tablePrefix . $tableName;
+		$tableName = $this->tablePrefix.$tableName;
 		$this->lockedTable = $tableName;
 		$this->adapter->lockTable($tableName);
 	}
@@ -342,11 +342,11 @@ 
 	 * @return string
 	 */
 	public function getError() {
-		$msg = $this->errorCode() . ': ';
+		$msg = $this->errorCode().': ';
 		$errorInfo = $this->errorInfo();
 		if (is_array($errorInfo)) {
-			$msg .= 'SQLSTATE = '.$errorInfo[0] . ', ';
-			$msg .= 'Driver Code = '.$errorInfo[1] . ', ';
+			$msg .= 'SQLSTATE = '.$errorInfo[0].', ';
+			$msg .= 'Driver Code = '.$errorInfo[1].', ';
 			$msg .= 'Driver Message = '.$errorInfo[2];
 		}
 		return $msg;
@@ -358,9 +358,9 @@ 
 	 * @param string $table table name without the prefix
 	 */
 	public function dropTable($table) {
-		$table = $this->tablePrefix . trim($table);
+		$table = $this->tablePrefix.trim($table);
 		$schema = $this->getSchemaManager();
-		if($schema->tablesExist(array($table))) {
+		if ($schema->tablesExist(array($table))) {
 			$schema->dropTable($table);
 		}
 	}
@@ -371,8 +371,8 @@ 
 	 * @param string $table table name without the prefix
 	 * @return bool
 	 */
-	public function tableExists($table){
-		$table = $this->tablePrefix . trim($table);
+	public function tableExists($table) {
+		$table = $this->tablePrefix.trim($table);
 		$schema = $this->getSchemaManager();
 		return $schema->tablesExist(array($table));
 	}
@@ -383,7 +383,7 @@ 
 	 * @return string
 	 */
 	protected function replaceTablePrefix($statement) {
-		return str_replace( '*PREFIX*', $this->tablePrefix, $statement );
+		return str_replace('*PREFIX*', $this->tablePrefix, $statement);
 	}
 
 	/**