Inspection of "Update to Changes" - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Test Setup Failed

Push — master ( defeb2...c0e551 )

by Tomasz

created 2025-08-12 13:16 UTC

Status

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

@@ -28,9 +28,9 @@  discard block
 block discarded – undo
 ?>
 
 <!-- JQuery -->
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate-1.2.1.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate-1.2.1.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js") ?>"></script>
 <!-- JQuery -->
 
 <script type="text/javascript">
@@ -44,10 +44,10 @@  discard block
 block discarded – undo
 $operatingSystem = $Gui->detectOS();
 $Gui->loggerInstance->debug(4, $operatingSystem);
 if ($operatingSystem) {
-    print "recognisedOS = '" . $operatingSystem['device'] . "';\n";
+    print "recognisedOS = '".$operatingSystem['device']."';\n";
 }
 
-print 'downloadMessage = "' . $Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE] . '";';
+print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE].'";';
 //TODO modify this based on OS detection
 if (preg_match('/Android/', $_SERVER['HTTP_USER_AGENT'])) {
     $profile_list_size = 1;
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
 require "user/js/cat_js.php";
 ?>
     var loading_ico = new Image();
-    loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>";
+    loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>";
 </script>
 <?php $Gui->languageInstance->setTextDomain("web_user"); ?>
 <!-- DiscoJuice -->
@@ -67,9 +67,9 @@  discard block
 block discarded – undo
     front_page = 0;
     var lang = "<?php echo($Gui->languageInstance->getLang()) ?>";
 </script>
-<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","discojuice/css/discojuice.css")?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "discojuice/css/discojuice.css")?>" />
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
-<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" />
+<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
 </head>
 <body>
 <div id="wrap">
@@ -77,14 +77,14 @@  discard block
 block discarded – undo
     <?php echo $divs->divHeading($visibility); ?>
     <div id="main_page">
         <div id="loading_ico">
-          <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>" alt="Authenticating ..."/>
+          <?php echo _("Authenticating")."..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>" alt="Authenticating ..."/>
         </div>
         <div id="info_overlay"> <!-- device info -->
             <div id="info_window"></div>
-            <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
+            <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
         </div>
         <div id="main_menu_info" style="display:none"> <!-- stuff triggered form main menu -->
-          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
+          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
           <div id="main_menu_content"></div>
         </div>
         <div id="main_body">

Please login to merge, or discard this patch.

utils/installTranslations.php 1 patch

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

@@ -8,7 +8,7 @@
 block discarded – undo
  * License: see the web/copyright.php file in the file structure
  * ******************************************************************************
  */
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 
 const AREAS = ["web_admin", "web_user", "devices", "core", "diagnostics"];
 foreach (\config\Master::LANGUAGES as $lang => $details) {

Please login to merge, or discard this patch.

web/admin/112365365321.php 1 patch

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

@@ -19,7 +19,7 @@  discard block
 block discarded – undo
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(__DIR__)) . '/config/_config.php';
+require_once dirname(dirname(__DIR__)).'/config/_config.php';
 
 $uiElements = new web\lib\admin\UIElements();
 
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
                         // filesystem cleanup
                     case web\lib\common\FormElements::BUTTON_DELETE:
                         $i = web\lib\admin\Maintenance::deleteObsoleteTempDirs();
-                        echo "<div class='ca-summary'><table>" . $uiElements->boxRemark(sprintf("Deleted %d cache directories.", $i), "Cache deleted") . "</table></div>";
+                        echo "<div class='ca-summary'><table>".$uiElements->boxRemark(sprintf("Deleted %d cache directories.", $i), "Cache deleted")."</table></div>";
                         break;
                     default:
                         break;
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
                     $admin_query = $dbHandle->exec("SELECT SUM(downloads_admin) AS admin, SUM(downloads_user) AS user, SUM(downloads_silverbullet) as silverbullet FROM downloads WHERE device_id = '$index'");
                     // SELECT -> mysqli_result, not boolean
                     while ($a = mysqli_fetch_object(/** @scrutinizer ignore-type */ $admin_query)) {
-                        echo "<td>" . $device_array['display'] . "</td><td>" . $a->admin . "</td><td>" . $a->user . "</td><td>" . $a->silverbullet . "</td><td>" . sprintf("%s", $a->user + $a->silverbullet) . "</td>";
+                        echo "<td>".$device_array['display']."</td><td>".$a->admin."</td><td>".$a->user."</td><td>".$a->silverbullet."</td><td>".sprintf("%s", $a->user + $a->silverbullet)."</td>";
                         $gross_admin = $gross_admin + $a->admin;
                         $gross_user = $gross_user + $a->user;
                         $gross_silverbullet = $gross_silverbullet + $a->silverbullet;

Please login to merge, or discard this patch.

devices/PP_OSU_XML/DevicePPOSUXML.php 1 patch

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

@@ -92,10 +92,10 @@  discard block
 block discarded – undo
         <NodeName>AAAServerTrustRoot</NodeName>';
         foreach ($this->attributes['internal:CAs'][0] as $oneCert) {
             $retval .= '<Node>
-                         <NodeName>' . $oneCert['uuid'] . '</NodeName>
+                         <NodeName>' . $oneCert['uuid'].'</NodeName>
                              <Node>
                                <NodeName>CertSHA256Fingerprint</NodeName>
-                               <Value>' . $oneCert['sha256'] . '</Value>
+                               <Value>' . $oneCert['sha256'].'</Value>
                              </Node>
                        </Node>
                   ';
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
         $now = new \DateTime();
         return '<Node>
           <NodeName>CreationDate</NodeName>
-          <Value>' . $now->format("Y-m-d") . "T" . $now->format("H:i:s") . "Z" . '</Value>
+          <Value>' . $now->format("Y-m-d")."T".$now->format("H:i:s")."Z".'</Value>
         </Node>';
     }
 
@@ -128,11 +128,11 @@  discard block
 block discarded – undo
         <NodeName>HomeSP</NodeName>
         <Node>
           <NodeName>FriendlyName</NodeName>
-          <Value>' . sprintf(_("%s via Passpoint"), \config\ConfAssistant::CONSORTIUM['display_name']) . '</Value>
+          <Value>' . sprintf(_("%s via Passpoint"), \config\ConfAssistant::CONSORTIUM['display_name']).'</Value>
         </Node>
         <Node>
           <NodeName>FQDN</NodeName>
-          <Value>' . $this->attributes['eap:server_name'][0] /* what, only one FQDN allowed? */ . '</Value>
+          <Value>' . $this->attributes['eap:server_name'][0] /* what, only one FQDN allowed? */.'</Value>
         </Node>
         <Node>
           <NodeName>RoamingConsortiumOI</NodeName>
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
                 $oiList .= ",";
             }
         }
-        $retval .= $oiList . '</Value>
+        $retval .= $oiList.'</Value>
         </Node>
       </Node>
 ';
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
         <NodeName>Credential</NodeName>
         <Node>
               <NodeName>Realm</NodeName>
-              <Value>' . $this->attributes['internal:realm'][0] . '</Value>
+              <Value>' . $this->attributes['internal:realm'][0].'</Value>
             </Node>';
         /* the example file I got did not include CreationDate, so omit it
          * 
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
             </Node>
             <Node>
               <NodeName>CertSHA256Fingerprint</NodeName>
-              <Value>' . strtoupper($this->clientCert["sha256"]) /* the actual cert has to go... where? */ . '</Value>
+              <Value>' . strtoupper($this->clientCert["sha256"]) /* the actual cert has to go... where? */.'</Value>
             </Node>
           </Node>
       </Node>
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
         // foresee signing.
         // but if they ever change their mind, we are prepared
 
-        $outputFromSigning = system($this->sign . " installer_profile '$fileName' > /dev/null");
+        $outputFromSigning = system($this->sign." installer_profile '$fileName' > /dev/null");
         if ($outputFromSigning === FALSE) {
             $this->loggerInstance->debug(2, "Signing the ONC installer $fileName FAILED!\n");
         }

Please login to merge, or discard this patch.

core/ProfileSilverbullet.php 1 patch

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

@@ -96,7 +96,7 @@  discard block
 block discarded – undo
 
 // realm is automatically calculated, then stored in DB
 
-        $this->realm = "opaquehash@$myInst->identifier-$this->identifier." . strtolower($myInst->federation) . \config\ConfAssistant::SILVERBULLET['realm_suffix'];
+        $this->realm = "opaquehash@$myInst->identifier-$this->identifier.".strtolower($myInst->federation).\config\ConfAssistant::SILVERBULLET['realm_suffix'];
         $localValueIfAny = "";
 
 // but there's some common internal attributes populated directly
@@ -113,11 +113,11 @@  discard block
 block discarded – undo
 
         // and we need to populate eap:server_name and eap:ca_file with the NRO-specific EAP information
         $silverbulletAttributes = [
-            "eap:server_name" => "auth." . strtolower($myFed->tld) . \config\ConfAssistant::SILVERBULLET['server_suffix'],
+            "eap:server_name" => "auth.".strtolower($myFed->tld).\config\ConfAssistant::SILVERBULLET['server_suffix'],
         ];
         $temp = array_merge($this->addInternalAttributes($internalAttributes), $this->addInternalAttributes($silverbulletAttributes));
         $x509 = new \core\common\X509();
-        $caHandle = fopen(dirname(__FILE__) . "/../config/SilverbulletServerCerts/" . strtoupper($myFed->tld) . "/root.pem", "r");
+        $caHandle = fopen(dirname(__FILE__)."/../config/SilverbulletServerCerts/".strtoupper($myFed->tld)."/root.pem", "r");
         if ($caHandle !== FALSE) {
             $cAFile = fread($caHandle, 16000000);
             foreach ($x509->splitCertificate($cAFile) as $oneCa) {
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
         if (empty($certNames)) {
             return [];
         }
-        $namesCondensed = "'" . implode("' OR username = '", $certNames) . "'";
+        $namesCondensed = "'".implode("' OR username = '", $certNames)."'";
         $serverHandles = DBConnection::handle("RADIUS");
         $returnarray = [];
         foreach ($serverHandles as $oneDbServer) {

Please login to merge, or discard this patch.

core/common/X509.php 1 patch

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

@@ -88,7 +88,7 @@
 block discarded – undo
     public function der2pem($derData)
     {
         $pem = chunk_split(base64_encode($derData), 64, "\n");
-        $pem = "-----BEGIN CERTIFICATE-----\n" . $pem . "-----END CERTIFICATE-----\n";
+        $pem = "-----BEGIN CERTIFICATE-----\n".$pem."-----END CERTIFICATE-----\n";
         return $pem;
     }
 

Please login to merge, or discard this patch.

core/DeviceFactory.php 1 patch

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

@@ -65,8 +65,8 @@  discard block
 block discarded – undo
         parent::__construct();
         $Dev = \devices\Devices::listDevices();
         if (isset($Dev[$blueprint])) {
-            $this->loggerInstance->debug(4, "loaded: devices/" . $Dev[$blueprint]['directory'] . "/" . $Dev[$blueprint]['module'] . ".php\n");
-            $class_name = "\devices\\" . $Dev[$blueprint]['directory'] . "\Device" . $Dev[$blueprint]['module'];
+            $this->loggerInstance->debug(4, "loaded: devices/".$Dev[$blueprint]['directory']."/".$Dev[$blueprint]['module'].".php\n");
+            $class_name = "\devices\\".$Dev[$blueprint]['directory']."\Device".$Dev[$blueprint]['module'];
             $this->device = new $class_name();
             if (!$this->device) {
                 $this->loggerInstance->debug(2, "module loading failed");
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
         } else {
             echo("unknown devicename:$blueprint\n");
         }
-        $this->device->module_path = ROOT . '/devices/' . $Dev[$blueprint]['directory'];
+        $this->device->module_path = ROOT.'/devices/'.$Dev[$blueprint]['directory'];
         $this->device->signer = isset($Dev[$blueprint]['signer']) ? $Dev[$blueprint]['signer'] : 0;
         $this->device->device_id = $blueprint;
         $options = \devices\Devices::$Options;

Please login to merge, or discard this patch.

core/diag/Sociopath.php 1 patch

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

@@ -108,7 +108,7 @@  discard block
 block discarded – undo
                 "TXT" => _("If you use more than one device: do your other devices still work?"),
                 "FACTOR_YES" => 0.33, // seems that all is okay with the account as such
                 "FACTOR_NO" => 3, // now that is suspicious indeed
-                "VERDICTLECTURE" => _("If all devices stopped working simultaneously, there may be a problem with your account as such. Maybe your account expired, or you were forced to change the password? These questions are best answered by your Identity Provider [MGW: display contact info]"),],
+                "VERDICTLECTURE" => _("If all devices stopped working simultaneously, there may be a problem with your account as such. Maybe your account expired, or you were forced to change the password? These questions are best answered by your Identity Provider [MGW: display contact info]"), ],
             6 => ["AREA" => AbstractTest::INFRA_SP_80211,
                 "TXT" => _("Is the place you are currently at heavily crowded, or is a network-intensive workload going on?"),
                 "FACTOR_YES" => 3,
@@ -144,11 +144,11 @@  discard block
 block discarded – undo
         $questionDetails = $this->qaArray[$questionNumber];
         if ($answer === TRUE) {
             $this->possibleFailureReasons[$questionDetails['AREA']] = $this->possibleFailureReasons[$questionDetails['AREA']] * $questionDetails["FACTOR_YES"];
-            $this->loggerInstance->debug(3, "Adjusting " . $questionDetails['AREA'] . " by " . $questionDetails["FACTOR_YES"] . "\n");
+            $this->loggerInstance->debug(3, "Adjusting ".$questionDetails['AREA']." by ".$questionDetails["FACTOR_YES"]."\n");
             $factor = $questionDetails["FACTOR_YES"];
         } elseif ($answer === FALSE) {
             $this->possibleFailureReasons[$questionDetails['AREA']] = $this->possibleFailureReasons[$questionDetails['AREA']] * $questionDetails["FACTOR_NO"];
-            $this->loggerInstance->debug(3, "Adjusting " . $questionDetails['AREA'] . " by " . $questionDetails["FACTOR_NO"] . "\n");
+            $this->loggerInstance->debug(3, "Adjusting ".$questionDetails['AREA']." by ".$questionDetails["FACTOR_NO"]."\n");
             $factor = $questionDetails["FACTOR_NO"];
         } else {
             $factor = 1;
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
         // if both are identical, take any of the questions in the pool of both
         foreach ($this->qaArray as $questionNumber => $questionDetails) {
             // if we find a question we didn't ask before AND it is related to our currently high-scoring problem area, ask it
-            if (!array_key_exists($questionNumber, $this->previousQuestions) && ( $questionDetails["AREA"] == $highestCategory || $questionDetails["AREA"] == $nextCategory)) {
+            if (!array_key_exists($questionNumber, $this->previousQuestions) && ($questionDetails["AREA"] == $highestCategory || $questionDetails["AREA"] == $nextCategory)) {
                 return json_encode(["NEXTEXISTS" => TRUE, "NUMBER" => $questionNumber, "TEXT" => $questionDetails["TXT"]]);
             }
         }
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
         $text = $this->genericVerdictTexts[$area];
         foreach ($this->previousQuestions as $number => $factor) {
             if ($this->qaArray[$number]["AREA"] == $area && $factor > 1) {
-                $text .= "\n\n" . $this->qaArray[$number]["VERDICTLECTURE"];
+                $text .= "\n\n".$this->qaArray[$number]["VERDICTLECTURE"];
             }
         }
         return $text;

Please login to merge, or discard this patch.

core/diag/Telepath.php 1 patch

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

@@ -113,7 +113,7 @@  discard block
 block discarded – undo
         if ($this->idPFederation === NULL && preg_match("/\.(..)$/", $realm, $matches)) {
             $this->idPFederation = strtoupper($matches[1]);
         }
-        $this->loggerInstance->debug(4, "XYZ: IdP-side NRO is " . $this->idPFederation . "\n");
+        $this->loggerInstance->debug(4, "XYZ: IdP-side NRO is ".$this->idPFederation."\n");
     }
     /* The eduroam OT monitoring has the following return codes:
      * 
@@ -443,12 +443,12 @@  discard block
 block discarded – undo
                     break;
                 case \core\AbstractProfile::READINESS_LEVEL_NOTREADY:
                     $this->additionalFindings[AbstractTest::INFRA_IDP_RADIUS][] = ["Profile" => "UNCONCLUSIVE"];
-                    $this->testsuite = new RADIUSTests($this->realm, "anonymous@" . $this->realm);
+                    $this->testsuite = new RADIUSTests($this->realm, "anonymous@".$this->realm);
                     break;
                 default:
             }
         } else {
-            $this->testsuite = new RADIUSTests($this->realm, "anonymous@" . $this->realm);
+            $this->testsuite = new RADIUSTests($this->realm, "anonymous@".$this->realm);
         }
     }
 

Please login to merge, or discard this patch.

		@@ -113,7 +113,7 @@ discard block
		block discarded – undo
113	113	if ($this->idPFederation === NULL && preg_match("/\.(..)$/", $realm, $matches)) {
114	114	$this->idPFederation = strtoupper($matches[1]);
115	115	}
116		- $this->loggerInstance->debug(4, "XYZ: IdP-side NRO is " . $this->idPFederation . "\n");
	116	+ $this->loggerInstance->debug(4, "XYZ: IdP-side NRO is ".$this->idPFederation."\n");
117	117	}
118	118	/* The eduroam OT monitoring has the following return codes:
119	119	*
		@@ -443,12 +443,12 @@ discard block
		block discarded – undo
443	443	break;
444	444	case \core\AbstractProfile::READINESS_LEVEL_NOTREADY:
445	445	$this->additionalFindings[AbstractTest::INFRA_IDP_RADIUS][] = ["Profile" => "UNCONCLUSIVE"];
446		- $this->testsuite = new RADIUSTests($this->realm, "anonymous@" . $this->realm);
	446	+ $this->testsuite = new RADIUSTests($this->realm, "anonymous@".$this->realm);
447	447	break;
448	448	default:
449	449	}
450	450	} else {
451		- $this->testsuite = new RADIUSTests($this->realm, "anonymous@" . $this->realm);
	451	+ $this->testsuite = new RADIUSTests($this->realm, "anonymous@".$this->realm);
452	452	}
453	453	}
454	454

		@@ -28,9 +28,9 @@ discard block
		block discarded – undo
28	28	?>
29	29
30	30	<!-- JQuery -->
31		-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js") ?>"></script>
32		-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate-1.2.1.js") ?>"></script>
33		-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js") ?>"></script>
	31	+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js") ?>"></script>
	32	+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate-1.2.1.js") ?>"></script>
	33	+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js") ?>"></script>
34	34	<!-- JQuery -->
35	35
36	36	<script type="text/javascript">
		@@ -44,10 +44,10 @@ discard block
		block discarded – undo
44	44	$operatingSystem = $Gui->detectOS();
45	45	$Gui->loggerInstance->debug(4, $operatingSystem);
46	46	if ($operatingSystem) {
47		- print "recognisedOS = '" . $operatingSystem['device'] . "';\n";
	47	+ print "recognisedOS = '".$operatingSystem['device']."';\n";
48	48	}
49	49
50		-print 'downloadMessage = "' . $Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE] . '";';
	50	+print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE].'";';
51	51	//TODO modify this based on OS detection
52	52	if (preg_match('/Android/', $_SERVER['HTTP_USER_AGENT'])) {
53	53	$profile_list_size = 1;
		@@ -58,7 +58,7 @@ discard block
		block discarded – undo
58	58	require "user/js/cat_js.php";
59	59	?>
60	60	var loading_ico = new Image();
61		- loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>";
	61	+ loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>";
62	62	</script>
63	63	<?php $Gui->languageInstance->setTextDomain("web_user"); ?>
64	64	<!-- DiscoJuice -->
		@@ -67,9 +67,9 @@ discard block
		block discarded – undo
67	67	front_page = 0;
68	68	var lang = "<?php echo($Gui->languageInstance->getLang()) ?>";
69	69	</script>
70		-<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","discojuice/css/discojuice.css")?>" />
	70	+<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "discojuice/css/discojuice.css")?>" />
71	71	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
72		-<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" />
	72	+<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
73	73	</head>
74	74	<body>
75	75	<div id="wrap">
		@@ -77,14 +77,14 @@ discard block
		block discarded – undo
77	77	<?php echo $divs->divHeading($visibility); ?>
78	78	<div id="main_page">
79	79	<div id="loading_ico">
80		- <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>" alt="Authenticating ..."/>
	80	+ <?php echo _("Authenticating")."..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>" alt="Authenticating ..."/>
81	81	</div>
82	82	<div id="info_overlay"> <!-- device info -->
83	83	<div id="info_window"></div>
84		- <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
	84	+ <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
85	85	</div>
86	86	<div id="main_menu_info" style="display:none"> <!-- stuff triggered form main menu -->
87		- <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
	87	+ <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
88	88	<div id="main_menu_content"></div>
89	89	</div>
90	90	<div id="main_body">

		@@ -8,7 +8,7 @@
		block discarded – undo
8	8	* License: see the web/copyright.php file in the file structure
9	9	* ******************************************************************************
10	10	*/
11		-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
	11	+require_once dirname(dirname(__FILE__))."/config/_config.php";
12	12
13	13	const AREAS = ["web_admin", "web_user", "devices", "core", "diagnostics"];
14	14	foreach (\config\Master::LANGUAGES as $lang => $details) {

		@@ -19,7 +19,7 @@ discard block
		block discarded – undo
19	19	* <base_url>/copyright.php after deploying the software
20	20	*/
21	21
22		-require_once dirname(dirname(__DIR__)) . '/config/_config.php';
	22	+require_once dirname(dirname(__DIR__)).'/config/_config.php';
23	23
24	24	$uiElements = new web\lib\admin\UIElements();
25	25
		@@ -75,7 +75,7 @@ discard block
		block discarded – undo
75	75	// filesystem cleanup
76	76	case web\lib\common\FormElements::BUTTON_DELETE:
77	77	$i = web\lib\admin\Maintenance::deleteObsoleteTempDirs();
78		- echo "<div class='ca-summary'><table>" . $uiElements->boxRemark(sprintf("Deleted %d cache directories.", $i), "Cache deleted") . "</table></div>";
	78	+ echo "<div class='ca-summary'><table>".$uiElements->boxRemark(sprintf("Deleted %d cache directories.", $i), "Cache deleted")."</table></div>";
79	79	break;
80	80	default:
81	81	break;
		@@ -141,7 +141,7 @@ discard block
		block discarded – undo
141	141	$admin_query = $dbHandle->exec("SELECT SUM(downloads_admin) AS admin, SUM(downloads_user) AS user, SUM(downloads_silverbullet) as silverbullet FROM downloads WHERE device_id = '$index'");
142	142	// SELECT -> mysqli_result, not boolean
143	143	while ($a = mysqli_fetch_object(/** @scrutinizer ignore-type */ $admin_query)) {
144		- echo "<td>" . $device_array['display'] . "</td><td>" . $a->admin . "</td><td>" . $a->user . "</td><td>" . $a->silverbullet . "</td><td>" . sprintf("%s", $a->user + $a->silverbullet) . "</td>";
	144	+ echo "<td>".$device_array['display']."</td><td>".$a->admin."</td><td>".$a->user."</td><td>".$a->silverbullet."</td><td>".sprintf("%s", $a->user + $a->silverbullet)."</td>";
145	145	$gross_admin = $gross_admin + $a->admin;
146	146	$gross_user = $gross_user + $a->user;
147	147	$gross_silverbullet = $gross_silverbullet + $a->silverbullet;

		@@ -92,10 +92,10 @@ discard block
		block discarded – undo
92	92	<NodeName>AAAServerTrustRoot</NodeName>';
93	93	foreach ($this->attributes['internal:CAs'][0] as $oneCert) {
94	94	$retval .= '<Node>
95		- <NodeName>' . $oneCert['uuid'] . '</NodeName>
	95	+ <NodeName>' . $oneCert['uuid'].'</NodeName>
96	96	<Node>
97	97	<NodeName>CertSHA256Fingerprint</NodeName>
98		- <Value>' . $oneCert['sha256'] . '</Value>
	98	+ <Value>' . $oneCert['sha256'].'</Value>
99	99	</Node>
100	100	</Node>
101	101	';
		@@ -114,7 +114,7 @@ discard block
		block discarded – undo
114	114	$now = new \DateTime();
115	115	return '<Node>
116	116	<NodeName>CreationDate</NodeName>
117		- <Value>' . $now->format("Y-m-d") . "T" . $now->format("H:i:s") . "Z" . '</Value>
	117	+ <Value>' . $now->format("Y-m-d")."T".$now->format("H:i:s")."Z".'</Value>
118	118	</Node>';
119	119	}
120	120
		@@ -128,11 +128,11 @@ discard block
		block discarded – undo
128	128	<NodeName>HomeSP</NodeName>
129	129	<Node>
130	130	<NodeName>FriendlyName</NodeName>
131		- <Value>' . sprintf(_("%s via Passpoint"), \config\ConfAssistant::CONSORTIUM['display_name']) . '</Value>
	131	+ <Value>' . sprintf(_("%s via Passpoint"), \config\ConfAssistant::CONSORTIUM['display_name']).'</Value>
132	132	</Node>
133	133	<Node>
134	134	<NodeName>FQDN</NodeName>
135		- <Value>' . $this->attributes['eap:server_name'][0] /* what, only one FQDN allowed? */ . '</Value>
	135	+ <Value>' . $this->attributes['eap:server_name'][0] /* what, only one FQDN allowed? */.'</Value>
136	136	</Node>
137	137	<Node>
138	138	<NodeName>RoamingConsortiumOI</NodeName>
		@@ -148,7 +148,7 @@ discard block
		block discarded – undo
148	148	$oiList .= ",";
149	149	}
150	150	}
151		- $retval .= $oiList . '</Value>
	151	+ $retval .= $oiList.'</Value>
152	152	</Node>
153	153	</Node>
154	154	';
		@@ -165,7 +165,7 @@ discard block
		block discarded – undo
165	165	<NodeName>Credential</NodeName>
166	166	<Node>
167	167	<NodeName>Realm</NodeName>
168		- <Value>' . $this->attributes['internal:realm'][0] . '</Value>
	168	+ <Value>' . $this->attributes['internal:realm'][0].'</Value>
169	169	</Node>';
170	170	/* the example file I got did not include CreationDate, so omit it
171	171	*
		@@ -180,7 +180,7 @@ discard block
		block discarded – undo
180	180	</Node>
181	181	<Node>
182	182	<NodeName>CertSHA256Fingerprint</NodeName>
183		- <Value>' . strtoupper($this->clientCert["sha256"]) /* the actual cert has to go... where? */ . '</Value>
	183	+ <Value>' . strtoupper($this->clientCert["sha256"]) /* the actual cert has to go... where? */.'</Value>
184	184	</Node>
185	185	</Node>
186	186	</Node>
		@@ -298,7 +298,7 @@ discard block
		block discarded – undo
298	298	// foresee signing.
299	299	// but if they ever change their mind, we are prepared
300	300
301		- $outputFromSigning = system($this->sign . " installer_profile '$fileName' > /dev/null");
	301	+ $outputFromSigning = system($this->sign." installer_profile '$fileName' > /dev/null");
302	302	if ($outputFromSigning === FALSE) {
303	303	$this->loggerInstance->debug(2, "Signing the ONC installer $fileName FAILED!\n");
304	304	}

		@@ -96,7 +96,7 @@ discard block
		block discarded – undo
96	96
97	97	// realm is automatically calculated, then stored in DB
98	98
99		- $this->realm = "opaquehash@$myInst->identifier-$this->identifier." . strtolower($myInst->federation) . \config\ConfAssistant::SILVERBULLET['realm_suffix'];
	99	+ $this->realm = "opaquehash@$myInst->identifier-$this->identifier.".strtolower($myInst->federation).\config\ConfAssistant::SILVERBULLET['realm_suffix'];
100	100	$localValueIfAny = "";
101	101
102	102	// but there's some common internal attributes populated directly
		@@ -113,11 +113,11 @@ discard block
		block discarded – undo
113	113
114	114	// and we need to populate eap:server_name and eap:ca_file with the NRO-specific EAP information
115	115	$silverbulletAttributes = [
116		- "eap:server_name" => "auth." . strtolower($myFed->tld) . \config\ConfAssistant::SILVERBULLET['server_suffix'],
	116	+ "eap:server_name" => "auth.".strtolower($myFed->tld).\config\ConfAssistant::SILVERBULLET['server_suffix'],
117	117	];
118	118	$temp = array_merge($this->addInternalAttributes($internalAttributes), $this->addInternalAttributes($silverbulletAttributes));
119	119	$x509 = new \core\common\X509();
120		- $caHandle = fopen(dirname(__FILE__) . "/../config/SilverbulletServerCerts/" . strtoupper($myFed->tld) . "/root.pem", "r");
	120	+ $caHandle = fopen(dirname(__FILE__)."/../config/SilverbulletServerCerts/".strtoupper($myFed->tld)."/root.pem", "r");
121	121	if ($caHandle !== FALSE) {
122	122	$cAFile = fread($caHandle, 16000000);
123	123	foreach ($x509->splitCertificate($cAFile) as $oneCa) {
		@@ -273,7 +273,7 @@ discard block
		block discarded – undo
273	273	if (empty($certNames)) {
274	274	return [];
275	275	}
276		- $namesCondensed = "'" . implode("' OR username = '", $certNames) . "'";
	276	+ $namesCondensed = "'".implode("' OR username = '", $certNames)."'";
277	277	$serverHandles = DBConnection::handle("RADIUS");
278	278	$returnarray = [];
279	279	foreach ($serverHandles as $oneDbServer) {

		@@ -88,7 +88,7 @@
		block discarded – undo
88	88	public function der2pem($derData)
89	89	{
90	90	$pem = chunk_split(base64_encode($derData), 64, "\n");
91		- $pem = "-----BEGIN CERTIFICATE-----\n" . $pem . "-----END CERTIFICATE-----\n";
	91	+ $pem = "-----BEGIN CERTIFICATE-----\n".$pem."-----END CERTIFICATE-----\n";
92	92	return $pem;
93	93	}
94	94

		@@ -65,8 +65,8 @@ discard block
		block discarded – undo
65	65	parent::__construct();
66	66	$Dev = \devices\Devices::listDevices();
67	67	if (isset($Dev[$blueprint])) {
68		- $this->loggerInstance->debug(4, "loaded: devices/" . $Dev[$blueprint]['directory'] . "/" . $Dev[$blueprint]['module'] . ".php\n");
69		- $class_name = "\devices\\" . $Dev[$blueprint]['directory'] . "\Device" . $Dev[$blueprint]['module'];
	68	+ $this->loggerInstance->debug(4, "loaded: devices/".$Dev[$blueprint]['directory']."/".$Dev[$blueprint]['module'].".php\n");
	69	+ $class_name = "\devices\\".$Dev[$blueprint]['directory']."\Device".$Dev[$blueprint]['module'];
70	70	$this->device = new $class_name();
71	71	if (!$this->device) {
72	72	$this->loggerInstance->debug(2, "module loading failed");
		@@ -75,7 +75,7 @@ discard block
		block discarded – undo
75	75	} else {
76	76	echo("unknown devicename:$blueprint\n");
77	77	}
78		- $this->device->module_path = ROOT . '/devices/' . $Dev[$blueprint]['directory'];
	78	+ $this->device->module_path = ROOT.'/devices/'.$Dev[$blueprint]['directory'];
79	79	$this->device->signer = isset($Dev[$blueprint]['signer']) ? $Dev[$blueprint]['signer'] : 0;
80	80	$this->device->device_id = $blueprint;
81	81	$options = \devices\Devices::$Options;

		@@ -108,7 +108,7 @@ discard block
		block discarded – undo
108	108	"TXT" => _("If you use more than one device: do your other devices still work?"),
109	109	"FACTOR_YES" => 0.33, // seems that all is okay with the account as such
110	110	"FACTOR_NO" => 3, // now that is suspicious indeed
111		- "VERDICTLECTURE" => _("If all devices stopped working simultaneously, there may be a problem with your account as such. Maybe your account expired, or you were forced to change the password? These questions are best answered by your Identity Provider [MGW: display contact info]"),],
	111	+ "VERDICTLECTURE" => _("If all devices stopped working simultaneously, there may be a problem with your account as such. Maybe your account expired, or you were forced to change the password? These questions are best answered by your Identity Provider [MGW: display contact info]"), ],
112	112	6 => ["AREA" => AbstractTest::INFRA_SP_80211,
113	113	"TXT" => _("Is the place you are currently at heavily crowded, or is a network-intensive workload going on?"),
114	114	"FACTOR_YES" => 3,
		@@ -144,11 +144,11 @@ discard block
		block discarded – undo
144	144	$questionDetails = $this->qaArray[$questionNumber];
145	145	if ($answer === TRUE) {
146	146	$this->possibleFailureReasons[$questionDetails['AREA']] = $this->possibleFailureReasons[$questionDetails['AREA']] * $questionDetails["FACTOR_YES"];
147		- $this->loggerInstance->debug(3, "Adjusting " . $questionDetails['AREA'] . " by " . $questionDetails["FACTOR_YES"] . "\n");
	147	+ $this->loggerInstance->debug(3, "Adjusting ".$questionDetails['AREA']." by ".$questionDetails["FACTOR_YES"]."\n");
148	148	$factor = $questionDetails["FACTOR_YES"];
149	149	} elseif ($answer === FALSE) {
150	150	$this->possibleFailureReasons[$questionDetails['AREA']] = $this->possibleFailureReasons[$questionDetails['AREA']] * $questionDetails["FACTOR_NO"];
151		- $this->loggerInstance->debug(3, "Adjusting " . $questionDetails['AREA'] . " by " . $questionDetails["FACTOR_NO"] . "\n");
	151	+ $this->loggerInstance->debug(3, "Adjusting ".$questionDetails['AREA']." by ".$questionDetails["FACTOR_NO"]."\n");
152	152	$factor = $questionDetails["FACTOR_NO"];
153	153	} else {
154	154	$factor = 1;
		@@ -183,7 +183,7 @@ discard block
		block discarded – undo
183	183	// if both are identical, take any of the questions in the pool of both
184	184	foreach ($this->qaArray as $questionNumber => $questionDetails) {
185	185	// if we find a question we didn't ask before AND it is related to our currently high-scoring problem area, ask it
186		- if (!array_key_exists($questionNumber, $this->previousQuestions) && ( $questionDetails["AREA"] == $highestCategory \|\| $questionDetails["AREA"] == $nextCategory)) {
	186	+ if (!array_key_exists($questionNumber, $this->previousQuestions) && ($questionDetails["AREA"] == $highestCategory \|\| $questionDetails["AREA"] == $nextCategory)) {
187	187	return json_encode(["NEXTEXISTS" => TRUE, "NUMBER" => $questionNumber, "TEXT" => $questionDetails["TXT"]]);
188	188	}
189	189	}
		@@ -211,7 +211,7 @@ discard block
		block discarded – undo
211	211	$text = $this->genericVerdictTexts[$area];
212	212	foreach ($this->previousQuestions as $number => $factor) {
213	213	if ($this->qaArray[$number]["AREA"] == $area && $factor > 1) {
214		- $text .= "\n\n" . $this->qaArray[$number]["VERDICTLECTURE"];
	214	+ $text .= "\n\n".$this->qaArray[$number]["VERDICTLECTURE"];
215	215	}
216	216	}
217	217	return $text;

GEANT / CAT

Push — master ( defeb2...c0e551 )

Status

Category

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

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

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

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

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

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

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

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

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