GEANT / CAT

web/lib/admin/Authentication.php

Spacing +2 added lines, -2 removed lines

@@ -142,7 +142,7 @@ 
         if ($trailerPosition !== FALSE) {
             $base = substr($scriptself, 0, $trailerPosition);
             if ($base !== FALSE) {
-                $url = "//$servername" . $base . "/logout_check.php";
+                $url = "//$servername".$base."/logout_check.php";
             }
         }
 
@@ -158,7 +158,7 @@ 
         if (!$handle instanceof \core\DBConnection) {
             $frontendHandle = $handle;
         }
-        $truncatedUser = substr($user,0,999);      
+        $truncatedUser = substr($user, 0, 999);      
         $handle->exec("INSERT INTO admin_logins (user_id, last_login) VALUES ('$truncatedUser', NOW()) ON DUPLICATE KEY UPDATE last_login=NOW()");
     }
 

devices/chromebook/DeviceChromebook.php

Spacing +10 added lines, -10 removed lines

@@ -82,7 +82,7 @@ 
         $cryptoJson = openssl_encrypt($clearJson, 'AES-256-CBC', $encryptionKey, OPENSSL_RAW_DATA, $initVector);
         $hmac = hash_hmac("sha1", $cryptoJson, $encryptionKey, TRUE);
 
-        $this->loggerInstance->debug(4, "Clear = $clearJson\nSalt = $salt\nPW = " . $password . "\nb(IV) = " . base64_encode($initVector) . "\nb(Cipher) = " . base64_encode($cryptoJson) . "\nb(HMAC) = " . base64_encode($hmac));
+        $this->loggerInstance->debug(4, "Clear = $clearJson\nSalt = $salt\nPW = ".$password."\nb(IV) = ".base64_encode($initVector)."\nb(Cipher) = ".base64_encode($cryptoJson)."\nb(HMAC) = ".base64_encode($hmac));
 
         // now, generate the container that holds all the crypto data
         $finalArray = [
@@ -156,7 +156,7 @@ 
     private function wiredBlock($eapdetails)
     {
         return [
-            "GUID" => \core\common\Entity::uuid('', "wired-dot1x-ethernet") . "}",
+            "GUID" => \core\common\Entity::uuid('', "wired-dot1x-ethernet")."}",
             "Name" => "eduroam configuration (wired network)",
             "Remove" => false,
             "Type" => "Ethernet",
@@ -197,7 +197,7 @@ 
         // if silverbullet, we deliver the client cert inline
 
         if ($selectedEap == \core\common\EAP::EAPTYPE_SILVERBULLET) {
-            $eaparray['ClientCertRef'] = "[" . $this->clientCert['GUID'] . "]";
+            $eaparray['ClientCertRef'] = "[".$this->clientCert['GUID']."]";
             $eaparray['ClientCertType'] = "Ref";
         }
 
@@ -236,7 +236,7 @@ 
         $jsonArray = ["Type" => "UnencryptedConfiguration"];
 
         foreach ($this->attributes['internal:CAs'][0] as $ca) {
-            $caRefs[] = "{" . $ca['uuid'] . "}";
+            $caRefs[] = "{".$ca['uuid']."}";
         }
         // define CA certificates
         foreach ($this->attributes['internal:CAs'][0] as $ca) {
@@ -246,15 +246,15 @@ 
             if ($caSanitized1 === FALSE) {
                 throw new Exception("Error cropping PEM data at its BEGIN marker.");
             }
-            $this->loggerInstance->debug(4, $caSanitized1 . "\n");
+            $this->loggerInstance->debug(4, $caSanitized1."\n");
             // remove \n
             $caSanitized = str_replace("\n", "", $caSanitized1);
-            $jsonArray["Certificates"][] = ["GUID" => "{" . $ca['uuid'] . "}", "Remove" => false, "Type" => "Authority", "X509" => $caSanitized];
-            $this->loggerInstance->debug(4, $caSanitized . "\n");
+            $jsonArray["Certificates"][] = ["GUID" => "{".$ca['uuid']."}", "Remove" => false, "Type" => "Authority", "X509" => $caSanitized];
+            $this->loggerInstance->debug(4, $caSanitized."\n");
         }
         // if we are doing silverbullet, include the unencrypted(!) P12 as a client certificate
         if ($this->selectedEap == \core\common\EAP::EAPTYPE_SILVERBULLET) {
-            $jsonArray["Certificates"][] = ["GUID" => "[" . $this->clientCert['GUID'] . "]", "PKCS12" => base64_encode($this->clientCert['certdataclear']), "Remove" => false, "Type" => "Client"];
+            $jsonArray["Certificates"][] = ["GUID" => "[".$this->clientCert['GUID']."]", "PKCS12" => base64_encode($this->clientCert['certdataclear']), "Remove" => false, "Type" => "Client"];
         }
         $eaparray = $this->eapBlock($caRefs);
         // define Wi-Fi networks
@@ -277,7 +277,7 @@ 
 
         file_put_contents('installer_profile', $finalJson);
 
-        $fileName = $this->installerBasename . '.onc';
+        $fileName = $this->installerBasename.'.onc';
 
         if (!$this->sign) {
             rename("installer_profile", $fileName);
@@ -288,7 +288,7 @@ 
         // have the notion of 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");
         }

core/diag/Sociopath.php

Spacing +5 added lines, -5 removed lines

@@ -108,7 +108,7 @@ 
                 "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 @@ 
         $questionDetails = $this->qaArray[$questionNumber];
         if ($answer === TRUE) {
             $this->possibleFailureReasons[$questionDetails['AREA']] = $this->possibleFailureReasons[$questionDetails['AREA']] * $questionDetails["FACTOR_YES"];
-            $this->loggerInstance->debug(4, "Adjusting " . $questionDetails['AREA'] . " by " . $questionDetails["FACTOR_YES"] . "\n");
+            $this->loggerInstance->debug(4, "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(4, "Adjusting " . $questionDetails['AREA'] . " by " . $questionDetails["FACTOR_NO"] . "\n");
+            $this->loggerInstance->debug(4, "Adjusting ".$questionDetails['AREA']." by ".$questionDetails["FACTOR_NO"]."\n");
             $factor = $questionDetails["FACTOR_NO"];
         } else {
             $factor = 1;
@@ -183,7 +183,7 @@ 
         // 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 @@ 
         $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;

web/admin/overview_federation.php

Indentation +13 added lines, -13 removed lines

@@ -493,17 +493,17 @@ 
                 }
                 echo "<td class='inst_td'>
                          <input type='hidden' name='inst' value='" 
-                       . $index."'>"
-                       . "<span style='display:none' class='inst_name'>".$my_idp."</span>"
-                       . "<span>".$idp_instance->name."</span>"
-                       . " (<a href='overview_org.php?inst_id="
-                       . $idp_instance->identifier."'>" 
-                       . (in_array($index, $userIdps) ? _("manage") : _("view"))
-                       . "</a>)"
-                       . (empty($listOfSilverbulletRealms) ? "" : "<ul><li>") 
-                       . implode("</li><li>", $listOfSilverbulletRealms) 
-                       . (empty($listOfSilverbulletRealms) ? "" : "</li><ul>")
-                       . "</td>";
+                        . $index."'>"
+                        . "<span style='display:none' class='inst_name'>".$my_idp."</span>"
+                        . "<span>".$idp_instance->name."</span>"
+                        . " (<a href='overview_org.php?inst_id="
+                        . $idp_instance->identifier."'>" 
+                        . (in_array($index, $userIdps) ? _("manage") : _("view"))
+                        . "</a>)"
+                        . (empty($listOfSilverbulletRealms) ? "" : "<ul><li>") 
+                        . implode("</li><li>", $listOfSilverbulletRealms) 
+                        . (empty($listOfSilverbulletRealms) ? "" : "</li><ul>")
+                        . "</td>";
                 // deployment status; need to dive into profiles for this
                 // show happy eyeballs if at least one profile is configured/showtime     
                 if (\config\Master::FUNCTIONALITY_FLAGS['SINGLE_SERVICE'] !== 'MSP') {
@@ -560,8 +560,8 @@ 
                             echo "<form method='post' action='overview_federation.php' accept-charset='UTF-8'>
                                 <input type='hidden' name='invitation_id' value='".$oneinvite['token']."'/>
                                 <button class='delete' type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_DELETE."'>"._("Revoke Invitation")."</button> "
-                           . sprintf(_("(expires %s)"), $oneinvite['expiry'])
-                           . "</form>";
+                            . sprintf(_("(expires %s)"), $oneinvite['expiry'])
+                            . "</form>";
                         }
                         echo "      </td>";                          
                         echo "         </tr>";

devices/eap_config/DeviceXML.php

Spacing +9 added lines, -9 removed lines

@@ -144,7 +144,7 @@ 
         $dom = new \DOMDocument('1.0', 'utf-8');
         $root = $dom->createElement($rootname);
         $dom->appendChild($root);
-        $ns = $dom->createAttributeNS( 'http://www.w3.org/2001/XMLSchema-instance', 'xsi:noNamespaceSchemaLocation' );
+        $ns = $dom->createAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'xsi:noNamespaceSchemaLocation');
         $ns->value = "eap-metadata.xsd";
         $root->appendChild($ns);
         $this->openRoamingToU = sprintf(_("I have read and agree to OpenRoaming Terms of Use at %s."), "https://wballiance.com/openroaming/toc-2020/");
@@ -181,7 +181,7 @@ 
                 if ($netDefinition['condition'] === 'internal:openroaming' &&
                         $this->attributes['internal:openroaming']) {
                     $this->setORtou();
-                    if (preg_match("/^ask/",$this->attributes['media:openroaming'][0])) {
+                    if (preg_match("/^ask/", $this->attributes['media:openroaming'][0])) {
                         $orNetwork = $netDefinition;
                         continue;                        
                     }
@@ -238,7 +238,7 @@ 
     }
     
     private function setORtou() {
-        if (preg_match("/preagreed/",$this->attributes['media:openroaming'][0])) {
+        if (preg_match("/preagreed/", $this->attributes['media:openroaming'][0])) {
             $this->addORtou = false;
         } else {
             $this->addORtou = true;
@@ -262,7 +262,7 @@ 
         $authMethods = new \core\DeviceXMLmain();
         $authMethods->setChild('AuthenticationMethod', $this->authMethodsList);
         $eapIdp->setChild('AuthenticationMethods', $authMethods);
-        $eapIdp->setChild('CredentialApplicability', $this->getCredentialApplicability($ssids,$oids));
+        $eapIdp->setChild('CredentialApplicability', $this->getCredentialApplicability($ssids, $oids));
 // TODO   $eap_idp->setChild('ValidUntil',$this->getValidUntil());
         $eapIdp->setChild('ProviderInfo', $this->providerInfo);
 // TODO   $eap_idp->setChild('VendorSpecific',$this->getVendorSpecific());
@@ -376,7 +376,7 @@ 
         $attr = $this->attributes;
         if (isset($attr['general:logo_file'][0])) {
             $rawLogoBlob = $attr['general:logo_file'][0];
-            $logoMime= $attr['internal:logo_file'][0]['mime'];
+            $logoMime = $attr['internal:logo_file'][0]['mime'];
             [$scaledBlob, $scaledMime] = $this->scaleLogo($rawLogoBlob, $logoMime);
             if ($scaledMime == 'none') {
                 return NULL;
@@ -404,8 +404,8 @@ 
      */
     private function scaleLogo($blob, $mime)
     {
-        $maxByte = 1024*50;
-        $maxPixelSize = [400,300,200,100];
+        $maxByte = 1024 * 50;
+        $maxPixelSize = [400, 300, 200, 100];
         // start with the actual file size
         $logoSize = strlen($blob);
         \core\common\Logging::debug_s(4, $logoSize, "Logo file size: ", "\n");
@@ -427,7 +427,7 @@ 
             return ['', 'none'];
         }
         $imageSize = $imageObject->getImageGeometry();
-        \core\common\Logging::debug_s(4, $imageSize, "Input logo pixel size: ","\n");        
+        \core\common\Logging::debug_s(4, $imageSize, "Input logo pixel size: ", "\n");        
         foreach ($maxPixelSize as $size) {
             $tmpImage = $imageObject;
             $tmpImage->setImageFormat('PNG');
@@ -477,7 +477,7 @@ 
                 $lng = $lngAttr['lang'] === 'any' ? \config\Master::APPEARANCE['defaultlocale'] : $lngAttr['lang'];
                 $tou .= "\n".$this->openRoamingToUArray[$lng];
                 $touObj->setValue($tou);
-                $out[] =  $touObj;
+                $out[] = $touObj;
             } 
         } else {
             $tou = $standardTou[0];