GEANT / CAT

core/DBConnection.php

Spacing +20 added lines, -20 removed lines

@@ -62,24 +62,24 @@ 
             case "EXTERNAL":
             case "FRONTEND":
             case "DIAGNOSTICS":
-                if (!isset(self::${"instance" . $theDb})) {
+                if (!isset(self::${"instance".$theDb})) {
                     $class = __CLASS__;
-                    self::${"instance" . $theDb} = new $class($database);
-                    DBConnection::${"instance" . $theDb}->databaseInstance = $theDb;
+                    self::${"instance".$theDb} = new $class($database);
+                    DBConnection::${"instance".$theDb}->databaseInstance = $theDb;
                 }
-                return self::${"instance" . $theDb};
+                return self::${"instance".$theDb};
             case "RADIUS":
-                if (!isset(self::${"instance" . $theDb})) {
+                if (!isset(self::${"instance".$theDb})) {
                     $class = __CLASS__;
                     foreach (\config\ConfAssistant::DB as $name => $oneRadiusAuthDb) {
                         $theInstance = new $class($name);
-                        self::${"instance" . $theDb}[] = $theInstance;
+                        self::${"instance".$theDb}[] = $theInstance;
                         $theInstance->databaseInstance = $theDb;
                     }
                 }
-                return self::${"instance" . $theDb};
+                return self::${"instance".$theDb};
             default:
-                throw new Exception("This type of database (" . strtoupper($database) . ") is not known!");
+                throw new Exception("This type of database (".strtoupper($database).") is not known!");
         }
     }
 
@@ -121,18 +121,18 @@ 
             }
         }
         // log exact query to debug log, if log level is at 5
-        $this->loggerInstance->debug(5, "DB ATTEMPT: ".$this->databaseInstance .": " . $querystring . "\n");
+        $this->loggerInstance->debug(5, "DB ATTEMPT: ".$this->databaseInstance.": ".$querystring."\n");
         if ($types !== NULL) {
-            $this->loggerInstance->debug(5, "Argument type sequence: $types, parameters are: " . /** @scrutinizer ignore-type */ print_r($arguments, true));
+            $this->loggerInstance->debug(5, "Argument type sequence: $types, parameters are: "./** @scrutinizer ignore-type */ print_r($arguments, true));
         }
 
         if ($this->connection->connect_error) {
-            throw new Exception("ERROR: Cannot send query to $this->databaseInstance database (no connection, error number" . $this->connection->connect_error . ")!");
+            throw new Exception("ERROR: Cannot send query to $this->databaseInstance database (no connection, error number".$this->connection->connect_error.")!");
         }
         if ($types === NULL) {
             $result = $this->connection->query($querystring);
             if ($result === FALSE) {
-                throw new Exception("DB: Unable to execute simple statement! Error was --> " . $this->connection->error . " <--");
+                throw new Exception("DB: Unable to execute simple statement! Error was --> ".$this->connection->error." <--");
             }
         } else {
             // fancy! prepared statement with dedicated argument list
@@ -148,7 +148,7 @@ 
                 }
                 $prepResult = $statementObject->prepare($querystring);
                 if ($prepResult === FALSE) {
-                    throw new Exception("DB: Unable to prepare statement! Statement was --> $querystring <--, error was --> " . $statementObject->error . " <--.");
+                    throw new Exception("DB: Unable to prepare statement! Statement was --> $querystring <--, error was --> ".$statementObject->error." <--.");
                 }
                 $this->preparedStatements[$querystring] = $statementObject;
             }
@@ -161,11 +161,11 @@ 
             array_unshift($localArray, $types);
             $retval = call_user_func_array([$statementObject, "bind_param"], $localArray);
             if ($retval === FALSE) {
-                throw new Exception("DB: Unable to bind parameters to prepared statement! Argument array was --> " . var_export($localArray, TRUE) . " <--. Error was --> " . $statementObject->error . " <--");
+                throw new Exception("DB: Unable to bind parameters to prepared statement! Argument array was --> ".var_export($localArray, TRUE)." <--. Error was --> ".$statementObject->error." <--");
             }
             $result = $statementObject->execute();
             if ($result === FALSE) {
-                throw new Exception("DB: Unable to execute prepared statement! Error was --> " . $statementObject->error . " <--");
+                throw new Exception("DB: Unable to execute prepared statement! Error was --> ".$statementObject->error." <--");
             }
             $selectResult = $statementObject->get_result();
             if ($selectResult !== FALSE) {
@@ -175,14 +175,14 @@ 
 
         // all cases where $result could be FALSE have been caught earlier
         if ($this->connection->errno) {
-            throw new Exception("ERROR: Cannot execute query in $this->databaseInstance database - (hopefully escaped) query was '$querystring', errno was " . $this->connection->errno . "!");
+            throw new Exception("ERROR: Cannot execute query in $this->databaseInstance database - (hopefully escaped) query was '$querystring', errno was ".$this->connection->errno."!");
         }
 
 
         if ($isMoreThanSelect || \config\Master::DEBUG_LEVEL == 5) {
-            $this->loggerInstance->writeSQLAudit("[DB: " . strtoupper($this->databaseInstance) . "] " . $querystring);
+            $this->loggerInstance->writeSQLAudit("[DB: ".strtoupper($this->databaseInstance)."] ".$querystring);
             if ($types !== NULL) {
-                $this->loggerInstance->writeSQLAudit("Argument type sequence: $types, parameters are: " . /** @scrutinizer ignore-type */ print_r($arguments, true));
+                $this->loggerInstance->writeSQLAudit("Argument type sequence: $types, parameters are: "./** @scrutinizer ignore-type */ print_r($arguments, true));
             }
         }
         return $result;
@@ -280,13 +280,13 @@ 
         if (isset(\config\Master::DB[$databaseCapitalised])) {
             $this->connection = new \mysqli(\config\Master::DB[$databaseCapitalised]['host'], \config\Master::DB[$databaseCapitalised]['user'], \config\Master::DB[$databaseCapitalised]['pass'], \config\Master::DB[$databaseCapitalised]['db']);
             if ($this->connection->connect_error) {
-                throw new Exception("ERROR: Unable to connect to $database database! This is a fatal error, giving up (error number " . $this->connection->connect_errno . ").");
+                throw new Exception("ERROR: Unable to connect to $database database! This is a fatal error, giving up (error number ".$this->connection->connect_errno.").");
             }
             $this->readOnly = \config\Master::DB[$databaseCapitalised]['readonly'];
         } else { // one of the RADIUS DBs
             $this->connection = new \mysqli(\config\ConfAssistant::DB[$databaseCapitalised]['host'], \config\ConfAssistant::DB[$databaseCapitalised]['user'], \config\ConfAssistant::DB[$databaseCapitalised]['pass'], \config\ConfAssistant::DB[$databaseCapitalised]['db']);
             if ($this->connection->connect_error) {
-                throw new Exception("ERROR: Unable to connect to $database database! This is a fatal error, giving up (error number " . $this->connection->connect_errno . ").");
+                throw new Exception("ERROR: Unable to connect to $database database! This is a fatal error, giving up (error number ".$this->connection->connect_errno.").");
             }
             $this->readOnly = \config\ConfAssistant::DB[$databaseCapitalised]['readonly'];
         }

web/diag/magicTelepath.php

Spacing +3 added lines, -3 removed lines

@@ -19,10 +19,10 @@
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
+require_once dirname(dirname(__DIR__))."/config/_config.php";
 $realm = htmlspecialchars(strip_tags(filter_input(INPUT_GET, 'realm')));
-$visited = htmlspecialchars(strip_tags(filter_input(INPUT_GET,'visited')));
-$nro = htmlspecialchars(strip_tags(filter_input(INPUT_GET,'nro')));
+$visited = htmlspecialchars(strip_tags(filter_input(INPUT_GET, 'visited')));
+$nro = htmlspecialchars(strip_tags(filter_input(INPUT_GET, 'nro')));
 \core\CAT::sessionStart();
 $languageObject = new core\common\Language();
 $languageObject->setTextDomain("diagonstics");

web/diag/testTelepath.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
+require_once dirname(dirname(__DIR__))."/config/_config.php";
 
 $therealm = htmlspecialchars(strip_tags(filter_input(INPUT_GET, 'realm')));
 $thevisited = htmlspecialchars(strip_tags(filter_input(INPUT_GET, 'visited')));
@@ -35,7 +35,7 @@ 
     $validator = new \web\lib\common\InputValidation();
     
     echo "<pre>";
-    echo "Testing " . $validatedRealm . " in " . $validator->string($thevisited);
+    echo "Testing ".$validatedRealm." in ".$validator->string($thevisited);
     print_r($telepath->magic());
     echo "</pre>";
 }
\ No newline at end of file

web/accountstatus/accountstatus.php

Spacing +6 added lines, -6 removed lines

@@ -26,7 +26,7 @@ 
  * @author Stefan Winter <stefan.winter@restena.lu>
  * @package Core
  */
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $cleanToken = FALSE;
 $invitationObject = new core\SilverbulletInvitation("INVALID");
@@ -74,7 +74,7 @@ 
 
 $statusInfo = ["token" => $cleanToken,
     "invitation_object" => $invitationObject,
-    "OS" => $Gui->operatingSystem,];
+    "OS" => $Gui->operatingSystem, ];
 
 if ($profile !== NULL) {
     $attributes = $Gui->profileAttributes($profile->identifier);
@@ -88,7 +88,7 @@ 
 $caAndSerial = htmlspecialchars(strip_tags($caAndSerialUnfiltered));
 
 if ($action !== NULL && $action !== FALSE && $action === \web\lib\common\FormElements::BUTTON_DELETE && $caAndSerial !== NULL && $caAndSerial !== FALSE) {
-    $tuple = explode(':',$caAndSerial);
+    $tuple = explode(':', $caAndSerial);
     $ca_type = $tuple[0];
     $serial = $tuple[1];
     if ($statusInfo['invitation_object']->invitationTokenStatus != \core\SilverbulletInvitation::SB_TOKENSTATUS_INVALID) {
@@ -103,12 +103,12 @@ 
                 print "//REVOKING\n";
                 $certObject = new \core\SilverbulletCertificate($serial, $ca_type);
                 $certObject->revokeCertificate();
-                header("Location: accountstatus.php?token=" . $statusInfo['token']);
+                header("Location: accountstatus.php?token=".$statusInfo['token']);
                 exit;
             }
         }
     }
-    header("Location: accountstatus.php?token=" . $statusInfo['token']);
+    header("Location: accountstatus.php?token=".$statusInfo['token']);
     exit;
 }
 
@@ -133,4 +133,4 @@ 
 $skinObject = new \web\lib\user\Skinjob($_REQUEST['skin'] ?? $_SESSION['skin'] ?? $fedskin[0] ?? \config\Master::APPEARANCE['skins'][0]);
 
 // and now, serve actual data
-require "../skins/" . $skinObject->skin . "/accountstatus/accountstatus.php";
+require "../skins/".$skinObject->skin."/accountstatus/accountstatus.php";

web/lib/admin/UIElements.php

Spacing +38 added lines, -38 removed lines

@@ -135,7 +135,7 @@ 
             sprintf(_("%s: Do not terminate EAP"), \core\ProfileSilverbullet::PRODUCTNAME) => "fed:silverbullet-noterm",
             sprintf(_("%s: max users per profile"), \core\ProfileSilverbullet::PRODUCTNAME) => "fed:silverbullet-maxusers",
             sprintf(_("Mint %s with CA on creation"), $this->nomenclatureIdP) => "fed:minted_ca_file",
-            sprintf(_("OpenRoaming: Allow %s Opt-In"),$this->nomenclatureParticipant) => "fed:openroaming",
+            sprintf(_("OpenRoaming: Allow %s Opt-In"), $this->nomenclatureParticipant) => "fed:openroaming",
             _("OpenRoaming: Custom NAPTR Target") => "fed:openroaming_customtarget",
             $ssidText => "media:SSID",
             $passpointOiText => "media:consortium_OI",
@@ -147,7 +147,7 @@ 
         $find = array_keys($displayNames, $input, TRUE);
 
         if (count($find) == 0) { // this is an error! throw an Exception
-            throw new \Exception("The translation of an option name was requested, but the option is not known to the system: " . htmlentities($input));
+            throw new \Exception("The translation of an option name was requested, but the option is not known to the system: ".htmlentities($input));
         }
         \core\common\Entity::outOfThePotatoes();
         // none of the strings have HTML in them, only translators can provide own text for it -> no threat, but complained about by the security review
@@ -169,7 +169,7 @@ 
 
         foreach ($optionlist as $option) {
             $type = $optioninfo->optionType($option['name']);
-            if (preg_match('/^' . $class . '/', $option['name']) && $option['level'] == "$level") {
+            if (preg_match('/^'.$class.'/', $option['name']) && $option['level'] == "$level") {
                 // all non-multilang attribs get this assignment ...
                 $language = "";
                 $content = $option['value'];
@@ -187,19 +187,19 @@ 
                         $locationMarkers[] = $coords;
                         break;
                     case "file":
-                        $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td>";
+                        $retval .= "<tr><td>".$this->displayName($option['name'])."</td><td>$language</td><td>";
                         switch ($option['name']) {
                             case "general:logo_file":
                             case "fed:logo_file":
-                                $retval .= $this->previewImageinHTML('ROWID-' . $option['level'] . '-' . $option['row_id']);
+                                $retval .= $this->previewImageinHTML('ROWID-'.$option['level'].'-'.$option['row_id']);
                                 break;
                             case "eap:ca_file":
                             // fall-through intended: display both the same way
                             case "fed:minted_ca_file":
-                                $retval .= $this->previewCAinHTML('ROWID-' . $option['level'] . '-' . $option['row_id']);
+                                $retval .= $this->previewCAinHTML('ROWID-'.$option['level'].'-'.$option['row_id']);
                                 break;
                             case "support:info_file":
-                                $retval .= $this->previewInfoFileinHTML('ROWID-' . $option['level'] . '-' . $option['row_id']);
+                                $retval .= $this->previewInfoFileinHTML('ROWID-'.$option['level'].'-'.$option['row_id']);
                                 break;
                             default:
                         }
@@ -209,10 +209,10 @@ 
                             // do not display the option at all; it gets auto-set by the ProfileSilverbullet constructor and doesn't have to be seen
                             break;
                         }
-                        $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>";
+                        $retval .= "<tr><td>".$this->displayName($option['name'])."</td><td>$language</td><td><strong>$content</strong></td></tr>";
                 }
             }
         }
@@ -221,11 +221,11 @@ 
             $locationCount = 0;
             foreach ($locationMarkers as $g) {
                 $locationCount++;
-                $marker .= '<marker name="' . $locationCount . '" lat="' . $g['lat'] . '" lng="' . $g['lon'] . '" />';
+                $marker .= '<marker name="'.$locationCount.'" lat="'.$g['lat'].'" lng="'.$g['lon'].'" />';
             }
             $marker .= '<\/markers>'; // some validator says this should be escaped
             $jMarker = json_encode($locationMarkers);
-            $retval .= '<tr><td><script>markers=\'' . $marker . '\'; jmarkers = \'' . $jMarker . '\';</script></td><td></td><td></td></tr>';
+            $retval .= '<tr><td><script>markers=\''.$marker.'\'; jmarkers = \''.$jMarker.'\';</script></td><td></td><td></td></tr>';
         }
         \core\common\Entity::outOfThePotatoes();
         return $retval;
@@ -241,11 +241,11 @@ 
         \core\common\Entity::intoThePotatoes();
         $idpoptions = $myInst->getAttributes();
         $retval = "<div class='infobox'>
-        <h2>" . sprintf(_("General %s details"), $this->nomenclatureParticipant) . "</h2>
+        <h2>" . sprintf(_("General %s details"), $this->nomenclatureParticipant)."</h2>
         <table>
             <tr>
                 <td>
-                    " . _("Country:") . "
+                    " . _("Country:")."
                 </td>
                 <td>
                 </td>
@@ -255,16 +255,16 @@ 
         $retval .= $myFed->name;
         $retval .= "</strong>
                 </td>
-            </tr>" . $this->infoblock($idpoptions, "general", "IdP") . "
+            </tr>" . $this->infoblock($idpoptions, "general", "IdP")."
         </table>
     </div>";
 
         $blocks = [["support", _("Global Helpdesk Details")], ["media", _("Media Properties")]];
         foreach ($blocks as $block) {
             $retval .= "<div class='infobox'>
-            <h2>" . $block[1] . "</h2>
+            <h2>" . $block[1]."</h2>
             <table>" .
-                    $this->infoblock($idpoptions, $block[0], "IdP") .
+                    $this->infoblock($idpoptions, $block[0], "IdP").
                     "</table>
         </div>";
         }
@@ -279,12 +279,12 @@ 
      */
     private function displaySize(int $number) {
         if ($number > 1024 * 1024) {
-            return round($number / 1024 / 1024, 2) . " MiB";
+            return round($number / 1024 / 1024, 2)." MiB";
         }
         if ($number > 1024) {
-            return round($number / 1024, 2) . " KiB";
+            return round($number / 1024, 2)." KiB";
         }
-        return $number . " B";
+        return $number." B";
     }
 
     /**
@@ -339,7 +339,7 @@ 
         $caExpiryTrashhold = \config\ConfAssistant::CERT_WARNINGS['expiry_warning'];
         $rawResult = UIElements::getBlobFromDB($ref['table'], $ref['rowindex'], FALSE);
         if (is_bool($rawResult)) { // we didn't actually get a CA!
-            $retval = "<div class='ca-summary'>" . _("There was an error while retrieving the certificate from the database!") . "</div>";
+            $retval = "<div class='ca-summary'>"._("There was an error while retrieving the certificate from the database!")."</div>";
             \core\common\Entity::outOfThePotatoes();
             return $retval;
         }
@@ -355,8 +355,8 @@ 
 
         $details['name'] = preg_replace('/(.)\/(.)/', "$1<br/>$2", $details['name']);
         $details['name'] = preg_replace('/\//', "", $details['name']);
-        $certstatus = ( $details['root'] == 1 ? "R" : "I");
-        $certTooltip = ( $details['root'] == 1 ? _("Root CA") : _("Intermediate CA"));
+        $certstatus = ($details['root'] == 1 ? "R" : "I");
+        $certTooltip = ($details['root'] == 1 ? _("Root CA") : _("Intermediate CA"));
         $innerbgColor = "#0000ff";
         $leftBorderColor = "#00ff00";
         $message = "";
@@ -364,35 +364,35 @@ 
             $leftBorderColor = "red";
             $message = _("This is a <strong>SERVER</strong> certificate!");
             if (\config\ConfAssistant::CERT_GUIDELINES !== '') {
-                $message .= "<br/><a target='_blank' href='".\config\ConfAssistant::CERT_GUIDELINES."'>". _("more info")."</a>";
+                $message .= "<br/><a target='_blank' href='".\config\ConfAssistant::CERT_GUIDELINES."'>"._("more info")."</a>";
             }
             $message .= "<br/>";
-            $retval = "<div class='ca-summary' style='border-left-color: $leftBorderColor'><div style='position:absolute; right: -15px; width:20px; height:20px; background-color:$innerbgColor; border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>" . $message . $details['name'] . "</div>";
+            $retval = "<div class='ca-summary' style='border-left-color: $leftBorderColor'><div style='position:absolute; right: -15px; width:20px; height:20px; background-color:$innerbgColor; border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>".$message.$details['name']."</div>";
             \core\common\Entity::outOfThePotatoes();
             return $retval;
         }
         $now = time();
         if ($now + \config\ConfAssistant::CERT_WARNINGS['expiry_critical'] > $details['full_details']['validTo_time_t']) {
             $leftBorderColor = "red";
-            $message = _("Certificate expired!") . "<br>";
-        } elseif($now + \config\ConfAssistant::CERT_WARNINGS['expiry_warning']  > $details['full_details']['validTo_time_t'] - $caExpiryTrashhold) {
+            $message = _("Certificate expired!")."<br>";
+        } elseif ($now + \config\ConfAssistant::CERT_WARNINGS['expiry_warning'] > $details['full_details']['validTo_time_t'] - $caExpiryTrashhold) {
             if ($leftBorderColor == "#00ff00") {
                 $leftBorderColor = "yellow";
             }
-            $message = _("Certificate close to expiry!") . "<br/>";            
+            $message = _("Certificate close to expiry!")."<br/>";            
         }
    
         if ($details['root'] == 1 && $details['basicconstraints_set'] == 0) {
             if ($leftBorderColor == "#00ff00") {
                 $leftBorderColor = "yellow";
             }
-            $message .= "<div style='max-width: 25em'><strong>" . _("Improper root certificate, required critical CA extension missing, will not reliably install!") . "</strong>";
+            $message .= "<div style='max-width: 25em'><strong>"._("Improper root certificate, required critical CA extension missing, will not reliably install!")."</strong>";
             if (\config\ConfAssistant::CERT_GUIDELINES !== '') {
-                $message .= "<br/><a target='_blank' href='".\config\ConfAssistant::CERT_GUIDELINES."'>". _("more info")."</a>";
+                $message .= "<br/><a target='_blank' href='".\config\ConfAssistant::CERT_GUIDELINES."'>"._("more info")."</a>";
             }
             $message .= "</div><br/>";
         }
-        $retval =  "<div class='ca-summary' style='border-left-color: $leftBorderColor'><div style='position:absolute; right: -15px; width:20px; height:20px; background-color:$innerbgColor; border-radius:10px; text-align: center;'><div title='$certTooltip' style='padding-top:3px; font-weight:bold; color:#ffffff;'>$certstatus</div></div>" . $message . $details['name'] . "<br>" . $this->displayName('eap:ca_vailduntil') . " " . gmdate('Y-m-d H:i:s', $details['full_details']['validTo_time_t']) . " UTC</div>";
+        $retval = "<div class='ca-summary' style='border-left-color: $leftBorderColor'><div style='position:absolute; right: -15px; width:20px; height:20px; background-color:$innerbgColor; border-radius:10px; text-align: center;'><div title='$certTooltip' style='padding-top:3px; font-weight:bold; color:#ffffff;'>$certstatus</div></div>".$message.$details['name']."<br>".$this->displayName('eap:ca_vailduntil')." ".gmdate('Y-m-d H:i:s', $details['full_details']['validTo_time_t'])." UTC</div>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -405,7 +405,7 @@ 
      */
     public function previewImageinHTML($imageReference) {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<img style='max-width:150px' src='inc/filepreview.php?id=" . $imageReference . "' alt='" . _("Preview of logo file") . "'/>";
+        $retval = "<img style='max-width:150px' src='inc/filepreview.php?id=".$imageReference."' alt='"._("Preview of logo file")."'/>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -422,13 +422,13 @@ 
         $ref = $validator->databaseReference($fileReference);
         $fileBlob = UIElements::getBlobFromDB($ref['table'], $ref['rowindex'], FALSE);
         if (is_bool($fileBlob)) { // we didn't actually get a file!
-            $retval = "<div class='ca-summary'>" . _("There was an error while retrieving the file from the database!") . "</div>";
+            $retval = "<div class='ca-summary'>"._("There was an error while retrieving the file from the database!")."</div>";
             \core\common\Entity::outOfThePotatoes();
             return $retval;
         }
         $decodedFileBlob = base64_decode($fileBlob);
         $fileinfo = new \finfo();
-        $retval = "<div class='ca-summary'>" . _("File exists") . " (" . $fileinfo->buffer($decodedFileBlob, FILEINFO_MIME_TYPE) . ", " . $this->displaySize(strlen($decodedFileBlob)) . ")<br/><a href='inc/filepreview.php?id=$fileReference'>" . _("Preview") . "</a></div>";
+        $retval = "<div class='ca-summary'>"._("File exists")." (".$fileinfo->buffer($decodedFileBlob, FILEINFO_MIME_TYPE).", ".$this->displaySize(strlen($decodedFileBlob)).")<br/><a href='inc/filepreview.php?id=$fileReference'>"._("Preview")."</a></div>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -585,8 +585,8 @@ 
             return "";
         }
 
-        $loggerInstance->debug(4, "Consortium logo is at: " . ROOT . "/web/resources/images/consortium_logo_large.png");
-        $logogd = imagecreatefrompng(ROOT . "/web/resources/images/consortium_logo_large.png");
+        $loggerInstance->debug(4, "Consortium logo is at: ".ROOT."/web/resources/images/consortium_logo_large.png");
+        $logogd = imagecreatefrompng(ROOT."/web/resources/images/consortium_logo_large.png");
         if ($logogd === FALSE) { // consortium logo is bogus; don't do anything
             return "";
         }
@@ -612,7 +612,7 @@ 
         imagecolorallocate($whiteimage, 255, 255, 255);
         // also make sure the initial placement is a multitude of 12; otherwise "two half" symbols might be affected
         $targetplacementx = (int) ($symbolsize * round(($sizeinput[0] / 2 - ($targetwidth - $symbolsize + 1) / 2) / $symbolsize));
-        $targetplacementy = (int) ($symbolsize * round(($sizeinput[1] / 2 - ($targetheight - $symbolsize + 1 ) / 2) / $symbolsize));
+        $targetplacementy = (int) ($symbolsize * round(($sizeinput[1] / 2 - ($targetheight - $symbolsize + 1) / 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();
@@ -662,9 +662,9 @@ 
                 $message = "Your configuration appears to be fine.";
                 break;
             default:
-                throw new Exception("The result code level " . $test->test_result['global'] . " is not defined!");
+                throw new Exception("The result code level ".$test->test_result['global']." is not defined!");
         }
-        $out .= $this->boxFlexible($test->test_result['global'], "<br><strong>Test Summary</strong><br>" . $message . "<br>See below for details<br><hr>");
+        $out .= $this->boxFlexible($test->test_result['global'], "<br><strong>Test Summary</strong><br>".$message."<br>See below for details<br><hr>");
         foreach ($test->out as $testValue) {
             foreach ($testValue as $o) {
                 $out .= $this->boxFlexible($o['level'], $o['message']);

web/admin/edit_silverbullet.php

Spacing +73 added lines, -73 removed lines

@@ -20,7 +20,7 @@ 
 /*
  * Class autoloader invocation, should be included prior to any other code at the entry points to the application
  */
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $auth->authenticate();
@@ -52,7 +52,7 @@ 
     $fed = new \core\Federation($inst->federation);
     $allowSb = $fed->getAttributes("fed:silverbullet");
     if (count($allowSb) == 0) {
-        throw new Exception("We were told to create a new SB profile, but this " . \config\ConfAssistant::CONSORTIUM['nomenclature_federation'] . " does not allow SB at all!");
+        throw new Exception("We were told to create a new SB profile, but this ".\config\ConfAssistant::CONSORTIUM['nomenclature_federation']." does not allow SB at all!");
     }
     // okay, new SB profiles are allowed. 
     // but is there a support:email attribute on inst level?
@@ -63,7 +63,7 @@ 
     // Create one.
     $newProfile = $inst->newProfile(core\AbstractProfile::PROFILETYPE_SILVERBULLET);
     // and modify the REQUEST_URI to add the new profile ID
-    $_SERVER['REQUEST_URI'] = $_SERVER['REQUEST_URI'] . "&profile_id=" . $newProfile->identifier;
+    $_SERVER['REQUEST_URI'] = $_SERVER['REQUEST_URI']."&profile_id=".$newProfile->identifier;
     $_GET['profile_id'] = $newProfile->identifier;
     $profile = $newProfile;
 } else {
@@ -88,7 +88,7 @@ 
 if (isset($_POST['command'])) {
     switch ($_POST['command']) {
         case \web\lib\common\FormElements::BUTTON_CLOSE:
-            header("Location: overview_org.php?inst_id=" . $inst->identifier);
+            header("Location: overview_org.php?inst_id=".$inst->identifier);
             break;
         case \web\lib\common\FormElements::BUTTON_TERMSOFUSE_ACCEPTED:
             if (isset($_POST['agreement']) && $_POST['agreement'] == 'true') {
@@ -131,7 +131,7 @@ 
                         break;
                     }
                     $properName = $validator->syntaxConformUser($elements[0]);
-                    $properDate = new DateTime($elements[1] . " 00:00:00");
+                    $properDate = new DateTime($elements[1]." 00:00:00");
                     $numberOfActivations = $elements[2] ?? 5;
                     $number = $validator->integer($numberOfActivations);
                     if ($number === FALSE) { // invalid input received, default to sane
@@ -234,18 +234,18 @@ 
                     // warn and ask for confirmation unless already confirmed
                     if (!isset($_POST['insecureconfirm']) || $_POST['insecureconfirm'] != "CONFIRM") {
                         echo $deco->pageheader(_("Insecure mail domain!"), "ADMIN-IDP-USERS");
-                        echo "<p>" . sprintf(_("The mail domain of the mail address <strong>%s</strong> is not secure: some or all of the mail servers are not accepting encrypted connections (no consistent support for STARTTLS)."), $properEmail) . "</p>";
-                        echo "<p>" . _("The invitation would need to be sent in cleartext across the internet, and can possibly be read and abused by anyone in transit.") . "</p>";
-                        echo "<p>" . _("Do you want the system to send this mail anyway?") . "</p>";
+                        echo "<p>".sprintf(_("The mail domain of the mail address <strong>%s</strong> is not secure: some or all of the mail servers are not accepting encrypted connections (no consistent support for STARTTLS)."), $properEmail)."</p>";
+                        echo "<p>"._("The invitation would need to be sent in cleartext across the internet, and can possibly be read and abused by anyone in transit.")."</p>";
+                        echo "<p>"._("Do you want the system to send this mail anyway?")."</p>";
                         echo $formtext;
-                        echo "<button type='submit' class='delete'>" . _("DO NOT SEND") . "</button>";
+                        echo "<button type='submit' class='delete'>"._("DO NOT SEND")."</button>";
                         echo "</form>";
                         echo $formtext;
-                        echo "<input type='hidden' name='command' value='" . \web\lib\common\FormElements::BUTTON_SENDINVITATIONMAILBYCAT . "'</>";
+                        echo "<input type='hidden' name='command' value='".\web\lib\common\FormElements::BUTTON_SENDINVITATIONMAILBYCAT."'</>";
                         echo "<input type='hidden' name='address' value='$properEmail'</>";
-                        echo "<input type='hidden' name='token' value='" . $invitationObject->invitationTokenString . "'</>";
+                        echo "<input type='hidden' name='token' value='".$invitationObject->invitationTokenString."'</>";
                         echo "<input type='hidden' name='insecureconfirm' value='CONFIRM'/>";
-                        echo "<button type='submit'>" . _("Send anyway.") . "</button>";
+                        echo "<button type='submit'>"._("Send anyway.")."</button>";
                         echo "</form>";
                         echo $deco->footer();
                         exit;
@@ -296,7 +296,7 @@ 
 $activeUsers = $profile->listActiveUsers();
 
 
-echo $deco->defaultPagePrelude(sprintf(_('Managing %s users'), \core\ProfileSilverbullet::PRODUCTNAME ));
+echo $deco->defaultPagePrelude(sprintf(_('Managing %s users'), \core\ProfileSilverbullet::PRODUCTNAME));
 
 ?>
 <script src='js/option_expand.js' type='text/javascript'></script>
@@ -339,12 +339,12 @@ 
     <img src='../resources/images/icons/loading51.gif' id='spin' alt='loading...' style='position:absolute;left: 50%; top: 50%; transform: translate(-100px, -50px); display:none; z-index: 100;'>
     <?php echo $uiElements->instLevelInfoBoxes($inst); ?>
     <div class='infobox'>
-        <h2><?php $tablecaption = sprintf(_('Current %s users'), \core\ProfileSilverbullet::PRODUCTNAME); echo $tablecaption;?></h2>
+        <h2><?php $tablecaption = sprintf(_('Current %s users'), \core\ProfileSilverbullet::PRODUCTNAME); echo $tablecaption; ?></h2>
         <table>
-            <caption><?php echo $tablecaption;?></caption>
+            <caption><?php echo $tablecaption; ?></caption>
             <tr>
-                <th class="wai-invisible" scope="col"><?php echo _("Property Type");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Property Value");?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Property Type"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Property Value"); ?></th>
             </tr>
 
             <tr>
@@ -368,19 +368,19 @@ 
         case "NOSTIPULATION":
             break;
         case "EMAIL-SENT":
-            echo $boundaryPre . $uiElements->boxOkay(_("The e-mail was sent successfully."), _("E-mail OK."), FALSE) . $boundaryPost;
+            echo $boundaryPre.$uiElements->boxOkay(_("The e-mail was sent successfully."), _("E-mail OK."), FALSE).$boundaryPost;
             break;
         case "EMAIL-NOTSENT":
-            echo $boundaryPre . $uiElements->boxError(_("The e-mail was NOT sent."), _("E-mail not OK."), FALSE) . $boundaryPost;
+            echo $boundaryPre.$uiElements->boxError(_("The e-mail was NOT sent."), _("E-mail not OK."), FALSE).$boundaryPost;
             break;
         case "SMS-SENT":
-            echo $boundaryPre . $uiElements->boxOkay(_("The SMS was sent successfully."), _("SMS OK."), FALSE) . $boundaryPost;
+            echo $boundaryPre.$uiElements->boxOkay(_("The SMS was sent successfully."), _("SMS OK."), FALSE).$boundaryPost;
             break;
         case "SMS-NOTSENT":
-            echo $boundaryPre . $uiElements->boxOkay(_("The SMS was NOT sent."), _("SMS not OK."), FALSE) . $boundaryPost;
+            echo $boundaryPre.$uiElements->boxOkay(_("The SMS was NOT sent."), _("SMS not OK."), FALSE).$boundaryPost;
             break;
         case "SMS-FRAGMENT":
-            echo $boundaryPre . $uiElements->boxWarning(_("Only a fragment of the SMS was sent. You should re-send it."), _("SMS Fragment."), FALSE) . $boundaryPost;
+            echo $boundaryPre.$uiElements->boxWarning(_("Only a fragment of the SMS was sent. You should re-send it."), _("SMS Fragment."), FALSE).$boundaryPost;
             break;
     }
     ?>
@@ -393,17 +393,17 @@ 
             <?php
             $bufferCurrentUsers = "<table class='sb-user-table' style='max-width:1920px;'>
                 <tr class='sb-title-row_id'>
-                    <td>" . _("User") . "</td>
-                    <td>" . _("Token/Certificate details") . "</td>
-                    <td>" . _("User/Token Expiry") . "</td>
-                    <td>" . _("Actions") . "</td>
+                    <td>" . _("User")."</td>
+                    <td>" . _("Token/Certificate details")."</td>
+                    <td>" . _("User/Token Expiry")."</td>
+                    <td>" . _("Actions")."</td>
                 </tr>";
             $bufferPreviousUsers = "<table class='sb-user-table' style='max-width:1920px;'>
                 <tr class='sb-title-row_id'>
-                    <td>" . _("User") . "</td>
-                    <td>" . _("Certificate details") . "</td>
-                    <td>" . _("User Expiry") . "</td>
-                    <td>" . _("Actions") . "</td>
+                    <td>" . _("User")."</td>
+                    <td>" . _("Certificate details")."</td>
+                    <td>" . _("User Expiry")."</td>
+                    <td>" . _("Actions")."</td>
                 </tr>";
 
             natsort($allUsers);
@@ -460,23 +460,23 @@ 
                     $display = empty(devices\Devices::listDevices()[$oneCert->device]['display']) ? $oneCert->device : devices\Devices::listDevices()[$oneCert->device]['display'];
 
                     $bufferText = "<div class='sb-certificate-summary ca-summary' $style>
-                                    <div class='sb-certificate-details'>" . _("Device:") . " " . $display .
-                            "<br>" . _("Serial Number:") . "&nbsp;" . dechex($oneCert->serial) .
-                            "<br>" . _("CN:") . "&nbsp;" . explode('@', $oneCert->username)[0] . "@…" .
-                            "<br>" . _("Expiry:") . "&nbsp;" . $oneCert->expiry .
-                            "<br>" . _("Issued:") . "&nbsp;" . $oneCert->issued .
-                            "</div>" .
+                                    <div class='sb-certificate-details'>"._("Device:")." ".$display.
+                            "<br>"._("Serial Number:")."&nbsp;".dechex($oneCert->serial).
+                            "<br>"._("CN:")."&nbsp;".explode('@', $oneCert->username)[0]."@…".
+                            "<br>"._("Expiry:")."&nbsp;".$oneCert->expiry.
+                            "<br>"._("Issued:")."&nbsp;".$oneCert->issued.
+                            "</div>".
                             "<div style='text-align:right;padding-top: 5px; $buttonStyle'>";
 
                     if ($buttonText == "") {
                         $bufferText .= $formtext
-                                . "<input type='hidden' name='certSerial' value='" . $oneCert->serial . "'/>"
-                                . "<input type='hidden' name='certAlgo' value='" . $oneCert->ca_type . "'/>"
+                                . "<input type='hidden' name='certSerial' value='".$oneCert->serial."'/>"
+                                . "<input type='hidden' name='certAlgo' value='".$oneCert->ca_type."'/>"
                                 . "<button type='submit' "
                                 . "name='command' "
-                                . "value='" . \web\lib\common\FormElements::BUTTON_REVOKECREDENTIAL . "' "
+                                . "value='".\web\lib\common\FormElements::BUTTON_REVOKECREDENTIAL."' "
                                 . "class='delete admin_only' "
-                                . "onclick='return confirm(\"" . sprintf(_("The device in question will stop functioning with %s. The revocation cannot be undone. Are you sure you want to do this?"), \config\ConfAssistant::CONSORTIUM['display_name']) . "\")'>"
+                                . "onclick='return confirm(\"".sprintf(_("The device in question will stop functioning with %s. The revocation cannot be undone. Are you sure you want to do this?"), \config\ConfAssistant::CONSORTIUM['display_name'])."\")'>"
                                 . _("Revoke")
                                 . "</button>"
                                 . "</form>";
@@ -501,13 +501,13 @@ 
                 }
                 // wrap the revoked and expired certs in a div that is hidden by default
                 if ($textRevokedCerts !== "") {
-                    $textRevokedCerts = "<span style='text-decoration: underline;' id='$oneUserId-revoked-heading' onclick='document.getElementById(\"$oneUserId-revoked-certs\").style.display = \"block\"; document.getElementById(\"$oneUserId-revoked-heading\").style.display = \"none\";'>" . sprintf(ngettext("(show %d revoked certificate)", "(show %d revoked certificates)", $countRevoked), $countRevoked) . "</span><div id='$oneUserId-revoked-certs' style='display:none;'>" . $textRevokedCerts . "</div>";
+                    $textRevokedCerts = "<span style='text-decoration: underline;' id='$oneUserId-revoked-heading' onclick='document.getElementById(\"$oneUserId-revoked-certs\").style.display = \"block\"; document.getElementById(\"$oneUserId-revoked-heading\").style.display = \"none\";'>".sprintf(ngettext("(show %d revoked certificate)", "(show %d revoked certificates)", $countRevoked), $countRevoked)."</span><div id='$oneUserId-revoked-certs' style='display:none;'>".$textRevokedCerts."</div>";
                 }
                 if ($textExpiredCerts !== "") {
-                    $textExpiredCerts = "<span style='text-decoration: underline;' id='$oneUserId-expired-heading' onclick='document.getElementById(\"$oneUserId-expired-certs\").style.display = \"block\"; document.getElementById(\"$oneUserId-expired-heading\").style.display = \"none\";'>" . sprintf(ngettext("(show %d expired certificate)", "(show %d expired certificates)", $countExpired), $countExpired) . "</span><div id='$oneUserId-expired-certs' style='display:none;'>" . $textExpiredCerts . "</div>";
+                    $textExpiredCerts = "<span style='text-decoration: underline;' id='$oneUserId-expired-heading' onclick='document.getElementById(\"$oneUserId-expired-certs\").style.display = \"block\"; document.getElementById(\"$oneUserId-expired-heading\").style.display = \"none\";'>".sprintf(ngettext("(show %d expired certificate)", "(show %d expired certificates)", $countExpired), $countExpired)."</span><div id='$oneUserId-expired-certs' style='display:none;'>".$textExpiredCerts."</div>";
                 }
                 // and push out the HTML
-                ${$outputBuffer} .= $textActiveCerts . "<br/>" . $textExpiredCerts . " " . $textRevokedCerts . "</td>";
+                ${$outputBuffer} .= $textActiveCerts."<br/>".$textExpiredCerts." ".$textRevokedCerts."</td>";
                 $tokenHtmlBuffer = "";
                 $hasOnePendingInvite = FALSE;
                 foreach ($tokensWithoutCerts as $invitationObject) {
@@ -518,38 +518,38 @@ 
                             $tokenHtmlBuffer .= "<tr class='sb-certificate-row_id admin_only'><td></td>";
                             $jsEncodedBody = str_replace('\n', '%0D%0A', str_replace('"', '', json_encode($invitationObject->invitationMailBody())));
                             $tokenHtmlBuffer .= "<td>";
-                            $tokenHtmlBuffer .= sprintf(_("The invitation token %s is ready for sending! Choose how to send it:"), "<input type='text' readonly='readonly' style='background-color:lightgrey;' size='60' value='" . $invitationObject->link() . "' name='token' class='identifiedtokenarea-" . $invitationObject->identifier . "'>(…)<br/>");
+                            $tokenHtmlBuffer .= sprintf(_("The invitation token %s is ready for sending! Choose how to send it:"), "<input type='text' readonly='readonly' style='background-color:lightgrey;' size='60' value='".$invitationObject->link()."' name='token' class='identifiedtokenarea-".$invitationObject->identifier."'>(…)<br/>");
                             $tokenHtmlBuffer .= "<table>
-                                    <tr><td style='vertical-align:bottom;'>" . _("E-Mail:") . "</td><td>
+                                    <tr><td style='vertical-align:bottom;'>" . _("E-Mail:")."</td><td>
                                     $formtext
-                                <input type='hidden' value='" . $invitationObject->invitationTokenString . "' name='token'><br/>
+                                <input type='hidden' value='".$invitationObject->invitationTokenString."' name='token'><br/>
                                 <input type='text' name='address' id='address-$invitationObject->identifier'/>
-                                <button type='button' onclick='window.location=\"mailto:\"+document.getElementById(\"address-$invitationObject->identifier\").value+\"?subject=" . $invitationObject->invitationMailSubject() . "&amp;body=$jsEncodedBody\"; return false;'>" . _("Local mail client") . "</button>
-                                <button type='submit' name='command' onclick='document.getElementById(\"spin\").style.display =\"block\"' value='" . \web\lib\common\FormElements::BUTTON_SENDINVITATIONMAILBYCAT . "'>" . _("Send with CAT") . "</button>
+                                <button type='button' onclick='window.location=\"mailto:\"+document.getElementById(\"address-$invitationObject->identifier\").value+\"?subject=".$invitationObject->invitationMailSubject()."&amp;body=$jsEncodedBody\"; return false;'>"._("Local mail client")."</button>
+                                <button type='submit' name='command' onclick='document.getElementById(\"spin\").style.display =\"block\"' value='" . \web\lib\common\FormElements::BUTTON_SENDINVITATIONMAILBYCAT."'>"._("Send with CAT")."</button>
                                     </form>
                                     </td></tr>
-                                    <tr><td style='vertical-align:bottom;'>" . _("SMS:") . "</td><td>
+                                    <tr><td style='vertical-align:bottom;'>" . _("SMS:")."</td><td>
                                     $formtext
-                                    <input type='hidden' value='" . $invitationObject->invitationTokenString . "' name='token'><br/>
+                                    <input type='hidden' value='".$invitationObject->invitationTokenString."' name='token'><br/>
                                     <input type='text' name='smsnumber' />
-				<button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_SENDINVITATIONSMS . "'>" . _("Send in SMS...") . "</button>
+				<button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_SENDINVITATIONSMS."'>"._("Send in SMS...")."</button>
                                     </form>
 				</td></tr>
-                                    <tr><td style='vertical-align:bottom;'>" . _("Manual:") . "</td><td>
-				<button type='button' class='clipboardButton admin_only' onclick='clipboardCopy(" . $invitationObject->identifier . ");'>" . _("Copy to Clipboard") . "</button>
+                                    <tr><td style='vertical-align:bottom;'>" . _("Manual:")."</td><td>
+				<button type='button' class='clipboardButton admin_only' onclick='clipboardCopy(" . $invitationObject->identifier.");'>"._("Copy to Clipboard")."</button>
                                     <form style='display:inline-block;' method='post' action='inc/displayQRcode.inc.php' onsubmit='popupQRWindow(this); return false;' accept-charset='UTF-8'>
-                                    <input type='hidden' value='" . $invitationObject->invitationTokenString . "' name='token'><br/>
-                                      <button type='submit'>" . _("Display QR code") . "</button>
+                                    <input type='hidden' value='" . $invitationObject->invitationTokenString."' name='token'><br/>
+                                      <button type='submit'>" . _("Display QR code")."</button>
                                   </form>
                                         </td></tr>
                                         
                                 </table>
                                 </td>";
-                            $tokenHtmlBuffer .= "<td>" . _("Expiry Date:") . " " . $invitationObject->expiry . " UTC<br>" . _("Activations remaining:") . " " . sprintf(_("%d of %d"), $invitationObject->activationsRemaining, $invitationObject->activationsTotal) . "</td>";
+                            $tokenHtmlBuffer .= "<td>"._("Expiry Date:")." ".$invitationObject->expiry." UTC<br>"._("Activations remaining:")." ".sprintf(_("%d of %d"), $invitationObject->activationsRemaining, $invitationObject->activationsTotal)."</td>";
                             $tokenHtmlBuffer .= "<td>"
                                     . $formtext
-                                    . "<input type='hidden' name='invitationtoken' value='" . $invitationObject->invitationTokenString . "'/>"
-                                    . "<button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_REVOKEINVITATION . "' class='delete'>" . _("Revoke") . "</button></form>"
+                                    . "<input type='hidden' name='invitationtoken' value='".$invitationObject->invitationTokenString."'/>"
+                                    . "<button type='submit' name='command' value='".\web\lib\common\FormElements::BUTTON_REVOKEINVITATION."' class='delete'>"._("Revoke")."</button></form>"
                                     . "</td></tr>";
                             break;
                         case core\SilverbulletInvitation::SB_TOKENSTATUS_EXPIRED:
@@ -565,10 +565,10 @@ 
                 }
                 ${$outputBuffer} .= "<td>$formtext
                     <div class='sb-date-container' style='min-width: 200px;'>
-                        <span><input type='text' maxlength='19' class='sb-date-picker' name='userexpiry' value='" . $profile->getUserExpiryDate($oneUserId) . "'>&nbsp;(UTC)</span>
+                        <span><input type='text' maxlength='19' class='sb-date-picker' name='userexpiry' value='".$profile->getUserExpiryDate($oneUserId)."'>&nbsp;(UTC)</span>
                     </div>
                     <input type='hidden' name='userid' value='$oneUserId'/>
-                    <button type='submit' class='admin_only' name='command' value='" . \web\lib\common\FormElements::BUTTON_CHANGEUSEREXPIRY . "'>" . _("Update") . "</button>
+                    <button type='submit' class='admin_only' name='command' value='".\web\lib\common\FormElements::BUTTON_CHANGEUSEREXPIRY."'>"._("Update")."</button>
                     </form>
                 </td>
                 <td>
@@ -576,33 +576,33 @@ 
 
                 if ($hasOnePendingInvite || count($validCerts) > 0) {
                     $deletionText = sprintf(_("All of the currently active devices will stop functioning with %s. This cannot be undone. While the user can be re-activated later, they will then need to be re-provisioned with new invitation tokens. Are you sure you want to do this?"), \config\ConfAssistant::CONSORTIUM['display_name']);
-                    ${$outputBuffer} .= $formtext . "
+                    ${$outputBuffer} .= $formtext."
                                     <input type='hidden' name='userid' value='$oneUserId'/>
                                     <button type='submit' "
                             . "name='command' "
-                            . "value='" . \web\lib\common\FormElements::BUTTON_DEACTIVATEUSER . "' "
+                            . "value='".\web\lib\common\FormElements::BUTTON_DEACTIVATEUSER."' "
                             . "class='delete admin_only' "
-                            . ( count($validCerts) > 0 ? "onclick='return confirm(\"" . $deletionText . "\")' " : "" )
+                            . (count($validCerts) > 0 ? "onclick='return confirm(\"".$deletionText."\")' " : "")
                             . ">"
                             . _("Deactivate User")
                             . "</button>
                                 </form>";
                 }
-                ${$outputBuffer} .= "<form method='post' action='inc/userStats.inc.php?inst_id=" . $profile->institution . "&amp;profile_id=" . $profile->identifier . "&amp;user_id=$oneUserId' onsubmit='popupStatsWindow(this); return false;' accept-charset='UTF-8'>
-                    <button type='submit'>" . _("Show Authentication Records") . "</button>
+                ${$outputBuffer} .= "<form method='post' action='inc/userStats.inc.php?inst_id=".$profile->institution."&amp;profile_id=".$profile->identifier."&amp;user_id=$oneUserId' onsubmit='popupStatsWindow(this); return false;' accept-charset='UTF-8'>
+                    <button type='submit'>"._("Show Authentication Records")."</button>
                 </form>";
                 if (new DateTime() < new DateTime($expiryDate)) { // current user, allow sending new token
-                    ${$outputBuffer} .= $formtext . "
+                    ${$outputBuffer} .= $formtext."
                     <input type='hidden' name='userid' value='$oneUserId'/>
-                    <button type='submit' name='command' class='admin_only' value='" . \web\lib\common\FormElements::BUTTON_NEWINVITATION . "'>" . _("New Invitation") . "</button>
-                    <label>" . _("Activations:") . "
+                    <button type='submit' name='command' class='admin_only' value='".\web\lib\common\FormElements::BUTTON_NEWINVITATION."'>"._("New Invitation")."</button>
+                    <label>" . _("Activations:")."
                         <input type='text' name='invitationsquantity' value='5' maxlength='3' style='width: 30px;'/>
                     </label>
                     </form>";
                 } elseif (count($profile->getUserAuthRecords($oneUserId, true)) == 0) { // previous user; if there are NO authentication records, allow full deletion - otherwise, need to keep user trace for abuse handling
-                    ${$outputBuffer} .= $formtext . "
+                    ${$outputBuffer} .= $formtext."
                     <input type='hidden' name='userid' value='$oneUserId'/>
-                    <button type='submit' class='delete admin_only' name='command' value='" . \web\lib\common\FormElements::BUTTON_DELETE . "'>" . _("Delete User") . "</button>
+                    <button type='submit' class='delete admin_only' name='command' value='".\web\lib\common\FormElements::BUTTON_DELETE."'>"._("Delete User")."</button>
                     </form>";
                 }
                 ${$outputBuffer} .= "</div>
@@ -634,13 +634,13 @@ 
                                     . ' If all accounts shown as active above are indeed still valid, please check the box below and push "Save".'
                                     . ' If any of the accounts are stale, please deactivate them by pushing the corresponding button before doing this.'), \config\ConfAssistant::SILVERBULLET['gracetime'] ?? core\ProfileSilverbullet::SB_ACKNOWLEDGEMENT_REQUIRED_DAYS);
 
-                    echo $formtext . "<div style='padding-bottom: 20px;'>"
+                    echo $formtext."<div style='padding-bottom: 20px;'>"
                     . "
                     <p>$acknowledgeText</p>
                     <input type='checkbox' name='acknowledge' value='true'>
-                    <label>" . sprintf(_("I have verified that all configured users are still eligible for %s."),\config\ConfAssistant::CONSORTIUM['display_name']) . "</label>
+                    <label>".sprintf(_("I have verified that all configured users are still eligible for %s."), \config\ConfAssistant::CONSORTIUM['display_name'])."</label>
                 </div>
-                <button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_ACKUSERELIGIBILITY . "'>" . _("Save") . "</button></form>";
+                <button type='submit' name='command' value='" . \web\lib\common\FormElements::BUTTON_ACKUSERELIGIBILITY."'>"._("Save")."</button></form>";
                 }
                 ?>
             </div>

web/diag/show_realmcheck.php

Spacing +2 added lines, -2 removed lines

@@ -150,7 +150,7 @@ 
             <div id="tabs-2">
                 <!--<button id="run_s_tests" onclick="run_udp()"><?php echo _("Repeat static connectivity tests") ?></button>-->
                 <p>
-                <?php print $realmTests->printStatic();?>
+                <?php print $realmTests->printStatic(); ?>
 
             <!-- tabs-2 end -->
             </div>
@@ -160,7 +160,7 @@ 
                 ?>
                 <div id="tabs-3">
                     <!--<button id="run_d_tests" onclick="run_dynamic()"><?php echo _("Repeat dynamic connectivity tests") ?></button>-->
-                    <?php print $realmTests->printDynamic();?>
+                    <?php print $realmTests->printDynamic(); ?>
                 <!-- tabs-3 end -->    
                 </div>
             <?php

core/common/OutsideComm.php

Spacing +20 added lines, -20 removed lines

@@ -39,7 +39,7 @@ 
      * @param int $timeout the timeout to download
      * @return string|boolean the data we got back, or FALSE on failure
      */
-    public static function downloadFile($url, $timeout=0)
+    public static function downloadFile($url, $timeout = 0)
     {
         $loggerInstance = new \core\common\Logging();
         if (!preg_match("/:\/\//", $url)) {
@@ -129,7 +129,7 @@ 
             $loggerInstance->debug(4, "OutsideComm::mailAddressValidSecure: no MX.");
             return OutsideComm::MAILDOMAIN_NO_MX;
         }
-        $loggerInstance->debug(5, "Domain: $domain MX: " . /** @scrutinizer ignore-type */ print_r($mx, TRUE));
+        $loggerInstance->debug(5, "Domain: $domain MX: "./** @scrutinizer ignore-type */ print_r($mx, TRUE));
         // create a pool of A and AAAA records for all the MXes
         $ipAddrs = [];
         foreach ($mx as $onemx) {
@@ -139,14 +139,14 @@ 
                 $ipAddrs[] = $oneipv4['ip'];
             }
             foreach ($v6list as $oneipv6) {
-                $ipAddrs[] = "[" . $oneipv6['ipv6'] . "]";
+                $ipAddrs[] = "[".$oneipv6['ipv6']."]";
             }
         }
         if (count($ipAddrs) == 0) {
             $loggerInstance->debug(4, "OutsideComm::mailAddressValidSecure: no mailserver hosts.");
             return OutsideComm::MAILDOMAIN_NO_HOST;
         }
-        $loggerInstance->debug(5, "Domain: $domain Addrs: " . /** @scrutinizer ignore-type */ print_r($ipAddrs, TRUE));
+        $loggerInstance->debug(5, "Domain: $domain Addrs: "./** @scrutinizer ignore-type */ print_r($ipAddrs, TRUE));
         // connect to all hosts. If all can't connect, return MAILDOMAIN_NO_CONNECT. 
         // If at least one does not support STARTTLS or one of the hosts doesn't connect
         // , return MAILDOMAIN_NO_STARTTLS (one which we can't connect to we also
@@ -199,7 +199,7 @@ 
         switch (\config\ConfAssistant::SMSSETTINGS['provider']) {
             case 'Nexmo':
                 // taken from https://docs.nexmo.com/messaging/sms-api
-                $url = 'https://rest.nexmo.com/sms/json?' . http_build_query(
+                $url = 'https://rest.nexmo.com/sms/json?'.http_build_query(
                                 [
                                     'api_key' => \config\ConfAssistant::SMSSETTINGS['username'],
                                     'api_secret' => \config\ConfAssistant::SMSSETTINGS['password'],
@@ -230,14 +230,14 @@ 
                     $loggerInstance->debug(2, 'Problem with SMS invitation: no message was sent!');
                     return OutsideComm::SMS_NOTSENT;
                 }
-                $loggerInstance->debug(2, 'Total of ' . $messageCount . ' messages were attempted to send.');
+                $loggerInstance->debug(2, 'Total of '.$messageCount.' messages were attempted to send.');
 
                 $totalFailures = 0;
                 foreach ($decoded_response['messages'] as $message) {
                     if ($message['status'] == 0) {
-                        $loggerInstance->debug(2, $message['message-id'] . ": Success");
+                        $loggerInstance->debug(2, $message['message-id'].": Success");
                     } else {
-                        $loggerInstance->debug(2, $message['message-id'] . ": Failed (failure code = " . $message['status'] . ")");
+                        $loggerInstance->debug(2, $message['message-id'].": Failed (failure code = ".$message['status'].")");
                         $totalFailures++;
                     }
                 }
@@ -306,7 +306,7 @@ 
             $proto = "https://";
         }
         // then, send out the mail
-        $message = _("Hello,") . "\n\n" . wordwrap($introTexts[$introtext] . " " . $validity, 72) . "\n\n";
+        $message = _("Hello,")."\n\n".wordwrap($introTexts[$introtext]." ".$validity, 72)."\n\n";
         // default means we don't have a Reply-To.
         $replyToMessage = wordwrap(_("manually. Please do not reply to this mail; this is a send-only address."));
 
@@ -314,8 +314,8 @@ 
             // see if we are supposed to add a custom message
             $customtext = $federation->getAttributes('fed:custominvite');
             if (count($customtext) > 0) {
-                $message .= wordwrap(sprintf(_("Additional message from your %s administrator:"), Entity::$nomenclature_fed), 72) . "\n---------------------------------" .
-                        wordwrap($customtext[0]['value'], 72) . "\n---------------------------------\n\n";
+                $message .= wordwrap(sprintf(_("Additional message from your %s administrator:"), Entity::$nomenclature_fed), 72)."\n---------------------------------".
+                        wordwrap($customtext[0]['value'], 72)."\n---------------------------------\n\n";
             }
             // and add Reply-To already now
             foreach ($federation->listFederationAdmins() as $fedadmin_id) {
@@ -331,19 +331,19 @@ 
         }
         $productname = \config\Master::APPEARANCE['productname'];
         $consortium = \config\ConfAssistant::CONSORTIUM['display_name'];
-        $message .= wordwrap(sprintf(_("To enlist as an administrator for that %s, please click on the following link:"), Entity::$nomenclature_participant), 72) . "\n\n" .
-                $proto . $_SERVER['SERVER_NAME'] . \config\Master::PATHS['cat_base_url'] . "admin/action_enrollment.php?token=$newtoken\n\n" .
-                wordwrap(sprintf(_("If clicking the link doesn't work, you can also go to the %s Administrator Interface at"), $productname), 72) . "\n\n" .
-                $proto . $_SERVER['SERVER_NAME'] . \config\Master::PATHS['cat_base_url'] . "admin/\n\n" .
-                _("and enter the invitation token") . "\n\n" .
-                $newtoken . "\n\n$replyToMessage\n\n" .
-                wordwrap(_("Do NOT forward the mail before the token has expired - or the recipients may be able to consume the token on your behalf!"), 72) . "\n\n" .
-                wordwrap(sprintf(_("We wish you a lot of fun with the %s."), $productname), 72) . "\n\n" .
+        $message .= wordwrap(sprintf(_("To enlist as an administrator for that %s, please click on the following link:"), Entity::$nomenclature_participant), 72)."\n\n".
+                $proto.$_SERVER['SERVER_NAME'].\config\Master::PATHS['cat_base_url']."admin/action_enrollment.php?token=$newtoken\n\n".
+                wordwrap(sprintf(_("If clicking the link doesn't work, you can also go to the %s Administrator Interface at"), $productname), 72)."\n\n".
+                $proto.$_SERVER['SERVER_NAME'].\config\Master::PATHS['cat_base_url']."admin/\n\n".
+                _("and enter the invitation token")."\n\n".
+                $newtoken."\n\n$replyToMessage\n\n".
+                wordwrap(_("Do NOT forward the mail before the token has expired - or the recipients may be able to consume the token on your behalf!"), 72)."\n\n".
+                wordwrap(sprintf(_("We wish you a lot of fun with the %s."), $productname), 72)."\n\n".
                 sprintf(_("Sincerely,\n\nYour friendly folks from %s Operations"), $consortium);
 
 
 // who to whom?
-        $mail->FromName = \config\Master::APPEARANCE['productname'] . " Invitation System";
+        $mail->FromName = \config\Master::APPEARANCE['productname']." Invitation System";
 
         if (isset(\config\Master::APPEARANCE['invitation-bcc-mail']) && \config\Master::APPEARANCE['invitation-bcc-mail'] !== NULL) {
             $mail->addBCC(\config\Master::APPEARANCE['invitation-bcc-mail']);

core/diag/RADIUSTestsUI.php

Spacing +11 added lines, -11 removed lines

@@ -296,7 +296,7 @@ 
          <table><tr>
          <td class='icon_td'>";
         $out[] = "<img src='".$this->stateIcons[$this->globalLevelStatic]."' id='main_static_ico' class='icon'></td><td id='main_static_result'>".
-                            $this->globalInfo[$this->globalLevelStatic].' '. _("See the appropriate tab for details.").'</td>
+                            $this->globalInfo[$this->globalLevelStatic].' '._("See the appropriate tab for details.").'</td>
          </tr></table>';
         if ($this->naptr > 0) {
             $out[] = "<hr><strong>"._("Dynamic connectivity tests")."</strong>
@@ -328,7 +328,7 @@ 
 <td class='icon_td'><img src='".$this->stateIcons[$result->level]."' id='src".$hostindex."_img'></td>
 <td id='src$hostindex' colspan=2>
 ";
-            $out[] = '<strong>'.($result->server ? $result->server : _("Connected to undetermined server")).'</strong><br/>'.sprintf (_("elapsed time: %sms."), $result->time_millisec).'<div>'.$result->message.'</div>';
+            $out[] = '<strong>'.($result->server ? $result->server : _("Connected to undetermined server")).'</strong><br/>'.sprintf(_("elapsed time: %sms."), $result->time_millisec).'<div>'.$result->message.'</div>';
                     
             if ($result->level > \core\common\Entity::L_OK && property_exists($result, 'cert_oddities')) {
                 foreach ($result->cert_oddities as $oddities) {
@@ -345,9 +345,9 @@ 
                     }
                 }
                 if ($result->server_cert->extensions) {
-                    $certdesc .= '<li>' . _('Extensions') . '<ul>';
+                    $certdesc .= '<li>'._('Extensions').'<ul>';
                     foreach ($result->server_cert->extensions as $ekey => $eval) {
-                        $certdesc .= '<li>' . $ekey . ': ' . $eval;
+                        $certdesc .= '<li>'.$ekey.': '.$eval;
                     }
                     $certdesc .= '</ul>';
                 }
@@ -355,7 +355,7 @@ 
                 $more .= '<span class="morecontent"><span>'.$certdesc.
                         '</span><a href="" class="morelink">'._("show server certificate details").'&raquo;</a></span></div>';
             }     
-            if ($more != '' ) {
+            if ($more != '') {
                 $out[] = '<tr><td>&nbsp;</td><td colspan="2">'.$more.'</td></tr>';
             }
             $out[] = "</table></ul>";
@@ -379,10 +379,10 @@ 
             if (isset($this->protocolsMap[$capath->IP]) && $this->protocolsMap[$capath->IP] != '') {
                 $prots = explode(';', $this->protocolsMap[$capath->IP]);
                 if (!empty($prots)) {
-                    $capathtest[] = ' ' . _("supported TLS protocols: ");
+                    $capathtest[] = ' '._("supported TLS protocols: ");
                     $capathtest[] = implode(', ', $prots);
                     if (!in_array("TLS1.3", $prots)) {
-                        $capathtest[] =  ' ' . '<font color="red">' . _("not supported: ") . 'TLS1.3</font>';
+                        $capathtest[] = ' '.'<font color="red">'._("not supported: ").'TLS1.3</font>';
                     }
                 }
             }
@@ -405,7 +405,7 @@ 
                 if ($capath->certdata->validTo) {
                     $certdesc .= '<li>'.$this->certFields['validTo'].' '.
                             date_create_from_format('ymdGis', 
-                                    substr($capath->certdata->validTo, 0, -1))->format('Y-m-d H:i:s'). ' UTC';
+                                    substr($capath->certdata->validTo, 0, -1))->format('Y-m-d H:i:s').' UTC';
                 }
                 if ($capath->certdata->extensions) {
                     if ($capath->certdata->extensions->subjectaltname) {                     
@@ -428,7 +428,7 @@ 
             } else {
                 $certdesc = '<br>';
             }
-            $capathtest[] = '<div>'.($capath->message!='' ? $capath->message : _('Test failed')).'</div>'.$more;
+            $capathtest[] = '<div>'.($capath->message != '' ? $capath->message : _('Test failed')).'</div>'.$more;
             $capathtest[] = '</td>
 </tr>
 </table>';
@@ -455,7 +455,7 @@ 
                         $srefused = 0;
                         $cliinfo = '';
                         $cliinfo .= '<li>'._('Client certificate').' <b>'.$ca->clientcertinfo->from.
-                                    '</b>'.', '.$ca->clientcertinfo->message .
+                                    '</b>'.', '.$ca->clientcertinfo->message.
                                     '<br> (CA: '.$ca->clientcertinfo->issuer.')<ul>';
                         foreach ($ca->certificate as $certificate) {
                             if ($certificate->returncode == \core\diag\RADIUSTests::RETVAL_CONNECTION_REFUSED) {
@@ -521,7 +521,7 @@ 
                 } else {
                     $cliinfo = _('Test failed');
                     $clientstest[] = "<table><tr><td class='icon_td' id='srcclient".$hostindex."_img'><img src='".
-                                    $this->stateIcons[\core\common\Entity::L_WARN]."'></td>" .
+                                    $this->stateIcons[\core\common\Entity::L_WARN]."'></td>".
                                     "<td id='srcclient$hostindex'>$cliinfo</td></tr></table>";
                 }
             } else {