GEANT / CAT

core/IdP.php

Spacing +1 added lines, -1 removed lines

@@ -191,7 +191,7 @@
                 case "SILVERBULLET":
                     $theProfile = new ProfileSilverbullet($identifier, $this);
                     $theProfile->addSupportedEapMethod(new \core\common\EAP(\core\common\EAP::EAPTYPE_SILVERBULLET), 1);
-                    $theProfile->setRealm($this->identifier."-".$theProfile->identifier."." . strtolower($this->federation) . strtolower(CONFIG_CONFASSISTANT['SILVERBULLET']['realm_suffix']));
+                    $theProfile->setRealm($this->identifier . "-" . $theProfile->identifier . "." . strtolower($this->federation) . strtolower(CONFIG_CONFASSISTANT['SILVERBULLET']['realm_suffix']));
                     return $theProfile;
                 default:
                     throw new Exception("This type of profile is unknown and can not be added.");

core/ProfileSilverbullet.php

Spacing +5 added lines, -5 removed lines

@@ -175,11 +175,11 @@ 
     public function invitationMailBody($invitationLink) {
         $text = _("Hello!");
         $text .= "\n\n";
-        $text .= sprintf(_("A new %s access credential has been created for you by your network administrator."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
+        $text .= sprintf(_("A new %s access credential has been created for you by your network administrator."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
         $text .= " ";
         $text .= sprintf(_("Please follow the following link with the device you want to enable for %s to get a custom %s installation program just for you. You can click on the link, copy and paste it into a browser or scan the attached QR code."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
         $text .= "\n\n$invitationLink\n\n"; // gets replaced with the token value by getBody()
-        $text .= sprintf(_("Please keep this email or bookmark this link for future use. After picking up your %s installation program, you can use the same link to get status information about your %s account."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
+        $text .= sprintf(_("Please keep this email or bookmark this link for future use. After picking up your %s installation program, you can use the same link to get status information about your %s account."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
         $text .= "\n\n";
         $text .= _("Regards,");
         $text .= "\n\n";
@@ -462,7 +462,7 @@ 
                 $indexStatement = "$certstatus\t$expiryIndexTxt\t" . ($certstatus == "R" ? "$nowIndexTxt,unspecified" : "") . "\t$serialHex\tunknown\t/O=" . CONFIG_CONFASSISTANT['CONSORTIUM']['name'] . "/OU=$federation/CN=$cn/emailAddress=$cn\n";
                 $logHandle->debug(4, "index.txt contents-to-be: $indexStatement");
                 if (!file_put_contents($tempdir . "/index.txt", $indexStatement)) {
-                $logHandle->debug(1,"Unable to write openssl index.txt file for revocation handling!");
+                $logHandle->debug(1, "Unable to write openssl index.txt file for revocation handling!");
                 }
                 // index.txt.attr is dull but needs to exist
                 file_put_contents($tempdir . "/index.txt.attr", "unique_subject = yes\n");
@@ -572,7 +572,7 @@ 
         if ($invitationsResult->num_rows == 0) {
             $loggerInstance->debug(2, "Token  $tokenvalue not found in database or database query error!\n");
             return ["status" => self::SB_TOKENSTATUS_INVALID,
-                "cert_status" => [],];
+                "cert_status" => [], ];
         }
         // if not returned, we found the token in the DB
         $invitationRow = mysqli_fetch_object(/** @scrutinizer ignore-type */ $invitationsResult);
@@ -742,7 +742,7 @@ 
                 throw new Exception("Impossible: the string ends with '/admin' but it's not possible to cut six characters from the end?!");
             }
         }
-        $link .= '/accountstatus/accountstatus.php?token='.$token;
+        $link .= '/accountstatus/accountstatus.php?token=' . $token;
         return $link;
     }
 

web/admin/overview_idp.php

Spacing +4 added lines, -4 removed lines

@@ -56,7 +56,7 @@ 
         <div class='infobox' style='text-align:center;'>
             <h2><?php echo sprintf(_("QR Code for %s download area"), $uiElements->nomenclature_inst); ?></h2>
             <?php
-            $displayurl = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier;
+            $displayurl = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier;
             $uri = "data:image/png;base64," . base64_encode($uiElements->pngInjectConsortiumLogo(QRcode::png($displayurl, FALSE, QR_ECLEVEL_Q, QRCODE_PIXELS_PER_SYMBOL), QRCODE_PIXELS_PER_SYMBOL));
             $size = getimagesize($uri);
             echo "<img width='" . ($size[0] / 4) . "' height='" . ($size[1] / 4) . "' src='$uri' alt='QR-code'/>";
@@ -93,7 +93,7 @@ 
                 </td>
                 <td>
                     <form action='edit_idp_result.php?inst_id=<?php echo $my_inst->identifier; ?>' method='post' accept-charset='UTF-8'>
-                        <button class='delete' type='submit' name='submitbutton' value='<?php echo web\lib\common\FormElements::BUTTON_DELETE; ?>' onclick="return confirm('<?php echo ( CONFIG_CONFASSISTANT['CONSORTIUM']['selfservice_registration'] === NULL ? sprintf(_("After deleting the IdP, you can not recreate it yourself - you need a new invitation token from the %s administrator!"), $uiElements->nomenclature_fed) . " " : "" ) . sprintf(_("Do you really want to delete your %s %s?"), $uiElements->nomenclature_inst, $my_inst->name); ?>')"><?php echo sprintf(_("Delete %s"), $uiElements->nomenclature_inst); ?></button>
+                        <button class='delete' type='submit' name='submitbutton' value='<?php echo web\lib\common\FormElements::BUTTON_DELETE; ?>' onclick="return confirm('<?php echo (CONFIG_CONFASSISTANT['CONSORTIUM']['selfservice_registration'] === NULL ? sprintf(_("After deleting the IdP, you can not recreate it yourself - you need a new invitation token from the %s administrator!"), $uiElements->nomenclature_fed) . " " : "") . sprintf(_("Do you really want to delete your %s %s?"), $uiElements->nomenclature_inst, $my_inst->name); ?>')"><?php echo sprintf(_("Delete %s"), $uiElements->nomenclature_inst); ?></button>
                     </form>
 
                 </td>
@@ -181,7 +181,7 @@ 
                         if ($readonly === FALSE) {
                             ?>
                             <form action='edit_silverbullet.php?inst_id=<?php echo $my_inst->identifier; ?>&profile_id=<?php echo $profile_list->identifier; ?>' method='POST'>
-                                <button <?php echo ( is_array($completeness) ? "disabled" : "" ); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button>
+                                <button <?php echo (is_array($completeness) ? "disabled" : ""); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button>
                             </form>
                             <?php
                         }
@@ -315,7 +315,7 @@ 
                     if (isset($URL['device-specific:redirect'])) {
                         $displayurl = $URL['device-specific:redirect'][0];
                     } else {
-                        $displayurl = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier . "&amp;profile=" . $profile_list->identifier;
+                        $displayurl = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier . "&amp;profile=" . $profile_list->identifier;
                     }
                     echo "<a href='$displayurl' style='white-space: nowrap; text-align: center;'>";
                     $uri = "data:image/png;base64," . base64_encode($uiElements->pngInjectConsortiumLogo(QRcode::png($displayurl, FALSE, QR_ECLEVEL_Q, QRCODE_PIXELS_PER_SYMBOL), QRCODE_PIXELS_PER_SYMBOL));

web/admin/overview_user.php

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
             $country[$key] = $row['country'];
             $name[$key] = $row['name'];
         }
-        echo "<tr><th>" . sprintf(_("%s Name"), $uiElements->nomenclature_inst) . "</th><th>" . sprintf(_("Other admins of this %s"), $uiElements->nomenclature_inst) . "</th><th>" . ( CONFIG['DB']['INST']['readonly'] === FALSE ? _("Administrator Management") : "") . "</th></tr>";
+        echo "<tr><th>" . sprintf(_("%s Name"), $uiElements->nomenclature_inst) . "</th><th>" . sprintf(_("Other admins of this %s"), $uiElements->nomenclature_inst) . "</th><th>" . (CONFIG['DB']['INST']['readonly'] === FALSE ? _("Administrator Management") : "") . "</th></tr>";
         foreach ($myFeds as $fed_id => $fed_name) {
             echo "<tr><td colspan='3'><strong>" . sprintf(_("%s %s: %s list"), $uiElements->nomenclature_fed, $fed_name, $uiElements->nomenclature_inst) . "</strong></td></tr>";
 

web/admin/sanity_tests.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     'mailer',
 ];
 
-if (CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_SILVERBULLET'] == "LOCAL" || CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_RADIUS'] == "LOCAL" ) {
+if (CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_SILVERBULLET'] == "LOCAL" || CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_RADIUS'] == "LOCAL") {
     $Tests[] = 'makensis';
     $Tests[] = 'makensis=>NSISmodules';
 }

core/SanityTests.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
             }
             if ($passedTheWindmill) {
                 if (substr($schemaLine, 0, 1) == '(') { // a relevant line in schema
-                    $this->profile_option_ct = $this->profile_option_ct+1;
+                    $this->profile_option_ct = $this->profile_option_ct + 1;
                 } else { // anything else, quit parsing
                     break;
                 }

core/diag/Logopath.php

Spacing +1 added lines, -1 removed lines

@@ -239,7 +239,7 @@
             // leave his mail address, remove him/her from the list of recipients
             foreach (Logopath::CATEGORYBINDING as $index => $functionName) {
                 if (in_array(Logopath::ENDUSER, $theMail[$index]) && $this->userEmail === FALSE) {
-                    $theMail[$index] = array_diff($theMail[$index], [Logopath::ENDUSER] );
+                    $theMail[$index] = array_diff($theMail[$index], [Logopath::ENDUSER]);
                 }
             }
             

core/DeviceConfig.php

Spacing +3 added lines, -3 removed lines

@@ -103,7 +103,7 @@ 
         $dummy_inst2 = _("organisation");
         // and do something useless with the strings so that there's no "unused" complaint
         // by Scrutinizer
-        if( $dummy_NRO . $dummy_inst1 . $dummy_inst2 == "") {
+        if ($dummy_NRO . $dummy_inst1 . $dummy_inst2 == "") {
             // oh well.
         }
 
@@ -213,7 +213,7 @@ 
         }
         if (isset($this->attributes['general:logo_file'])) {
             $this->loggerInstance->debug(5, "saving IDP logo\n");
-            $this->attributes['internal:logo_file'] = $this->saveLogoFile($this->attributes['general:logo_file'],'idp');
+            $this->attributes['internal:logo_file'] = $this->saveLogoFile($this->attributes['general:logo_file'], 'idp');
         }
         if (isset($this->attributes['fed:logo_file'])) {
             $this->loggerInstance->debug(5, "saving FED logo\n");
@@ -585,7 +585,7 @@ 
      * @return array list of filenames and the mime types
      * @throws Exception
      */
-    private function saveLogoFile($logos,$type) {
+    private function saveLogoFile($logos, $type) {
         $iterator = 0;
         $returnarray = [];
         foreach ($logos as $blob) {

core/diag/Sociopath.php

Spacing +9 added lines, -9 removed lines

@@ -62,7 +62,7 @@ 
             2 => ["AREA" => AbstractTest::INFRA_DEVICE, 
                   "TXT" => _("Did the device previously work when roaming, i.e. at other hotspots away from your home institution?"), 
                   "FACTOR" => 0.33,
-                  "VERDICTLECTURE" => sprintf(_("If roaming consistently does not work, then very likely your device configuration is wrong. Typical errors causing this symptom include: using a routing ('outer') username without the @realm.tld suffix - those potentially work at home, but can not be used when roaming. %s"),$confAssistantText)],
+                  "VERDICTLECTURE" => sprintf(_("If roaming consistently does not work, then very likely your device configuration is wrong. Typical errors causing this symptom include: using a routing ('outer') username without the @realm.tld suffix - those potentially work at home, but can not be used when roaming. %s"), $confAssistantText)],
             3 => ["AREA" => AbstractTest::INFRA_DEVICE, 
                   "TXT" => _("Did you recently change the configuration on your device?"), 
                   "FACTOR" => 3,
@@ -100,12 +100,12 @@ 
         $questionDetails = $this->qaArray[$questionNumber];
         if ($answer === TRUE) {
             $this->possibleFailureReasons[$questionDetails['AREA']] = $this->possibleFailureReasons[$questionDetails['AREA']] * $questionDetails["FACTOR"];
-            $this->loggerInstance->debug(3,"Adjusting ".$questionDetails['AREA']." by ".$questionDetails["FACTOR"]."\n");
+            $this->loggerInstance->debug(3, "Adjusting " . $questionDetails['AREA'] . " by " . $questionDetails["FACTOR"] . "\n");
             $factor = $questionDetails["FACTOR"];
         } elseif ($answer === FALSE) {
             $this->possibleFailureReasons[$questionDetails['AREA']] = $this->possibleFailureReasons[$questionDetails['AREA']] / $questionDetails["FACTOR"];
-            $this->loggerInstance->debug(3,"Adjusting ".$questionDetails['AREA']." by 1/".$questionDetails["FACTOR"]."\n");
-            $factor = 1/$questionDetails["FACTOR"];
+            $this->loggerInstance->debug(3, "Adjusting " . $questionDetails['AREA'] . " by 1/" . $questionDetails["FACTOR"] . "\n");
+            $factor = 1 / $questionDetails["FACTOR"];
         } else {
             $factor = 1;
         }
@@ -114,8 +114,8 @@ 
         $this->additionalFindings["QUESTIONSASKED"] = $this->previousQuestions;
         $_SESSION["SUSPECTS"] = $this->possibleFailureReasons;
         $_SESSION["EVIDENCE"] = $this->additionalFindings;
-        $this->loggerInstance->debug(3,$_SESSION['SUSPECTS']);
-        $this->loggerInstance->debug(3,$_SESSION['EVIDENCE']);
+        $this->loggerInstance->debug(3, $_SESSION['SUSPECTS']);
+        $this->loggerInstance->debug(3, $_SESSION['EVIDENCE']);
     }
     
     /**
@@ -134,7 +134,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"]]);
             }
         }
@@ -147,7 +147,7 @@ 
      * @return string JSON encoded array with all the info we have
      */
     public function getCurrentGuessState() {
-        return json_encode([ "SUSPECTS" => $this->possibleFailureReasons, "EVIDENCE" => $this->additionalFindings ]);
+        return json_encode(["SUSPECTS" => $this->possibleFailureReasons, "EVIDENCE" => $this->additionalFindings]);
     }
     
     /**
@@ -159,7 +159,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;