Inspection of "Fix "allow user mount" checkbox for external stora..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#7123)

by Robin

created 2017-11-09 13:50 UTC

Status

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

@@ -1,47 +1,47 @@  discard block
 block discarded – undo
 <?php
-	use \OCA\Files_External\Lib\Backend\Backend;
-	use \OCA\Files_External\Lib\Auth\AuthMechanism;
-	use \OCA\Files_External\Lib\DefinitionParameter;
-	use \OCA\Files_External\Service\BackendService;
+    use \OCA\Files_External\Lib\Backend\Backend;
+    use \OCA\Files_External\Lib\Auth\AuthMechanism;
+    use \OCA\Files_External\Lib\DefinitionParameter;
+    use \OCA\Files_External\Service\BackendService;
 
-	$canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN || $_['allowUserMounting'];
+    $canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN || $_['allowUserMounting'];
 
-	$l->t("Enable encryption");
-	$l->t("Enable previews");
-	$l->t("Enable sharing");
-	$l->t("Check for changes");
-	$l->t("Never");
-	$l->t("Once every direct access");
+    $l->t("Enable encryption");
+    $l->t("Enable previews");
+    $l->t("Enable sharing");
+    $l->t("Check for changes");
+    $l->t("Never");
+    $l->t("Once every direct access");
 
-	script('files_external', 'settings');
-	style('files_external', 'settings');
+    script('files_external', 'settings');
+    style('files_external', 'settings');
 
-	// load custom JS
-	foreach ($_['backends'] as $backend) {
-		/** @var Backend $backend */
-		$scripts = $backend->getCustomJs();
-		foreach ($scripts as $script) {
-			script('files_external', $script);
-		}
-	}
-	foreach ($_['authMechanisms'] as $authMechanism) {
-		/** @var AuthMechanism $authMechanism */
-		$scripts = $authMechanism->getCustomJs();
-		foreach ($scripts as $script) {
-			script('files_external', $script);
-		}
-	}
+    // load custom JS
+    foreach ($_['backends'] as $backend) {
+        /** @var Backend $backend */
+        $scripts = $backend->getCustomJs();
+        foreach ($scripts as $script) {
+            script('files_external', $script);
+        }
+    }
+    foreach ($_['authMechanisms'] as $authMechanism) {
+        /** @var AuthMechanism $authMechanism */
+        $scripts = $authMechanism->getCustomJs();
+        foreach ($scripts as $script) {
+            script('files_external', $script);
+        }
+    }
 
-	function writeParameterInput($parameter, $options, $classes = []) {
-		$value = '';
-		if (isset($options[$parameter->getName()])) {
-			$value = $options[$parameter->getName()];
-		}
-		$placeholder = $parameter->getText();
-		$is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL);
+    function writeParameterInput($parameter, $options, $classes = []) {
+        $value = '';
+        if (isset($options[$parameter->getName()])) {
+            $value = $options[$parameter->getName()];
+        }
+        $placeholder = $parameter->getText();
+        $is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL);
 
-		switch ($parameter->getType()) {
-		case DefinitionParameter::VALUE_PASSWORD: ?>
+        switch ($parameter->getType()) {
+        case DefinitionParameter::VALUE_PASSWORD: ?>
 			<?php if ($is_optional) { $classes[] = 'optional'; } ?>
 			<input type="password"
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
 				placeholder="<?php p($placeholder); ?>"
 			/>
 			<?php
-			break;
-		case DefinitionParameter::VALUE_BOOLEAN: ?>
+            break;
+        case DefinitionParameter::VALUE_BOOLEAN: ?>
 			<?php $checkboxId = uniqid("checkbox_"); ?>
 			<div>
 			<label>
@@ -65,16 +65,16 @@  discard block
 block discarded – undo
 			</label>
 			</div>
 			<?php
-			break;
-		case DefinitionParameter::VALUE_HIDDEN: ?>
+            break;
+        case DefinitionParameter::VALUE_HIDDEN: ?>
 			<input type="hidden"
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
 				data-parameter="<?php p($parameter->getName()); ?>"
 				value="<?php p($value); ?>"
 			/>
 			<?php
-			break;
-		default: ?>
+            break;
+        default: ?>
 			<?php if ($is_optional) { $classes[] = 'optional'; } ?>
 			<input type="text"
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
@@ -83,8 +83,8 @@  discard block
 block discarded – undo
 				placeholder="<?php p($placeholder); ?>"
 			/>
 			<?php
-		}
-	}
+        }
+    }
 ?>
 
 <form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
@@ -122,13 +122,13 @@  discard block
 block discarded – undo
 							<?php p($l->t('Add storage')); ?>
 						</option>
 						<?php
-							$sortedBackends = array_filter($_['backends'], function($backend) use ($_) {
-								return $backend->isVisibleFor($_['visibilityType']);
-							});
-							uasort($sortedBackends, function($a, $b) {
-								return strcasecmp($a->getText(), $b->getText());
-							});
-						?>
+                            $sortedBackends = array_filter($_['backends'], function($backend) use ($_) {
+                                return $backend->isVisibleFor($_['visibilityType']);
+                            });
+                            uasort($sortedBackends, function($a, $b) {
+                                return strcasecmp($a->getText(), $b->getText());
+                            });
+                        ?>
 						<?php foreach ($sortedBackends as $backend): ?>
 							<?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?>
 							<option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option>
@@ -175,10 +175,10 @@  discard block
 block discarded – undo
 		<p id="userMountingBackends"<?php if (!$_['allowUserMounting']): ?> class="hidden"<?php endif; ?>>
 			<?php p($l->t('Allow users to mount the following external storage')); ?><br />
 			<?php
-				$userBackends = array_filter($_['backends'], function($backend) {
-					return $backend->isAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL);
-				});
-			?>
+                $userBackends = array_filter($_['backends'], function($backend) {
+                    return $backend->isAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL);
+                });
+            ?>
 			<?php $i = 0; foreach ($userBackends as $backend): ?>
 				<?php if ($deprecateTo = $backend->getDeprecateTo()): ?>
 					<input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" />

Please login to merge, or discard this patch.

		@@ -1,47 +1,47 @@ discard block
		block discarded – undo
1	1	<?php
2		- use \OCA\Files_External\Lib\Backend\Backend;
3		- use \OCA\Files_External\Lib\Auth\AuthMechanism;
4		- use \OCA\Files_External\Lib\DefinitionParameter;
5		- use \OCA\Files_External\Service\BackendService;
	2	+ use \OCA\Files_External\Lib\Backend\Backend;
	3	+ use \OCA\Files_External\Lib\Auth\AuthMechanism;
	4	+ use \OCA\Files_External\Lib\DefinitionParameter;
	5	+ use \OCA\Files_External\Service\BackendService;
6	6
7		- $canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN \|\| $_['allowUserMounting'];
	7	+ $canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN \|\| $_['allowUserMounting'];
8	8
9		- $l->t("Enable encryption");
10		- $l->t("Enable previews");
11		- $l->t("Enable sharing");
12		- $l->t("Check for changes");
13		- $l->t("Never");
14		- $l->t("Once every direct access");
	9	+ $l->t("Enable encryption");
	10	+ $l->t("Enable previews");
	11	+ $l->t("Enable sharing");
	12	+ $l->t("Check for changes");
	13	+ $l->t("Never");
	14	+ $l->t("Once every direct access");
15	15
16		- script('files_external', 'settings');
17		- style('files_external', 'settings');
	16	+ script('files_external', 'settings');
	17	+ style('files_external', 'settings');
18	18
19		- // load custom JS
20		- foreach ($_['backends'] as $backend) {
21		- /** @var Backend $backend */
22		- $scripts = $backend->getCustomJs();
23		- foreach ($scripts as $script) {
24		- script('files_external', $script);
25		- }
26		- }
27		- foreach ($_['authMechanisms'] as $authMechanism) {
28		- /** @var AuthMechanism $authMechanism */
29		- $scripts = $authMechanism->getCustomJs();
30		- foreach ($scripts as $script) {
31		- script('files_external', $script);
32		- }
33		- }
	19	+ // load custom JS
	20	+ foreach ($_['backends'] as $backend) {
	21	+ /** @var Backend $backend */
	22	+ $scripts = $backend->getCustomJs();
	23	+ foreach ($scripts as $script) {
	24	+ script('files_external', $script);
	25	+ }
	26	+ }
	27	+ foreach ($_['authMechanisms'] as $authMechanism) {
	28	+ /** @var AuthMechanism $authMechanism */
	29	+ $scripts = $authMechanism->getCustomJs();
	30	+ foreach ($scripts as $script) {
	31	+ script('files_external', $script);
	32	+ }
	33	+ }
34	34
35		- function writeParameterInput($parameter, $options, $classes = []) {
36		- $value = '';
37		- if (isset($options[$parameter->getName()])) {
38		- $value = $options[$parameter->getName()];
39		- }
40		- $placeholder = $parameter->getText();
41		- $is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL);
	35	+ function writeParameterInput($parameter, $options, $classes = []) {
	36	+ $value = '';
	37	+ if (isset($options[$parameter->getName()])) {
	38	+ $value = $options[$parameter->getName()];
	39	+ }
	40	+ $placeholder = $parameter->getText();
	41	+ $is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL);
42	42
43		- switch ($parameter->getType()) {
44		- case DefinitionParameter::VALUE_PASSWORD: ?>
	43	+ switch ($parameter->getType()) {
	44	+ case DefinitionParameter::VALUE_PASSWORD: ?>
45	45	<?php if ($is_optional) { $classes[] = 'optional'; } ?>
46	46	<input type="password"
47	47	<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
		@@ -50,8 +50,8 @@ discard block
		block discarded – undo
50	50	placeholder="<?php p($placeholder); ?>"
51	51	/>
52	52	<?php
53		- break;
54		- case DefinitionParameter::VALUE_BOOLEAN: ?>
	53	+ break;
	54	+ case DefinitionParameter::VALUE_BOOLEAN: ?>
55	55	<?php $checkboxId = uniqid("checkbox_"); ?>
56	56	<div>
57	57	<label>
		@@ -65,16 +65,16 @@ discard block
		block discarded – undo
65	65	</label>
66	66	</div>
67	67	<?php
68		- break;
69		- case DefinitionParameter::VALUE_HIDDEN: ?>
	68	+ break;
	69	+ case DefinitionParameter::VALUE_HIDDEN: ?>
70	70	<input type="hidden"
71	71	<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
72	72	data-parameter="<?php p($parameter->getName()); ?>"
73	73	value="<?php p($value); ?>"
74	74	/>
75	75	<?php
76		- break;
77		- default: ?>
	76	+ break;
	77	+ default: ?>
78	78	<?php if ($is_optional) { $classes[] = 'optional'; } ?>
79	79	<input type="text"
80	80	<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
		@@ -83,8 +83,8 @@ discard block
		block discarded – undo
83	83	placeholder="<?php p($placeholder); ?>"
84	84	/>
85	85	<?php
86		- }
87		- }
	86	+ }
	87	+ }
88	88	?>
89	89
90	90	<form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
		@@ -122,13 +122,13 @@ discard block
		block discarded – undo
122	122	<?php p($l->t('Add storage')); ?>
123	123	</option>
124	124	<?php
125		- $sortedBackends = array_filter($_['backends'], function($backend) use ($_) {
126		- return $backend->isVisibleFor($_['visibilityType']);
127		- });
128		- uasort($sortedBackends, function($a, $b) {
129		- return strcasecmp($a->getText(), $b->getText());
130		- });
131		- ?>
	125	+ $sortedBackends = array_filter($_['backends'], function($backend) use ($_) {
	126	+ return $backend->isVisibleFor($_['visibilityType']);
	127	+ });
	128	+ uasort($sortedBackends, function($a, $b) {
	129	+ return strcasecmp($a->getText(), $b->getText());
	130	+ });
	131	+ ?>
132	132	<?php foreach ($sortedBackends as $backend): ?>
133	133	<?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?>
134	134	<option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option>
		@@ -175,10 +175,10 @@ discard block
		block discarded – undo
175	175	<p id="userMountingBackends"<?php if (!$_['allowUserMounting']): ?> class="hidden"<?php endif; ?>>
176	176	<?php p($l->t('Allow users to mount the following external storage')); ?><br />
177	177	<?php
178		- $userBackends = array_filter($_['backends'], function($backend) {
179		- return $backend->isAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL);
180		- });
181		- ?>
	178	+ $userBackends = array_filter($_['backends'], function($backend) {
	179	+ return $backend->isAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL);
	180	+ });
	181	+ ?>
182	182	<?php $i = 0; foreach ($userBackends as $backend): ?>
183	183	<?php if ($deprecateTo = $backend->getDeprecateTo()): ?>
184	184	<input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" />

nextcloud / server

Pull Request — master (#7123)

Status

Category

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