GEANT / CAT

web/basic.php

Spacing +1 added lines, -1 removed lines

@@ -32,4 +32,4 @@
 
 
 // and now, serve actual data
-include("skins/".$skinObject->skin."/basic.php");
+include("skins/" . $skinObject->skin . "/basic.php");

core/SanityTests.php

Spacing +11 added lines, -11 removed lines

@@ -539,47 +539,47 @@
         ["SETTING" => CONFIG['APPEARANCE']['from-mail'],
             "DEFVALUE" => "cat-invite@your-cat-installation.example",
             "COMPLAINTSTRING" => "APPEARANCE/from-mail ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => CONFIG['APPEARANCE']['support-contact']['url'],
             "DEFVALUE" => "cat-support@our-cat-installation.example?body=Only%20English%20language%20please!",
             "COMPLAINTSTRING" => "APPEARANCE/support-contact/url ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => CONFIG['APPEARANCE']['support-contact']['display'],
             "DEFVALUE" => "cat-support@our-cat-installation.example",
             "COMPLAINTSTRING" => "APPEARANCE/support-contact/display ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => CONFIG['APPEARANCE']['support-contact']['developer-mail'],
             "DEFVALUE" => "cat-develop@our-cat-installation.example",
             "COMPLAINTSTRING" => "APPEARANCE/support-contact/mail ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => CONFIG['APPEARANCE']['abuse-mail'],
             "DEFVALUE" => "my-abuse-contact@your-cat-installation.example",
             "COMPLAINTSTRING" => "APPEARANCE/abuse-mail ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => CONFIG['APPEARANCE']['MOTD'],
             "DEFVALUE" => "Release Candidate. All bugs to be shot on sight!",
             "COMPLAINTSTRING" => "APPEARANCE/MOTD ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
         ["SETTING" => CONFIG['APPEARANCE']['webcert_CRLDP'],
             "DEFVALUE" => ['list', 'of', 'CRL', 'pointers'],
             "COMPLAINTSTRING" => "APPEARANCE/webcert_CRLDP ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => CONFIG['APPEARANCE']['webcert_OCSP'],
             "DEFVALUE" => ['list', 'of', 'OCSP', 'pointers'],
             "COMPLAINTSTRING" => "APPEARANCE/webcert_OCSP ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => CONFIG['DB']['INST']['host'],
             "DEFVALUE" => "db.host.example",
             "COMPLAINTSTRING" => "DB/INST ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => CONFIG['DB']['INST']['host'],
             "DEFVALUE" => "db.host.example",
             "COMPLAINTSTRING" => "DB/USER ",
-            "REQUIRED" => TRUE,],
+            "REQUIRED" => TRUE, ],
         ["SETTING" => CONFIG['DB']['EXTERNAL']['host'],
             "DEFVALUE" => "customerdb.otherhost.example",
             "COMPLAINTSTRING" => "DB/EXTERNAL ",
-            "REQUIRED" => FALSE,],
+            "REQUIRED" => FALSE, ],
     ];
 
     /**

web/admin/inc/displayQRcode.inc.php

Spacing +3 added lines, -3 removed lines

@@ -28,6 +28,6 @@
 $invitationObject = new core\SilverbulletInvitation($validator->token(filter_input(INPUT_POST, 'token')));
 header("Content-Type:text/html;charset=utf-8");
 ?>
-<h1 style='text-align:center;'><?php echo _("Invitation Token QR Code");?></h1>
-<img style='float:none' src='data:image/png;base64,<?php echo base64_encode($uiElements->pngInjectConsortiumLogo(\QRcode::png($invitationObject->link(), FALSE, QR_ECLEVEL_Q, 11), 11));?>'/>
-<p>(<a href='<?php echo $link;?>'><?php echo $link;?>)</a></p>
+<h1 style='text-align:center;'><?php echo _("Invitation Token QR Code"); ?></h1>
+<img style='float:none' src='data:image/png;base64,<?php echo base64_encode($uiElements->pngInjectConsortiumLogo(\QRcode::png($invitationObject->link(), FALSE, QR_ECLEVEL_Q, 11), 11)); ?>'/>
+<p>(<a href='<?php echo $link; ?>'><?php echo $link; ?>)</a></p>

web/accountstatus/accountstatus.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
         // it can be VALID (exists and not redeemed, EXPIRED, REDEEMED or INVALID (non existent)
         $invitationObject = new core\SilverbulletInvitation($cleanToken);
     }
-} elseif (isset($_SERVER['SSL_CLIENT_SAN_Email']) || isset($_SERVER['SSL_CLIENT_SAN_Email_0']) ) {
+} elseif (isset($_SERVER['SSL_CLIENT_SAN_Email']) || isset($_SERVER['SSL_CLIENT_SAN_Email_0'])) {
     // maybe the user authenticated with his client cert? Then pick any of his
     // tokens to go on
     $certname = $_SERVER['SSL_CLIENT_SAN_Email'] ?? $_SERVER['SSL_CLIENT_SAN_Email_0'];
@@ -60,7 +60,7 @@ 
 
 $statusInfo = ["token" => $cleanToken,
     "invitation_object" => $invitationObject,
-    "OS" => $Gui->operatingSystem,];
+    "OS" => $Gui->operatingSystem, ];
 
 if ($profile !== NULL) {
     $attributes = $Gui->profileAttributes($profile->identifier);

core/ProfileSilverbullet.php

Spacing +1 added lines, -1 removed lines

@@ -455,7 +455,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");

core/SilverbulletInvitation.php

Spacing +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
             $certificatesNumber = ($certificatesResult ? $certificatesResult->num_rows : 0);
             $this->loggerInstance->debug(5, "At token validation level, " . $certificatesNumber . " certificates exist.\n");
             $this->associatedCertificates = \core\ProfileSilverbullet::enumerateCertDetails(/** @scrutinizer ignore-type */ $certificatesResult);
-            $this->activationsRemaining = (int)$this->activationsTotal - (int)$certificatesNumber;
+            $this->activationsRemaining = (int) $this->activationsTotal - (int) $certificatesNumber;
             switch ($certificatesNumber) {
                 case 0:
                     // find out if it has expired

web/diag/magicTelepath.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
  */
 require_once(dirname(dirname(__DIR__)) . "/config/_config.php");
 $realm = filter_input(INPUT_GET, 'realm', FILTER_SANITIZE_STRING);
-$visited = filter_input(INPUT_GET,'visited', FILTER_SANITIZE_STRING);
+$visited = filter_input(INPUT_GET, 'visited', FILTER_SANITIZE_STRING);
 if (session_status() != PHP_SESSION_ACTIVE) {
     session_start();
 }

web/lib/admin/UIElements.php

Spacing +9 added lines, -9 removed lines

@@ -47,9 +47,9 @@ 
         $dummy_inst1 = _("identity provider");
         $dummy_inst2 = _("organisation");
         // and do something useless with the strings so that there's no "unused" complaint
-        if ( $dummy_NRO . $dummy_inst1 . $dummy_inst2 == "") {
+        if ($dummy_NRO . $dummy_inst1 . $dummy_inst2 == "") {
             // Oh well.
-            explode(' ',$dummy_NRO);
+            explode(' ', $dummy_NRO);
         }
         $this->nomenclature_fed = _(CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation']);
         $this->nomenclature_inst = _(CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']);
@@ -187,7 +187,7 @@ 
                         }
                         break;
                     case "boolean":
-                        $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off") ) . "</strong></td></tr>";
+                        $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off")) . "</strong></td></tr>";
                         break;
                     default:
                         $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>$content</strong></td></tr>";
@@ -314,7 +314,7 @@ 
     
     private function checkROWIDpresence($reference) {
         $found = preg_match("/^ROWID-.*/", $reference);
-        if ($found  != 1) { // get excited on not-found AND on execution error
+        if ($found != 1) { // get excited on not-found AND on execution error
             throw new Exception("Error, ROWID expected.");
         }
     }
@@ -337,7 +337,7 @@ 
 
         $details['name'] = preg_replace('/(.)\/(.)/', "$1<br/>$2", $details['name']);
         $details['name'] = preg_replace('/\//', "", $details['name']);
-        $certstatus = ( $details['root'] == 1 ? "R" : "I");
+        $certstatus = ($details['root'] == 1 ? "R" : "I");
         if ($details['ca'] == 0 && $details['root'] != 1) {
             return "<div class='ca-summary' style='background-color:red'><div style='position:absolute; right: 0px; width:20px; height:20px; background-color:maroon;  border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>" . _("This is a <strong>SERVER</strong> certificate!") . "<br/>" . $details['name'] . "</div>";
         }
@@ -482,15 +482,15 @@ 
         $scale = sqrt($maxoccupy / $totallogopixels);
         $loggerInstance->debug(4, "Scaling info: $scale, $maxoccupy, $totallogopixels\n");
         // determine final pixel size - round to multitude of $symbolsize to match exact symbol boundary
-        $targetwidth = $symbolsize * (int)round($sizelogo[0] * $scale / $symbolsize);
-        $targetheight = $symbolsize * (int)round($sizelogo[1] * $scale / $symbolsize);
+        $targetwidth = $symbolsize * (int) round($sizelogo[0] * $scale / $symbolsize);
+        $targetheight = $symbolsize * (int) round($sizelogo[1] * $scale / $symbolsize);
         // paint white below the logo, in case it has transparencies (looks bad)
         // have one symbol in each direction extra white space
         $whiteimage = imagecreate($targetwidth + 2 * $symbolsize, $targetheight + 2 * $symbolsize);
         imagecolorallocate($whiteimage, 255, 255, 255);
         // also make sure the initial placement is a multitude of 12; otherwise "two half" symbols might be affected
-        $targetplacementx = $symbolsize * (int)round(($sizeinput[0] / 2 - ($targetwidth - $symbolsize) / 2) / $symbolsize);
-        $targetplacementy = $symbolsize * (int)round(($sizeinput[1] / 2 - ($targetheight - $symbolsize) / 2) / $symbolsize);
+        $targetplacementx = $symbolsize * (int) round(($sizeinput[0] / 2 - ($targetwidth - $symbolsize) / 2) / $symbolsize);
+        $targetplacementy = $symbolsize * (int) round(($sizeinput[1] / 2 - ($targetheight - $symbolsize) / 2) / $symbolsize);
         imagecopyresized($inputgd, $whiteimage, $targetplacementx - $symbolsize, $targetplacementy - $symbolsize, 0, 0, $targetwidth + 2 * $symbolsize, $targetheight + 2 * $symbolsize, $targetwidth + 2 * $symbolsize, $targetheight + 2 * $symbolsize);
         imagecopyresized($inputgd, $logogd, $targetplacementx, $targetplacementy, 0, 0, $targetwidth, $targetheight, $sizelogo[0], $sizelogo[1]);
         ob_start();