Inspection of "remove button for deployment with not accepted ToU" - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Test Failed

Push — master ( 96f1a7...81aca6 )

by Maja

created 2022-03-04 14:22 UTC

Status

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

@@ -26,7 +26,7 @@  discard block
 block discarded – undo
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $deco = new \web\lib\admin\PageDecoration();
 $validator = new \web\lib\common\InputValidation();
@@ -36,12 +36,12 @@  discard block
 block discarded – undo
 $myfed = new \core\Federation($my_inst->federation);
 
 if (!isset($_GET['deployment_id'])) {
-    if (isset($_POST['consortium']) && ( $_POST['consortium'] == "eduroam" ||
-            ( $_POST['consortium'] == "OpenRoaming" && count($myfed->getAttributes("fed:openroaming")) > 0 )
+    if (isset($_POST['consortium']) && ($_POST['consortium'] == "eduroam" ||
+            ($_POST['consortium'] == "OpenRoaming" && count($myfed->getAttributes("fed:openroaming")) > 0)
             )
     ) {
         $my_inst->newDeployment(\core\AbstractDeployment::DEPLOYMENTTYPE_MANAGED, $_POST['consortium']);
-        header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
+        header("Location: overview_org.php?inst_id=".$my_inst->identifier);
         exit(0);
     } else {
         throw new Exception("Desired consortium for Managed SP needs to be specified, and allowed!");
@@ -99,19 +99,19 @@  discard block
 block discarded – undo
                 if (isset($_POST['agreement']) && $_POST['agreement'] == "true") {
                     $deployment->addAttribute("hiddenmanagedsp:tou_accepted", NULL, 1);
                 }
-                header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
+                header("Location: overview_org.php?inst_id=".$my_inst->identifier);
                 exit(0);
             case web\lib\common\FormElements::BUTTON_DELETE:
                 $response = $deployment->setRADIUSconfig();
                 if (in_array('OK', $response)) {
                     $deployment->deactivate();
                 }
-                header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)));
+                header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)));
                 exit(0);
             case web\lib\common\FormElements::BUTTON_REMOVESP:
                 error_log("MGW Remove deployment ".serialize($deployment));
                 $deployment->remove();
-                header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
+                header("Location: overview_org.php?inst_id=".$my_inst->identifier);
                 exit(0);
             case web\lib\common\FormElements::BUTTON_ACTIVATE:
                 if (count($deployment->getAttributes("hiddenmanagedsp:tou_accepted")) > 0) {
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
                     if (in_array('OK', $response)) {
                         $deployment->activate();
                     }
-                    header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)));
+                    header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)));
                     exit(0);
                 } else {
                     throw new Exception("Activate button pushed without acknowledged ToUs!");
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
                 } else {
                     $response = ['NOOP', 'NOOP'];
                 }
-                header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)));
+                header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)));
                 exit(0);
             default:
                 throw new Exception("Unknown button action requested!");
@@ -157,10 +157,10 @@  discard block
 block discarded – undo
     if (isset($_POST['command'])) {
         switch ($_POST['command']) {
         case web\lib\common\FormElements::BUTTON_CLOSE:
-            header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
+            header("Location: overview_org.php?inst_id=".$my_inst->identifier);
             exit(0);
         default:
-            header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
+            header("Location: overview_org.php?inst_id=".$my_inst->identifier);
             exit(0);
         }
     }
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
     echo $uiElements->instLevelInfoBoxes($my_inst);
     $deploymentOptions = $deployment->getAttributes();
     echo "<form enctype='multipart/form-data' action='edit_hotspot.php?inst_id=$my_inst->identifier&amp;deployment_id=$deployment->identifier' method='post' accept-charset='UTF-8'>
-                <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>";
+                <input type='hidden' name='MAX_FILE_SIZE' value='".\config\Master::MAX_UPLOAD_SIZE."'>";
     $optionDisplay = new \web\lib\admin\OptionDisplay($deploymentOptions, \core\Options::LEVEL_PROFILE);
     ?>
     <fieldset class='option_container' id='managedsp_override'>
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
                 <!-- input for VLAN identifier for home users-->
                 <td>
                     <span id='vlan_label'>
-                        <?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " " . _("(unset with '0')"))); ?>
+                        <?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " "._("(unset with '0')"))); ?>
                     </span>
                 </td>
                 <td>
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
     </fieldset>
 
     <?php
-    echo "<p><button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>" . _("Discard changes") . "</button></p></form>";
+    echo "<p><button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>"._("Discard changes")."</button></p></form>";
     echo $deco->footer();
 
     
\ No newline at end of file

Please login to merge, or discard this patch.

		@@ -26,7 +26,7 @@ discard block
		block discarded – undo
26	26	*/
27	27	?>
28	28	<?php
29		-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
	29	+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
30	30
31	31	$deco = new \web\lib\admin\PageDecoration();
32	32	$validator = new \web\lib\common\InputValidation();
		@@ -36,12 +36,12 @@ discard block
		block discarded – undo
36	36	$myfed = new \core\Federation($my_inst->federation);
37	37
38	38	if (!isset($_GET['deployment_id'])) {
39		- if (isset($_POST['consortium']) && ( $_POST['consortium'] == "eduroam" \|\|
40		- ( $_POST['consortium'] == "OpenRoaming" && count($myfed->getAttributes("fed:openroaming")) > 0 )
	39	+ if (isset($_POST['consortium']) && ($_POST['consortium'] == "eduroam" \|\|
	40	+ ($_POST['consortium'] == "OpenRoaming" && count($myfed->getAttributes("fed:openroaming")) > 0)
41	41	)
42	42	) {
43	43	$my_inst->newDeployment(\core\AbstractDeployment::DEPLOYMENTTYPE_MANAGED, $_POST['consortium']);
44		- header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
	44	+ header("Location: overview_org.php?inst_id=".$my_inst->identifier);
45	45	exit(0);
46	46	} else {
47	47	throw new Exception("Desired consortium for Managed SP needs to be specified, and allowed!");
		@@ -99,19 +99,19 @@ discard block
		block discarded – undo
99	99	if (isset($_POST['agreement']) && $_POST['agreement'] == "true") {
100	100	$deployment->addAttribute("hiddenmanagedsp:tou_accepted", NULL, 1);
101	101	}
102		- header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
	102	+ header("Location: overview_org.php?inst_id=".$my_inst->identifier);
103	103	exit(0);
104	104	case web\lib\common\FormElements::BUTTON_DELETE:
105	105	$response = $deployment->setRADIUSconfig();
106	106	if (in_array('OK', $response)) {
107	107	$deployment->deactivate();
108	108	}
109		- header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)));
	109	+ header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)));
110	110	exit(0);
111	111	case web\lib\common\FormElements::BUTTON_REMOVESP:
112	112	error_log("MGW Remove deployment ".serialize($deployment));
113	113	$deployment->remove();
114		- header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
	114	+ header("Location: overview_org.php?inst_id=".$my_inst->identifier);
115	115	exit(0);
116	116	case web\lib\common\FormElements::BUTTON_ACTIVATE:
117	117	if (count($deployment->getAttributes("hiddenmanagedsp:tou_accepted")) > 0) {
		@@ -119,7 +119,7 @@ discard block
		block discarded – undo
119	119	if (in_array('OK', $response)) {
120	120	$deployment->activate();
121	121	}
122		- header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)));
	122	+ header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)));
123	123	exit(0);
124	124	} else {
125	125	throw new Exception("Activate button pushed without acknowledged ToUs!");
		@@ -148,7 +148,7 @@ discard block
		block discarded – undo
148	148	} else {
149	149	$response = ['NOOP', 'NOOP'];
150	150	}
151		- header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)));
	151	+ header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)));
152	152	exit(0);
153	153	default:
154	154	throw new Exception("Unknown button action requested!");
		@@ -157,10 +157,10 @@ discard block
		block discarded – undo
157	157	if (isset($_POST['command'])) {
158	158	switch ($_POST['command']) {
159	159	case web\lib\common\FormElements::BUTTON_CLOSE:
160		- header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
	160	+ header("Location: overview_org.php?inst_id=".$my_inst->identifier);
161	161	exit(0);
162	162	default:
163		- header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
	163	+ header("Location: overview_org.php?inst_id=".$my_inst->identifier);
164	164	exit(0);
165	165	}
166	166	}
		@@ -187,7 +187,7 @@ discard block
		block discarded – undo
187	187	echo $uiElements->instLevelInfoBoxes($my_inst);
188	188	$deploymentOptions = $deployment->getAttributes();
189	189	echo "<form enctype='multipart/form-data' action='edit_hotspot.php?inst_id=$my_inst->identifier&deployment_id=$deployment->identifier' method='post' accept-charset='UTF-8'>
190		- <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>";
	190	+ <input type='hidden' name='MAX_FILE_SIZE' value='".\config\Master::MAX_UPLOAD_SIZE."'>";
191	191	$optionDisplay = new \web\lib\admin\OptionDisplay($deploymentOptions, \core\Options::LEVEL_PROFILE);
192	192	?>
193	193	<fieldset class='option_container' id='managedsp_override'>
		@@ -221,7 +221,7 @@ discard block
		block discarded – undo
221	221	<!-- input for VLAN identifier for home users-->
222	222	<td>
223	223	<span id='vlan_label'>
224		- <?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " " . _("(unset with '0')"))); ?>
	224	+ <?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " "._("(unset with '0')"))); ?>
225	225	</span>
226	226	</td>
227	227	<td>
		@@ -241,7 +241,7 @@ discard block
		block discarded – undo
241	241	</fieldset>
242	242
243	243	<?php
244		- echo "<p><button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>" . _("Discard changes") . "</button></p></form>";
	244	+ echo "<p><button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>"._("Discard changes")."</button></p></form>";
245	245	echo $deco->footer();
246	246
247	247
248	248	\ No newline at end of file

GEANT / CAT

Push — master ( 96f1a7...81aca6 )

Status

Category

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