Inspection of "Displaying warnings about Improper root certificat..." - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — release_2_1 ( 1cb6d0...7c84e2 )

by Tomasz

created 2024-03-19 21:59 UTC

Status

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

@@ -73,17 +73,17 @@  discard block
 block discarded – undo
         $retval = "<div class='sidebar'><p>";
         $user = new \core\User($_SESSION['user']);
         if ($advancedControls) {
-            $retval .= "<strong>" . _("You are:") . "</strong> ".$_SESSION['name']
+            $retval .= "<strong>"._("You are:")."</strong> ".$_SESSION['name']
             ."<br/>
               <br/>";
             if ($user->isFederationAdmin()) {
-                $retval .= "<a href='" . \core\CAT::getRootUrlPath() . "/admin/overview_federation.php'>" . _("The NRO page") . "</a> ";
+                $retval .= "<a href='".\core\CAT::getRootUrlPath()."/admin/overview_federation.php'>"._("The NRO page")."</a> ";
 
             }
-            $retval .= "<a href='" . \core\CAT::getRootUrlPath() . "/admin/overview_user.php'>" . _("Go to your Profile page") . "</a> 
-              <a href='" . \core\CAT::getRootUrlPath() . "/admin/inc/logout.php'>" . _("Logout") . "</a> ";
+            $retval .= "<a href='".\core\CAT::getRootUrlPath()."/admin/overview_user.php'>"._("Go to your Profile page")."</a> 
+              <a href='" . \core\CAT::getRootUrlPath()."/admin/inc/logout.php'>"._("Logout")."</a> ";
         }
-        $retval .= "<a href='" . \core\CAT::getRootUrlPath() . "/'>" . _("Start page") . "</a>
+        $retval .= "<a href='".\core\CAT::getRootUrlPath()."/'>"._("Start page")."</a>
             </p>
         </div> <!-- sidebar -->";
         \core\common\Entity::outOfThePotatoes();
@@ -107,23 +107,23 @@  discard block
 block discarded – undo
                     <h1>$cap1</h1>
                 </div><!--header_captions-->
                 <div id='langselection' style='padding-top:20px; padding-".$this->start.":10px;'>
-                    <form action='$place' method='GET' accept-charset='UTF-8'>" . _("View this page in") . "&nbsp;
+                    <form action='$place' method='GET' accept-charset='UTF-8'>"._("View this page in")."&nbsp;
                         <select id='lang' name='lang' onchange='this.form.submit()'>";
 
         foreach (\config\Master::LANGUAGES as $lang => $getValue) {
-            $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $getValue['display'] . "</option> ";
+            $retval .= "<option value='$lang' ".(strtoupper($language) == strtoupper($lang) ? "selected" : "")." >".$getValue['display']."</option> ";
         }
         $retval .= "</select>";
 
         foreach ($_GET as $getVar => $getValue) {
             $filterValue = filter_input(INPUT_GET, $getVar, FILTER_SANITIZE_STRING);
             if ($getVar != "lang" && $getValue != "") {
-                $retval .= "<input type='hidden' name='" . htmlspecialchars($getVar) . "' value='" . htmlspecialchars($filterValue) . "'>";
+                $retval .= "<input type='hidden' name='".htmlspecialchars($getVar)."' value='".htmlspecialchars($filterValue)."'>";
             }
         }
         $retval .= "</form>
                 </div><!--langselection-->";
-        $logoUrl = \core\CAT::getRootUrlPath() . "/resources/images/consortium_logo.png";
+        $logoUrl = \core\CAT::getRootUrlPath()."/resources/images/consortium_logo.png";
         $retval .= "<div class='consortium_logo'>
                     <img id='test_locate' src='$logoUrl' alt='Consortium Logo'>
                 </div> <!-- consortium_logo -->
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
 
         if (isset(\config\Master::APPEARANCE['MOTD']) && \config\Master::APPEARANCE['MOTD'] != "") {
             $retval .= "<div id='header_MOTD' style='display:inline-block; padding-".$this->start.":20px;vertical-align:top;'>
-              <p class='MOTD'>" . \config\Master::APPEARANCE['MOTD'] . "</p>
+              <p class='MOTD'>" . \config\Master::APPEARANCE['MOTD']."</p>
               </div><!--header_MOTD-->";
         }
         $retval .= $this->sidebar($advancedControls);
@@ -242,9 +242,9 @@  discard block
 block discarded – undo
           <html xmlns='http://www.w3.org/1999/xhtml' lang='$ourlocale'".($this->langObject->rtl ? "dir='rtl'" : "").">
           <head lang='$ourlocale'>
           <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
-        $cssUrl = \core\CAT::getRootUrlPath() . "/resources/css/cat.css.php";
+        $cssUrl = \core\CAT::getRootUrlPath()."/resources/css/cat.css.php";
         $retval .= "<link rel='stylesheet' type='text/css' href='$cssUrl' />";
-        $retval .= "<title>" . htmlspecialchars($pagetitle) . "</title>";
+        $retval .= "<title>".htmlspecialchars($pagetitle)."</title>";
         return $retval;
     }
 
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
             // we may need to jump up one dir if we are either in admin/ or accountstatus/
             // (accountstatus courtesy of my good mood. It's userspace not admin space so
             // it shouldn't be using this function any more.)
-            $logoBase = \core\CAT::getRootUrlPath() . "/resources/images";
+            $logoBase = \core\CAT::getRootUrlPath()."/resources/images";
             return "<span id='logos'><img src='$logoBase/dante.png' alt='DANTE' style='height:23px;width:47px'/>
               <img src='$logoBase/eu.png' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span>
               <span id='eu_text' style='text-align:right;'><a href='http://ec.europa.eu/dgs/connect/index_en.htm' style='text-decoration:none; vertical-align:top;'>European Commission Communications Networks, Content and Technology</a></span>";

Please login to merge, or discard this patch.

web/lib/common/InputValidation.php 1 patch

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

@@ -40,7 +40,7 @@  discard block
 block discarded – undo
     private function inputValidationError($customtext)
     {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<p>" . _("Input validation error: ") . $customtext . "</p>";
+        $retval = "<p>"._("Input validation error: ").$customtext."</p>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }
@@ -135,14 +135,14 @@  discard block
 block discarded – undo
             }
             if ($user->isFederationAdmin($temp->federation)) {
                 $this->loggerInstance->debug(4, "You are fed admin for this IdP\n");
-                return [$temp,'readonly'];
+                return [$temp, 'readonly'];
             }
             throw new Exception($this->inputValidationError("This IdP identifier is not accessible!"));
         }
         if ($claimedFedBinding !== NULL && strtoupper($temp->federation) != strtoupper($claimedFedBinding->tld)) {
             throw new Exception($this->inputValidationError("This IdP does not belong to the claimed federation!"));
         }
-        return [$temp,'nouser'];
+        return [$temp, 'nouser'];
     }
 
     /**
@@ -584,7 +584,7 @@  discard block
 block discarded – undo
         try {
             $image->readImageBlob($binary);
         } catch (\ImagickException $exception) {
-            echo "Error" . $exception->getMessage();
+            echo "Error".$exception->getMessage();
             return FALSE;
         }
         // image survived the sanity check

Please login to merge, or discard this patch.

web/admin/action_req_certificate.php 1 patch

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

@@ -26,7 +26,7 @@  discard block
 block discarded – undo
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 $auth = new \web\lib\admin\Authentication();
 $deco = new \web\lib\admin\PageDecoration();
 $validator = new \web\lib\common\InputValidation();
@@ -105,10 +105,10 @@  discard block
 block discarded – undo
                 $fed = $validator->existingFederation($_POST['NRO-list']);
                 $country = strtoupper($fed->tld);
                 $DN[] = "C=$country";
-                $DN[] = "O=NRO of " . iconv('UTF-8', 'ASCII//TRANSLIT', $cat->knownFederations[strtoupper($fed->tld)]);
+                $DN[] = "O=NRO of ".iconv('UTF-8', 'ASCII//TRANSLIT', $cat->knownFederations[strtoupper($fed->tld)]);
                 $serverInfo = $externalDb->listExternalTlsServersFederation($fed->tld);
                 $serverList = explode(",", array_key_first($serverInfo));
-                $DN[] = "CN=" . $serverList[0];
+                $DN[] = "CN=".$serverList[0];
                 $policies[] = "eduroam IdP";
                 $policies[] = "eduroam SP";
                 $firstName = $serverInfo[array_key_first($serverInfo)][0]["name"];
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
                 }
                 $DN[] = "O=".iconv('UTF-8', 'ASCII//TRANSLIT', $ou);
                 $serverList = explode(",", $serverInfo["servers"]);
-                $DN[] = "CN=" . $serverList[0];
+                $DN[] = "CN=".$serverList[0];
                 switch ($serverInfo["type"]) {
                     case core\IdP::TYPE_IDPSP:
                         $policies[] = "eduroam IdP";
@@ -152,12 +152,12 @@  discard block
 block discarded – undo
             default:
                 throw new Exception("Sorry: Unknown level of issuance requested.");
         }
-        echo "<p style='font-size: large'>" . _("Requesting a certificate with the following properties");
+        echo "<p style='font-size: large'>"._("Requesting a certificate with the following properties");
         echo "<ul>";
-        echo "<li>" . _("Policy OIDs: ") . implode(", ", $policies) . "</li>";
-        echo "<li>" . _("Distinguished Name: ") . implode(", ", $DN) . "</li>";
-        echo "<li>" . _("subjectAltName:DNS : ") . implode(", ", $serverList) . "</li>";
-        echo "<li>" . _("Requester Contact Details: ") . $firstName . " &lt;" . $firstMail . "&gt;" . "</li>";
+        echo "<li>"._("Policy OIDs: ").implode(", ", $policies)."</li>";
+        echo "<li>"._("Distinguished Name: ").implode(", ", $DN)."</li>";
+        echo "<li>"._("subjectAltName:DNS : ").implode(", ", $serverList)."</li>";
+        echo "<li>"._("Requester Contact Details: ").$firstName." &lt;".$firstMail."&gt;"."</li>";
         echo "</ul></p>";
 
         $vettedCsr = $validator->string($_POST['CSR'], true);
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
         $loggerInstance->debug(2, $DN, "CERT DN: ", "\n");
         // our certs can be good for max 5 years
         $fed->requestCertificate($user->identifier, $newCsrWithMeta, $expiryDays);
-        echo "<p>" . _("The certificate was requested.") . "</p>";
+        echo "<p>"._("The certificate was requested.")."</p>";
         ?>
         <form action="overview_certificates.php" method="GET">
             <button type="submit"><?php echo _("Back to Certificate Overview"); ?></button>
@@ -191,23 +191,23 @@  discard block
 block discarded – undo
         switch (count($feds)) {
             case 0:
                 echo "<div>";
-                echo $uiElements->boxRemark("<strong>" . sprintf(_("None of your %s servers has complete information in the database."),$uiElements->nomenclatureFed)."</strong>" . _("At least the DNS names of TLS servers and a role-based contact mail address are required."));
+                echo $uiElements->boxRemark("<strong>".sprintf(_("None of your %s servers has complete information in the database."), $uiElements->nomenclatureFed)."</strong>"._("At least the DNS names of TLS servers and a role-based contact mail address are required."));
                 echo "</div>";
                 break;
             case 1:
-                echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>' . sprintf(_("Certificate for %s") ." ", $uiElements->nomenclatureFed) . '</input>';
-                echo " <strong>" . $cat->knownFederations[$feds[0]->tld] . "</strong>";
-                echo '<input type="hidden" name="NRO-list" id="NRO-list" value="' . $feds[0]->tld . '"/>';
+                echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>'.sprintf(_("Certificate for %s")." ", $uiElements->nomenclatureFed).'</input>';
+                echo " <strong>".$cat->knownFederations[$feds[0]->tld]."</strong>";
+                echo '<input type="hidden" name="NRO-list" id="NRO-list" value="'.$feds[0]->tld.'"/>';
                 break;
             default:
-                echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>' . sprintf(_("Certificate for %s") ." ", $uiElements->nomenclatureFed) . '</input>';
+                echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>'.sprintf(_("Certificate for %s")." ", $uiElements->nomenclatureFed).'</input>';
                 ?>
                 <select name="NRO-list" id="NRO-list">
                     <option value="notset"><?php echo _("---PPPLEASE CHOOSE---"); ?></option>
                     <?php
                     foreach ($feds as $oneFed) {
                         #echo '<option value="' . strtoupper($oneFed->tld) . '">' . $cat->knownFederations[$oneFed->tld] . "</option>";
-                        echo '<option value="AAA' . strtoupper($oneFed->tld) . '">' . $oneIdP["names"][$langObject->getLang()] . "</option>";
+                        echo '<option value="AAA'.strtoupper($oneFed->tld).'">'.$oneIdP["names"][$langObject->getLang()]."</option>";
                         
                     }
                     ?>
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
         $allIdPs = [];
         foreach ($allAuthorizedFeds as $oneFed) {
             foreach ($externalDb->listExternalTlsServersInstitution($oneFed['value']) as $id => $oneIdP) {
-                $allIdPs[$id] = '[' . substr($id, 0, 2) . '] ' . $oneIdP["names"][$langObject->getLang()];
+                $allIdPs[$id] = '['.substr($id, 0, 2).'] '.$oneIdP["names"][$langObject->getLang()];
             }
         }
         if (count($allIdPs) > 0) {
@@ -228,14 +228,14 @@  discard block
 block discarded – undo
             <option value="notset"><?php echo _("---PLEASE CHOOSE---"); ?></option>
 <?php
 foreach ($allIdPs as $id => $name) {
-    echo '<option value="' . $id . '">' . $name . "</option>";
+    echo '<option value="'.$id.'">'.$name."</option>";
 }
 ?>
         </select>
         <?php
         } else {
             echo "<div>";
-            echo $uiElements->boxRemark(sprintf(_("<strong>No organisation inside your %s has complete information in the database</strong>."." "._("At least the DNS names of TLS servers and a role-based contact mail address are required.")),$uiElements->nomenclatureFed), "No TLS capable org!", true);
+            echo $uiElements->boxRemark(sprintf(_("<strong>No organisation inside your %s has complete information in the database</strong>."." "._("At least the DNS names of TLS servers and a role-based contact mail address are required.")), $uiElements->nomenclatureFed), "No TLS capable org!", true);
             echo "</div>";
         }
         ?>
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
         <h2><?php echo _("2. CSR generation"); ?></h2>
         <p><?php echo _("One way to generate an acceptable certificate request is via this openssl one-liner:"); ?></p>
         <?php 
-        echo "openssl req -new -newkey rsa:4096 -out test.csr -keyout test.key -subj /". implode('/', array_reverse($DN)) ."/C=XY/O=WillBeReplaced/CN=will.be.replaced";
+        echo "openssl req -new -newkey rsa:4096 -out test.csr -keyout test.key -subj /".implode('/', array_reverse($DN))."/C=XY/O=WillBeReplaced/CN=will.be.replaced";
         ?>
         <h2><?php echo _("3. Submission"); ?></h2>
 <?php echo _("Please paste your CSR here:"); ?><br/><textarea name="CSR" id="CSR" rows="20" cols="85"/></textarea><br/>

Please login to merge, or discard this patch.

web/admin/API.php 1 patch

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

@@ -20,7 +20,7 @@  discard block
 block discarded – undo
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 // no SAML auth on this page. The API key authenticates the entity
 
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
 
 $inputDecoded = json_decode($inputRaw, TRUE);
 if (!is_array($inputDecoded)) {
-    $adminApi->returnError(web\lib\admin\API::ERROR_MALFORMED_REQUEST, "Unable to decode JSON POST data." . json_last_error_msg() . $inputRaw);
+    $adminApi->returnError(web\lib\admin\API::ERROR_MALFORMED_REQUEST, "Unable to decode JSON POST data.".json_last_error_msg().$inputRaw);
     exit(1);
 }
 
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
             throw new Exception("A required parameter is missing, and this wasn't caught earlier?!");
         }
         $newtokens = $mgmt->createTokens(true, [$admin], $idp);
-        $URL = "https://" . $_SERVER['SERVER_NAME'] . dirname($_SERVER['SCRIPT_NAME']) . "/action_enrollment.php?token=" . array_keys($newtokens)[0];
+        $URL = "https://".$_SERVER['SERVER_NAME'].dirname($_SERVER['SCRIPT_NAME'])."/action_enrollment.php?token=".array_keys($newtokens)[0];
         $success = ["TOKEN URL" => $URL, "TOKEN" => array_keys($newtokens)[0]];
         // done with the essentials - display in response. But if we also have an email address, send it there
         $email = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_TARGETMAIL);
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
         if ($found) {
             $adminApi->returnSuccess([]);
         }
-        $adminApi->returnError(web\lib\admin\API::ERROR_INVALID_PARAMETER, "The admin with ID $toBeDeleted is not associated to IdP " . $idp->identifier);
+        $adminApi->returnError(web\lib\admin\API::ERROR_INVALID_PARAMETER, "The admin with ID $toBeDeleted is not associated to IdP ".$idp->identifier);
         break;
     case web\lib\admin\API::ACTION_STATISTICS_FED:
         $detail = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_DETAIL);
@@ -281,10 +281,10 @@  discard block
 block discarded – undo
                 $outer = "";
                 $profile->setAnonymousIDSupport(FALSE);
             } else {
-                $outer = $outer . "@";
+                $outer = $outer."@";
                 $profile->setAnonymousIDSupport(TRUE);
             }
-            $profile->setRealm($outer . $realm);
+            $profile->setRealm($outer.$realm);
         }
         /* const AUXATTRIB_PROFILE_TESTUSER = 'ATTRIB-PROFILE-TESTUSER'; */
         $testuser = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_PROFILE_TESTUSER);
@@ -531,7 +531,7 @@  discard block
 block discarded – undo
         // extract relevant subset of information from cert objects
         $certDetails = [];
         foreach ($certs as $cert) {
-            $certDetails[$cert->ca_type . ":" . $cert->serial] = ["ISSUED" => $cert->issued, "EXPIRY" => $cert->expiry, "STATUS" => $cert->status, "DEVICE" => $cert->device, "CN" => $cert->username, "ANNOTATION" => $cert->annotation];
+            $certDetails[$cert->ca_type.":".$cert->serial] = ["ISSUED" => $cert->issued, "EXPIRY" => $cert->expiry, "STATUS" => $cert->status, "DEVICE" => $cert->device, "CN" => $cert->username, "ANNOTATION" => $cert->annotation];
         }
         $adminApi->returnSuccess($certDetails);
         break;

Please login to merge, or discard this patch.

web/lib/admin/API.php 1 patch

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

@@ -254,7 +254,7 @@  discard block
 block discarded – undo
     const ACTIONS = [
         // Inst-level actions.
         API::ACTION_NEWINST_BY_REF => [
-            "REQ" => [API::AUXATTRIB_EXTERNALID,],
+            "REQ" => [API::AUXATTRIB_EXTERNALID, ],
             "OPT" => [
                 'general:geo_coordinates',
                 'general:logo_file',
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
             "FLAG" => [],
         ],
         API::ACTION_NEWINST => [
-            "REQ" => [API::AUXATTRIB_INSTTYPE,], // "IdP", "SP" or "IdPSP"
+            "REQ" => [API::AUXATTRIB_INSTTYPE, ], // "IdP", "SP" or "IdPSP"
             "OPT" => [
                 'general:instname',
                 'general:geo_coordinates',
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
     public function scrub($inputJson, $fedObject) {        
         $optionInstance = \core\Options::instance();
         $parameters = [];
-        $allPossibleAttribs = array_merge(API::ACTIONS[$inputJson['ACTION']]['REQ'], API::ACTIONS[$inputJson['ACTION']]['OPT'],  API::ACTIONS[$inputJson['ACTION']]['FLAG']);
+        $allPossibleAttribs = array_merge(API::ACTIONS[$inputJson['ACTION']]['REQ'], API::ACTIONS[$inputJson['ACTION']]['OPT'], API::ACTIONS[$inputJson['ACTION']]['FLAG']);
         // some actions don't need parameters. Don't get excited when there aren't any.
         if (!isset($inputJson['PARAMETERS'])) {
             return [];
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
                         break;
                 }   
             } elseif (preg_match("/^FLAG-/", $oneIncomingParam['NAME'])) {
-                if ($oneIncomingParam['VALUE'] != "TRUE" && $oneIncomingParam['VALUE'] != "FALSE" ) {
+                if ($oneIncomingParam['VALUE'] != "TRUE" && $oneIncomingParam['VALUE'] != "FALSE") {
                     continue;
                 }
             } else {
@@ -591,8 +591,8 @@  discard block
 block discarded – undo
 
                 case \core\Options::TYPECODE_COORDINATES:
                     $extension = \core\Options::TYPECODE_TEXT;
-                    $coercedInline["option"][$basename] = $oneAttrib['NAME'] . "#";
-                    $coercedInline["value"][$basename . "-" . $extension] = $oneAttrib['VALUE'];
+                    $coercedInline["option"][$basename] = $oneAttrib['NAME']."#";
+                    $coercedInline["value"][$basename."-".$extension] = $oneAttrib['VALUE'];
                     break;
                 case \core\Options::TYPECODE_TEXT:
                 // Fall-through: they all get the same treatment.
@@ -602,18 +602,18 @@  discard block
 block discarded – undo
                 // Fall-through: they all get the same treatment.
                 case \core\Options::TYPECODE_INTEGER:
                     $extension = $optionInfo['type'];
-                    $coercedInline["option"][$basename] = $oneAttrib['NAME'] . "#";
-                    $coercedInline["value"][$basename . "-" . $extension] = $oneAttrib['VALUE'];
+                    $coercedInline["option"][$basename] = $oneAttrib['NAME']."#";
+                    $coercedInline["value"][$basename."-".$extension] = $oneAttrib['VALUE'];
                     if ($optionInfo['flag'] == "ML") {
-                        $coercedInline["value"][$basename . "-lang"] = $oneAttrib['LANG'];
+                        $coercedInline["value"][$basename."-lang"] = $oneAttrib['LANG'];
                     }
                     break;
                 case \core\Options::TYPECODE_FILE:
                     // Binary data is expected in base64 encoding. This is true also for PEM files!
                     $extension = $optionInfo['type'];
-                    $coercedInline["option"][$basename] = $oneAttrib['NAME'] . "#";
-                    file_put_contents($dir['dir'] . "/" . $basename . "-" . $extension, base64_decode($oneAttrib['VALUE']));
-                    $coercedFile["value"]['tmp_name'][$basename . "-" . $extension] = $dir['dir'] . "/" . $basename . "-" . $extension;
+                    $coercedInline["option"][$basename] = $oneAttrib['NAME']."#";
+                    file_put_contents($dir['dir']."/".$basename."-".$extension, base64_decode($oneAttrib['VALUE']));
+                    $coercedFile["value"]['tmp_name'][$basename."-".$extension] = $dir['dir']."/".$basename."-".$extension;
                     break;
                 default:
                     throw new Exception("We don't seem to know this type code!");
@@ -642,7 +642,7 @@  discard block
 block discarded – undo
     public function returnSuccess($details) {
         $output = json_encode(["result" => "SUCCESS", "details" => $details], JSON_PRETTY_PRINT);
         if ($output === FALSE) {
-            $this->returnError(API::ERROR_INTERNAL_ERROR, "Unable to JSON encode return data: ". json_last_error(). " - ". json_last_error_msg());
+            $this->returnError(API::ERROR_INTERNAL_ERROR, "Unable to JSON encode return data: ".json_last_error()." - ".json_last_error_msg());
         }
         else {
             echo $output;

Please login to merge, or discard this patch.

web/lib/admin/UIElements.php 1 patch

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

@@ -135,7 +135,7 @@  discard block
 block discarded – undo
             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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
 
         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 @@  discard block
 block discarded – undo
                         $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 @@  discard block
 block discarded – undo
                             // 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 @@  discard block
 block discarded – undo
             $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 @@  discard block
 block discarded – undo
         \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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
      */
     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 @@  discard block
 block discarded – undo
         $caExpiryTrashhold = 5184000; // 60 days
         $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,16 +355,16 @@  discard block
 block discarded – undo
 
         $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"));
         $mainbgColor = "#ccccff";
         $innerbgColor = "#0000ff";
         $message = "";
         if ($details['ca'] == 0 && $details['root'] != 1) {
             $mainbgColor = "red";
             $innerbgColor = "maroon";
-            $message = _("This is a <strong>SERVER</strong> certificate!") . "<br/>";
-            $retval = "<div class='ca-summary' style='background-color:$mainbgColor'><div style='position:absolute; right: 0px; 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>";
+            $message = _("This is a <strong>SERVER</strong> certificate!")."<br/>";
+            $retval = "<div class='ca-summary' style='background-color:$mainbgColor'><div style='position:absolute; right: 0px; 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;
         }
@@ -372,21 +372,21 @@  discard block
 block discarded – undo
         if (time() > $details['full_details']['validTo_time_t']) {
             $mainbgColor = "red";
             $innerbgColor = "maroon";
-            $message = _("Certificate expired!") . "<br>";
-        } elseif(time() > $details['full_details']['validTo_time_t'] - $caExpiryTrashhold) {
+            $message = _("Certificate expired!")."<br>";
+        } elseif (time() > $details['full_details']['validTo_time_t'] - $caExpiryTrashhold) {
             $mainbgColor = "yellow";
             $innerbgColor = "#0000ff";
-            $message = _("Certificate close to expiry!") . "<br>";            
+            $message = _("Certificate close to expiry!")."<br>";            
         }
    
         if ($details['root'] == 1 && $details['basicconstraints_set'] == 0) {
             if ($mainbgColor == "#ccccff") {
                 $mainbgColor = "yellow";
             }
-            $message .= "<div style='max-width: 25em'><strong>" . _("Improper root certificate, required critical CA extension missing, will not reliably install!") . "</strong><br><a target='_blank' href=''>". _("more info")."</a></div><br>";
+            $message .= "<div style='max-width: 25em'><strong>"._("Improper root certificate, required critical CA extension missing, will not reliably install!")."</strong><br><a target='_blank' href=''>"._("more info")."</a></div><br>";
         }
         
-        $retval =     "<div class='ca-summary' style='background-color:$mainbgColor'><div style='position:absolute; right: 0px; 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='background-color:$mainbgColor'><div style='position:absolute; right: 0px; 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;
     }
@@ -399,7 +399,7 @@  discard block
 block discarded – undo
      */
     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;
     }
@@ -416,13 +416,13 @@  discard block
 block discarded – undo
         $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;
     }
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
             $retval .= "<tr><td>";
         }
         $finalCaption = ($caption !== NULL ? $caption : $uiMessages[$level]['text']);
-        $retval .= "<img class='icon' src='" . $uiMessages[$level]['icon'] . "' alt='" . $finalCaption . "' title='" . $finalCaption . "'/>";
+        $retval .= "<img class='icon' src='".$uiMessages[$level]['icon']."' alt='".$finalCaption."' title='".$finalCaption."'/>";
         if (!$omittabletags) {
             $retval .= "</td><td>";
         }
@@ -532,8 +532,8 @@  discard block
 block discarded – undo
             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 "";
         }
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
         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();
@@ -609,9 +609,9 @@  discard block
 block discarded – undo
                 $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']);

Please login to merge, or discard this patch.

		@@ -73,17 +73,17 @@ discard block
		block discarded – undo
73	73	$retval = "<div class='sidebar'><p>";
74	74	$user = new \core\User($_SESSION['user']);
75	75	if ($advancedControls) {
76		- $retval .= "<strong>" . _("You are:") . "</strong> ".$_SESSION['name']
	76	+ $retval .= "<strong>"._("You are:")."</strong> ".$_SESSION['name']
77	77	."<br/>
78	78	<br/>";
79	79	if ($user->isFederationAdmin()) {
80		- $retval .= "<a href='" . \core\CAT::getRootUrlPath() . "/admin/overview_federation.php'>" . _("The NRO page") . "</a> ";
	80	+ $retval .= "<a href='".\core\CAT::getRootUrlPath()."/admin/overview_federation.php'>"._("The NRO page")."</a> ";
81	81
82	82	}
83		- $retval .= "<a href='" . \core\CAT::getRootUrlPath() . "/admin/overview_user.php'>" . _("Go to your Profile page") . "</a>
84		- <a href='" . \core\CAT::getRootUrlPath() . "/admin/inc/logout.php'>" . _("Logout") . "</a> ";
	83	+ $retval .= "<a href='".\core\CAT::getRootUrlPath()."/admin/overview_user.php'>"._("Go to your Profile page")."</a>
	84	+ <a href='" . \core\CAT::getRootUrlPath()."/admin/inc/logout.php'>"._("Logout")."</a> ";
85	85	}
86		- $retval .= "<a href='" . \core\CAT::getRootUrlPath() . "/'>" . _("Start page") . "</a>
	86	+ $retval .= "<a href='".\core\CAT::getRootUrlPath()."/'>"._("Start page")."</a>
87	87	</p>
88	88	</div> <!-- sidebar -->";
89	89	\core\common\Entity::outOfThePotatoes();
		@@ -107,23 +107,23 @@ discard block
		block discarded – undo
107	107	<h1>$cap1</h1>
108	108	</div><!--header_captions-->
109	109	<div id='langselection' style='padding-top:20px; padding-".$this->start.":10px;'>
110		- <form action='$place' method='GET' accept-charset='UTF-8'>" . _("View this page in") . "
	110	+ <form action='$place' method='GET' accept-charset='UTF-8'>"._("View this page in")."
111	111	<select id='lang' name='lang' onchange='this.form.submit()'>";
112	112
113	113	foreach (\config\Master::LANGUAGES as $lang => $getValue) {
114		- $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $getValue['display'] . "</option> ";
	114	+ $retval .= "<option value='$lang' ".(strtoupper($language) == strtoupper($lang) ? "selected" : "")." >".$getValue['display']."</option> ";
115	115	}
116	116	$retval .= "</select>";
117	117
118	118	foreach ($_GET as $getVar => $getValue) {
119	119	$filterValue = filter_input(INPUT_GET, $getVar, FILTER_SANITIZE_STRING);
120	120	if ($getVar != "lang" && $getValue != "") {
121		- $retval .= "<input type='hidden' name='" . htmlspecialchars($getVar) . "' value='" . htmlspecialchars($filterValue) . "'>";
	121	+ $retval .= "<input type='hidden' name='".htmlspecialchars($getVar)."' value='".htmlspecialchars($filterValue)."'>";
122	122	}
123	123	}
124	124	$retval .= "</form>
125	125	</div><!--langselection-->";
126		- $logoUrl = \core\CAT::getRootUrlPath() . "/resources/images/consortium_logo.png";
	126	+ $logoUrl = \core\CAT::getRootUrlPath()."/resources/images/consortium_logo.png";
127	127	$retval .= "<div class='consortium_logo'>
128	128	<img id='test_locate' src='$logoUrl' alt='Consortium Logo'>
129	129	</div> <!-- consortium_logo -->
		@@ -216,7 +216,7 @@ discard block
		block discarded – undo
216	216
217	217	if (isset(\config\Master::APPEARANCE['MOTD']) && \config\Master::APPEARANCE['MOTD'] != "") {
218	218	$retval .= "<div id='header_MOTD' style='display:inline-block; padding-".$this->start.":20px;vertical-align:top;'>
219		- <p class='MOTD'>" . \config\Master::APPEARANCE['MOTD'] . "</p>
	219	+ <p class='MOTD'>" . \config\Master::APPEARANCE['MOTD']."</p>
220	220	</div><!--header_MOTD-->";
221	221	}
222	222	$retval .= $this->sidebar($advancedControls);
		@@ -242,9 +242,9 @@ discard block
		block discarded – undo
242	242	<html xmlns='http://www.w3.org/1999/xhtml' lang='$ourlocale'".($this->langObject->rtl ? "dir='rtl'" : "").">
243	243	<head lang='$ourlocale'>
244	244	<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
245		- $cssUrl = \core\CAT::getRootUrlPath() . "/resources/css/cat.css.php";
	245	+ $cssUrl = \core\CAT::getRootUrlPath()."/resources/css/cat.css.php";
246	246	$retval .= "<link rel='stylesheet' type='text/css' href='$cssUrl' />";
247		- $retval .= "<title>" . htmlspecialchars($pagetitle) . "</title>";
	247	+ $retval .= "<title>".htmlspecialchars($pagetitle)."</title>";
248	248	return $retval;
249	249	}
250	250
		@@ -258,7 +258,7 @@ discard block
		block discarded – undo
258	258	// we may need to jump up one dir if we are either in admin/ or accountstatus/
259	259	// (accountstatus courtesy of my good mood. It's userspace not admin space so
260	260	// it shouldn't be using this function any more.)
261		- $logoBase = \core\CAT::getRootUrlPath() . "/resources/images";
	261	+ $logoBase = \core\CAT::getRootUrlPath()."/resources/images";
262	262	return "<span id='logos'><img src='$logoBase/dante.png' alt='DANTE' style='height:23px;width:47px'/>
263	263	<img src='$logoBase/eu.png' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span>
264	264	<span id='eu_text' style='text-align:right;'><a href='http://ec.europa.eu/dgs/connect/index_en.htm' style='text-decoration:none; vertical-align:top;'>European Commission Communications Networks, Content and Technology</a></span>";

		@@ -40,7 +40,7 @@ discard block
		block discarded – undo
40	40	private function inputValidationError($customtext)
41	41	{
42	42	\core\common\Entity::intoThePotatoes();
43		- $retval = "<p>" . _("Input validation error: ") . $customtext . "</p>";
	43	+ $retval = "<p>"._("Input validation error: ").$customtext."</p>";
44	44	\core\common\Entity::outOfThePotatoes();
45	45	return $retval;
46	46	}
		@@ -135,14 +135,14 @@ discard block
		block discarded – undo
135	135	}
136	136	if ($user->isFederationAdmin($temp->federation)) {
137	137	$this->loggerInstance->debug(4, "You are fed admin for this IdP\n");
138		- return [$temp,'readonly'];
	138	+ return [$temp, 'readonly'];
139	139	}
140	140	throw new Exception($this->inputValidationError("This IdP identifier is not accessible!"));
141	141	}
142	142	if ($claimedFedBinding !== NULL && strtoupper($temp->federation) != strtoupper($claimedFedBinding->tld)) {
143	143	throw new Exception($this->inputValidationError("This IdP does not belong to the claimed federation!"));
144	144	}
145		- return [$temp,'nouser'];
	145	+ return [$temp, 'nouser'];
146	146	}
147	147
148	148	/**
		@@ -584,7 +584,7 @@ discard block
		block discarded – undo
584	584	try {
585	585	$image->readImageBlob($binary);
586	586	} catch (\ImagickException $exception) {
587		- echo "Error" . $exception->getMessage();
	587	+ echo "Error".$exception->getMessage();
588	588	return FALSE;
589	589	}
590	590	// image survived the sanity check

		@@ -26,7 +26,7 @@ discard block
		block discarded – undo
26	26	*/
27	27	?>
28	28	<?php
29		-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
	29	+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
30	30	$auth = new \web\lib\admin\Authentication();
31	31	$deco = new \web\lib\admin\PageDecoration();
32	32	$validator = new \web\lib\common\InputValidation();
		@@ -105,10 +105,10 @@ discard block
		block discarded – undo
105	105	$fed = $validator->existingFederation($_POST['NRO-list']);
106	106	$country = strtoupper($fed->tld);
107	107	$DN[] = "C=$country";
108		- $DN[] = "O=NRO of " . iconv('UTF-8', 'ASCII//TRANSLIT', $cat->knownFederations[strtoupper($fed->tld)]);
	108	+ $DN[] = "O=NRO of ".iconv('UTF-8', 'ASCII//TRANSLIT', $cat->knownFederations[strtoupper($fed->tld)]);
109	109	$serverInfo = $externalDb->listExternalTlsServersFederation($fed->tld);
110	110	$serverList = explode(",", array_key_first($serverInfo));
111		- $DN[] = "CN=" . $serverList[0];
	111	+ $DN[] = "CN=".$serverList[0];
112	112	$policies[] = "eduroam IdP";
113	113	$policies[] = "eduroam SP";
114	114	$firstName = $serverInfo[array_key_first($serverInfo)][0]["name"];
		@@ -132,7 +132,7 @@ discard block
		block discarded – undo
132	132	}
133	133	$DN[] = "O=".iconv('UTF-8', 'ASCII//TRANSLIT', $ou);
134	134	$serverList = explode(",", $serverInfo["servers"]);
135		- $DN[] = "CN=" . $serverList[0];
	135	+ $DN[] = "CN=".$serverList[0];
136	136	switch ($serverInfo["type"]) {
137	137	case core\IdP::TYPE_IDPSP:
138	138	$policies[] = "eduroam IdP";
		@@ -152,12 +152,12 @@ discard block
		block discarded – undo
152	152	default:
153	153	throw new Exception("Sorry: Unknown level of issuance requested.");
154	154	}
155		- echo "<p style='font-size: large'>" . _("Requesting a certificate with the following properties");
	155	+ echo "<p style='font-size: large'>"._("Requesting a certificate with the following properties");
156	156	echo "<ul>";
157		- echo "<li>" . _("Policy OIDs: ") . implode(", ", $policies) . "</li>";
158		- echo "<li>" . _("Distinguished Name: ") . implode(", ", $DN) . "</li>";
159		- echo "<li>" . _("subjectAltName:DNS : ") . implode(", ", $serverList) . "</li>";
160		- echo "<li>" . _("Requester Contact Details: ") . $firstName . " <" . $firstMail . ">" . "</li>";
	157	+ echo "<li>"._("Policy OIDs: ").implode(", ", $policies)."</li>";
	158	+ echo "<li>"._("Distinguished Name: ").implode(", ", $DN)."</li>";
	159	+ echo "<li>"._("subjectAltName:DNS : ").implode(", ", $serverList)."</li>";
	160	+ echo "<li>"._("Requester Contact Details: ").$firstName." <".$firstMail.">"."</li>";
161	161	echo "</ul></p>";
162	162
163	163	$vettedCsr = $validator->string($_POST['CSR'], true);
		@@ -173,7 +173,7 @@ discard block
		block discarded – undo
173	173	$loggerInstance->debug(2, $DN, "CERT DN: ", "\n");
174	174	// our certs can be good for max 5 years
175	175	$fed->requestCertificate($user->identifier, $newCsrWithMeta, $expiryDays);
176		- echo "<p>" . _("The certificate was requested.") . "</p>";
	176	+ echo "<p>"._("The certificate was requested.")."</p>";
177	177	?>
178	178	<form action="overview_certificates.php" method="GET">
179	179	<button type="submit"><?php echo _("Back to Certificate Overview"); ?></button>
		@@ -191,23 +191,23 @@ discard block
		block discarded – undo
191	191	switch (count($feds)) {
192	192	case 0:
193	193	echo "<div>";
194		- echo $uiElements->boxRemark("<strong>" . sprintf(_("None of your %s servers has complete information in the database."),$uiElements->nomenclatureFed)."</strong>" . _("At least the DNS names of TLS servers and a role-based contact mail address are required."));
	194	+ echo $uiElements->boxRemark("<strong>".sprintf(_("None of your %s servers has complete information in the database."), $uiElements->nomenclatureFed)."</strong>"._("At least the DNS names of TLS servers and a role-based contact mail address are required."));
195	195	echo "</div>";
196	196	break;
197	197	case 1:
198		- echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>' . sprintf(_("Certificate for %s") ." ", $uiElements->nomenclatureFed) . '</input>';
199		- echo " <strong>" . $cat->knownFederations[$feds[0]->tld] . "</strong>";
200		- echo '<input type="hidden" name="NRO-list" id="NRO-list" value="' . $feds[0]->tld . '"/>';
	198	+ echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>'.sprintf(_("Certificate for %s")." ", $uiElements->nomenclatureFed).'</input>';
	199	+ echo " <strong>".$cat->knownFederations[$feds[0]->tld]."</strong>";
	200	+ echo '<input type="hidden" name="NRO-list" id="NRO-list" value="'.$feds[0]->tld.'"/>';
201	201	break;
202	202	default:
203		- echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>' . sprintf(_("Certificate for %s") ." ", $uiElements->nomenclatureFed) . '</input>';
	203	+ echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>'.sprintf(_("Certificate for %s")." ", $uiElements->nomenclatureFed).'</input>';
204	204	?>
205	205	<select name="NRO-list" id="NRO-list">
206	206	<option value="notset"><?php echo _("---PPPLEASE CHOOSE---"); ?></option>
207	207	<?php
208	208	foreach ($feds as $oneFed) {
209	209	#echo '<option value="' . strtoupper($oneFed->tld) . '">' . $cat->knownFederations[$oneFed->tld] . "</option>";
210		- echo '<option value="AAA' . strtoupper($oneFed->tld) . '">' . $oneIdP["names"][$langObject->getLang()] . "</option>";
	210	+ echo '<option value="AAA'.strtoupper($oneFed->tld).'">'.$oneIdP["names"][$langObject->getLang()]."</option>";
211	211
212	212	}
213	213	?>
		@@ -217,7 +217,7 @@ discard block
		block discarded – undo
217	217	$allIdPs = [];
218	218	foreach ($allAuthorizedFeds as $oneFed) {
219	219	foreach ($externalDb->listExternalTlsServersInstitution($oneFed['value']) as $id => $oneIdP) {
220		- $allIdPs[$id] = '[' . substr($id, 0, 2) . '] ' . $oneIdP["names"][$langObject->getLang()];
	220	+ $allIdPs[$id] = '['.substr($id, 0, 2).'] '.$oneIdP["names"][$langObject->getLang()];
221	221	}
222	222	}
223	223	if (count($allIdPs) > 0) {
		@@ -228,14 +228,14 @@ discard block
		block discarded – undo
228	228	<option value="notset"><?php echo _("---PLEASE CHOOSE---"); ?></option>
229	229	<?php
230	230	foreach ($allIdPs as $id => $name) {
231		- echo '<option value="' . $id . '">' . $name . "</option>";
	231	+ echo '<option value="'.$id.'">'.$name."</option>";
232	232	}
233	233	?>
234	234	</select>
235	235	<?php
236	236	} else {
237	237	echo "<div>";
238		- echo $uiElements->boxRemark(sprintf(_("<strong>No organisation inside your %s has complete information in the database</strong>."." "._("At least the DNS names of TLS servers and a role-based contact mail address are required.")),$uiElements->nomenclatureFed), "No TLS capable org!", true);
	238	+ echo $uiElements->boxRemark(sprintf(_("<strong>No organisation inside your %s has complete information in the database</strong>."." "._("At least the DNS names of TLS servers and a role-based contact mail address are required.")), $uiElements->nomenclatureFed), "No TLS capable org!", true);
239	239	echo "</div>";
240	240	}
241	241	?>
		@@ -245,7 +245,7 @@ discard block
		block discarded – undo
245	245	<h2><?php echo _("2. CSR generation"); ?></h2>
246	246	<p><?php echo _("One way to generate an acceptable certificate request is via this openssl one-liner:"); ?></p>
247	247	<?php
248		- echo "openssl req -new -newkey rsa:4096 -out test.csr -keyout test.key -subj /". implode('/', array_reverse($DN)) ."/C=XY/O=WillBeReplaced/CN=will.be.replaced";
	248	+ echo "openssl req -new -newkey rsa:4096 -out test.csr -keyout test.key -subj /".implode('/', array_reverse($DN))."/C=XY/O=WillBeReplaced/CN=will.be.replaced";
249	249	?>
250	250	<h2><?php echo _("3. Submission"); ?></h2>
251	251	<?php echo _("Please paste your CSR here:"); ?><br/><textarea name="CSR" id="CSR" rows="20" cols="85"/></textarea><br/>

		@@ -20,7 +20,7 @@ discard block
		block discarded – undo
20	20	* <base_url>/copyright.php after deploying the software
21	21	*/
22	22
23		-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
	23	+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
24	24
25	25	// no SAML auth on this page. The API key authenticates the entity
26	26
		@@ -38,7 +38,7 @@ discard block
		block discarded – undo
38	38
39	39	$inputDecoded = json_decode($inputRaw, TRUE);
40	40	if (!is_array($inputDecoded)) {
41		- $adminApi->returnError(web\lib\admin\API::ERROR_MALFORMED_REQUEST, "Unable to decode JSON POST data." . json_last_error_msg() . $inputRaw);
	41	+ $adminApi->returnError(web\lib\admin\API::ERROR_MALFORMED_REQUEST, "Unable to decode JSON POST data.".json_last_error_msg().$inputRaw);
42	42	exit(1);
43	43	}
44	44
		@@ -132,7 +132,7 @@ discard block
		block discarded – undo
132	132	throw new Exception("A required parameter is missing, and this wasn't caught earlier?!");
133	133	}
134	134	$newtokens = $mgmt->createTokens(true, [$admin], $idp);
135		- $URL = "https://" . $_SERVER['SERVER_NAME'] . dirname($_SERVER['SCRIPT_NAME']) . "/action_enrollment.php?token=" . array_keys($newtokens)[0];
	135	+ $URL = "https://".$_SERVER['SERVER_NAME'].dirname($_SERVER['SCRIPT_NAME'])."/action_enrollment.php?token=".array_keys($newtokens)[0];
136	136	$success = ["TOKEN URL" => $URL, "TOKEN" => array_keys($newtokens)[0]];
137	137	// done with the essentials - display in response. But if we also have an email address, send it there
138	138	$email = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_TARGETMAIL);
		@@ -169,7 +169,7 @@ discard block
		block discarded – undo
169	169	if ($found) {
170	170	$adminApi->returnSuccess([]);
171	171	}
172		- $adminApi->returnError(web\lib\admin\API::ERROR_INVALID_PARAMETER, "The admin with ID $toBeDeleted is not associated to IdP " . $idp->identifier);
	172	+ $adminApi->returnError(web\lib\admin\API::ERROR_INVALID_PARAMETER, "The admin with ID $toBeDeleted is not associated to IdP ".$idp->identifier);
173	173	break;
174	174	case web\lib\admin\API::ACTION_STATISTICS_FED:
175	175	$detail = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_DETAIL);
		@@ -281,10 +281,10 @@ discard block
		block discarded – undo
281	281	$outer = "";
282	282	$profile->setAnonymousIDSupport(FALSE);
283	283	} else {
284		- $outer = $outer . "@";
	284	+ $outer = $outer."@";
285	285	$profile->setAnonymousIDSupport(TRUE);
286	286	}
287		- $profile->setRealm($outer . $realm);
	287	+ $profile->setRealm($outer.$realm);
288	288	}
289	289	/* const AUXATTRIB_PROFILE_TESTUSER = 'ATTRIB-PROFILE-TESTUSER'; */
290	290	$testuser = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_PROFILE_TESTUSER);
		@@ -531,7 +531,7 @@ discard block
		block discarded – undo
531	531	// extract relevant subset of information from cert objects
532	532	$certDetails = [];
533	533	foreach ($certs as $cert) {
534		- $certDetails[$cert->ca_type . ":" . $cert->serial] = ["ISSUED" => $cert->issued, "EXPIRY" => $cert->expiry, "STATUS" => $cert->status, "DEVICE" => $cert->device, "CN" => $cert->username, "ANNOTATION" => $cert->annotation];
	534	+ $certDetails[$cert->ca_type.":".$cert->serial] = ["ISSUED" => $cert->issued, "EXPIRY" => $cert->expiry, "STATUS" => $cert->status, "DEVICE" => $cert->device, "CN" => $cert->username, "ANNOTATION" => $cert->annotation];
535	535	}
536	536	$adminApi->returnSuccess($certDetails);
537	537	break;

		@@ -254,7 +254,7 @@ discard block
		block discarded – undo
254	254	const ACTIONS = [
255	255	// Inst-level actions.
256	256	API::ACTION_NEWINST_BY_REF => [
257		- "REQ" => [API::AUXATTRIB_EXTERNALID,],
	257	+ "REQ" => [API::AUXATTRIB_EXTERNALID, ],
258	258	"OPT" => [
259	259	'general:geo_coordinates',
260	260	'general:logo_file',
		@@ -271,7 +271,7 @@ discard block
		block discarded – undo
271	271	"FLAG" => [],
272	272	],
273	273	API::ACTION_NEWINST => [
274		- "REQ" => [API::AUXATTRIB_INSTTYPE,], // "IdP", "SP" or "IdPSP"
	274	+ "REQ" => [API::AUXATTRIB_INSTTYPE, ], // "IdP", "SP" or "IdPSP"
275	275	"OPT" => [
276	276	'general:instname',
277	277	'general:geo_coordinates',
		@@ -490,7 +490,7 @@ discard block
		block discarded – undo
490	490	public function scrub($inputJson, $fedObject) {
491	491	$optionInstance = \core\Options::instance();
492	492	$parameters = [];
493		- $allPossibleAttribs = array_merge(API::ACTIONS[$inputJson['ACTION']]['REQ'], API::ACTIONS[$inputJson['ACTION']]['OPT'], API::ACTIONS[$inputJson['ACTION']]['FLAG']);
	493	+ $allPossibleAttribs = array_merge(API::ACTIONS[$inputJson['ACTION']]['REQ'], API::ACTIONS[$inputJson['ACTION']]['OPT'], API::ACTIONS[$inputJson['ACTION']]['FLAG']);
494	494	// some actions don't need parameters. Don't get excited when there aren't any.
495	495	if (!isset($inputJson['PARAMETERS'])) {
496	496	return [];
		@@ -533,7 +533,7 @@ discard block
		block discarded – undo
533	533	break;
534	534	}
535	535	} elseif (preg_match("/^FLAG-/", $oneIncomingParam['NAME'])) {
536		- if ($oneIncomingParam['VALUE'] != "TRUE" && $oneIncomingParam['VALUE'] != "FALSE" ) {
	536	+ if ($oneIncomingParam['VALUE'] != "TRUE" && $oneIncomingParam['VALUE'] != "FALSE") {
537	537	continue;
538	538	}
539	539	} else {
		@@ -591,8 +591,8 @@ discard block
		block discarded – undo
591	591
592	592	case \core\Options::TYPECODE_COORDINATES:
593	593	$extension = \core\Options::TYPECODE_TEXT;
594		- $coercedInline["option"][$basename] = $oneAttrib['NAME'] . "#";
595		- $coercedInline["value"][$basename . "-" . $extension] = $oneAttrib['VALUE'];
	594	+ $coercedInline["option"][$basename] = $oneAttrib['NAME']."#";
	595	+ $coercedInline["value"][$basename."-".$extension] = $oneAttrib['VALUE'];
596	596	break;
597	597	case \core\Options::TYPECODE_TEXT:
598	598	// Fall-through: they all get the same treatment.
		@@ -602,18 +602,18 @@ discard block
		block discarded – undo
602	602	// Fall-through: they all get the same treatment.
603	603	case \core\Options::TYPECODE_INTEGER:
604	604	$extension = $optionInfo['type'];
605		- $coercedInline["option"][$basename] = $oneAttrib['NAME'] . "#";
606		- $coercedInline["value"][$basename . "-" . $extension] = $oneAttrib['VALUE'];
	605	+ $coercedInline["option"][$basename] = $oneAttrib['NAME']."#";
	606	+ $coercedInline["value"][$basename."-".$extension] = $oneAttrib['VALUE'];
607	607	if ($optionInfo['flag'] == "ML") {
608		- $coercedInline["value"][$basename . "-lang"] = $oneAttrib['LANG'];
	608	+ $coercedInline["value"][$basename."-lang"] = $oneAttrib['LANG'];
609	609	}
610	610	break;
611	611	case \core\Options::TYPECODE_FILE:
612	612	// Binary data is expected in base64 encoding. This is true also for PEM files!
613	613	$extension = $optionInfo['type'];
614		- $coercedInline["option"][$basename] = $oneAttrib['NAME'] . "#";
615		- file_put_contents($dir['dir'] . "/" . $basename . "-" . $extension, base64_decode($oneAttrib['VALUE']));
616		- $coercedFile["value"]['tmp_name'][$basename . "-" . $extension] = $dir['dir'] . "/" . $basename . "-" . $extension;
	614	+ $coercedInline["option"][$basename] = $oneAttrib['NAME']."#";
	615	+ file_put_contents($dir['dir']."/".$basename."-".$extension, base64_decode($oneAttrib['VALUE']));
	616	+ $coercedFile["value"]['tmp_name'][$basename."-".$extension] = $dir['dir']."/".$basename."-".$extension;
617	617	break;
618	618	default:
619	619	throw new Exception("We don't seem to know this type code!");
		@@ -642,7 +642,7 @@ discard block
		block discarded – undo
642	642	public function returnSuccess($details) {
643	643	$output = json_encode(["result" => "SUCCESS", "details" => $details], JSON_PRETTY_PRINT);
644	644	if ($output === FALSE) {
645		- $this->returnError(API::ERROR_INTERNAL_ERROR, "Unable to JSON encode return data: ". json_last_error(). " - ". json_last_error_msg());
	645	+ $this->returnError(API::ERROR_INTERNAL_ERROR, "Unable to JSON encode return data: ".json_last_error()." - ".json_last_error_msg());
646	646	}
647	647	else {
648	648	echo $output;

		@@ -135,7 +135,7 @@ discard block
		block discarded – undo
135	135	sprintf(_("%s: Do not terminate EAP"), \core\ProfileSilverbullet::PRODUCTNAME) => "fed:silverbullet-noterm",
136	136	sprintf(_("%s: max users per profile"), \core\ProfileSilverbullet::PRODUCTNAME) => "fed:silverbullet-maxusers",
137	137	sprintf(_("Mint %s with CA on creation"), $this->nomenclatureIdP) => "fed:minted_ca_file",
138		- sprintf(_("OpenRoaming: Allow %s Opt-In"),$this->nomenclatureParticipant) => "fed:openroaming",
	138	+ sprintf(_("OpenRoaming: Allow %s Opt-In"), $this->nomenclatureParticipant) => "fed:openroaming",
139	139	_("OpenRoaming: Custom NAPTR Target") => "fed:openroaming_customtarget",
140	140	$ssidText => "media:SSID",
141	141	$passpointOiText => "media:consortium_OI",
		@@ -147,7 +147,7 @@ discard block
		block discarded – undo
147	147	$find = array_keys($displayNames, $input, TRUE);
148	148
149	149	if (count($find) == 0) { // this is an error! throw an Exception
150		- throw new \Exception("The translation of an option name was requested, but the option is not known to the system: " . htmlentities($input));
	150	+ throw new \Exception("The translation of an option name was requested, but the option is not known to the system: ".htmlentities($input));
151	151	}
152	152	\core\common\Entity::outOfThePotatoes();
153	153	// 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 @@ discard block
		block discarded – undo
169	169
170	170	foreach ($optionlist as $option) {
171	171	$type = $optioninfo->optionType($option['name']);
172		- if (preg_match('/^' . $class . '/', $option['name']) && $option['level'] == "$level") {
	172	+ if (preg_match('/^'.$class.'/', $option['name']) && $option['level'] == "$level") {
173	173	// all non-multilang attribs get this assignment ...
174	174	$language = "";
175	175	$content = $option['value'];
		@@ -187,19 +187,19 @@ discard block
		block discarded – undo
187	187	$locationMarkers[] = $coords;
188	188	break;
189	189	case "file":
190		- $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td>";
	190	+ $retval .= "<tr><td>".$this->displayName($option['name'])."</td><td>$language</td><td>";
191	191	switch ($option['name']) {
192	192	case "general:logo_file":
193	193	case "fed:logo_file":
194		- $retval .= $this->previewImageinHTML('ROWID-' . $option['level'] . '-' . $option['row_id']);
	194	+ $retval .= $this->previewImageinHTML('ROWID-'.$option['level'].'-'.$option['row_id']);
195	195	break;
196	196	case "eap:ca_file":
197	197	// fall-through intended: display both the same way
198	198	case "fed:minted_ca_file":
199		- $retval .= $this->previewCAinHTML('ROWID-' . $option['level'] . '-' . $option['row_id']);
	199	+ $retval .= $this->previewCAinHTML('ROWID-'.$option['level'].'-'.$option['row_id']);
200	200	break;
201	201	case "support:info_file":
202		- $retval .= $this->previewInfoFileinHTML('ROWID-' . $option['level'] . '-' . $option['row_id']);
	202	+ $retval .= $this->previewInfoFileinHTML('ROWID-'.$option['level'].'-'.$option['row_id']);
203	203	break;
204	204	default:
205	205	}
		@@ -209,10 +209,10 @@ discard block
		block discarded – undo
209	209	// do not display the option at all; it gets auto-set by the ProfileSilverbullet constructor and doesn't have to be seen
210	210	break;
211	211	}
212		- $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off") ) . "</strong></td></tr>";
	212	+ $retval .= "<tr><td>".$this->displayName($option['name'])."</td><td>$language</td><td><strong>".($content == "on" ? _("on") : _("off"))."</strong></td></tr>";
213	213	break;
214	214	default:
215		- $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>$content</strong></td></tr>";
	215	+ $retval .= "<tr><td>".$this->displayName($option['name'])."</td><td>$language</td><td><strong>$content</strong></td></tr>";
216	216	}
217	217	}
218	218	}
		@@ -221,11 +221,11 @@ discard block
		block discarded – undo
221	221	$locationCount = 0;
222	222	foreach ($locationMarkers as $g) {
223	223	$locationCount++;
224		- $marker .= '<marker name="' . $locationCount . '" lat="' . $g['lat'] . '" lng="' . $g['lon'] . '" />';
	224	+ $marker .= '<marker name="'.$locationCount.'" lat="'.$g['lat'].'" lng="'.$g['lon'].'" />';
225	225	}
226	226	$marker .= '<\/markers>'; // some validator says this should be escaped
227	227	$jMarker = json_encode($locationMarkers);
228		- $retval .= '<tr><td><script>markers=\'' . $marker . '\'; jmarkers = \'' . $jMarker . '\';</script></td><td></td><td></td></tr>';
	228	+ $retval .= '<tr><td><script>markers=\''.$marker.'\'; jmarkers = \''.$jMarker.'\';</script></td><td></td><td></td></tr>';
229	229	}
230	230	\core\common\Entity::outOfThePotatoes();
231	231	return $retval;
		@@ -241,11 +241,11 @@ discard block
		block discarded – undo
241	241	\core\common\Entity::intoThePotatoes();
242	242	$idpoptions = $myInst->getAttributes();
243	243	$retval = "<div class='infobox'>
244		- <h2>" . sprintf(_("General %s details"), $this->nomenclatureParticipant) . "</h2>
	244	+ <h2>" . sprintf(_("General %s details"), $this->nomenclatureParticipant)."</h2>
245	245	<table>
246	246	<tr>
247	247	<td>
248		- " . _("Country:") . "
	248	+ " . _("Country:")."
249	249	</td>
250	250	<td>
251	251	</td>
		@@ -255,16 +255,16 @@ discard block
		block discarded – undo
255	255	$retval .= $myFed->name;
256	256	$retval .= "</strong>
257	257	</td>
258		- </tr>" . $this->infoblock($idpoptions, "general", "IdP") . "
	258	+ </tr>" . $this->infoblock($idpoptions, "general", "IdP")."
259	259	</table>
260	260	</div>";
261	261
262	262	$blocks = [["support", _("Global Helpdesk Details")], ["media", _("Media Properties")]];
263	263	foreach ($blocks as $block) {
264	264	$retval .= "<div class='infobox'>
265		- <h2>" . $block[1] . "</h2>
	265	+ <h2>" . $block[1]."</h2>
266	266	<table>" .
267		- $this->infoblock($idpoptions, $block[0], "IdP") .
	267	+ $this->infoblock($idpoptions, $block[0], "IdP").
268	268	"</table>
269	269	</div>";
270	270	}
		@@ -279,12 +279,12 @@ discard block
		block discarded – undo
279	279	*/
280	280	private function displaySize(int $number) {
281	281	if ($number > 1024 * 1024) {
282		- return round($number / 1024 / 1024, 2) . " MiB";
	282	+ return round($number / 1024 / 1024, 2)." MiB";
283	283	}
284	284	if ($number > 1024) {
285		- return round($number / 1024, 2) . " KiB";
	285	+ return round($number / 1024, 2)." KiB";
286	286	}
287		- return $number . " B";
	287	+ return $number." B";
288	288	}
289	289
290	290	/**
		@@ -339,7 +339,7 @@ discard block
		block discarded – undo
339	339	$caExpiryTrashhold = 5184000; // 60 days
340	340	$rawResult = UIElements::getBlobFromDB($ref['table'], $ref['rowindex'], FALSE);
341	341	if (is_bool($rawResult)) { // we didn't actually get a CA!
342		- $retval = "<div class='ca-summary'>" . _("There was an error while retrieving the certificate from the database!") . "</div>";
	342	+ $retval = "<div class='ca-summary'>"._("There was an error while retrieving the certificate from the database!")."</div>";
343	343	\core\common\Entity::outOfThePotatoes();
344	344	return $retval;
345	345	}
		@@ -355,16 +355,16 @@ discard block
		block discarded – undo
355	355
356	356	$details['name'] = preg_replace('/(.)\/(.)/', "$1<br/>$2", $details['name']);
357	357	$details['name'] = preg_replace('/\//', "", $details['name']);
358		- $certstatus = ( $details['root'] == 1 ? "R" : "I");
359		- $certTooltip = ( $details['root'] == 1 ? _("Root CA") : _("Intermediate CA"));
	358	+ $certstatus = ($details['root'] == 1 ? "R" : "I");
	359	+ $certTooltip = ($details['root'] == 1 ? _("Root CA") : _("Intermediate CA"));
360	360	$mainbgColor = "#ccccff";
361	361	$innerbgColor = "#0000ff";
362	362	$message = "";
363	363	if ($details['ca'] == 0 && $details['root'] != 1) {
364	364	$mainbgColor = "red";
365	365	$innerbgColor = "maroon";
366		- $message = _("This is a <strong>SERVER</strong> certificate!") . "<br/>";
367		- $retval = "<div class='ca-summary' style='background-color:$mainbgColor'><div style='position:absolute; right: 0px; 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>";
	366	+ $message = _("This is a <strong>SERVER</strong> certificate!")."<br/>";
	367	+ $retval = "<div class='ca-summary' style='background-color:$mainbgColor'><div style='position:absolute; right: 0px; 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>";
368	368	\core\common\Entity::outOfThePotatoes();
369	369	return $retval;
370	370	}
		@@ -372,21 +372,21 @@ discard block
		block discarded – undo
372	372	if (time() > $details['full_details']['validTo_time_t']) {
373	373	$mainbgColor = "red";
374	374	$innerbgColor = "maroon";
375		- $message = _("Certificate expired!") . "<br>";
376		- } elseif(time() > $details['full_details']['validTo_time_t'] - $caExpiryTrashhold) {
	375	+ $message = _("Certificate expired!")."<br>";
	376	+ } elseif (time() > $details['full_details']['validTo_time_t'] - $caExpiryTrashhold) {
377	377	$mainbgColor = "yellow";
378	378	$innerbgColor = "#0000ff";
379		- $message = _("Certificate close to expiry!") . "<br>";
	379	+ $message = _("Certificate close to expiry!")."<br>";
380	380	}
381	381
382	382	if ($details['root'] == 1 && $details['basicconstraints_set'] == 0) {
383	383	if ($mainbgColor == "#ccccff") {
384	384	$mainbgColor = "yellow";
385	385	}
386		- $message .= "<div style='max-width: 25em'><strong>" . _("Improper root certificate, required critical CA extension missing, will not reliably install!") . "</strong><br><a target='_blank' href=''>". _("more info")."</a></div><br>";
	386	+ $message .= "<div style='max-width: 25em'><strong>"._("Improper root certificate, required critical CA extension missing, will not reliably install!")."</strong><br><a target='_blank' href=''>"._("more info")."</a></div><br>";
387	387	}
388	388
389		- $retval = "<div class='ca-summary' style='background-color:$mainbgColor'><div style='position:absolute; right: 0px; 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>";
	389	+ $retval = "<div class='ca-summary' style='background-color:$mainbgColor'><div style='position:absolute; right: 0px; 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>";
390	390	\core\common\Entity::outOfThePotatoes();
391	391	return $retval;
392	392	}
		@@ -399,7 +399,7 @@ discard block
		block discarded – undo
399	399	*/
400	400	public function previewImageinHTML($imageReference) {
401	401	\core\common\Entity::intoThePotatoes();
402		- $retval = "<img style='max-width:150px' src='inc/filepreview.php?id=" . $imageReference . "' alt='" . _("Preview of logo file") . "'/>";
	402	+ $retval = "<img style='max-width:150px' src='inc/filepreview.php?id=".$imageReference."' alt='"._("Preview of logo file")."'/>";
403	403	\core\common\Entity::outOfThePotatoes();
404	404	return $retval;
405	405	}
		@@ -416,13 +416,13 @@ discard block
		block discarded – undo
416	416	$ref = $validator->databaseReference($fileReference);
417	417	$fileBlob = UIElements::getBlobFromDB($ref['table'], $ref['rowindex'], FALSE);
418	418	if (is_bool($fileBlob)) { // we didn't actually get a file!
419		- $retval = "<div class='ca-summary'>" . _("There was an error while retrieving the file from the database!") . "</div>";
	419	+ $retval = "<div class='ca-summary'>"._("There was an error while retrieving the file from the database!")."</div>";
420	420	\core\common\Entity::outOfThePotatoes();
421	421	return $retval;
422	422	}
423	423	$decodedFileBlob = base64_decode($fileBlob);
424	424	$fileinfo = new \finfo();
425		- $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>";
	425	+ $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>";
426	426	\core\common\Entity::outOfThePotatoes();
427	427	return $retval;
428	428	}
		@@ -450,7 +450,7 @@ discard block
		block discarded – undo
450	450	$retval .= "<tr><td>";
451	451	}
452	452	$finalCaption = ($caption !== NULL ? $caption : $uiMessages[$level]['text']);
453		- $retval .= "<img class='icon' src='" . $uiMessages[$level]['icon'] . "' alt='" . $finalCaption . "' title='" . $finalCaption . "'/>";
	453	+ $retval .= "<img class='icon' src='".$uiMessages[$level]['icon']."' alt='".$finalCaption."' title='".$finalCaption."'/>";
454	454	if (!$omittabletags) {
455	455	$retval .= "</td><td>";
456	456	}
		@@ -532,8 +532,8 @@ discard block
		block discarded – undo
532	532	return "";
533	533	}
534	534
535		- $loggerInstance->debug(4, "Consortium logo is at: " . ROOT . "/web/resources/images/consortium_logo_large.png");
536		- $logogd = imagecreatefrompng(ROOT . "/web/resources/images/consortium_logo_large.png");
	535	+ $loggerInstance->debug(4, "Consortium logo is at: ".ROOT."/web/resources/images/consortium_logo_large.png");
	536	+ $logogd = imagecreatefrompng(ROOT."/web/resources/images/consortium_logo_large.png");
537	537	if ($logogd === FALSE) { // consortium logo is bogus; don't do anything
538	538	return "";
539	539	}
		@@ -559,7 +559,7 @@ discard block
		block discarded – undo
559	559	imagecolorallocate($whiteimage, 255, 255, 255);
560	560	// also make sure the initial placement is a multitude of 12; otherwise "two half" symbols might be affected
561	561	$targetplacementx = (int) ($symbolsize * round(($sizeinput[0] / 2 - ($targetwidth - $symbolsize + 1) / 2) / $symbolsize));
562		- $targetplacementy = (int) ($symbolsize * round(($sizeinput[1] / 2 - ($targetheight - $symbolsize + 1 ) / 2) / $symbolsize));
	562	+ $targetplacementy = (int) ($symbolsize * round(($sizeinput[1] / 2 - ($targetheight - $symbolsize + 1) / 2) / $symbolsize));
563	563	imagecopyresized($inputgd, $whiteimage, $targetplacementx - $symbolsize, $targetplacementy - $symbolsize, 0, 0, $targetwidth + 2 * $symbolsize, $targetheight + 2 * $symbolsize, $targetwidth + 2 * $symbolsize, $targetheight + 2 * $symbolsize);
564	564	imagecopyresized($inputgd, $logogd, $targetplacementx, $targetplacementy, 0, 0, $targetwidth, $targetheight, $sizelogo[0], $sizelogo[1]);
565	565	ob_start();
		@@ -609,9 +609,9 @@ discard block
		block discarded – undo
609	609	$message = "Your configuration appears to be fine.";
610	610	break;
611	611	default:
612		- throw new Exception("The result code level " . $test->test_result['global'] . " is not defined!");
	612	+ throw new Exception("The result code level ".$test->test_result['global']." is not defined!");
613	613	}
614		- $out .= $this->boxFlexible($test->test_result['global'], "<br><strong>Test Summary</strong><br>" . $message . "<br>See below for details<br><hr>");
	614	+ $out .= $this->boxFlexible($test->test_result['global'], "<br><strong>Test Summary</strong><br>".$message."<br>See below for details<br><hr>");
615	615	foreach ($test->out as $testValue) {
616	616	foreach ($testValue as $o) {
617	617	$out .= $this->boxFlexible($o['level'], $o['message']);

GEANT / CAT

Push — release_2_1 ( 1cb6d0...7c84e2 )

Status

Category

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

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

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

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

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

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