Inspection of "Merge pull request #9278 from nextcloud/bug/noid/l..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 9b1500...83b0ce )

by Morris

created 2018-04-23 15:49 UTC

Status

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

@@ -36,13 +36,13 @@  discard block
 block discarded – undo
 $l = \OC::$server->getL10N('user_ldap');
 
 if(!isset($_POST['action'])) {
-	\OC_JSON::error(array('message' => $l->t('No action specified')));
+    \OC_JSON::error(array('message' => $l->t('No action specified')));
 }
 $action = (string)$_POST['action'];
 
 
 if(!isset($_POST['ldap_serverconfig_chooser'])) {
-	\OC_JSON::error(array('message' => $l->t('No configuration specified')));
+    \OC_JSON::error(array('message' => $l->t('No configuration specified')));
 }
 $prefix = (string)$_POST['ldap_serverconfig_chooser'];
 
@@ -55,96 +55,96 @@  discard block
 block discarded – undo
 $con->setIgnoreValidation(true);
 
 $userManager = new \OCA\User_LDAP\User\Manager(
-	\OC::$server->getConfig(),
-	new \OCA\User_LDAP\FilesystemHelper(),
-	new \OCA\User_LDAP\LogWrapper(),
-	\OC::$server->getAvatarManager(),
-	new \OCP\Image(),
-	\OC::$server->getDatabaseConnection(),
-	\OC::$server->getUserManager(),
-	\OC::$server->getNotificationManager());
+    \OC::$server->getConfig(),
+    new \OCA\User_LDAP\FilesystemHelper(),
+    new \OCA\User_LDAP\LogWrapper(),
+    \OC::$server->getAvatarManager(),
+    new \OCP\Image(),
+    \OC::$server->getDatabaseConnection(),
+    \OC::$server->getUserManager(),
+    \OC::$server->getNotificationManager());
 
 $access = new \OCA\User_LDAP\Access(
-	$con,
-	$ldapWrapper,
-	$userManager,
-	new \OCA\User_LDAP\Helper(\OC::$server->getConfig()),
-	\OC::$server->getConfig(),
-	\OC::$server->getUserManager()
+    $con,
+    $ldapWrapper,
+    $userManager,
+    new \OCA\User_LDAP\Helper(\OC::$server->getConfig()),
+    \OC::$server->getConfig(),
+    \OC::$server->getUserManager()
 );
 
 $wizard = new \OCA\User_LDAP\Wizard($configuration, $ldapWrapper, $access);
 
 switch($action) {
-	case 'guessPortAndTLS':
-	case 'guessBaseDN':
-	case 'detectEmailAttribute':
-	case 'detectUserDisplayNameAttribute':
-	case 'determineGroupMemberAssoc':
-	case 'determineUserObjectClasses':
-	case 'determineGroupObjectClasses':
-	case 'determineGroupsForUsers':
-	case 'determineGroupsForGroups':
-	case 'determineAttributes':
-	case 'getUserListFilter':
-	case 'getUserLoginFilter':
-	case 'getGroupFilter':
-	case 'countUsers':
-	case 'countGroups':
-	case 'countInBaseDN':
-		try {
-			$result = $wizard->$action();
-			if($result !== false) {
-				\OC_JSON::success($result->getResultArray());
-				exit;
-			}
-		} catch (\Exception $e) {
-			\OC_JSON::error(array('message' => $e->getMessage(), 'code' => $e->getCode()));
-			exit;
-		}
-		\OC_JSON::error();
-		exit;
-		break;
+    case 'guessPortAndTLS':
+    case 'guessBaseDN':
+    case 'detectEmailAttribute':
+    case 'detectUserDisplayNameAttribute':
+    case 'determineGroupMemberAssoc':
+    case 'determineUserObjectClasses':
+    case 'determineGroupObjectClasses':
+    case 'determineGroupsForUsers':
+    case 'determineGroupsForGroups':
+    case 'determineAttributes':
+    case 'getUserListFilter':
+    case 'getUserLoginFilter':
+    case 'getGroupFilter':
+    case 'countUsers':
+    case 'countGroups':
+    case 'countInBaseDN':
+        try {
+            $result = $wizard->$action();
+            if($result !== false) {
+                \OC_JSON::success($result->getResultArray());
+                exit;
+            }
+        } catch (\Exception $e) {
+            \OC_JSON::error(array('message' => $e->getMessage(), 'code' => $e->getCode()));
+            exit;
+        }
+        \OC_JSON::error();
+        exit;
+        break;
 
-	case 'testLoginName': {
-		try {
-			$loginName = $_POST['ldap_test_loginname'];
-			$result = $wizard->$action($loginName);
-			if($result !== false) {
-				\OC_JSON::success($result->getResultArray());
-				exit;
-			}
-		} catch (\Exception $e) {
-			\OC_JSON::error(array('message' => $e->getMessage()));
-			exit;
-		}
-		\OC_JSON::error();
-		exit;
-		break;
-	}
+    case 'testLoginName': {
+        try {
+            $loginName = $_POST['ldap_test_loginname'];
+            $result = $wizard->$action($loginName);
+            if($result !== false) {
+                \OC_JSON::success($result->getResultArray());
+                exit;
+            }
+        } catch (\Exception $e) {
+            \OC_JSON::error(array('message' => $e->getMessage()));
+            exit;
+        }
+        \OC_JSON::error();
+        exit;
+        break;
+    }
 
-	case 'save':
-		$key = isset($_POST['cfgkey']) ? $_POST['cfgkey'] : false;
-		$val = isset($_POST['cfgval']) ? $_POST['cfgval'] : null;
-		if($key === false || is_null($val)) {
-			\OC_JSON::error(array('message' => $l->t('No data specified')));
-			exit;
-		}
-		$cfg = array($key => $val);
-		$setParameters = array();
-		$configuration->setConfiguration($cfg, $setParameters);
-		if(!in_array($key, $setParameters)) {
-			\OC_JSON::error(array('message' => $l->t($key.
-				' Could not set configuration %s', $setParameters[0])));
-			exit;
-		}
-		$configuration->saveConfiguration();
-		//clear the cache on save
-		$connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix);
-		$connection->clearCache();
-		\OC_JSON::success();
-		break;
-	default:
-		\OC_JSON::error(array('message' => $l->t('Action does not exist')));
-		break;
+    case 'save':
+        $key = isset($_POST['cfgkey']) ? $_POST['cfgkey'] : false;
+        $val = isset($_POST['cfgval']) ? $_POST['cfgval'] : null;
+        if($key === false || is_null($val)) {
+            \OC_JSON::error(array('message' => $l->t('No data specified')));
+            exit;
+        }
+        $cfg = array($key => $val);
+        $setParameters = array();
+        $configuration->setConfiguration($cfg, $setParameters);
+        if(!in_array($key, $setParameters)) {
+            \OC_JSON::error(array('message' => $l->t($key.
+                ' Could not set configuration %s', $setParameters[0])));
+            exit;
+        }
+        $configuration->saveConfiguration();
+        //clear the cache on save
+        $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix);
+        $connection->clearCache();
+        \OC_JSON::success();
+        break;
+    default:
+        \OC_JSON::error(array('message' => $l->t('Action does not exist')));
+        break;
 }

Please login to merge, or discard this patch.

		@@ -36,13 +36,13 @@ discard block
		block discarded – undo
36	36	$l = \OC::$server->getL10N('user_ldap');
37	37
38	38	if(!isset($_POST['action'])) {
39		- \OC_JSON::error(array('message' => $l->t('No action specified')));
	39	+ \OC_JSON::error(array('message' => $l->t('No action specified')));
40	40	}
41	41	$action = (string)$_POST['action'];
42	42
43	43
44	44	if(!isset($_POST['ldap_serverconfig_chooser'])) {
45		- \OC_JSON::error(array('message' => $l->t('No configuration specified')));
	45	+ \OC_JSON::error(array('message' => $l->t('No configuration specified')));
46	46	}
47	47	$prefix = (string)$_POST['ldap_serverconfig_chooser'];
48	48
		@@ -55,96 +55,96 @@ discard block
		block discarded – undo
55	55	$con->setIgnoreValidation(true);
56	56
57	57	$userManager = new \OCA\User_LDAP\User\Manager(
58		- \OC::$server->getConfig(),
59		- new \OCA\User_LDAP\FilesystemHelper(),
60		- new \OCA\User_LDAP\LogWrapper(),
61		- \OC::$server->getAvatarManager(),
62		- new \OCP\Image(),
63		- \OC::$server->getDatabaseConnection(),
64		- \OC::$server->getUserManager(),
65		- \OC::$server->getNotificationManager());
	58	+ \OC::$server->getConfig(),
	59	+ new \OCA\User_LDAP\FilesystemHelper(),
	60	+ new \OCA\User_LDAP\LogWrapper(),
	61	+ \OC::$server->getAvatarManager(),
	62	+ new \OCP\Image(),
	63	+ \OC::$server->getDatabaseConnection(),
	64	+ \OC::$server->getUserManager(),
	65	+ \OC::$server->getNotificationManager());
66	66
67	67	$access = new \OCA\User_LDAP\Access(
68		- $con,
69		- $ldapWrapper,
70		- $userManager,
71		- new \OCA\User_LDAP\Helper(\OC::$server->getConfig()),
72		- \OC::$server->getConfig(),
73		- \OC::$server->getUserManager()
	68	+ $con,
	69	+ $ldapWrapper,
	70	+ $userManager,
	71	+ new \OCA\User_LDAP\Helper(\OC::$server->getConfig()),
	72	+ \OC::$server->getConfig(),
	73	+ \OC::$server->getUserManager()
74	74	);
75	75
76	76	$wizard = new \OCA\User_LDAP\Wizard($configuration, $ldapWrapper, $access);
77	77
78	78	switch($action) {
79		- case 'guessPortAndTLS':
80		- case 'guessBaseDN':
81		- case 'detectEmailAttribute':
82		- case 'detectUserDisplayNameAttribute':
83		- case 'determineGroupMemberAssoc':
84		- case 'determineUserObjectClasses':
85		- case 'determineGroupObjectClasses':
86		- case 'determineGroupsForUsers':
87		- case 'determineGroupsForGroups':
88		- case 'determineAttributes':
89		- case 'getUserListFilter':
90		- case 'getUserLoginFilter':
91		- case 'getGroupFilter':
92		- case 'countUsers':
93		- case 'countGroups':
94		- case 'countInBaseDN':
95		- try {
96		- $result = $wizard->$action();
97		- if($result !== false) {
98		- \OC_JSON::success($result->getResultArray());
99		- exit;
100		- }
101		- } catch (\Exception $e) {
102		- \OC_JSON::error(array('message' => $e->getMessage(), 'code' => $e->getCode()));
103		- exit;
104		- }
105		- \OC_JSON::error();
106		- exit;
107		- break;
	79	+ case 'guessPortAndTLS':
	80	+ case 'guessBaseDN':
	81	+ case 'detectEmailAttribute':
	82	+ case 'detectUserDisplayNameAttribute':
	83	+ case 'determineGroupMemberAssoc':
	84	+ case 'determineUserObjectClasses':
	85	+ case 'determineGroupObjectClasses':
	86	+ case 'determineGroupsForUsers':
	87	+ case 'determineGroupsForGroups':
	88	+ case 'determineAttributes':
	89	+ case 'getUserListFilter':
	90	+ case 'getUserLoginFilter':
	91	+ case 'getGroupFilter':
	92	+ case 'countUsers':
	93	+ case 'countGroups':
	94	+ case 'countInBaseDN':
	95	+ try {
	96	+ $result = $wizard->$action();
	97	+ if($result !== false) {
	98	+ \OC_JSON::success($result->getResultArray());
	99	+ exit;
	100	+ }
	101	+ } catch (\Exception $e) {
	102	+ \OC_JSON::error(array('message' => $e->getMessage(), 'code' => $e->getCode()));
	103	+ exit;
	104	+ }
	105	+ \OC_JSON::error();
	106	+ exit;
	107	+ break;
108	108
109		- case 'testLoginName': {
110		- try {
111		- $loginName = $_POST['ldap_test_loginname'];
112		- $result = $wizard->$action($loginName);
113		- if($result !== false) {
114		- \OC_JSON::success($result->getResultArray());
115		- exit;
116		- }
117		- } catch (\Exception $e) {
118		- \OC_JSON::error(array('message' => $e->getMessage()));
119		- exit;
120		- }
121		- \OC_JSON::error();
122		- exit;
123		- break;
124		- }
	109	+ case 'testLoginName': {
	110	+ try {
	111	+ $loginName = $_POST['ldap_test_loginname'];
	112	+ $result = $wizard->$action($loginName);
	113	+ if($result !== false) {
	114	+ \OC_JSON::success($result->getResultArray());
	115	+ exit;
	116	+ }
	117	+ } catch (\Exception $e) {
	118	+ \OC_JSON::error(array('message' => $e->getMessage()));
	119	+ exit;
	120	+ }
	121	+ \OC_JSON::error();
	122	+ exit;
	123	+ break;
	124	+ }
125	125
126		- case 'save':
127		- $key = isset($_POST['cfgkey']) ? $_POST['cfgkey'] : false;
128		- $val = isset($_POST['cfgval']) ? $_POST['cfgval'] : null;
129		- if($key === false \|\| is_null($val)) {
130		- \OC_JSON::error(array('message' => $l->t('No data specified')));
131		- exit;
132		- }
133		- $cfg = array($key => $val);
134		- $setParameters = array();
135		- $configuration->setConfiguration($cfg, $setParameters);
136		- if(!in_array($key, $setParameters)) {
137		- \OC_JSON::error(array('message' => $l->t($key.
138		- ' Could not set configuration %s', $setParameters[0])));
139		- exit;
140		- }
141		- $configuration->saveConfiguration();
142		- //clear the cache on save
143		- $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix);
144		- $connection->clearCache();
145		- \OC_JSON::success();
146		- break;
147		- default:
148		- \OC_JSON::error(array('message' => $l->t('Action does not exist')));
149		- break;
	126	+ case 'save':
	127	+ $key = isset($_POST['cfgkey']) ? $_POST['cfgkey'] : false;
	128	+ $val = isset($_POST['cfgval']) ? $_POST['cfgval'] : null;
	129	+ if($key === false \|\| is_null($val)) {
	130	+ \OC_JSON::error(array('message' => $l->t('No data specified')));
	131	+ exit;
	132	+ }
	133	+ $cfg = array($key => $val);
	134	+ $setParameters = array();
	135	+ $configuration->setConfiguration($cfg, $setParameters);
	136	+ if(!in_array($key, $setParameters)) {
	137	+ \OC_JSON::error(array('message' => $l->t($key.
	138	+ ' Could not set configuration %s', $setParameters[0])));
	139	+ exit;
	140	+ }
	141	+ $configuration->saveConfiguration();
	142	+ //clear the cache on save
	143	+ $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix);
	144	+ $connection->clearCache();
	145	+ \OC_JSON::success();
	146	+ break;
	147	+ default:
	148	+ \OC_JSON::error(array('message' => $l->t('Action does not exist')));
	149	+ break;
150	150	}

nextcloud / server

Push — master ( 9b1500...83b0ce )

Status

Category

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