Inspection of "Support Circles" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#3813)

by Maxence

created 2017-03-14 22:11 UTC

Status

Indentation +47 added lines, -47 removed lines patch added patch discarded remove patch

@@ -29,60 +29,60 @@
 block discarded – undo
 
 $application = new Application();
 $application->registerRoutes(
-	$this,
-	array(
-		'routes' => array(
-			array(
-				'name' => 'API#getThumbnail',
-				'url' => '/api/v1/thumbnail/{x}/{y}/{file}',
-				'verb' => 'GET',
-				'requirements' => array('file' => '.+')
-			),
-			array(
-				'name' => 'API#updateFileTags',
-				'url' => '/api/v1/files/{path}',
-				'verb' => 'POST',
-				'requirements' => array('path' => '.+'),
-			),
-			array(
-				'name' => 'API#getRecentFiles',
-				'url' => '/api/v1/recent/',
-				'verb' => 'GET'
-			),
-			array(
-				'name' => 'API#updateFileSorting',
-				'url' => '/api/v1/sorting',
-				'verb' => 'POST'
-			),
-			array(
-				'name' => 'API#showHiddenFiles',
-				'url' => '/api/v1/showhidden',
-				'verb' => 'POST'
-			),
-			[
-				'name' => 'view#index',
-				'url' => '/',
-				'verb' => 'GET',
-			],
-			[
-				'name' => 'settings#setMaxUploadSize',
-				'url' => '/settings/maxUpload',
-				'verb' => 'POST',
-			]
-		)
-	)
+    $this,
+    array(
+        'routes' => array(
+            array(
+                'name' => 'API#getThumbnail',
+                'url' => '/api/v1/thumbnail/{x}/{y}/{file}',
+                'verb' => 'GET',
+                'requirements' => array('file' => '.+')
+            ),
+            array(
+                'name' => 'API#updateFileTags',
+                'url' => '/api/v1/files/{path}',
+                'verb' => 'POST',
+                'requirements' => array('path' => '.+'),
+            ),
+            array(
+                'name' => 'API#getRecentFiles',
+                'url' => '/api/v1/recent/',
+                'verb' => 'GET'
+            ),
+            array(
+                'name' => 'API#updateFileSorting',
+                'url' => '/api/v1/sorting',
+                'verb' => 'POST'
+            ),
+            array(
+                'name' => 'API#showHiddenFiles',
+                'url' => '/api/v1/showhidden',
+                'verb' => 'POST'
+            ),
+            [
+                'name' => 'view#index',
+                'url' => '/',
+                'verb' => 'GET',
+            ],
+            [
+                'name' => 'settings#setMaxUploadSize',
+                'url' => '/settings/maxUpload',
+                'verb' => 'POST',
+            ]
+        )
+    )
 );
 
 /** @var $this \OC\Route\Router */
 
 $this->create('files_ajax_download', 'ajax/download.php')
-	->actionInclude('files/ajax/download.php');
+    ->actionInclude('files/ajax/download.php');
 $this->create('files_ajax_getstoragestats', 'ajax/getstoragestats.php')
-	->actionInclude('files/ajax/getstoragestats.php');
+    ->actionInclude('files/ajax/getstoragestats.php');
 $this->create('files_ajax_list', 'ajax/list.php')
-	->actionInclude('files/ajax/list.php');
+    ->actionInclude('files/ajax/list.php');
 
 $this->create('download', 'download{file}')
-	->requirements(array('file' => '.*'))
-	->actionInclude('files/download.php');
+    ->requirements(array('file' => '.*'))
+    ->actionInclude('files/download.php');
 

Please login to merge, or discard this patch.

apps/files/appinfo/app.php 1 patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -39,21 +39,21 @@
 block discarded – undo
 $templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
 
 \OCA\Files\App::getNavigationManager()->add(function () use ($l) {
-	return [
-		'id' => 'files',
-		'appname' => 'files',
-		'script' => 'list.php',
-		'order' => 0,
-		'name' => $l->t('All files'),
-	];
+    return [
+        'id' => 'files',
+        'appname' => 'files',
+        'script' => 'list.php',
+        'order' => 0,
+        'name' => $l->t('All files'),
+    ];
 });
 
 \OCA\Files\App::getNavigationManager()->add(function () use ($l) {
-	return [
-		'id' => 'recent',
-		'appname' => 'files',
-		'script' => 'recentlist.php',
-		'order' => 2,
-		'name' => $l->t('Recent'),
-	];
+    return [
+        'id' => 'recent',
+        'appname' => 'files',
+        'script' => 'recentlist.php',
+        'order' => 2,
+        'name' => $l->t('Recent'),
+    ];
 });

Please login to merge, or discard this patch.

apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php 1 patch

Indentation +45 added lines, -45 removed lines patch added patch discarded remove patch

@@ -28,54 +28,54 @@
 block discarded – undo
 use OCP\Http\Client\IClientService;
 
 class RetryJob extends Job {
-	/** @var IClientService */
-	private $clientService;
-	/** @var IJobList */
-	private $jobList;
-	/** @var string */
-	private $lookupServer = 'https://lookup.nextcloud.com/users';
+    /** @var IClientService */
+    private $clientService;
+    /** @var IJobList */
+    private $jobList;
+    /** @var string */
+    private $lookupServer = 'https://lookup.nextcloud.com/users';
 
-	/**
-	 * @param IClientService|null $clientService
-	 * @param IJobList|null $jobList
-	 */
-	public function __construct(IClientService $clientService = null,
-								IJobList $jobList = null) {
-		if($clientService !== null) {
-			$this->clientService = $clientService;
-		} else {
-			$this->clientService = \OC::$server->getHTTPClientService();
-		}
-		if($jobList !== null) {
-			$this->jobList = $jobList;
-		} else {
-			$this->jobList = \OC::$server->getJobList();
-		}
-	}
+    /**
+     * @param IClientService|null $clientService
+     * @param IJobList|null $jobList
+     */
+    public function __construct(IClientService $clientService = null,
+                                IJobList $jobList = null) {
+        if($clientService !== null) {
+            $this->clientService = $clientService;
+        } else {
+            $this->clientService = \OC::$server->getHTTPClientService();
+        }
+        if($jobList !== null) {
+            $this->jobList = $jobList;
+        } else {
+            $this->jobList = \OC::$server->getJobList();
+        }
+    }
 
-	protected function run($argument) {
-		if($argument['retryNo'] === 5) {
-			return;
-		}
+    protected function run($argument) {
+        if($argument['retryNo'] === 5) {
+            return;
+        }
 
-		$client = $this->clientService->newClient();
+        $client = $this->clientService->newClient();
 
-		try {
-			$client->post($this->lookupServer,
-				[
-					'body' => json_encode($argument['dataArray']),
-					'timeout' => 10,
-					'connect_timeout' => 3,
-				]
-			);
-		} catch (\Exception $e) {
-			$this->jobList->add(RetryJob::class,
-				[
-					'dataArray' => $argument['dataArray'],
-					'retryNo' => $argument['retryNo'] + 1,
-				]
-			);
+        try {
+            $client->post($this->lookupServer,
+                [
+                    'body' => json_encode($argument['dataArray']),
+                    'timeout' => 10,
+                    'connect_timeout' => 3,
+                ]
+            );
+        } catch (\Exception $e) {
+            $this->jobList->add(RetryJob::class,
+                [
+                    'dataArray' => $argument['dataArray'],
+                    'retryNo' => $argument['retryNo'] + 1,
+                ]
+            );
 
-		}
-	}
+        }
+    }
 }

Please login to merge, or discard this patch.

apps/lookup_server_connector/appinfo/app.php 1 patch

Indentation +19 added lines, -19 removed lines patch added patch discarded remove patch

@@ -22,24 +22,24 @@
 block discarded – undo
 $dispatcher = \OC::$server->getEventDispatcher();
 
 $dispatcher->addListener('OC\AccountManager::userUpdated', function(\Symfony\Component\EventDispatcher\GenericEvent $event) {
-	$user = $event->getSubject();
+    $user = $event->getSubject();
 
-	$keyManager = new \OC\Security\IdentityProof\Manager(
-		\OC::$server->getAppDataDir('identityproof'),
-		\OC::$server->getCrypto()
-	);
-	$updateLookupServer = new \OCA\LookupServerConnector\UpdateLookupServer(
-		new \OC\Accounts\AccountManager(\OC::$server->getDatabaseConnection(), \OC::$server->getEventDispatcher()),
-		\OC::$server->getConfig(),
-		\OC::$server->getSecureRandom(),
-		\OC::$server->getHTTPClientService(),
-		$keyManager,
-		new \OC\Security\IdentityProof\Signer(
-			$keyManager,
-			new \OC\AppFramework\Utility\TimeFactory(),
-			\OC::$server->getUserManager()
-		),
-		\OC::$server->getJobList()
-	);
-	$updateLookupServer->userUpdated($user);
+    $keyManager = new \OC\Security\IdentityProof\Manager(
+        \OC::$server->getAppDataDir('identityproof'),
+        \OC::$server->getCrypto()
+    );
+    $updateLookupServer = new \OCA\LookupServerConnector\UpdateLookupServer(
+        new \OC\Accounts\AccountManager(\OC::$server->getDatabaseConnection(), \OC::$server->getEventDispatcher()),
+        \OC::$server->getConfig(),
+        \OC::$server->getSecureRandom(),
+        \OC::$server->getHTTPClientService(),
+        $keyManager,
+        new \OC\Security\IdentityProof\Signer(
+            $keyManager,
+            new \OC\AppFramework\Utility\TimeFactory(),
+            \OC::$server->getUserManager()
+        ),
+        \OC::$server->getJobList()
+    );
+    $updateLookupServer->userUpdated($user);
 });

Please login to merge, or discard this patch.

apps/user_ldap/templates/settings.php 1 patch

Indentation +46 added lines, -46 removed lines patch added patch discarded remove patch

@@ -5,46 +5,46 @@  discard block
 block discarded – undo
 vendor_style('user_ldap', 'ui-multiselect/jquery.multiselect');
 
 script('user_ldap', [
-	'wizard/controller',
-	'wizard/configModel',
-	'wizard/view',
-	'wizard/wizardObject',
-	'wizard/wizardTabGeneric',
-	'wizard/wizardTabElementary',
-	'wizard/wizardTabAbstractFilter',
-	'wizard/wizardTabUserFilter',
-	'wizard/wizardTabLoginFilter',
-	'wizard/wizardTabGroupFilter',
-	'wizard/wizardTabAdvanced',
-	'wizard/wizardTabExpert',
-	'wizard/wizardDetectorQueue',
-	'wizard/wizardDetectorGeneric',
-	'wizard/wizardDetectorPort',
-	'wizard/wizardDetectorBaseDN',
-	'wizard/wizardDetectorFeatureAbstract',
-	'wizard/wizardDetectorUserObjectClasses',
-	'wizard/wizardDetectorGroupObjectClasses',
-	'wizard/wizardDetectorGroupsForUsers',
-	'wizard/wizardDetectorGroupsForGroups',
-	'wizard/wizardDetectorSimpleRequestAbstract',
-	'wizard/wizardDetectorFilterUser',
-	'wizard/wizardDetectorFilterLogin',
-	'wizard/wizardDetectorFilterGroup',
-	'wizard/wizardDetectorUserCount',
-	'wizard/wizardDetectorGroupCount',
-	'wizard/wizardDetectorEmailAttribute',
-	'wizard/wizardDetectorUserDisplayNameAttribute',
-	'wizard/wizardDetectorUserGroupAssociation',
-	'wizard/wizardDetectorAvailableAttributes',
-	'wizard/wizardDetectorTestAbstract',
-	'wizard/wizardDetectorTestLoginName',
-	'wizard/wizardDetectorTestBaseDN',
-	'wizard/wizardDetectorTestConfiguration',
-	'wizard/wizardDetectorClearUserMappings',
-	'wizard/wizardDetectorClearGroupMappings',
-	'wizard/wizardFilterOnType',
-	'wizard/wizardFilterOnTypeFactory',
-	'wizard/wizard'
+    'wizard/controller',
+    'wizard/configModel',
+    'wizard/view',
+    'wizard/wizardObject',
+    'wizard/wizardTabGeneric',
+    'wizard/wizardTabElementary',
+    'wizard/wizardTabAbstractFilter',
+    'wizard/wizardTabUserFilter',
+    'wizard/wizardTabLoginFilter',
+    'wizard/wizardTabGroupFilter',
+    'wizard/wizardTabAdvanced',
+    'wizard/wizardTabExpert',
+    'wizard/wizardDetectorQueue',
+    'wizard/wizardDetectorGeneric',
+    'wizard/wizardDetectorPort',
+    'wizard/wizardDetectorBaseDN',
+    'wizard/wizardDetectorFeatureAbstract',
+    'wizard/wizardDetectorUserObjectClasses',
+    'wizard/wizardDetectorGroupObjectClasses',
+    'wizard/wizardDetectorGroupsForUsers',
+    'wizard/wizardDetectorGroupsForGroups',
+    'wizard/wizardDetectorSimpleRequestAbstract',
+    'wizard/wizardDetectorFilterUser',
+    'wizard/wizardDetectorFilterLogin',
+    'wizard/wizardDetectorFilterGroup',
+    'wizard/wizardDetectorUserCount',
+    'wizard/wizardDetectorGroupCount',
+    'wizard/wizardDetectorEmailAttribute',
+    'wizard/wizardDetectorUserDisplayNameAttribute',
+    'wizard/wizardDetectorUserGroupAssociation',
+    'wizard/wizardDetectorAvailableAttributes',
+    'wizard/wizardDetectorTestAbstract',
+    'wizard/wizardDetectorTestLoginName',
+    'wizard/wizardDetectorTestBaseDN',
+    'wizard/wizardDetectorTestConfiguration',
+    'wizard/wizardDetectorClearUserMappings',
+    'wizard/wizardDetectorClearGroupMappings',
+    'wizard/wizardFilterOnType',
+    'wizard/wizardFilterOnTypeFactory',
+    'wizard/wizard'
 ]);
 
 style('user_ldap', 'settings');
@@ -67,12 +67,12 @@  discard block
 block discarded – undo
 		<li class="ldapSettingsTabs"><a href="#ldapSettings-1"><?php p($l->t('Advanced'));?></a></li>
 	</ul>
 	<?php if(OCP\App::isEnabled('user_webdavauth')) {
-		print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them.').'</p>');
-	}
-	if(!function_exists('ldap_connect')) {
-		print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>');
-	}
-	?>
+        print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them.').'</p>');
+    }
+    if(!function_exists('ldap_connect')) {
+        print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>');
+    }
+    ?>
 	<?php require_once(__DIR__ . '/part.wizard-server.php'); ?>
 	<?php require_once(__DIR__ . '/part.wizard-userfilter.php'); ?>
 	<?php require_once(__DIR__ . '/part.wizard-loginfilter.php'); ?>

Please login to merge, or discard this patch.

apps/user_ldap/templates/part.wizard-server.php 1 patch

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -9,19 +9,19 @@
 block discarded – undo
 		<p>
 		<select id="ldap_serverconfig_chooser" name="ldap_serverconfig_chooser">
 		<?php if(count($_['serverConfigurationPrefixes']) === 0 ) {
-			?>
+            ?>
 				<option value="" selected><?php p($l->t('1. Server'));?></option>');
 			<?php
-		} else {
-			$i = 1;
-			$sel = ' selected';
-			foreach($_['serverConfigurationPrefixes'] as $prefix) {
-				?>
+        } else {
+            $i = 1;
+            $sel = ' selected';
+            foreach($_['serverConfigurationPrefixes'] as $prefix) {
+                ?>
 				<option value="<?php p($prefix); ?>"<?php p($sel); $sel = ''; ?>><?php p($l->t('%s. Server:', array($i++)));?> <?php p(' '.$_['serverConfigurationHosts'][$prefix]); ?></option>
 				<?php
-			}
-		}
-		?>
+            }
+        }
+        ?>
 		</select>
 		<button type="button" id="ldap_action_add_configuration"
 			name="ldap_action_add_configuration" class="icon-add icon-default-style"

Please login to merge, or discard this patch.

apps/user_ldap/ajax/clearMappings.php 1 patch

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -34,16 +34,16 @@
 block discarded – undo
 $subject = (string)$_POST['ldap_clear_mapping'];
 $mapping = null;
 if($subject === 'user') {
-	$mapping = new UserMapping(\OC::$server->getDatabaseConnection());
+    $mapping = new UserMapping(\OC::$server->getDatabaseConnection());
 } else if($subject === 'group') {
-	$mapping = new GroupMapping(\OC::$server->getDatabaseConnection());
+    $mapping = new GroupMapping(\OC::$server->getDatabaseConnection());
 }
 try {
-	if(is_null($mapping) || !$mapping->clear()) {
-		$l = \OC::$server->getL10N('user_ldap');
-		throw new \Exception($l->t('Failed to clear the mappings.'));
-	}
-	OCP\JSON::success();
+    if(is_null($mapping) || !$mapping->clear()) {
+        $l = \OC::$server->getL10N('user_ldap');
+        throw new \Exception($l->t('Failed to clear the mappings.'));
+    }
+    OCP\JSON::success();
 } catch (\Exception $e) {
-	OCP\JSON::error(array('message' => $e->getMessage()));
+    OCP\JSON::error(array('message' => $e->getMessage()));
 }

Please login to merge, or discard this patch.

apps/user_ldap/ajax/testConfiguration.php 1 patch

Indentation +32 added lines, -32 removed lines patch added patch discarded remove patch

@@ -37,24 +37,24 @@  discard block
 block discarded – undo
 
 
 try {
-	$configurationOk = true;
-	$conf = $connection->getConfiguration();
-	if ($conf['ldap_configuration_active'] === '0') {
-		//needs to be true, otherwise it will also fail with an irritating message
-		$conf['ldap_configuration_active'] = '1';
-		$configurationOk = $connection->setConfiguration($conf);
-	}
-	if ($configurationOk) {
-		//Configuration is okay
-		/*
+    $configurationOk = true;
+    $conf = $connection->getConfiguration();
+    if ($conf['ldap_configuration_active'] === '0') {
+        //needs to be true, otherwise it will also fail with an irritating message
+        $conf['ldap_configuration_active'] = '1';
+        $configurationOk = $connection->setConfiguration($conf);
+    }
+    if ($configurationOk) {
+        //Configuration is okay
+        /*
 		 * Clossing the session since it won't be used from this point on. There might be a potential
 		 * race condition if a second request is made: either this request or the other might not
 		 * contact the LDAP backup server the first time when it should, but there shouldn't be any
 		 * problem with that other than the extra connection.
 		 */
-		\OC::$server->getSession()->close();
-		if ($connection->bind()) {
-			/*
+        \OC::$server->getSession()->close();
+        if ($connection->bind()) {
+            /*
 			 * This shiny if block is an ugly hack to find out whether anonymous
 			 * bind is possible on AD or not. Because AD happily and constantly
 			 * replies with success to any anonymous bind request, we need to
@@ -63,24 +63,24 @@  discard block
 block discarded – undo
 			 * exception by the LDAP wrapper. We catch this. Other cases may
 			 * pass (like e.g. expected syntax error).
 			 */
-			try {
-				$ldapWrapper->read($connection->getConnectionResource(), '', 'objectClass=*', array('dn'));
-			} catch (\Exception $e) {
-				if($e->getCode() === 1) {
-					OCP\JSON::error(array('message' => $l->t('The configuration is invalid: anonymous bind is not allowed.')));
-					exit;
-				}
-			}
-			OCP\JSON::success(array('message'
-			=> $l->t('The configuration is valid and the connection could be established!')));
-		} else {
-			OCP\JSON::error(array('message'
-			=> $l->t('The configuration is valid, but the Bind failed. Please check the server settings and credentials.')));
-		}
-	} else {
-		OCP\JSON::error(array('message'
-		=> $l->t('The configuration is invalid. Please have a look at the logs for further details.')));
-	}
+            try {
+                $ldapWrapper->read($connection->getConnectionResource(), '', 'objectClass=*', array('dn'));
+            } catch (\Exception $e) {
+                if($e->getCode() === 1) {
+                    OCP\JSON::error(array('message' => $l->t('The configuration is invalid: anonymous bind is not allowed.')));
+                    exit;
+                }
+            }
+            OCP\JSON::success(array('message'
+            => $l->t('The configuration is valid and the connection could be established!')));
+        } else {
+            OCP\JSON::error(array('message'
+            => $l->t('The configuration is valid, but the Bind failed. Please check the server settings and credentials.')));
+        }
+    } else {
+        OCP\JSON::error(array('message'
+        => $l->t('The configuration is invalid. Please have a look at the logs for further details.')));
+    }
 } catch (\Exception $e) {
-	OCP\JSON::error(array('message' => $e->getMessage()));
+    OCP\JSON::error(array('message' => $e->getMessage()));
 }

Please login to merge, or discard this patch.

apps/user_ldap/ajax/getConfiguration.php 1 patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -34,7 +34,7 @@
 block discarded – undo
 $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix);
 $configuration = $connection->getConfiguration();
 if (isset($configuration['ldap_agent_password']) && $configuration['ldap_agent_password'] !== '') {
-	// hide password
-	$configuration['ldap_agent_password'] = '**PASSWORD SET**';
+    // hide password
+    $configuration['ldap_agent_password'] = '**PASSWORD SET**';
 }
 OCP\JSON::success(array('configuration' => $configuration));

Please login to merge, or discard this patch.

		@@ -29,60 +29,60 @@
		block discarded – undo
29	29
30	30	$application = new Application();
31	31	$application->registerRoutes(
32		- $this,
33		- array(
34		- 'routes' => array(
35		- array(
36		- 'name' => 'API#getThumbnail',
37		- 'url' => '/api/v1/thumbnail/{x}/{y}/{file}',
38		- 'verb' => 'GET',
39		- 'requirements' => array('file' => '.+')
40		- ),
41		- array(
42		- 'name' => 'API#updateFileTags',
43		- 'url' => '/api/v1/files/{path}',
44		- 'verb' => 'POST',
45		- 'requirements' => array('path' => '.+'),
46		- ),
47		- array(
48		- 'name' => 'API#getRecentFiles',
49		- 'url' => '/api/v1/recent/',
50		- 'verb' => 'GET'
51		- ),
52		- array(
53		- 'name' => 'API#updateFileSorting',
54		- 'url' => '/api/v1/sorting',
55		- 'verb' => 'POST'
56		- ),
57		- array(
58		- 'name' => 'API#showHiddenFiles',
59		- 'url' => '/api/v1/showhidden',
60		- 'verb' => 'POST'
61		- ),
62		- [
63		- 'name' => 'view#index',
64		- 'url' => '/',
65		- 'verb' => 'GET',
66		- ],
67		- [
68		- 'name' => 'settings#setMaxUploadSize',
69		- 'url' => '/settings/maxUpload',
70		- 'verb' => 'POST',
71		- ]
72		- )
73		- )
	32	+ $this,
	33	+ array(
	34	+ 'routes' => array(
	35	+ array(
	36	+ 'name' => 'API#getThumbnail',
	37	+ 'url' => '/api/v1/thumbnail/{x}/{y}/{file}',
	38	+ 'verb' => 'GET',
	39	+ 'requirements' => array('file' => '.+')
	40	+ ),
	41	+ array(
	42	+ 'name' => 'API#updateFileTags',
	43	+ 'url' => '/api/v1/files/{path}',
	44	+ 'verb' => 'POST',
	45	+ 'requirements' => array('path' => '.+'),
	46	+ ),
	47	+ array(
	48	+ 'name' => 'API#getRecentFiles',
	49	+ 'url' => '/api/v1/recent/',
	50	+ 'verb' => 'GET'
	51	+ ),
	52	+ array(
	53	+ 'name' => 'API#updateFileSorting',
	54	+ 'url' => '/api/v1/sorting',
	55	+ 'verb' => 'POST'
	56	+ ),
	57	+ array(
	58	+ 'name' => 'API#showHiddenFiles',
	59	+ 'url' => '/api/v1/showhidden',
	60	+ 'verb' => 'POST'
	61	+ ),
	62	+ [
	63	+ 'name' => 'view#index',
	64	+ 'url' => '/',
	65	+ 'verb' => 'GET',
	66	+ ],
	67	+ [
	68	+ 'name' => 'settings#setMaxUploadSize',
	69	+ 'url' => '/settings/maxUpload',
	70	+ 'verb' => 'POST',
	71	+ ]
	72	+ )
	73	+ )
74	74	);
75	75
76	76	/** @var $this \OC\Route\Router */
77	77
78	78	$this->create('files_ajax_download', 'ajax/download.php')
79		- ->actionInclude('files/ajax/download.php');
	79	+ ->actionInclude('files/ajax/download.php');
80	80	$this->create('files_ajax_getstoragestats', 'ajax/getstoragestats.php')
81		- ->actionInclude('files/ajax/getstoragestats.php');
	81	+ ->actionInclude('files/ajax/getstoragestats.php');
82	82	$this->create('files_ajax_list', 'ajax/list.php')
83		- ->actionInclude('files/ajax/list.php');
	83	+ ->actionInclude('files/ajax/list.php');
84	84
85	85	$this->create('download', 'download{file}')
86		- ->requirements(array('file' => '.*'))
87		- ->actionInclude('files/download.php');
	86	+ ->requirements(array('file' => '.*'))
	87	+ ->actionInclude('files/download.php');
88	88

		@@ -39,21 +39,21 @@
		block discarded – undo
39	39	$templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
40	40
41	41	\OCA\Files\App::getNavigationManager()->add(function () use ($l) {
42		- return [
43		- 'id' => 'files',
44		- 'appname' => 'files',
45		- 'script' => 'list.php',
46		- 'order' => 0,
47		- 'name' => $l->t('All files'),
48		- ];
	42	+ return [
	43	+ 'id' => 'files',
	44	+ 'appname' => 'files',
	45	+ 'script' => 'list.php',
	46	+ 'order' => 0,
	47	+ 'name' => $l->t('All files'),
	48	+ ];
49	49	});
50	50
51	51	\OCA\Files\App::getNavigationManager()->add(function () use ($l) {
52		- return [
53		- 'id' => 'recent',
54		- 'appname' => 'files',
55		- 'script' => 'recentlist.php',
56		- 'order' => 2,
57		- 'name' => $l->t('Recent'),
58		- ];
	52	+ return [
	53	+ 'id' => 'recent',
	54	+ 'appname' => 'files',
	55	+ 'script' => 'recentlist.php',
	56	+ 'order' => 2,
	57	+ 'name' => $l->t('Recent'),
	58	+ ];
59	59	});

		@@ -28,54 +28,54 @@
		block discarded – undo
28	28	use OCP\Http\Client\IClientService;
29	29
30	30	class RetryJob extends Job {
31		- /** @var IClientService */
32		- private $clientService;
33		- /** @var IJobList */
34		- private $jobList;
35		- /** @var string */
36		- private $lookupServer = 'https://lookup.nextcloud.com/users';
	31	+ /** @var IClientService */
	32	+ private $clientService;
	33	+ /** @var IJobList */
	34	+ private $jobList;
	35	+ /** @var string */
	36	+ private $lookupServer = 'https://lookup.nextcloud.com/users';
37	37
38		- /**
39		- * @param IClientService\|null $clientService
40		- * @param IJobList\|null $jobList
41		- */
42		- public function __construct(IClientService $clientService = null,
43		- IJobList $jobList = null) {
44		- if($clientService !== null) {
45		- $this->clientService = $clientService;
46		- } else {
47		- $this->clientService = \OC::$server->getHTTPClientService();
48		- }
49		- if($jobList !== null) {
50		- $this->jobList = $jobList;
51		- } else {
52		- $this->jobList = \OC::$server->getJobList();
53		- }
54		- }
	38	+ /**
	39	+ * @param IClientService\|null $clientService
	40	+ * @param IJobList\|null $jobList
	41	+ */
	42	+ public function __construct(IClientService $clientService = null,
	43	+ IJobList $jobList = null) {
	44	+ if($clientService !== null) {
	45	+ $this->clientService = $clientService;
	46	+ } else {
	47	+ $this->clientService = \OC::$server->getHTTPClientService();
	48	+ }
	49	+ if($jobList !== null) {
	50	+ $this->jobList = $jobList;
	51	+ } else {
	52	+ $this->jobList = \OC::$server->getJobList();
	53	+ }
	54	+ }
55	55
56		- protected function run($argument) {
57		- if($argument['retryNo'] === 5) {
58		- return;
59		- }
	56	+ protected function run($argument) {
	57	+ if($argument['retryNo'] === 5) {
	58	+ return;
	59	+ }
60	60
61		- $client = $this->clientService->newClient();
	61	+ $client = $this->clientService->newClient();
62	62
63		- try {
64		- $client->post($this->lookupServer,
65		- [
66		- 'body' => json_encode($argument['dataArray']),
67		- 'timeout' => 10,
68		- 'connect_timeout' => 3,
69		- ]
70		- );
71		- } catch (\Exception $e) {
72		- $this->jobList->add(RetryJob::class,
73		- [
74		- 'dataArray' => $argument['dataArray'],
75		- 'retryNo' => $argument['retryNo'] + 1,
76		- ]
77		- );
	63	+ try {
	64	+ $client->post($this->lookupServer,
	65	+ [
	66	+ 'body' => json_encode($argument['dataArray']),
	67	+ 'timeout' => 10,
	68	+ 'connect_timeout' => 3,
	69	+ ]
	70	+ );
	71	+ } catch (\Exception $e) {
	72	+ $this->jobList->add(RetryJob::class,
	73	+ [
	74	+ 'dataArray' => $argument['dataArray'],
	75	+ 'retryNo' => $argument['retryNo'] + 1,
	76	+ ]
	77	+ );
78	78
79		- }
80		- }
	79	+ }
	80	+ }
81	81	}

		@@ -22,24 +22,24 @@
		block discarded – undo
22	22	$dispatcher = \OC::$server->getEventDispatcher();
23	23
24	24	$dispatcher->addListener('OC\AccountManager::userUpdated', function(\Symfony\Component\EventDispatcher\GenericEvent $event) {
25		- $user = $event->getSubject();
	25	+ $user = $event->getSubject();
26	26
27		- $keyManager = new \OC\Security\IdentityProof\Manager(
28		- \OC::$server->getAppDataDir('identityproof'),
29		- \OC::$server->getCrypto()
30		- );
31		- $updateLookupServer = new \OCA\LookupServerConnector\UpdateLookupServer(
32		- new \OC\Accounts\AccountManager(\OC::$server->getDatabaseConnection(), \OC::$server->getEventDispatcher()),
33		- \OC::$server->getConfig(),
34		- \OC::$server->getSecureRandom(),
35		- \OC::$server->getHTTPClientService(),
36		- $keyManager,
37		- new \OC\Security\IdentityProof\Signer(
38		- $keyManager,
39		- new \OC\AppFramework\Utility\TimeFactory(),
40		- \OC::$server->getUserManager()
41		- ),
42		- \OC::$server->getJobList()
43		- );
44		- $updateLookupServer->userUpdated($user);
	27	+ $keyManager = new \OC\Security\IdentityProof\Manager(
	28	+ \OC::$server->getAppDataDir('identityproof'),
	29	+ \OC::$server->getCrypto()
	30	+ );
	31	+ $updateLookupServer = new \OCA\LookupServerConnector\UpdateLookupServer(
	32	+ new \OC\Accounts\AccountManager(\OC::$server->getDatabaseConnection(), \OC::$server->getEventDispatcher()),
	33	+ \OC::$server->getConfig(),
	34	+ \OC::$server->getSecureRandom(),
	35	+ \OC::$server->getHTTPClientService(),
	36	+ $keyManager,
	37	+ new \OC\Security\IdentityProof\Signer(
	38	+ $keyManager,
	39	+ new \OC\AppFramework\Utility\TimeFactory(),
	40	+ \OC::$server->getUserManager()
	41	+ ),
	42	+ \OC::$server->getJobList()
	43	+ );
	44	+ $updateLookupServer->userUpdated($user);
45	45	});

		@@ -5,46 +5,46 @@ discard block
		block discarded – undo
5	5	vendor_style('user_ldap', 'ui-multiselect/jquery.multiselect');
6	6
7	7	script('user_ldap', [
8		- 'wizard/controller',
9		- 'wizard/configModel',
10		- 'wizard/view',
11		- 'wizard/wizardObject',
12		- 'wizard/wizardTabGeneric',
13		- 'wizard/wizardTabElementary',
14		- 'wizard/wizardTabAbstractFilter',
15		- 'wizard/wizardTabUserFilter',
16		- 'wizard/wizardTabLoginFilter',
17		- 'wizard/wizardTabGroupFilter',
18		- 'wizard/wizardTabAdvanced',
19		- 'wizard/wizardTabExpert',
20		- 'wizard/wizardDetectorQueue',
21		- 'wizard/wizardDetectorGeneric',
22		- 'wizard/wizardDetectorPort',
23		- 'wizard/wizardDetectorBaseDN',
24		- 'wizard/wizardDetectorFeatureAbstract',
25		- 'wizard/wizardDetectorUserObjectClasses',
26		- 'wizard/wizardDetectorGroupObjectClasses',
27		- 'wizard/wizardDetectorGroupsForUsers',
28		- 'wizard/wizardDetectorGroupsForGroups',
29		- 'wizard/wizardDetectorSimpleRequestAbstract',
30		- 'wizard/wizardDetectorFilterUser',
31		- 'wizard/wizardDetectorFilterLogin',
32		- 'wizard/wizardDetectorFilterGroup',
33		- 'wizard/wizardDetectorUserCount',
34		- 'wizard/wizardDetectorGroupCount',
35		- 'wizard/wizardDetectorEmailAttribute',
36		- 'wizard/wizardDetectorUserDisplayNameAttribute',
37		- 'wizard/wizardDetectorUserGroupAssociation',
38		- 'wizard/wizardDetectorAvailableAttributes',
39		- 'wizard/wizardDetectorTestAbstract',
40		- 'wizard/wizardDetectorTestLoginName',
41		- 'wizard/wizardDetectorTestBaseDN',
42		- 'wizard/wizardDetectorTestConfiguration',
43		- 'wizard/wizardDetectorClearUserMappings',
44		- 'wizard/wizardDetectorClearGroupMappings',
45		- 'wizard/wizardFilterOnType',
46		- 'wizard/wizardFilterOnTypeFactory',
47		- 'wizard/wizard'
	8	+ 'wizard/controller',
	9	+ 'wizard/configModel',
	10	+ 'wizard/view',
	11	+ 'wizard/wizardObject',
	12	+ 'wizard/wizardTabGeneric',
	13	+ 'wizard/wizardTabElementary',
	14	+ 'wizard/wizardTabAbstractFilter',
	15	+ 'wizard/wizardTabUserFilter',
	16	+ 'wizard/wizardTabLoginFilter',
	17	+ 'wizard/wizardTabGroupFilter',
	18	+ 'wizard/wizardTabAdvanced',
	19	+ 'wizard/wizardTabExpert',
	20	+ 'wizard/wizardDetectorQueue',
	21	+ 'wizard/wizardDetectorGeneric',
	22	+ 'wizard/wizardDetectorPort',
	23	+ 'wizard/wizardDetectorBaseDN',
	24	+ 'wizard/wizardDetectorFeatureAbstract',
	25	+ 'wizard/wizardDetectorUserObjectClasses',
	26	+ 'wizard/wizardDetectorGroupObjectClasses',
	27	+ 'wizard/wizardDetectorGroupsForUsers',
	28	+ 'wizard/wizardDetectorGroupsForGroups',
	29	+ 'wizard/wizardDetectorSimpleRequestAbstract',
	30	+ 'wizard/wizardDetectorFilterUser',
	31	+ 'wizard/wizardDetectorFilterLogin',
	32	+ 'wizard/wizardDetectorFilterGroup',
	33	+ 'wizard/wizardDetectorUserCount',
	34	+ 'wizard/wizardDetectorGroupCount',
	35	+ 'wizard/wizardDetectorEmailAttribute',
	36	+ 'wizard/wizardDetectorUserDisplayNameAttribute',
	37	+ 'wizard/wizardDetectorUserGroupAssociation',
	38	+ 'wizard/wizardDetectorAvailableAttributes',
	39	+ 'wizard/wizardDetectorTestAbstract',
	40	+ 'wizard/wizardDetectorTestLoginName',
	41	+ 'wizard/wizardDetectorTestBaseDN',
	42	+ 'wizard/wizardDetectorTestConfiguration',
	43	+ 'wizard/wizardDetectorClearUserMappings',
	44	+ 'wizard/wizardDetectorClearGroupMappings',
	45	+ 'wizard/wizardFilterOnType',
	46	+ 'wizard/wizardFilterOnTypeFactory',
	47	+ 'wizard/wizard'
48	48	]);
49	49
50	50	style('user_ldap', 'settings');
		@@ -67,12 +67,12 @@ discard block
		block discarded – undo
67	67	<li class="ldapSettingsTabs"><a href="#ldapSettings-1"><?php p($l->t('Advanced'));?></a></li>
68	68	</ul>
69	69	<?php if(OCP\App::isEnabled('user_webdavauth')) {
70		- print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them.').'</p>');
71		- }
72		- if(!function_exists('ldap_connect')) {
73		- print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>');
74		- }
75		- ?>
	70	+ print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them.').'</p>');
	71	+ }
	72	+ if(!function_exists('ldap_connect')) {
	73	+ print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>');
	74	+ }
	75	+ ?>
76	76	<?php require_once(__DIR__ . '/part.wizard-server.php'); ?>
77	77	<?php require_once(__DIR__ . '/part.wizard-userfilter.php'); ?>
78	78	<?php require_once(__DIR__ . '/part.wizard-loginfilter.php'); ?>

		@@ -9,19 +9,19 @@
		block discarded – undo
9	9	<p>
10	10	<select id="ldap_serverconfig_chooser" name="ldap_serverconfig_chooser">
11	11	<?php if(count($_['serverConfigurationPrefixes']) === 0 ) {
12		- ?>
	12	+ ?>
13	13	<option value="" selected><?php p($l->t('1. Server'));?></option>');
14	14	<?php
15		- } else {
16		- $i = 1;
17		- $sel = ' selected';
18		- foreach($_['serverConfigurationPrefixes'] as $prefix) {
19		- ?>
	15	+ } else {
	16	+ $i = 1;
	17	+ $sel = ' selected';
	18	+ foreach($_['serverConfigurationPrefixes'] as $prefix) {
	19	+ ?>
20	20	<option value="<?php p($prefix); ?>"<?php p($sel); $sel = ''; ?>><?php p($l->t('%s. Server:', array($i++)));?> <?php p(' '.$_['serverConfigurationHosts'][$prefix]); ?></option>
21	21	<?php
22		- }
23		- }
24		- ?>
	22	+ }
	23	+ }
	24	+ ?>
25	25	</select>
26	26	<button type="button" id="ldap_action_add_configuration"
27	27	name="ldap_action_add_configuration" class="icon-add icon-default-style"

		@@ -34,16 +34,16 @@
		block discarded – undo
34	34	$subject = (string)$_POST['ldap_clear_mapping'];
35	35	$mapping = null;
36	36	if($subject === 'user') {
37		- $mapping = new UserMapping(\OC::$server->getDatabaseConnection());
	37	+ $mapping = new UserMapping(\OC::$server->getDatabaseConnection());
38	38	} else if($subject === 'group') {
39		- $mapping = new GroupMapping(\OC::$server->getDatabaseConnection());
	39	+ $mapping = new GroupMapping(\OC::$server->getDatabaseConnection());
40	40	}
41	41	try {
42		- if(is_null($mapping) \|\| !$mapping->clear()) {
43		- $l = \OC::$server->getL10N('user_ldap');
44		- throw new \Exception($l->t('Failed to clear the mappings.'));
45		- }
46		- OCP\JSON::success();
	42	+ if(is_null($mapping) \|\| !$mapping->clear()) {
	43	+ $l = \OC::$server->getL10N('user_ldap');
	44	+ throw new \Exception($l->t('Failed to clear the mappings.'));
	45	+ }
	46	+ OCP\JSON::success();
47	47	} catch (\Exception $e) {
48		- OCP\JSON::error(array('message' => $e->getMessage()));
	48	+ OCP\JSON::error(array('message' => $e->getMessage()));
49	49	}

		@@ -37,24 +37,24 @@ discard block
		block discarded – undo
37	37
38	38
39	39	try {
40		- $configurationOk = true;
41		- $conf = $connection->getConfiguration();
42		- if ($conf['ldap_configuration_active'] === '0') {
43		- //needs to be true, otherwise it will also fail with an irritating message
44		- $conf['ldap_configuration_active'] = '1';
45		- $configurationOk = $connection->setConfiguration($conf);
46		- }
47		- if ($configurationOk) {
48		- //Configuration is okay
49		- /*
	40	+ $configurationOk = true;
	41	+ $conf = $connection->getConfiguration();
	42	+ if ($conf['ldap_configuration_active'] === '0') {
	43	+ //needs to be true, otherwise it will also fail with an irritating message
	44	+ $conf['ldap_configuration_active'] = '1';
	45	+ $configurationOk = $connection->setConfiguration($conf);
	46	+ }
	47	+ if ($configurationOk) {
	48	+ //Configuration is okay
	49	+ /*
50	50	* Clossing the session since it won't be used from this point on. There might be a potential
51	51	* race condition if a second request is made: either this request or the other might not
52	52	* contact the LDAP backup server the first time when it should, but there shouldn't be any
53	53	* problem with that other than the extra connection.
54	54	*/
55		- \OC::$server->getSession()->close();
56		- if ($connection->bind()) {
57		- /*
	55	+ \OC::$server->getSession()->close();
	56	+ if ($connection->bind()) {
	57	+ /*
58	58	* This shiny if block is an ugly hack to find out whether anonymous
59	59	* bind is possible on AD or not. Because AD happily and constantly
60	60	* replies with success to any anonymous bind request, we need to
		@@ -63,24 +63,24 @@ discard block
		block discarded – undo
63	63	* exception by the LDAP wrapper. We catch this. Other cases may
64	64	* pass (like e.g. expected syntax error).
65	65	*/
66		- try {
67		- $ldapWrapper->read($connection->getConnectionResource(), '', 'objectClass=*', array('dn'));
68		- } catch (\Exception $e) {
69		- if($e->getCode() === 1) {
70		- OCP\JSON::error(array('message' => $l->t('The configuration is invalid: anonymous bind is not allowed.')));
71		- exit;
72		- }
73		- }
74		- OCP\JSON::success(array('message'
75		- => $l->t('The configuration is valid and the connection could be established!')));
76		- } else {
77		- OCP\JSON::error(array('message'
78		- => $l->t('The configuration is valid, but the Bind failed. Please check the server settings and credentials.')));
79		- }
80		- } else {
81		- OCP\JSON::error(array('message'
82		- => $l->t('The configuration is invalid. Please have a look at the logs for further details.')));
83		- }
	66	+ try {
	67	+ $ldapWrapper->read($connection->getConnectionResource(), '', 'objectClass=*', array('dn'));
	68	+ } catch (\Exception $e) {
	69	+ if($e->getCode() === 1) {
	70	+ OCP\JSON::error(array('message' => $l->t('The configuration is invalid: anonymous bind is not allowed.')));
	71	+ exit;
	72	+ }
	73	+ }
	74	+ OCP\JSON::success(array('message'
	75	+ => $l->t('The configuration is valid and the connection could be established!')));
	76	+ } else {
	77	+ OCP\JSON::error(array('message'
	78	+ => $l->t('The configuration is valid, but the Bind failed. Please check the server settings and credentials.')));
	79	+ }
	80	+ } else {
	81	+ OCP\JSON::error(array('message'
	82	+ => $l->t('The configuration is invalid. Please have a look at the logs for further details.')));
	83	+ }
84	84	} catch (\Exception $e) {
85		- OCP\JSON::error(array('message' => $e->getMessage()));
	85	+ OCP\JSON::error(array('message' => $e->getMessage()));
86	86	}

		@@ -34,7 +34,7 @@
		block discarded – undo
34	34	$connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix);
35	35	$configuration = $connection->getConfiguration();
36	36	if (isset($configuration['ldap_agent_password']) && $configuration['ldap_agent_password'] !== '') {
37		- // hide password
38		- $configuration['ldap_agent_password'] = 'PASSWORD SET';
	37	+ // hide password
	38	+ $configuration['ldap_agent_password'] = 'PASSWORD SET';
39	39	}
40	40	OCP\JSON::success(array('configuration' => $configuration));

nextcloud / server

Pull Request — master (#3813)

Status

Category

Indentation +47 added lines, -47 removed lines patch added patch discarded remove patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

Indentation +45 added lines, -45 removed lines patch added patch discarded remove patch

Indentation +19 added lines, -19 removed lines patch added patch discarded remove patch

Indentation +46 added lines, -46 removed lines patch added patch discarded remove patch

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

Indentation +32 added lines, -32 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch