Inspection of "Merge pull request #10967 from nextcloud/ziprespon..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 126a82...e45248 )

by Morris

created 2018-10-02 21:34 UTC

Status

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -65,7 +65,7 @@
 block discarded – undo
 		$username_as_share = ($storage->getBackendOption('username_as_share') === true);
 
 		if ($username_as_share) {
-			$share = '/' . $storage->getBackendOption('user');
+			$share = '/'.$storage->getBackendOption('user');
 			$storage->setBackendOption('share', $share);
 		}
 	}

Please login to merge, or discard this patch.

apps/files_external/lib/Lib/Auth/Password/UserProvided.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -61,7 +61,7 @@
 block discarded – undo
 	}
 
 	private function getCredentialsIdentifier($storageId) {
-		return self::CREDENTIALS_IDENTIFIER_PREFIX . $storageId;
+		return self::CREDENTIALS_IDENTIFIER_PREFIX.$storageId;
 	}
 
 	public function saveBackendOptions(IUser $user, $id, array $options) {

Please login to merge, or discard this patch.

apps/files_external/lib/Controller/StoragesController.php 1 patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -127,7 +127,7 @@  discard block
 block discarded – undo
 			$this->logger->logException($e);
 			return new DataResponse(
 				[
-					'message' => (string)$this->l10n->t('Invalid backend or authentication mechanism class')
+					'message' => (string) $this->l10n->t('Invalid backend or authentication mechanism class')
 				],
 				Http::STATUS_UNPROCESSABLE_ENTITY
 			);
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
 		if ($mountPoint === '') {
 			return new DataResponse(
 				array(
-					'message' => (string)$this->l10n->t('Invalid mount point')
+					'message' => (string) $this->l10n->t('Invalid mount point')
 				),
 				Http::STATUS_UNPROCESSABLE_ENTITY
 			);
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
 			// objectstore must not be sent from client side
 			return new DataResponse(
 				array(
-					'message' => (string)$this->l10n->t('Objectstore forbidden')
+					'message' => (string) $this->l10n->t('Objectstore forbidden')
 				),
 				Http::STATUS_UNPROCESSABLE_ENTITY
 			);
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
 			// invalid backend
 			return new DataResponse(
 				array(
-					'message' => (string)$this->l10n->t('Invalid storage backend "%s"', [
+					'message' => (string) $this->l10n->t('Invalid storage backend "%s"', [
 						$backend->getIdentifier()
 					])
 				),
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
 			// not permitted to use backend
 			return new DataResponse(
 				array(
-					'message' => (string)$this->l10n->t('Not permitted to use backend "%s"', [
+					'message' => (string) $this->l10n->t('Not permitted to use backend "%s"', [
 						$backend->getIdentifier()
 					])
 				),
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
 			// not permitted to use auth mechanism
 			return new DataResponse(
 				array(
-					'message' => (string)$this->l10n->t('Not permitted to use authentication mechanism "%s"', [
+					'message' => (string) $this->l10n->t('Not permitted to use authentication mechanism "%s"', [
 						$authMechanism->getIdentifier()
 					])
 				),
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
 			// unsatisfied parameters
 			return new DataResponse(
 				array(
-					'message' => (string)$this->l10n->t('Unsatisfied backend parameters')
+					'message' => (string) $this->l10n->t('Unsatisfied backend parameters')
 				),
 				Http::STATUS_UNPROCESSABLE_ENTITY
 			);
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
 			// unsatisfied parameters
 			return new DataResponse(
 				[
-					'message' => (string)$this->l10n->t('Unsatisfied authentication mechanism parameters')
+					'message' => (string) $this->l10n->t('Unsatisfied authentication mechanism parameters')
 				],
 				Http::STATUS_UNPROCESSABLE_ENTITY
 			);
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
 		} catch (NotFoundException $e) {
 			return new DataResponse(
 				[
-					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
+					'message' => (string) $this->l10n->t('Storage with ID "%d" not found', array($id))
 				],
 				Http::STATUS_NOT_FOUND
 			);
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
 		} catch (NotFoundException $e) {
 			return new DataResponse(
 				[
-					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
+					'message' => (string) $this->l10n->t('Storage with ID "%d" not found', array($id))
 				],
 				Http::STATUS_NOT_FOUND
 			);

Please login to merge, or discard this patch.

lib/private/Template/CSSResourceLocator.php 1 patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -64,13 +64,13 @@  discard block
 block discarded – undo
 		) {
 			return;
 		}
-		$style = substr($style, strpos($style, '/')+1);
+		$style = substr($style, strpos($style, '/') + 1);
 		$app_path = \OC_App::getAppPath($app);
 		$app_url = \OC_App::getAppWebPath($app);
 
 		if ($app_path === false && $app_url === false) {
 			$this->logger->error('Could not find resource {resource} to load', [
-				'resource' => $app . '/' . $style . '.css',
+				'resource' => $app.'/'.$style.'.css',
 				'app' => 'cssresourceloader',
 			]);
 			return;
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
 		// turned into cwd.
 		$app_path = realpath($app_path);
 
-		if(!$this->cacheAndAppendScssIfExist($app_path, $style.'.scss', $app)) {
+		if (!$this->cacheAndAppendScssIfExist($app_path, $style.'.scss', $app)) {
 			$this->append($app_path, $style.'.css', $app_url);
 		}
 	}
@@ -105,8 +105,8 @@  discard block
 block discarded – undo
 	 */
 	protected function cacheAndAppendScssIfExist($root, $file, $app = 'core') {
 		if (is_file($root.'/'.$file)) {
-			if($this->scssCacher !== null) {
-				if($this->scssCacher->process($root, $file, $app)) {
+			if ($this->scssCacher !== null) {
+				if ($this->scssCacher->process($root, $file, $app)) {
 
 					$this->append($root, $this->scssCacher->getCachedSCSS($app, $file), \OC::$WEBROOT, true, true);
 					return true;
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
 				}
 			}
 
-			$this->resources[] = array($webRoot? : \OC::$WEBROOT, $webRoot, $file);
+			$this->resources[] = array($webRoot ?: \OC::$WEBROOT, $webRoot, $file);
 		}
 	}
 }

Please login to merge, or discard this patch.

apps/user_ldap/lib/LDAP.php 1 patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -52,12 +52,12 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 */
 	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 @@  discard block
 block discarded – undo
 	 */
 	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 @@  discard block
 block discarded – undo
 			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 @@  discard block
 block discarded – undo
 	 * 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])

Please login to merge, or discard this patch.

apps/dav/lib/CalDAV/BirthdayService.php 1 patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -120,7 +120,7 @@  discard block
 block discarded – undo
 
 			$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 @@  discard block
 block discarded – undo
 			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 @@  discard block
 block discarded – undo
 
 		$unknownYear = false;
 		if (!$dateParts['year']) {
-			$birthday = '1900-' . $dateParts['month'] . '-' . $dateParts['date'];
+			$birthday = '1900-'.$dateParts['month'].'-'.$dateParts['date'];
 
 			$unknownYear = true;
 		}
@@ -203,10 +203,10 @@  discard block
 block discarded – undo
 			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 @@  discard block
 block discarded – undo
 			$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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 	 * @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)) {

Please login to merge, or discard this patch.

apps/user_ldap/composer/composer/autoload_classmap.php 1 patch

Spacing +58 added lines, -58 removed lines patch added patch discarded remove patch

@@ -6,62 +6,62 @@
 block discarded – undo
 $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',
 );

Please login to merge, or discard this patch.

ocs/v1.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -29,8 +29,8 @@  discard block
 block discarded – undo
  *
  */
 
-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 @@  discard block
 block discarded – undo
  * 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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	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);
 }

Please login to merge, or discard this patch.

apps/files/lib/Service/TagService.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -122,7 +122,7 @@
 block discarded – undo
 		}
 
 		$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,

Please login to merge, or discard this patch.

		@@ -65,7 +65,7 @@
		block discarded – undo
65	65	$username_as_share = ($storage->getBackendOption('username_as_share') === true);
66	66
67	67	if ($username_as_share) {
68		- $share = '/' . $storage->getBackendOption('user');
	68	+ $share = '/'.$storage->getBackendOption('user');
69	69	$storage->setBackendOption('share', $share);
70	70	}
71	71	}

		@@ -61,7 +61,7 @@
		block discarded – undo
61	61	}
62	62
63	63	private function getCredentialsIdentifier($storageId) {
64		- return self::CREDENTIALS_IDENTIFIER_PREFIX . $storageId;
	64	+ return self::CREDENTIALS_IDENTIFIER_PREFIX.$storageId;
65	65	}
66	66
67	67	public function saveBackendOptions(IUser $user, $id, array $options) {

		@@ -127,7 +127,7 @@ discard block
		block discarded – undo
127	127	$this->logger->logException($e);
128	128	return new DataResponse(
129	129	[
130		- 'message' => (string)$this->l10n->t('Invalid backend or authentication mechanism class')
	130	+ 'message' => (string) $this->l10n->t('Invalid backend or authentication mechanism class')
131	131	],
132	132	Http::STATUS_UNPROCESSABLE_ENTITY
133	133	);
		@@ -146,7 +146,7 @@ discard block
		block discarded – undo
146	146	if ($mountPoint === '') {
147	147	return new DataResponse(
148	148	array(
149		- 'message' => (string)$this->l10n->t('Invalid mount point')
	149	+ 'message' => (string) $this->l10n->t('Invalid mount point')
150	150	),
151	151	Http::STATUS_UNPROCESSABLE_ENTITY
152	152	);
		@@ -156,7 +156,7 @@ discard block
		block discarded – undo
156	156	// objectstore must not be sent from client side
157	157	return new DataResponse(
158	158	array(
159		- 'message' => (string)$this->l10n->t('Objectstore forbidden')
	159	+ 'message' => (string) $this->l10n->t('Objectstore forbidden')
160	160	),
161	161	Http::STATUS_UNPROCESSABLE_ENTITY
162	162	);
		@@ -170,7 +170,7 @@ discard block
		block discarded – undo
170	170	// invalid backend
171	171	return new DataResponse(
172	172	array(
173		- 'message' => (string)$this->l10n->t('Invalid storage backend "%s"', [
	173	+ 'message' => (string) $this->l10n->t('Invalid storage backend "%s"', [
174	174	$backend->getIdentifier()
175	175	])
176	176	),
		@@ -182,7 +182,7 @@ discard block
		block discarded – undo
182	182	// not permitted to use backend
183	183	return new DataResponse(
184	184	array(
185		- 'message' => (string)$this->l10n->t('Not permitted to use backend "%s"', [
	185	+ 'message' => (string) $this->l10n->t('Not permitted to use backend "%s"', [
186	186	$backend->getIdentifier()
187	187	])
188	188	),
		@@ -193,7 +193,7 @@ discard block
		block discarded – undo
193	193	// not permitted to use auth mechanism
194	194	return new DataResponse(
195	195	array(
196		- 'message' => (string)$this->l10n->t('Not permitted to use authentication mechanism "%s"', [
	196	+ 'message' => (string) $this->l10n->t('Not permitted to use authentication mechanism "%s"', [
197	197	$authMechanism->getIdentifier()
198	198	])
199	199	),
		@@ -205,7 +205,7 @@ discard block
		block discarded – undo
205	205	// unsatisfied parameters
206	206	return new DataResponse(
207	207	array(
208		- 'message' => (string)$this->l10n->t('Unsatisfied backend parameters')
	208	+ 'message' => (string) $this->l10n->t('Unsatisfied backend parameters')
209	209	),
210	210	Http::STATUS_UNPROCESSABLE_ENTITY
211	211	);
		@@ -214,7 +214,7 @@ discard block
		block discarded – undo
214	214	// unsatisfied parameters
215	215	return new DataResponse(
216	216	[
217		- 'message' => (string)$this->l10n->t('Unsatisfied authentication mechanism parameters')
	217	+ 'message' => (string) $this->l10n->t('Unsatisfied authentication mechanism parameters')
218	218	],
219	219	Http::STATUS_UNPROCESSABLE_ENTITY
220	220	);
		@@ -306,7 +306,7 @@ discard block
		block discarded – undo
306	306	} catch (NotFoundException $e) {
307	307	return new DataResponse(
308	308	[
309		- 'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
	309	+ 'message' => (string) $this->l10n->t('Storage with ID "%d" not found', array($id))
310	310	],
311	311	Http::STATUS_NOT_FOUND
312	312	);
		@@ -331,7 +331,7 @@ discard block
		block discarded – undo
331	331	} catch (NotFoundException $e) {
332	332	return new DataResponse(
333	333	[
334		- 'message' => (string)$this->l10n->t('Storage with ID "%d" not found', array($id))
	334	+ 'message' => (string) $this->l10n->t('Storage with ID "%d" not found', array($id))
335	335	],
336	336	Http::STATUS_NOT_FOUND
337	337	);

		@@ -64,13 +64,13 @@ discard block
		block discarded – undo
64	64	) {
65	65	return;
66	66	}
67		- $style = substr($style, strpos($style, '/')+1);
	67	+ $style = substr($style, strpos($style, '/') + 1);
68	68	$app_path = \OC_App::getAppPath($app);
69	69	$app_url = \OC_App::getAppWebPath($app);
70	70
71	71	if ($app_path === false && $app_url === false) {
72	72	$this->logger->error('Could not find resource {resource} to load', [
73		- 'resource' => $app . '/' . $style . '.css',
	73	+ 'resource' => $app.'/'.$style.'.css',
74	74	'app' => 'cssresourceloader',
75	75	]);
76	76	return;
		@@ -81,7 +81,7 @@ discard block
		block discarded – undo
81	81	// turned into cwd.
82	82	$app_path = realpath($app_path);
83	83
84		- if(!$this->cacheAndAppendScssIfExist($app_path, $style.'.scss', $app)) {
	84	+ if (!$this->cacheAndAppendScssIfExist($app_path, $style.'.scss', $app)) {
85	85	$this->append($app_path, $style.'.css', $app_url);
86	86	}
87	87	}
		@@ -105,8 +105,8 @@ discard block
		block discarded – undo
105	105	*/
106	106	protected function cacheAndAppendScssIfExist($root, $file, $app = 'core') {
107	107	if (is_file($root.'/'.$file)) {
108		- if($this->scssCacher !== null) {
109		- if($this->scssCacher->process($root, $file, $app)) {
	108	+ if ($this->scssCacher !== null) {
	109	+ if ($this->scssCacher->process($root, $file, $app)) {
110	110
111	111	$this->append($root, $this->scssCacher->getCachedSCSS($app, $file), \OC::$WEBROOT, true, true);
112	112	return true;
		@@ -145,7 +145,7 @@ discard block
		block discarded – undo
145	145	}
146	146	}
147	147
148		- $this->resources[] = array($webRoot? : \OC::$WEBROOT, $webRoot, $file);
	148	+ $this->resources[] = array($webRoot ?: \OC::$WEBROOT, $webRoot, $file);
149	149	}
150	150	}
151	151	}

		@@ -52,12 +52,12 @@ discard block
		block discarded – undo
52	52	* @return mixed
53	53	*/
54	54	public function connect($host, $port) {
55		- if(strpos($host, '://') === false) {
56		- $host = 'ldap://' . $host;
	55	+ if (strpos($host, '://') === false) {
	56	+ $host = 'ldap://'.$host;
57	57	}
58		- if(strpos($host, ':', strpos($host, '://') + 1) === false) {
	58	+ if (strpos($host, ':', strpos($host, '://') + 1) === false) {
59	59	//ldap_connect ignores port parameter when URLs are passed
60		- $host .= ':' . $port;
	60	+ $host .= ':'.$port;
61	61	}
62	62	return $this->invokeLDAPMethod('connect', $host);
63	63	}
		@@ -267,13 +267,13 @@ discard block
		block discarded – undo
267	267	* @return bool
268	268	*/
269	269	protected function isResultFalse($result) {
270		- if($result === false) {
	270	+ if ($result === false) {
271	271	return true;
272	272	}
273	273
274		- if($this->curFunc === 'ldap_search' && is_array($result)) {
	274	+ if ($this->curFunc === 'ldap_search' && is_array($result)) {
275	275	foreach ($result as $singleResult) {
276		- if($singleResult === false) {
	276	+ if ($singleResult === false) {
277	277	return true;
278	278	}
279	279	}
		@@ -287,8 +287,8 @@ discard block
		block discarded – undo
287	287	*/
288	288	protected function invokeLDAPMethod() {
289	289	$arguments = func_get_args();
290		- $func = 'ldap_' . array_shift($arguments);
291		- if(function_exists($func)) {
	290	+ $func = 'ldap_'.array_shift($arguments);
	291	+ if (function_exists($func)) {
292	292	$this->preFunctionCall($func, $arguments);
293	293	$result = call_user_func_array($func, $arguments);
294	294	if ($this->isResultFalse($result)) {
		@@ -318,12 +318,12 @@ discard block
		block discarded – undo
318	318	*/
319	319	private function processLDAPError($resource) {
320	320	$errorCode = ldap_errno($resource);
321		- if($errorCode === 0) {
	321	+ if ($errorCode === 0) {
322	322	return;
323	323	}
324		- $errorMsg = ldap_error($resource);
	324	+ $errorMsg = ldap_error($resource);
325	325
326		- if($this->curFunc === 'ldap_get_entries'
	326	+ if ($this->curFunc === 'ldap_get_entries'
327	327	&& $errorCode === -4) {
328	328	} else if ($errorCode === 32) {
329	329	//for now
		@@ -339,7 +339,7 @@ discard block
		block discarded – undo
339	339	throw new \Exception('LDAP Operations error', $errorCode);
340	340	} else if ($errorCode === 19) {
341	341	ldap_get_option($this->curArgs[0], LDAP_OPT_ERROR_STRING, $extended_error);
342		- throw new ConstraintViolationException(!empty($extended_error)?$extended_error:$errorMsg, $errorCode);
	342	+ throw new ConstraintViolationException(!empty($extended_error) ? $extended_error : $errorMsg, $errorCode);
343	343	} else {
344	344	\OC::$server->getLogger()->debug('LDAP error {message} ({code}) after calling {func}', [
345	345	'app' => 'user_ldap',
		@@ -354,9 +354,9 @@ discard block
		block discarded – undo
354	354	* Called after an ldap method is run to act on LDAP error if necessary
355	355	*/
356	356	private function postFunctionCall() {
357		- if($this->isResource($this->curArgs[0])) {
	357	+ if ($this->isResource($this->curArgs[0])) {
358	358	$resource = $this->curArgs[0];
359		- } else if(
	359	+ } else if (
360	360	$this->curFunc === 'ldap_search'
361	361	&& is_array($this->curArgs[0])
362	362	&& $this->isResource($this->curArgs[0][0])

		@@ -120,7 +120,7 @@ discard block
		block discarded – undo
120	120
121	121	$calendar = $this->ensureCalendarExists($principalUri);
122	122	foreach (['', '-death', '-anniversary'] as $tag) {
123		- $objectUri = $book['uri'] . '-' . $cardUri . $tag .'.ics';
	123	+ $objectUri = $book['uri'].'-'.$cardUri.$tag.'.ics';
124	124	$this->calDavBackEnd->deleteCalendarObject($calendar['id'], $objectUri);
125	125	}
126	126	}
		@@ -175,7 +175,7 @@ discard block
		block discarded – undo
175	175	return null;
176	176	}
177	177	$birthday = $doc->{$dateField};
178		- if (!(string)$birthday) {
	178	+ if (!(string) $birthday) {
179	179	return null;
180	180	}
181	181	// Skip if the BDAY property is not of the right type.
		@@ -192,7 +192,7 @@ discard block
		block discarded – undo
192	192
193	193	$unknownYear = false;
194	194	if (!$dateParts['year']) {
195		- $birthday = '1900-' . $dateParts['month'] . '-' . $dateParts['date'];
	195	+ $birthday = '1900-'.$dateParts['month'].'-'.$dateParts['date'];
196	196
197	197	$unknownYear = true;
198	198	}
		@@ -203,10 +203,10 @@ discard block
		block discarded – undo
203	203	return null;
204	204	}
205	205	if ($unknownYear) {
206		- $summary = $doc->FN->getValue() . ' ' . $summarySymbol;
	206	+ $summary = $doc->FN->getValue().' '.$summarySymbol;
207	207	} else {
208		- $year = (int)$date->format('Y');
209		- $summary = $doc->FN->getValue() . " ($summarySymbol$year)";
	208	+ $year = (int) $date->format('Y');
	209	+ $summary = $doc->FN->getValue()." ($summarySymbol$year)";
210	210	}
211	211	$vCal = new VCalendar();
212	212	$vCal->VERSION = '2.0';
		@@ -222,7 +222,7 @@ discard block
		block discarded – undo
222	222	$date
223	223	);
224	224	$vEvent->DTEND['VALUE'] = 'DATE';
225		- $vEvent->{'UID'} = $doc->UID . $postfix;
	225	+ $vEvent->{'UID'} = $doc->UID.$postfix;
226	226	$vEvent->{'RRULE'} = 'FREQ=YEARLY';
227	227	$vEvent->{'SUMMARY'} = $summary;
228	228	$vEvent->{'TRANSP'} = 'TRANSPARENT';
		@@ -242,9 +242,9 @@ discard block
		block discarded – undo
242	242	$principal = 'principals/users/'.$user;
243	243	$this->ensureCalendarExists($principal);
244	244	$books = $this->cardDavBackEnd->getAddressBooksForUser($principal);
245		- foreach($books as $book) {
	245	+ foreach ($books as $book) {
246	246	$cards = $this->cardDavBackEnd->getCards($book['id']);
247		- foreach($cards as $card) {
	247	+ foreach ($cards as $card) {
248	248	$this->onCardChanged($book['id'], $card['uri'], $card['carddata']);
249	249	}
250	250	}
		@@ -297,7 +297,7 @@ discard block
		block discarded – undo
297	297	* @param string[] $type
298	298	*/
299	299	private function updateCalendar($cardUri, $cardData, $book, $calendarId, $type) {
300		- $objectUri = $book['uri'] . '-' . $cardUri . $type['postfix'] . '.ics';
	300	+ $objectUri = $book['uri'].'-'.$cardUri.$type['postfix'].'.ics';
301	301	$calendarData = $this->buildDateFromContact($cardData, $type['field'], $type['postfix'], $type['symbol']);
302	302	$existing = $this->calDavBackEnd->getCalendarObject($calendarId, $objectUri);
303	303	if (is_null($calendarData)) {

		@@ -6,62 +6,62 @@
		block discarded – undo
6	6	$baseDir = $vendorDir;
7	7
8	8	return array(
9		- 'OCA\\User_LDAP\\Access' => $baseDir . '/../lib/Access.php',
10		- 'OCA\\User_LDAP\\AccessFactory' => $baseDir . '/../lib/AccessFactory.php',
11		- 'OCA\\User_LDAP\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
12		- 'OCA\\User_LDAP\\BackendUtility' => $baseDir . '/../lib/BackendUtility.php',
13		- 'OCA\\User_LDAP\\Command\\CheckUser' => $baseDir . '/../lib/Command/CheckUser.php',
14		- 'OCA\\User_LDAP\\Command\\CreateEmptyConfig' => $baseDir . '/../lib/Command/CreateEmptyConfig.php',
15		- 'OCA\\User_LDAP\\Command\\DeleteConfig' => $baseDir . '/../lib/Command/DeleteConfig.php',
16		- 'OCA\\User_LDAP\\Command\\Search' => $baseDir . '/../lib/Command/Search.php',
17		- 'OCA\\User_LDAP\\Command\\SetConfig' => $baseDir . '/../lib/Command/SetConfig.php',
18		- 'OCA\\User_LDAP\\Command\\ShowConfig' => $baseDir . '/../lib/Command/ShowConfig.php',
19		- 'OCA\\User_LDAP\\Command\\ShowRemnants' => $baseDir . '/../lib/Command/ShowRemnants.php',
20		- 'OCA\\User_LDAP\\Command\\TestConfig' => $baseDir . '/../lib/Command/TestConfig.php',
21		- 'OCA\\User_LDAP\\Configuration' => $baseDir . '/../lib/Configuration.php',
22		- 'OCA\\User_LDAP\\Connection' => $baseDir . '/../lib/Connection.php',
23		- 'OCA\\User_LDAP\\ConnectionFactory' => $baseDir . '/../lib/ConnectionFactory.php',
24		- 'OCA\\User_LDAP\\Controller\\ConfigAPIController' => $baseDir . '/../lib/Controller/ConfigAPIController.php',
25		- 'OCA\\User_LDAP\\Controller\\RenewPasswordController' => $baseDir . '/../lib/Controller/RenewPasswordController.php',
26		- 'OCA\\User_LDAP\\Exceptions\\ConstraintViolationException' => $baseDir . '/../lib/Exceptions/ConstraintViolationException.php',
27		- 'OCA\\User_LDAP\\Exceptions\\NotOnLDAP' => $baseDir . '/../lib/Exceptions/NotOnLDAP.php',
28		- 'OCA\\User_LDAP\\FilesystemHelper' => $baseDir . '/../lib/FilesystemHelper.php',
29		- 'OCA\\User_LDAP\\GroupPluginManager' => $baseDir . '/../lib/GroupPluginManager.php',
30		- 'OCA\\User_LDAP\\Group_LDAP' => $baseDir . '/../lib/Group_LDAP.php',
31		- 'OCA\\User_LDAP\\Group_Proxy' => $baseDir . '/../lib/Group_Proxy.php',
32		- 'OCA\\User_LDAP\\Helper' => $baseDir . '/../lib/Helper.php',
33		- 'OCA\\User_LDAP\\IGroupLDAP' => $baseDir . '/../lib/IGroupLDAP.php',
34		- 'OCA\\User_LDAP\\ILDAPGroupPlugin' => $baseDir . '/../lib/ILDAPGroupPlugin.php',
35		- 'OCA\\User_LDAP\\ILDAPUserPlugin' => $baseDir . '/../lib/ILDAPUserPlugin.php',
36		- 'OCA\\User_LDAP\\ILDAPWrapper' => $baseDir . '/../lib/ILDAPWrapper.php',
37		- 'OCA\\User_LDAP\\IUserLDAP' => $baseDir . '/../lib/IUserLDAP.php',
38		- 'OCA\\User_LDAP\\Jobs\\CleanUp' => $baseDir . '/../lib/Jobs/CleanUp.php',
39		- 'OCA\\User_LDAP\\Jobs\\Sync' => $baseDir . '/../lib/Jobs/Sync.php',
40		- 'OCA\\User_LDAP\\Jobs\\UpdateGroups' => $baseDir . '/../lib/Jobs/UpdateGroups.php',
41		- 'OCA\\User_LDAP\\LDAP' => $baseDir . '/../lib/LDAP.php',
42		- 'OCA\\User_LDAP\\LDAPProvider' => $baseDir . '/../lib/LDAPProvider.php',
43		- 'OCA\\User_LDAP\\LDAPProviderFactory' => $baseDir . '/../lib/LDAPProviderFactory.php',
44		- 'OCA\\User_LDAP\\LDAPUtility' => $baseDir . '/../lib/LDAPUtility.php',
45		- 'OCA\\User_LDAP\\LogWrapper' => $baseDir . '/../lib/LogWrapper.php',
46		- 'OCA\\User_LDAP\\Mapping\\AbstractMapping' => $baseDir . '/../lib/Mapping/AbstractMapping.php',
47		- 'OCA\\User_LDAP\\Mapping\\GroupMapping' => $baseDir . '/../lib/Mapping/GroupMapping.php',
48		- 'OCA\\User_LDAP\\Mapping\\UserMapping' => $baseDir . '/../lib/Mapping/UserMapping.php',
49		- 'OCA\\User_LDAP\\Migration\\UUIDFix' => $baseDir . '/../lib/Migration/UUIDFix.php',
50		- 'OCA\\User_LDAP\\Migration\\UUIDFixGroup' => $baseDir . '/../lib/Migration/UUIDFixGroup.php',
51		- 'OCA\\User_LDAP\\Migration\\UUIDFixInsert' => $baseDir . '/../lib/Migration/UUIDFixInsert.php',
52		- 'OCA\\User_LDAP\\Migration\\UUIDFixUser' => $baseDir . '/../lib/Migration/UUIDFixUser.php',
53		- 'OCA\\User_LDAP\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php',
54		- 'OCA\\User_LDAP\\Proxy' => $baseDir . '/../lib/Proxy.php',
55		- 'OCA\\User_LDAP\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
56		- 'OCA\\User_LDAP\\Settings\\Section' => $baseDir . '/../lib/Settings/Section.php',
57		- 'OCA\\User_LDAP\\UserPluginManager' => $baseDir . '/../lib/UserPluginManager.php',
58		- 'OCA\\User_LDAP\\User\\DeletedUsersIndex' => $baseDir . '/../lib/User/DeletedUsersIndex.php',
59		- 'OCA\\User_LDAP\\User\\IUserTools' => $baseDir . '/../lib/User/IUserTools.php',
60		- 'OCA\\User_LDAP\\User\\Manager' => $baseDir . '/../lib/User/Manager.php',
61		- 'OCA\\User_LDAP\\User\\OfflineUser' => $baseDir . '/../lib/User/OfflineUser.php',
62		- 'OCA\\User_LDAP\\User\\User' => $baseDir . '/../lib/User/User.php',
63		- 'OCA\\User_LDAP\\User_LDAP' => $baseDir . '/../lib/User_LDAP.php',
64		- 'OCA\\User_LDAP\\User_Proxy' => $baseDir . '/../lib/User_Proxy.php',
65		- 'OCA\\User_LDAP\\Wizard' => $baseDir . '/../lib/Wizard.php',
66		- 'OCA\\User_LDAP\\WizardResult' => $baseDir . '/../lib/WizardResult.php',
	9	+ 'OCA\\User_LDAP\\Access' => $baseDir.'/../lib/Access.php',
	10	+ 'OCA\\User_LDAP\\AccessFactory' => $baseDir.'/../lib/AccessFactory.php',
	11	+ 'OCA\\User_LDAP\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
	12	+ 'OCA\\User_LDAP\\BackendUtility' => $baseDir.'/../lib/BackendUtility.php',
	13	+ 'OCA\\User_LDAP\\Command\\CheckUser' => $baseDir.'/../lib/Command/CheckUser.php',
	14	+ 'OCA\\User_LDAP\\Command\\CreateEmptyConfig' => $baseDir.'/../lib/Command/CreateEmptyConfig.php',
	15	+ 'OCA\\User_LDAP\\Command\\DeleteConfig' => $baseDir.'/../lib/Command/DeleteConfig.php',
	16	+ 'OCA\\User_LDAP\\Command\\Search' => $baseDir.'/../lib/Command/Search.php',
	17	+ 'OCA\\User_LDAP\\Command\\SetConfig' => $baseDir.'/../lib/Command/SetConfig.php',
	18	+ 'OCA\\User_LDAP\\Command\\ShowConfig' => $baseDir.'/../lib/Command/ShowConfig.php',
	19	+ 'OCA\\User_LDAP\\Command\\ShowRemnants' => $baseDir.'/../lib/Command/ShowRemnants.php',
	20	+ 'OCA\\User_LDAP\\Command\\TestConfig' => $baseDir.'/../lib/Command/TestConfig.php',
	21	+ 'OCA\\User_LDAP\\Configuration' => $baseDir.'/../lib/Configuration.php',
	22	+ 'OCA\\User_LDAP\\Connection' => $baseDir.'/../lib/Connection.php',
	23	+ 'OCA\\User_LDAP\\ConnectionFactory' => $baseDir.'/../lib/ConnectionFactory.php',
	24	+ 'OCA\\User_LDAP\\Controller\\ConfigAPIController' => $baseDir.'/../lib/Controller/ConfigAPIController.php',
	25	+ 'OCA\\User_LDAP\\Controller\\RenewPasswordController' => $baseDir.'/../lib/Controller/RenewPasswordController.php',
	26	+ 'OCA\\User_LDAP\\Exceptions\\ConstraintViolationException' => $baseDir.'/../lib/Exceptions/ConstraintViolationException.php',
	27	+ 'OCA\\User_LDAP\\Exceptions\\NotOnLDAP' => $baseDir.'/../lib/Exceptions/NotOnLDAP.php',
	28	+ 'OCA\\User_LDAP\\FilesystemHelper' => $baseDir.'/../lib/FilesystemHelper.php',
	29	+ 'OCA\\User_LDAP\\GroupPluginManager' => $baseDir.'/../lib/GroupPluginManager.php',
	30	+ 'OCA\\User_LDAP\\Group_LDAP' => $baseDir.'/../lib/Group_LDAP.php',
	31	+ 'OCA\\User_LDAP\\Group_Proxy' => $baseDir.'/../lib/Group_Proxy.php',
	32	+ 'OCA\\User_LDAP\\Helper' => $baseDir.'/../lib/Helper.php',
	33	+ 'OCA\\User_LDAP\\IGroupLDAP' => $baseDir.'/../lib/IGroupLDAP.php',
	34	+ 'OCA\\User_LDAP\\ILDAPGroupPlugin' => $baseDir.'/../lib/ILDAPGroupPlugin.php',
	35	+ 'OCA\\User_LDAP\\ILDAPUserPlugin' => $baseDir.'/../lib/ILDAPUserPlugin.php',
	36	+ 'OCA\\User_LDAP\\ILDAPWrapper' => $baseDir.'/../lib/ILDAPWrapper.php',
	37	+ 'OCA\\User_LDAP\\IUserLDAP' => $baseDir.'/../lib/IUserLDAP.php',
	38	+ 'OCA\\User_LDAP\\Jobs\\CleanUp' => $baseDir.'/../lib/Jobs/CleanUp.php',
	39	+ 'OCA\\User_LDAP\\Jobs\\Sync' => $baseDir.'/../lib/Jobs/Sync.php',
	40	+ 'OCA\\User_LDAP\\Jobs\\UpdateGroups' => $baseDir.'/../lib/Jobs/UpdateGroups.php',
	41	+ 'OCA\\User_LDAP\\LDAP' => $baseDir.'/../lib/LDAP.php',
	42	+ 'OCA\\User_LDAP\\LDAPProvider' => $baseDir.'/../lib/LDAPProvider.php',
	43	+ 'OCA\\User_LDAP\\LDAPProviderFactory' => $baseDir.'/../lib/LDAPProviderFactory.php',
	44	+ 'OCA\\User_LDAP\\LDAPUtility' => $baseDir.'/../lib/LDAPUtility.php',
	45	+ 'OCA\\User_LDAP\\LogWrapper' => $baseDir.'/../lib/LogWrapper.php',
	46	+ 'OCA\\User_LDAP\\Mapping\\AbstractMapping' => $baseDir.'/../lib/Mapping/AbstractMapping.php',
	47	+ 'OCA\\User_LDAP\\Mapping\\GroupMapping' => $baseDir.'/../lib/Mapping/GroupMapping.php',
	48	+ 'OCA\\User_LDAP\\Mapping\\UserMapping' => $baseDir.'/../lib/Mapping/UserMapping.php',
	49	+ 'OCA\\User_LDAP\\Migration\\UUIDFix' => $baseDir.'/../lib/Migration/UUIDFix.php',
	50	+ 'OCA\\User_LDAP\\Migration\\UUIDFixGroup' => $baseDir.'/../lib/Migration/UUIDFixGroup.php',
	51	+ 'OCA\\User_LDAP\\Migration\\UUIDFixInsert' => $baseDir.'/../lib/Migration/UUIDFixInsert.php',
	52	+ 'OCA\\User_LDAP\\Migration\\UUIDFixUser' => $baseDir.'/../lib/Migration/UUIDFixUser.php',
	53	+ 'OCA\\User_LDAP\\Notification\\Notifier' => $baseDir.'/../lib/Notification/Notifier.php',
	54	+ 'OCA\\User_LDAP\\Proxy' => $baseDir.'/../lib/Proxy.php',
	55	+ 'OCA\\User_LDAP\\Settings\\Admin' => $baseDir.'/../lib/Settings/Admin.php',
	56	+ 'OCA\\User_LDAP\\Settings\\Section' => $baseDir.'/../lib/Settings/Section.php',
	57	+ 'OCA\\User_LDAP\\UserPluginManager' => $baseDir.'/../lib/UserPluginManager.php',
	58	+ 'OCA\\User_LDAP\\User\\DeletedUsersIndex' => $baseDir.'/../lib/User/DeletedUsersIndex.php',
	59	+ 'OCA\\User_LDAP\\User\\IUserTools' => $baseDir.'/../lib/User/IUserTools.php',
	60	+ 'OCA\\User_LDAP\\User\\Manager' => $baseDir.'/../lib/User/Manager.php',
	61	+ 'OCA\\User_LDAP\\User\\OfflineUser' => $baseDir.'/../lib/User/OfflineUser.php',
	62	+ 'OCA\\User_LDAP\\User\\User' => $baseDir.'/../lib/User/User.php',
	63	+ 'OCA\\User_LDAP\\User_LDAP' => $baseDir.'/../lib/User_LDAP.php',
	64	+ 'OCA\\User_LDAP\\User_Proxy' => $baseDir.'/../lib/User_Proxy.php',
	65	+ 'OCA\\User_LDAP\\Wizard' => $baseDir.'/../lib/Wizard.php',
	66	+ 'OCA\\User_LDAP\\WizardResult' => $baseDir.'/../lib/WizardResult.php',
67	67	);

		@@ -29,8 +29,8 @@ discard block
		block discarded – undo
29	29	*
30	30	*/
31	31
32		-require_once __DIR__ . '/../lib/versioncheck.php';
33		-require_once __DIR__ . '/../lib/base.php';
	32	+require_once __DIR__.'/../lib/versioncheck.php';
	33	+require_once __DIR__.'/../lib/base.php';
34	34
35	35	if (\OCP\Util::needUpgrade()
36	36	\|\| \OC::$server->getSystemConfig()->getValue('maintenance', false)) {
		@@ -72,7 +72,7 @@ discard block
		block discarded – undo
72	72	* Try the appframework routes
73	73	*/
74	74	try {
75		- if(!\OC::$server->getUserSession()->isLoggedIn()) {
	75	+ if (!\OC::$server->getUserSession()->isLoggedIn()) {
76	76	OC::handleLogin(\OC::$server->getRequest());
77	77	}
78	78	OC::$server->getRouter()->match('/ocsapp'.\OC::$server->getRequest()->getRawPathInfo());
		@@ -80,7 +80,7 @@ discard block
		block discarded – undo
80	80	OC_API::setContentType();
81	81
82	82	$format = \OC::$server->getRequest()->getParam('format', 'xml');
83		- $txt='Invalid query, please check the syntax. API specifications are here:'
	83	+ $txt = 'Invalid query, please check the syntax. API specifications are here:'
84	84	.' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services.'."\n";
85	85	OC_API::respond(new \OC\OCS\Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
86	86	} catch (MethodNotAllowedException $e) {
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95	OC_API::setContentType();
96	96
97	97	$format = \OC::$server->getRequest()->getParam('format', 'xml');
98		- $txt='Invalid query, please check the syntax. API specifications are here:'
	98	+ $txt = 'Invalid query, please check the syntax. API specifications are here:'
99	99	.' http://www.freedesktop.org/wiki/Specifications/open-collaboration-services.'."\n";
100	100	OC_API::respond(new \OC\OCS\Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
101	101	}

		@@ -122,7 +122,7 @@
		block discarded – undo
122	122	}
123	123
124	124	$eventName = $addToFavorite ? 'addFavorite' : 'removeFavorite';
125		- $this->dispatcher->dispatch(self::class . '::' . $eventName, new GenericEvent(null, [
	125	+ $this->dispatcher->dispatch(self::class.'::'.$eventName, new GenericEvent(null, [
126	126	'userId' => $user->getUID(),
127	127	'fileId' => $fileId,
128	128	'path' => $path,

nextcloud / server

Push — master ( 126a82...e45248 )

Status

Category

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +58 added lines, -58 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch