nextcloud / server

apps/user_ldap/lib/LDAP.php

Spacing +15 added lines, -15 removed lines

@@ -52,12 +52,12 @@ 
 	 * @return mixed
 	 */
 	public function connect($host, $port) {
-		if(strpos($host, '://') === false) {
-			$host = 'ldap://' . $host;
+		if (strpos($host, '://') === false) {
+			$host = 'ldap://'.$host;
 		}
-		if(strpos($host, ':', strpos($host, '://') + 1) === false) {
+		if (strpos($host, ':', strpos($host, '://') + 1) === false) {
 			//ldap_connect ignores port parameter when URLs are passed
-			$host .= ':' . $port;
+			$host .= ':'.$port;
 		}
 		return $this->invokeLDAPMethod('connect', $host);
 	}
@@ -267,13 +267,13 @@ 
 	 * @return bool
 	 */
 	protected function isResultFalse($result) {
-		if($result === false) {
+		if ($result === false) {
 			return true;
 		}
 
-		if($this->curFunc === 'ldap_search' && is_array($result)) {
+		if ($this->curFunc === 'ldap_search' && is_array($result)) {
 			foreach ($result as $singleResult) {
-				if($singleResult === false) {
+				if ($singleResult === false) {
 					return true;
 				}
 			}
@@ -287,8 +287,8 @@ 
 	 */
 	protected function invokeLDAPMethod() {
 		$arguments = func_get_args();
-		$func = 'ldap_' . array_shift($arguments);
-		if(function_exists($func)) {
+		$func = 'ldap_'.array_shift($arguments);
+		if (function_exists($func)) {
 			$this->preFunctionCall($func, $arguments);
 			$result = call_user_func_array($func, $arguments);
 			if ($this->isResultFalse($result)) {
@@ -318,12 +318,12 @@ 
 	 */
 	private function processLDAPError($resource) {
 		$errorCode = ldap_errno($resource);
-		if($errorCode === 0) {
+		if ($errorCode === 0) {
 			return;
 		}
-		$errorMsg  = ldap_error($resource);
+		$errorMsg = ldap_error($resource);
 
-		if($this->curFunc === 'ldap_get_entries'
+		if ($this->curFunc === 'ldap_get_entries'
 			&& $errorCode === -4) {
 		} else if ($errorCode === 32) {
 			//for now
@@ -339,7 +339,7 @@ 
 			throw new \Exception('LDAP Operations error', $errorCode);
 		} else if ($errorCode === 19) {
 			ldap_get_option($this->curArgs[0], LDAP_OPT_ERROR_STRING, $extended_error);
-			throw new ConstraintViolationException(!empty($extended_error)?$extended_error:$errorMsg, $errorCode);
+			throw new ConstraintViolationException(!empty($extended_error) ? $extended_error : $errorMsg, $errorCode);
 		} else {
 			\OC::$server->getLogger()->debug('LDAP error {message} ({code}) after calling {func}', [
 				'app' => 'user_ldap',
@@ -354,9 +354,9 @@ 
 	 * Called after an ldap method is run to act on LDAP error if necessary
 	 */
 	private function postFunctionCall() {
-		if($this->isResource($this->curArgs[0])) {
+		if ($this->isResource($this->curArgs[0])) {
 			$resource = $this->curArgs[0];
-		} else if(
+		} else if (
 			   $this->curFunc === 'ldap_search'
 			&& is_array($this->curArgs[0])
 			&& $this->isResource($this->curArgs[0][0])

apps/updatenotification/lib/Notification/Notifier.php

Spacing +2 added lines, -2 removed lines

@@ -106,7 +106,7 @@ 
 			$notification->setParsedSubject($l->t('Update to %1$s is available.', [$parameters['version']]));
 
 			if ($this->isAdmin()) {
-				$notification->setLink($this->url->linkToRouteAbsolute('settings.AdminSettings.index') . '#updater');
+				$notification->setLink($this->url->linkToRouteAbsolute('settings.AdminSettings.index').'#updater');
 			}
 		} else {
 			$appInfo = $this->getAppInfo($notification->getObjectType());
@@ -126,7 +126,7 @@ 
 				]);
 
 			if ($this->isAdmin()) {
-				$notification->setLink($this->url->linkToRouteAbsolute('settings.AppSettings.viewApps', ['category' => 'updates']) . '#app-' . $notification->getObjectType());
+				$notification->setLink($this->url->linkToRouteAbsolute('settings.AppSettings.viewApps', ['category' => 'updates']).'#app-'.$notification->getObjectType());
 			}
 		}
 

apps/dav/lib/CalDAV/BirthdayService.php

Spacing +10 added lines, -10 removed lines

@@ -120,7 +120,7 @@ 
 
 			$calendar = $this->ensureCalendarExists($principalUri);
 			foreach (['', '-death', '-anniversary'] as $tag) {
-				$objectUri = $book['uri'] . '-' . $cardUri . $tag .'.ics';
+				$objectUri = $book['uri'].'-'.$cardUri.$tag.'.ics';
 				$this->calDavBackEnd->deleteCalendarObject($calendar['id'], $objectUri);
 			}
 		}
@@ -175,7 +175,7 @@ 
 			return null;
 		}
 		$birthday = $doc->{$dateField};
-		if (!(string)$birthday) {
+		if (!(string) $birthday) {
 			return null;
 		}
 		// Skip if the BDAY property is not of the right type.
@@ -192,7 +192,7 @@ 
 
 		$unknownYear = false;
 		if (!$dateParts['year']) {
-			$birthday = '1900-' . $dateParts['month'] . '-' . $dateParts['date'];
+			$birthday = '1900-'.$dateParts['month'].'-'.$dateParts['date'];
 
 			$unknownYear = true;
 		}
@@ -203,10 +203,10 @@ 
 			return null;
 		}
 		if ($unknownYear) {
-			$summary = $doc->FN->getValue() . ' ' . $summarySymbol;
+			$summary = $doc->FN->getValue().' '.$summarySymbol;
 		} else {
-			$year = (int)$date->format('Y');
-			$summary = $doc->FN->getValue() . " ($summarySymbol$year)";
+			$year = (int) $date->format('Y');
+			$summary = $doc->FN->getValue()." ($summarySymbol$year)";
 		}
 		$vCal = new VCalendar();
 		$vCal->VERSION = '2.0';
@@ -222,7 +222,7 @@ 
 			$date
 		);
 		$vEvent->DTEND['VALUE'] = 'DATE';
-		$vEvent->{'UID'} = $doc->UID . $postfix;
+		$vEvent->{'UID'} = $doc->UID.$postfix;
 		$vEvent->{'RRULE'} = 'FREQ=YEARLY';
 		$vEvent->{'SUMMARY'} = $summary;
 		$vEvent->{'TRANSP'} = 'TRANSPARENT';
@@ -242,9 +242,9 @@ 
 		$principal = 'principals/users/'.$user;
 		$this->ensureCalendarExists($principal);
 		$books = $this->cardDavBackEnd->getAddressBooksForUser($principal);
-		foreach($books as $book) {
+		foreach ($books as $book) {
 			$cards = $this->cardDavBackEnd->getCards($book['id']);
-			foreach($cards as $card) {
+			foreach ($cards as $card) {
 				$this->onCardChanged($book['id'], $card['uri'], $card['carddata']);
 			}
 		}
@@ -297,7 +297,7 @@ 
 	 * @param string[] $type
 	 */
 	private function updateCalendar($cardUri, $cardData, $book, $calendarId, $type) {
-		$objectUri = $book['uri'] . '-' . $cardUri . $type['postfix'] . '.ics';
+		$objectUri = $book['uri'].'-'.$cardUri.$type['postfix'].'.ics';
 		$calendarData = $this->buildDateFromContact($cardData, $type['field'], $type['postfix'], $type['symbol']);
 		$existing = $this->calDavBackEnd->getCalendarObject($calendarId, $objectUri);
 		if (is_null($calendarData)) {

apps/user_ldap/composer/composer/autoload_classmap.php

Spacing +58 added lines, -58 removed lines

@@ -6,62 +6,62 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\User_LDAP\\Access' => $baseDir . '/../lib/Access.php',
-    'OCA\\User_LDAP\\AccessFactory' => $baseDir . '/../lib/AccessFactory.php',
-    'OCA\\User_LDAP\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\User_LDAP\\BackendUtility' => $baseDir . '/../lib/BackendUtility.php',
-    'OCA\\User_LDAP\\Command\\CheckUser' => $baseDir . '/../lib/Command/CheckUser.php',
-    'OCA\\User_LDAP\\Command\\CreateEmptyConfig' => $baseDir . '/../lib/Command/CreateEmptyConfig.php',
-    'OCA\\User_LDAP\\Command\\DeleteConfig' => $baseDir . '/../lib/Command/DeleteConfig.php',
-    'OCA\\User_LDAP\\Command\\Search' => $baseDir . '/../lib/Command/Search.php',
-    'OCA\\User_LDAP\\Command\\SetConfig' => $baseDir . '/../lib/Command/SetConfig.php',
-    'OCA\\User_LDAP\\Command\\ShowConfig' => $baseDir . '/../lib/Command/ShowConfig.php',
-    'OCA\\User_LDAP\\Command\\ShowRemnants' => $baseDir . '/../lib/Command/ShowRemnants.php',
-    'OCA\\User_LDAP\\Command\\TestConfig' => $baseDir . '/../lib/Command/TestConfig.php',
-    'OCA\\User_LDAP\\Configuration' => $baseDir . '/../lib/Configuration.php',
-    'OCA\\User_LDAP\\Connection' => $baseDir . '/../lib/Connection.php',
-    'OCA\\User_LDAP\\ConnectionFactory' => $baseDir . '/../lib/ConnectionFactory.php',
-    'OCA\\User_LDAP\\Controller\\ConfigAPIController' => $baseDir . '/../lib/Controller/ConfigAPIController.php',
-    'OCA\\User_LDAP\\Controller\\RenewPasswordController' => $baseDir . '/../lib/Controller/RenewPasswordController.php',
-    'OCA\\User_LDAP\\Exceptions\\ConstraintViolationException' => $baseDir . '/../lib/Exceptions/ConstraintViolationException.php',
-    'OCA\\User_LDAP\\Exceptions\\NotOnLDAP' => $baseDir . '/../lib/Exceptions/NotOnLDAP.php',
-    'OCA\\User_LDAP\\FilesystemHelper' => $baseDir . '/../lib/FilesystemHelper.php',
-    'OCA\\User_LDAP\\GroupPluginManager' => $baseDir . '/../lib/GroupPluginManager.php',
-    'OCA\\User_LDAP\\Group_LDAP' => $baseDir . '/../lib/Group_LDAP.php',
-    'OCA\\User_LDAP\\Group_Proxy' => $baseDir . '/../lib/Group_Proxy.php',
-    'OCA\\User_LDAP\\Helper' => $baseDir . '/../lib/Helper.php',
-    'OCA\\User_LDAP\\IGroupLDAP' => $baseDir . '/../lib/IGroupLDAP.php',
-    'OCA\\User_LDAP\\ILDAPGroupPlugin' => $baseDir . '/../lib/ILDAPGroupPlugin.php',
-    'OCA\\User_LDAP\\ILDAPUserPlugin' => $baseDir . '/../lib/ILDAPUserPlugin.php',
-    'OCA\\User_LDAP\\ILDAPWrapper' => $baseDir . '/../lib/ILDAPWrapper.php',
-    'OCA\\User_LDAP\\IUserLDAP' => $baseDir . '/../lib/IUserLDAP.php',
-    'OCA\\User_LDAP\\Jobs\\CleanUp' => $baseDir . '/../lib/Jobs/CleanUp.php',
-    'OCA\\User_LDAP\\Jobs\\Sync' => $baseDir . '/../lib/Jobs/Sync.php',
-    'OCA\\User_LDAP\\Jobs\\UpdateGroups' => $baseDir . '/../lib/Jobs/UpdateGroups.php',
-    'OCA\\User_LDAP\\LDAP' => $baseDir . '/../lib/LDAP.php',
-    'OCA\\User_LDAP\\LDAPProvider' => $baseDir . '/../lib/LDAPProvider.php',
-    'OCA\\User_LDAP\\LDAPProviderFactory' => $baseDir . '/../lib/LDAPProviderFactory.php',
-    'OCA\\User_LDAP\\LDAPUtility' => $baseDir . '/../lib/LDAPUtility.php',
-    'OCA\\User_LDAP\\LogWrapper' => $baseDir . '/../lib/LogWrapper.php',
-    'OCA\\User_LDAP\\Mapping\\AbstractMapping' => $baseDir . '/../lib/Mapping/AbstractMapping.php',
-    'OCA\\User_LDAP\\Mapping\\GroupMapping' => $baseDir . '/../lib/Mapping/GroupMapping.php',
-    'OCA\\User_LDAP\\Mapping\\UserMapping' => $baseDir . '/../lib/Mapping/UserMapping.php',
-    'OCA\\User_LDAP\\Migration\\UUIDFix' => $baseDir . '/../lib/Migration/UUIDFix.php',
-    'OCA\\User_LDAP\\Migration\\UUIDFixGroup' => $baseDir . '/../lib/Migration/UUIDFixGroup.php',
-    'OCA\\User_LDAP\\Migration\\UUIDFixInsert' => $baseDir . '/../lib/Migration/UUIDFixInsert.php',
-    'OCA\\User_LDAP\\Migration\\UUIDFixUser' => $baseDir . '/../lib/Migration/UUIDFixUser.php',
-    'OCA\\User_LDAP\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php',
-    'OCA\\User_LDAP\\Proxy' => $baseDir . '/../lib/Proxy.php',
-    'OCA\\User_LDAP\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
-    'OCA\\User_LDAP\\Settings\\Section' => $baseDir . '/../lib/Settings/Section.php',
-    'OCA\\User_LDAP\\UserPluginManager' => $baseDir . '/../lib/UserPluginManager.php',
-    'OCA\\User_LDAP\\User\\DeletedUsersIndex' => $baseDir . '/../lib/User/DeletedUsersIndex.php',
-    'OCA\\User_LDAP\\User\\IUserTools' => $baseDir . '/../lib/User/IUserTools.php',
-    'OCA\\User_LDAP\\User\\Manager' => $baseDir . '/../lib/User/Manager.php',
-    'OCA\\User_LDAP\\User\\OfflineUser' => $baseDir . '/../lib/User/OfflineUser.php',
-    'OCA\\User_LDAP\\User\\User' => $baseDir . '/../lib/User/User.php',
-    'OCA\\User_LDAP\\User_LDAP' => $baseDir . '/../lib/User_LDAP.php',
-    'OCA\\User_LDAP\\User_Proxy' => $baseDir . '/../lib/User_Proxy.php',
-    'OCA\\User_LDAP\\Wizard' => $baseDir . '/../lib/Wizard.php',
-    'OCA\\User_LDAP\\WizardResult' => $baseDir . '/../lib/WizardResult.php',
+    'OCA\\User_LDAP\\Access' => $baseDir.'/../lib/Access.php',
+    'OCA\\User_LDAP\\AccessFactory' => $baseDir.'/../lib/AccessFactory.php',
+    'OCA\\User_LDAP\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\User_LDAP\\BackendUtility' => $baseDir.'/../lib/BackendUtility.php',
+    'OCA\\User_LDAP\\Command\\CheckUser' => $baseDir.'/../lib/Command/CheckUser.php',
+    'OCA\\User_LDAP\\Command\\CreateEmptyConfig' => $baseDir.'/../lib/Command/CreateEmptyConfig.php',
+    'OCA\\User_LDAP\\Command\\DeleteConfig' => $baseDir.'/../lib/Command/DeleteConfig.php',
+    'OCA\\User_LDAP\\Command\\Search' => $baseDir.'/../lib/Command/Search.php',
+    'OCA\\User_LDAP\\Command\\SetConfig' => $baseDir.'/../lib/Command/SetConfig.php',
+    'OCA\\User_LDAP\\Command\\ShowConfig' => $baseDir.'/../lib/Command/ShowConfig.php',
+    'OCA\\User_LDAP\\Command\\ShowRemnants' => $baseDir.'/../lib/Command/ShowRemnants.php',
+    'OCA\\User_LDAP\\Command\\TestConfig' => $baseDir.'/../lib/Command/TestConfig.php',
+    'OCA\\User_LDAP\\Configuration' => $baseDir.'/../lib/Configuration.php',
+    'OCA\\User_LDAP\\Connection' => $baseDir.'/../lib/Connection.php',
+    'OCA\\User_LDAP\\ConnectionFactory' => $baseDir.'/../lib/ConnectionFactory.php',
+    'OCA\\User_LDAP\\Controller\\ConfigAPIController' => $baseDir.'/../lib/Controller/ConfigAPIController.php',
+    'OCA\\User_LDAP\\Controller\\RenewPasswordController' => $baseDir.'/../lib/Controller/RenewPasswordController.php',
+    'OCA\\User_LDAP\\Exceptions\\ConstraintViolationException' => $baseDir.'/../lib/Exceptions/ConstraintViolationException.php',
+    'OCA\\User_LDAP\\Exceptions\\NotOnLDAP' => $baseDir.'/../lib/Exceptions/NotOnLDAP.php',
+    'OCA\\User_LDAP\\FilesystemHelper' => $baseDir.'/../lib/FilesystemHelper.php',
+    'OCA\\User_LDAP\\GroupPluginManager' => $baseDir.'/../lib/GroupPluginManager.php',
+    'OCA\\User_LDAP\\Group_LDAP' => $baseDir.'/../lib/Group_LDAP.php',
+    'OCA\\User_LDAP\\Group_Proxy' => $baseDir.'/../lib/Group_Proxy.php',
+    'OCA\\User_LDAP\\Helper' => $baseDir.'/../lib/Helper.php',
+    'OCA\\User_LDAP\\IGroupLDAP' => $baseDir.'/../lib/IGroupLDAP.php',
+    'OCA\\User_LDAP\\ILDAPGroupPlugin' => $baseDir.'/../lib/ILDAPGroupPlugin.php',
+    'OCA\\User_LDAP\\ILDAPUserPlugin' => $baseDir.'/../lib/ILDAPUserPlugin.php',
+    'OCA\\User_LDAP\\ILDAPWrapper' => $baseDir.'/../lib/ILDAPWrapper.php',
+    'OCA\\User_LDAP\\IUserLDAP' => $baseDir.'/../lib/IUserLDAP.php',
+    'OCA\\User_LDAP\\Jobs\\CleanUp' => $baseDir.'/../lib/Jobs/CleanUp.php',
+    'OCA\\User_LDAP\\Jobs\\Sync' => $baseDir.'/../lib/Jobs/Sync.php',
+    'OCA\\User_LDAP\\Jobs\\UpdateGroups' => $baseDir.'/../lib/Jobs/UpdateGroups.php',
+    'OCA\\User_LDAP\\LDAP' => $baseDir.'/../lib/LDAP.php',
+    'OCA\\User_LDAP\\LDAPProvider' => $baseDir.'/../lib/LDAPProvider.php',
+    'OCA\\User_LDAP\\LDAPProviderFactory' => $baseDir.'/../lib/LDAPProviderFactory.php',
+    'OCA\\User_LDAP\\LDAPUtility' => $baseDir.'/../lib/LDAPUtility.php',
+    'OCA\\User_LDAP\\LogWrapper' => $baseDir.'/../lib/LogWrapper.php',
+    'OCA\\User_LDAP\\Mapping\\AbstractMapping' => $baseDir.'/../lib/Mapping/AbstractMapping.php',
+    'OCA\\User_LDAP\\Mapping\\GroupMapping' => $baseDir.'/../lib/Mapping/GroupMapping.php',
+    'OCA\\User_LDAP\\Mapping\\UserMapping' => $baseDir.'/../lib/Mapping/UserMapping.php',
+    'OCA\\User_LDAP\\Migration\\UUIDFix' => $baseDir.'/../lib/Migration/UUIDFix.php',
+    'OCA\\User_LDAP\\Migration\\UUIDFixGroup' => $baseDir.'/../lib/Migration/UUIDFixGroup.php',
+    'OCA\\User_LDAP\\Migration\\UUIDFixInsert' => $baseDir.'/../lib/Migration/UUIDFixInsert.php',
+    'OCA\\User_LDAP\\Migration\\UUIDFixUser' => $baseDir.'/../lib/Migration/UUIDFixUser.php',
+    'OCA\\User_LDAP\\Notification\\Notifier' => $baseDir.'/../lib/Notification/Notifier.php',
+    'OCA\\User_LDAP\\Proxy' => $baseDir.'/../lib/Proxy.php',
+    'OCA\\User_LDAP\\Settings\\Admin' => $baseDir.'/../lib/Settings/Admin.php',
+    'OCA\\User_LDAP\\Settings\\Section' => $baseDir.'/../lib/Settings/Section.php',
+    'OCA\\User_LDAP\\UserPluginManager' => $baseDir.'/../lib/UserPluginManager.php',
+    'OCA\\User_LDAP\\User\\DeletedUsersIndex' => $baseDir.'/../lib/User/DeletedUsersIndex.php',
+    'OCA\\User_LDAP\\User\\IUserTools' => $baseDir.'/../lib/User/IUserTools.php',
+    'OCA\\User_LDAP\\User\\Manager' => $baseDir.'/../lib/User/Manager.php',
+    'OCA\\User_LDAP\\User\\OfflineUser' => $baseDir.'/../lib/User/OfflineUser.php',
+    'OCA\\User_LDAP\\User\\User' => $baseDir.'/../lib/User/User.php',
+    'OCA\\User_LDAP\\User_LDAP' => $baseDir.'/../lib/User_LDAP.php',
+    'OCA\\User_LDAP\\User_Proxy' => $baseDir.'/../lib/User_Proxy.php',
+    'OCA\\User_LDAP\\Wizard' => $baseDir.'/../lib/Wizard.php',
+    'OCA\\User_LDAP\\WizardResult' => $baseDir.'/../lib/WizardResult.php',
 );

ocs/v1.php

Spacing +5 added lines, -5 removed lines

@@ -29,8 +29,8 @@ 
  *
  */
 
-require_once __DIR__ . '/../lib/versioncheck.php';
-require_once __DIR__ . '/../lib/base.php';
+require_once __DIR__.'/../lib/versioncheck.php';
+require_once __DIR__.'/../lib/base.php';
 
 if (\OCP\Util::needUpgrade()
 	|| \OC::$server->getSystemConfig()->getValue('maintenance', false)) {
@@ -72,7 +72,7 @@ 
  * Try the appframework routes
  */
 try {
-	if(!\OC::$server->getUserSession()->isLoggedIn()) {
+	if (!\OC::$server->getUserSession()->isLoggedIn()) {
 		OC::handleLogin(\OC::$server->getRequest());
 	}
 	OC::$server->getRouter()->match('/ocsapp'.\OC::$server->getRequest()->getRawPathInfo());
@@ -80,7 +80,7 @@ 
 	OC_API::setContentType();
 
 	$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.'."\n";
 	OC_API::respond(new \OC\OCS\Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
 } catch (MethodNotAllowedException $e) {
@@ -95,7 +95,7 @@ 
 	OC_API::setContentType();
 
 	$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.'."\n";
 	OC_API::respond(new \OC\OCS\Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
 }

apps/files/lib/Service/TagService.php

Spacing +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
 		}
 
 		$eventName = $addToFavorite ? 'addFavorite' : 'removeFavorite';
-		$this->dispatcher->dispatch(self::class . '::' . $eventName, new GenericEvent(null, [
+		$this->dispatcher->dispatch(self::class.'::'.$eventName, new GenericEvent(null, [
 			'userId' => $user->getUID(),
 			'fileId' => $fileId,
 			'path' => $path,

apps/theming/lib/Capabilities.php

Spacing +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
 				'color-element' => $this->util->elementColor($color),
 				'logo' => $this->url->getAbsoluteURL($this->theming->getLogo()),
 				'background' => $backgroundLogo === 'backgroundColor' ?
-					$this->theming->getColorPrimary() :
-					$this->url->getAbsoluteURL($this->theming->getBackground()),
+					$this->theming->getColorPrimary() : $this->url->getAbsoluteURL($this->theming->getBackground()),
 				'background-plain' => $backgroundLogo === 'backgroundColor',
 				'background-default' => !$this->util->isBackgroundThemed(),
 			],

apps/theming/lib/Util.php

Spacing +16 added lines, -16 removed lines

@@ -64,7 +64,7 @@ 
 	 */
 	public function invertTextColor($color) {
 		$l = $this->calculateLuma($color);
-		if($l>0.6) {
+		if ($l > 0.6) {
 			return true;
 		} else {
 			return false;
@@ -79,7 +79,7 @@ 
 	 */
 	public function elementColor($color) {
 		$l = $this->calculateLuminance($color);
-		if($l>0.8) {
+		if ($l > 0.8) {
 			return '#555555';
 		}
 		return $color;
@@ -93,7 +93,7 @@ 
 		list($red, $green, $blue) = $this->hexToRGB($color);
 		$compiler = new Compiler();
 		$hsl = $compiler->toHSL($red, $green, $blue);
-		return $hsl[3]/100;
+		return $hsl[3] / 100;
 	}
 
 	/**
@@ -102,7 +102,7 @@ 
 	 */
 	public function calculateLuma($color) {
 		list($red, $green, $blue) = $this->hexToRGB($color);
-		return (0.2126 * $red  + 0.7152 * $green + 0.0722 * $blue) / 255;
+		return (0.2126 * $red + 0.7152 * $green + 0.0722 * $blue) / 255;
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 	public function hexToRGB($color) {
 		$hex = preg_replace("/[^0-9A-Fa-f]/", '', $color);
 		if (strlen($hex) === 3) {
-			$hex = $hex{0} . $hex{0} . $hex{1} . $hex{1} . $hex{2} . $hex{2};
+			$hex = $hex{0}.$hex{0}.$hex{1}.$hex{1}.$hex{2}.$hex{2};
 		}
 		if (strlen($hex) !== 6) {
 			return 0;
@@ -129,7 +129,7 @@ 
 	 * @return string base64 encoded radio button svg
 	 */
 	public function generateRadioButton($color) {
-		$radioButtonIcon = '<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">' .
+		$radioButtonIcon = '<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">'.
 			'<path d="M8 1a7 7 0 0 0-7 7 7 7 0 0 0 7 7 7 7 0 0 0 7-7 7 7 0 0 0-7-7zm0 1a6 6 0 0 1 6 6 6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6zm0 2a4 4 0 1 0 0 8 4 4 0 0 0 0-8z" fill="'.$color.'"/></svg>';
 		return base64_encode($radioButtonIcon);
 	}
@@ -143,11 +143,11 @@ 
 		$app = str_replace(array('\0', '/', '\\', '..'), '', $app);
 		try {
 			$appPath = $this->appManager->getAppPath($app);
-			$icon = $appPath . '/img/' . $app . '.svg';
+			$icon = $appPath.'/img/'.$app.'.svg';
 			if (file_exists($icon)) {
 				return $icon;
 			}
-			$icon = $appPath . '/img/app.svg';
+			$icon = $appPath.'/img/app.svg';
 			if (file_exists($icon)) {
 				return $icon;
 			}
@@ -162,7 +162,7 @@ 
 				}
 			} catch (NotFoundException $e) {}
 		}
-		return \OC::$SERVERROOT . '/core/img/logo.svg';
+		return \OC::$SERVERROOT.'/core/img/logo.svg';
 	}
 
 	/**
@@ -174,7 +174,7 @@ 
 		$app = str_replace(array('\0', '/', '\\', '..'), '', $app);
 		$image = str_replace(array('\0', '\\', '..'), '', $image);
 		if ($app === "core") {
-			$icon = \OC::$SERVERROOT . '/core/img/' . $image;
+			$icon = \OC::$SERVERROOT.'/core/img/'.$image;
 			if (file_exists($icon)) {
 				return $icon;
 			}
@@ -186,23 +186,23 @@ 
 			return false;
 		}
 
-		$icon = $appPath . '/img/' . $image;
+		$icon = $appPath.'/img/'.$image;
 		if (file_exists($icon)) {
 			return $icon;
 		}
-		$icon = $appPath . '/img/' . $image . '.svg';
+		$icon = $appPath.'/img/'.$image.'.svg';
 		if (file_exists($icon)) {
 			return $icon;
 		}
-		$icon = $appPath . '/img/' . $image . '.png';
+		$icon = $appPath.'/img/'.$image.'.png';
 		if (file_exists($icon)) {
 			return $icon;
 		}
-		$icon = $appPath . '/img/' . $image . '.gif';
+		$icon = $appPath.'/img/'.$image.'.gif';
 		if (file_exists($icon)) {
 			return $icon;
 		}
-		$icon = $appPath . '/img/' . $image . '.jpg';
+		$icon = $appPath.'/img/'.$image.'.jpg';
 		if (file_exists($icon)) {
 			return $icon;
 		}
@@ -236,7 +236,7 @@ 
 	}
 
 	public function isBackgroundThemed() {
-		$backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime',false);
+		$backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime', false);
 
 		$backgroundExists = true;
 		try {

apps/user_ldap/lib/Jobs/Sync.php

Spacing +30 added lines, -30 removed lines

@@ -112,7 +112,7 @@ 
 			$pagingSize = $this->config->getAppValue('user_ldap', $configKey, $minPagingSize);
 			$minPagingSize = $minPagingSize === null ? $pagingSize : min($minPagingSize, $pagingSize);
 		}
-		return (int)$minPagingSize;
+		return (int) $minPagingSize;
 	}
 
 	/**
@@ -123,20 +123,20 @@ 
 
 		$isBackgroundJobModeAjax = $this->config
 				->getAppValue('core', 'backgroundjobs_mode', 'ajax') === 'ajax';
-		if($isBackgroundJobModeAjax) {
+		if ($isBackgroundJobModeAjax) {
 			return;
 		}
 
 		$cycleData = $this->getCycle();
-		if($cycleData === null) {
+		if ($cycleData === null) {
 			$cycleData = $this->determineNextCycle();
-			if($cycleData === null) {
+			if ($cycleData === null) {
 				$this->updateInterval();
 				return;
 			}
 		}
 
-		if(!$this->qualifiesToRun($cycleData)) {
+		if (!$this->qualifiesToRun($cycleData)) {
 			$this->updateInterval();
 			return;
 		}
@@ -165,7 +165,7 @@ 
 
 		$filter = $access->combineFilterWithAnd(array(
 			$access->connection->ldapUserFilter,
-			$access->connection->ldapUserDisplayName . '=*',
+			$access->connection->ldapUserDisplayName.'=*',
 			$access->getFilterPartForUserSearch('')
 		));
 		$results = $access->fetchListOfUsers(
@@ -176,10 +176,10 @@ 
 			true
 		);
 
-		if((int)$connection->ldapPagingSize === 0) {
+		if ((int) $connection->ldapPagingSize === 0) {
 			return false;
 		}
-		return count($results) >= (int)$connection->ldapPagingSize;
+		return count($results) >= (int) $connection->ldapPagingSize;
 	}
 
 	/**
@@ -190,16 +190,16 @@ 
 	 */
 	public function getCycle() {
 		$prefixes = $this->ldapHelper->getServerConfigurationPrefixes(true);
-		if(count($prefixes) === 0) {
+		if (count($prefixes) === 0) {
 			return null;
 		}
 
 		$cycleData = [
 			'prefix' => $this->config->getAppValue('user_ldap', 'background_sync_prefix', null),
-			'offset' => (int)$this->config->getAppValue('user_ldap', 'background_sync_offset', 0),
+			'offset' => (int) $this->config->getAppValue('user_ldap', 'background_sync_offset', 0),
 		];
 
-		if(
+		if (
 			$cycleData['prefix'] !== null
 			&& in_array($cycleData['prefix'], $prefixes)
 		) {
@@ -228,14 +228,14 @@ 
 	 */
 	public function determineNextCycle(array $cycleData = null) {
 		$prefixes = $this->ldapHelper->getServerConfigurationPrefixes(true);
-		if(count($prefixes) === 0) {
+		if (count($prefixes) === 0) {
 			return null;
 		}
 
 		// get the next prefix in line and remember it
 		$oldPrefix = $cycleData === null ? null : $cycleData['prefix'];
 		$prefix = $this->getNextPrefix($oldPrefix);
-		if($prefix === null) {
+		if ($prefix === null) {
 			return null;
 		}
 		$cycleData['prefix'] = $prefix;
@@ -253,8 +253,8 @@ 
 	 * @return bool
 	 */
 	public function qualifiesToRun($cycleData) {
-		$lastChange = $this->config->getAppValue('user_ldap', $cycleData['prefix'] . '_lastChange', 0);
-		if((time() - $lastChange) > 60 * 30) {
+		$lastChange = $this->config->getAppValue('user_ldap', $cycleData['prefix'].'_lastChange', 0);
+		if ((time() - $lastChange) > 60 * 30) {
 			return true;
 		}
 		return false;
@@ -267,7 +267,7 @@ 
 	 */
 	protected function increaseOffset($cycleData) {
 		$ldapConfig = new Configuration($cycleData['prefix']);
-		$cycleData['offset'] += (int)$ldapConfig->ldapPagingSize;
+		$cycleData['offset'] += (int) $ldapConfig->ldapPagingSize;
 		$this->setCycle($cycleData);
 	}
 
@@ -280,17 +280,17 @@ 
 	protected function getNextPrefix($lastPrefix) {
 		$prefixes = $this->ldapHelper->getServerConfigurationPrefixes(true);
 		$noOfPrefixes = count($prefixes);
-		if($noOfPrefixes === 0) {
+		if ($noOfPrefixes === 0) {
 			return null;
 		}
 		$i = $lastPrefix === null ? false : array_search($lastPrefix, $prefixes, true);
-		if($i === false) {
+		if ($i === false) {
 			$i = -1;
 		} else {
 			$i++;
 		}
 
-		if(!isset($prefixes[$i])) {
+		if (!isset($prefixes[$i])) {
 			$i = 0;
 		}
 		return $prefixes[$i];
@@ -302,49 +302,49 @@ 
 	 * @param array $argument
 	 */
 	public function setArgument($argument) {
-		if(isset($argument['config'])) {
+		if (isset($argument['config'])) {
 			$this->config = $argument['config'];
 		} else {
 			$this->config = \OC::$server->getConfig();
 		}
 
-		if(isset($argument['helper'])) {
+		if (isset($argument['helper'])) {
 			$this->ldapHelper = $argument['helper'];
 		} else {
 			$this->ldapHelper = new Helper($this->config);
 		}
 
-		if(isset($argument['ldapWrapper'])) {
+		if (isset($argument['ldapWrapper'])) {
 			$this->ldap = $argument['ldapWrapper'];
 		} else {
 			$this->ldap = new LDAP();
 		}
 
-		if(isset($argument['avatarManager'])) {
+		if (isset($argument['avatarManager'])) {
 			$this->avatarManager = $argument['avatarManager'];
 		} else {
 			$this->avatarManager = \OC::$server->getAvatarManager();
 		}
 
-		if(isset($argument['dbc'])) {
+		if (isset($argument['dbc'])) {
 			$this->dbc = $argument['dbc'];
 		} else {
 			$this->dbc = \OC::$server->getDatabaseConnection();
 		}
 
-		if(isset($argument['ncUserManager'])) {
+		if (isset($argument['ncUserManager'])) {
 			$this->ncUserManager = $argument['ncUserManager'];
 		} else {
 			$this->ncUserManager = \OC::$server->getUserManager();
 		}
 
-		if(isset($argument['notificationManager'])) {
+		if (isset($argument['notificationManager'])) {
 			$this->notificationManager = $argument['notificationManager'];
 		} else {
 			$this->notificationManager = \OC::$server->getNotificationManager();
 		}
 
-		if(isset($argument['userManager'])) {
+		if (isset($argument['userManager'])) {
 			$this->userManager = $argument['userManager'];
 		} else {
 			$this->userManager = new Manager(
@@ -359,19 +359,19 @@ 
 			);
 		}
 
-		if(isset($argument['mapper'])) {
+		if (isset($argument['mapper'])) {
 			$this->mapper = $argument['mapper'];
 		} else {
 			$this->mapper = new UserMapping($this->dbc);
 		}
 		
-		if(isset($argument['connectionFactory'])) {
+		if (isset($argument['connectionFactory'])) {
 			$this->connectionFactory = $argument['connectionFactory'];
 		} else {
 			$this->connectionFactory = new ConnectionFactory($this->ldap);
 		}
 
-		if(isset($argument['accessFactory'])) {
+		if (isset($argument['accessFactory'])) {
 			$this->accessFactory = $argument['accessFactory'];
 		} else {
 			$this->accessFactory = new AccessFactory(