Inspection of "Fix old broken OpenSSL versions crashing the insta..." - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Test Failed

Pull Request — master (#300)

by ken

created 2024-06-11 09:21 UTC

Status

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

@@ -73,13 +73,13 @@  discard block
 block discarded – undo
         $retval = "<div class='sidebar'><p>";
 
         if ($advancedControls) {
-            $retval .= "<strong>" . _("You are:") . "</strong> ".$_SESSION['name']
+            $retval .= "<strong>"._("You are:")."</strong> ".$_SESSION['name']
             ."<br/>
               <br/>
-              <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> ";
+              <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();
@@ -103,23 +103,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 -->
@@ -212,7 +212,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);
@@ -238,9 +238,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;
     }
 
@@ -254,7 +254,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.

core/CAT.php 1 patch

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

@@ -109,7 +109,7 @@  discard block
 block discarded – undo
         parent::__construct();
         common\Entity::intoThePotatoes();
 
-        $this->catVersionString = sprintf("Unreleased %s Git Revision"    , "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>") . "</a>";
+        $this->catVersionString = sprintf("Unreleased %s Git Revision", "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>")."</a>";
 
         if (CAT::RELEASE_VERSION) {
             $major = CAT::VERSION_MAJOR;
@@ -117,14 +117,14 @@  discard block
 block discarded – undo
             $patch = CAT::VERSION_PATCH;
             $extra = CAT::VERSION_EXTRA;
             $temp_version = "CAT-$major.$minor";
-            $branch = "release_$major" . "_$minor";
+            $branch = "release_$major"."_$minor";
             if (CAT::VERSION_PATCH != 0) {
                 $temp_version .= ".$patch";
             }
             if (CAT::VERSION_EXTRA != "") {
                 $temp_version .= "-$extra";
             }
-            $this->catVersionString = sprintf("Release <a href='%s'>%s</a>", "https://github.com/GEANT/CAT/tree/" . $branch . "/Changes.md", $temp_version);
+            $this->catVersionString = sprintf("Release <a href='%s'>%s</a>", "https://github.com/GEANT/CAT/tree/".$branch."/Changes.md", $temp_version);
 
         }
         $product = \config\Master::APPEARANCE['productname'];
@@ -132,9 +132,9 @@  discard block
 block discarded – undo
         $maxYear = self::COPYRIGHT_MAX_YEAR;
         $holder = self::COPYRIGHT_HOLDER;
         $consortia = self::COPYRIGHT_CONSORTIA;
-        $this->catCopyright = "$product - " . $this->catVersionString . " &copy; $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
+        $this->catCopyright = "$product - ".$this->catVersionString." &copy; $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
         $this->catCopyrifhtAndLicense = "&copy; $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
-        $this->catVersion = "$product<br>" . $this->catVersionString;
+        $this->catVersion = "$product<br>".$this->catVersionString;
 
         /* Federations are created in DB with bootstrapFederation, and listed via listFederations
          */

Please login to merge, or discard this patch.

web/skins/modern/accountstatus/resources/css/accountstatus.css.php 1 patch

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

@@ -17,12 +17,12 @@
 block discarded – undo
  *          <base_url>/copyright.php after deploying the software
  */
 header("Content-Type:text/css");
-require_once dirname(dirname(dirname(dirname(dirname(dirname(__DIR__)))))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(dirname(dirname(__DIR__))))))."/config/_config.php";
 $langInstance = new core\common\Language();
 $start = $langInstance->rtl ? "right" : "left";
 ?>
 #sb_info {
-    padding-<?php echo $start;?>: 30px; 
+    padding-<?php echo $start; ?>: 30px; 
     font-size: 12px;  
     font-weight: normal; 
 }

Please login to merge, or discard this patch.

web/admin/css/silverbullet.css.php 1 patch

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

@@ -21,7 +21,7 @@  discard block
 block discarded – undo
 // we need to know if we are serving a RTL language so we can flip some heading
 // items
 header("Content-Type:text/css");
-require_once dirname(dirname(dirname(__DIR__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__DIR__)))."/config/_config.php";
 $langInstance = new core\common\Language();
 $start = $langInstance->rtl ? "right" : "left";
 $end = $langInstance->rtl ? "left" : "right";
@@ -82,16 +82,16 @@  discard block
 block discarded – undo
     margin-bottom:3px;
 }
 .sb-date-picker{
-    padding-<?php echo $end;?>:25px;
+    padding-<?php echo $end; ?>:25px;
     width: 140px;
 }
 .sb-date-button{
-    margin-<?php echo $start;?>:-30px;
+    margin-<?php echo $start; ?>:-30px;
     min-height: 22px;
-    border-<?php echo $start;?>-style: solid;
+    border-<?php echo $start; ?>-style: solid;
     border-top-style: solid;
-    border-<?php echo $end;?>-style: solid;
-    border-<?php echo $end;?>-width: 1px;
+    border-<?php echo $end; ?>-style: solid;
+    border-<?php echo $end; ?>-width: 1px;
     border-bottom-width: 1px;
     border-radius: 1px;
     box-shadow: 0px 0px 0px #666666;

Please login to merge, or discard this patch.

web/admin/css/eapSorter.css.php 1 patch

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

@@ -22,7 +22,7 @@  discard block
 block discarded – undo
 // we need to know if we are serving a RTL language so we can flip some heading
 // items
 header("Content-Type:text/css");
-require_once dirname(dirname(dirname(__DIR__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__DIR__)))."/config/_config.php";
 
 $langInstance = new core\common\Language();
 $start = $langInstance->rtl ? "right" : "left";
@@ -32,15 +32,15 @@  discard block
 block discarded – undo
 ol.eapmethods { list-style-position: inside; margin: 0; padding: 0px; padding-top: 20px; padding-bottom: 0px; width: 20em; }
 ol.eapmethods li{
     background: #CCF;
-    border-<?php echo $start;?>-style: inset;
-    border-<?php echo $start;?>-width: 1px;
-    border-<?php echo $start;?>-color: #8BBACB;
+    border-<?php echo $start; ?>-style: inset;
+    border-<?php echo $start; ?>-width: 1px;
+    border-<?php echo $start; ?>-color: #8BBACB;
     border-top-style: inset;
     border-top-width: 1px;
     border-top-color: #8BBACB;
-    border-<?php echo $end;?>-style: outset;
-    border-<?php echo $end;?>-width: 2px;
-    border-<?php echo $end;?>-color: #043D52;
+    border-<?php echo $end; ?>-style: outset;
+    border-<?php echo $end; ?>-width: 2px;
+    border-<?php echo $end; ?>-color: #043D52;
     border-bottom-style: outset;
     border-bottom-width: 2px;
     border-bottom-color: #043D52;
@@ -51,8 +51,8 @@  discard block
 block discarded – undo
     background-position:95% 50%;
     margin: 2px 0px 2px 0px;
     padding: 3px;
-    padding-<?php echo $start;?>: 1em;
-    padding-<?php echo $end;?>: 0px;
+    padding-<?php echo $start; ?>: 1em;
+    padding-<?php echo $end; ?>: 0px;
 }
 
 table.eaptable td {

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 " . $cat->knownFederations[strtoupper($fed->tld)];
+                $DN[] = "O=NRO of ".$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=$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);
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
             "FED" => $country];
         // 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>
@@ -189,23 +189,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>";
                         
                     }
                     ?>
@@ -215,7 +215,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) {
@@ -226,14 +226,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>";
         }
         ?>
@@ -243,7 +243,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/skins/modern/resources/css/cat-user.css.php 1 patch

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

@@ -19,7 +19,7 @@  discard block
 block discarded – undo
  *          <base_url>/copyright.php after deploying the software
  */
 header("Content-Type:text/css");
-require dirname(dirname(dirname(dirname(dirname(dirname(__FILE__)))))) . "/config/_config.php";
+require dirname(dirname(dirname(dirname(dirname(dirname(__FILE__))))))."/config/_config.php";
 $langInstance = new core\common\Language();
 $start = $langInstance->rtl ? "right" : "left";
 $end = $langInstance->rtl ? "left" : "right";
@@ -399,8 +399,8 @@  discard block
 block discarded – undo
 
 #message_only {
     padding-top: 20px;
-    padding-<?php echo $start;?>: 30px;
-    padding-<?php echo $end;?>: 30px;
+    padding-<?php echo $start; ?>: 30px;
+    padding-<?php echo $end; ?>: 30px;
     font-weight: normal;
     position: relative;
     font-size: 15px;

Please login to merge, or discard this patch.

core/EntityWithDBProperties.php 1 patch

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

@@ -139,7 +139,7 @@  discard block
 block discarded – undo
             case "core\User":
                 return $this->userName;
             default:
-                throw new Exception("Operating on a class where we don't know the relevant identifier in the DB - " . get_class($this) . "!");
+                throw new Exception("Operating on a class where we don't know the relevant identifier in the DB - ".get_class($this)."!");
         }
     }
 
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
      */
     public function beginFlushAttributes($extracondition = "")
     {
-        $quotedIdentifier = (!is_int($this->getRelevantIdentifier()) ? "\"" : "") . $this->getRelevantIdentifier() . (!is_int($this->getRelevantIdentifier()) ? "\"" : "");
+        $quotedIdentifier = (!is_int($this->getRelevantIdentifier()) ? "\"" : "").$this->getRelevantIdentifier().(!is_int($this->getRelevantIdentifier()) ? "\"" : "");
         $this->databaseHandle->exec("DELETE FROM $this->entityOptionTable WHERE $this->entityIdColumn = $quotedIdentifier AND option_name NOT LIKE '%_file' $extracondition");
         $this->updateFreshness();
         $execFlush = $this->databaseHandle->exec("SELECT row_id FROM $this->entityOptionTable WHERE $this->entityIdColumn = $quotedIdentifier $extracondition");
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
      */
     public function commitFlushAttributes(array $tobedeleted)
     {
-        $quotedIdentifier = (!is_int($this->getRelevantIdentifier()) ? "\"" : "") . $this->getRelevantIdentifier() . (!is_int($this->getRelevantIdentifier()) ? "\"" : "");
+        $quotedIdentifier = (!is_int($this->getRelevantIdentifier()) ? "\"" : "").$this->getRelevantIdentifier().(!is_int($this->getRelevantIdentifier()) ? "\"" : "");
         foreach (array_keys($tobedeleted) as $row_id) {
             $this->databaseHandle->exec("DELETE FROM $this->entityOptionTable WHERE $this->entityIdColumn = $quotedIdentifier AND row_id = $row_id");
             $this->updateFreshness();
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
     {
         $relevantId = $this->getRelevantIdentifier();
         $identifierType = (is_int($relevantId) ? "i" : "s");
-        $this->databaseHandle->exec("INSERT INTO $this->entityOptionTable ($this->entityIdColumn, option_name, option_lang, option_value) VALUES(?,?,?,?)", $identifierType . "sss", $relevantId, $attrName, $attrLang, $attrValue);
+        $this->databaseHandle->exec("INSERT INTO $this->entityOptionTable ($this->entityIdColumn, option_name, option_lang, option_value) VALUES(?,?,?,?)", $identifierType."sss", $relevantId, $attrName, $attrLang, $attrValue);
         $this->updateFreshness();
     }
 

Please login to merge, or discard this patch.

core/ProfileRADIUS.php 1 patch

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

@@ -105,9 +105,9 @@  discard block
 block discarded – undo
 
         $attributesLowLevel = array_merge($this->deviceLevelAttributes, $this->eapLevelAttributes);
 
-        $this->loggerInstance->debug(5, "Device-Level Attributes: " . /** @scrutinizer ignore-type */ print_r($this->deviceLevelAttributes, true));
-        $this->loggerInstance->debug(5, "EAP-Level Attributes: " . /** @scrutinizer ignore-type */ print_r($this->eapLevelAttributes, true));
-        $this->loggerInstance->debug(5, "All low-Level Attributes: " . /** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
+        $this->loggerInstance->debug(5, "Device-Level Attributes: "./** @scrutinizer ignore-type */ print_r($this->deviceLevelAttributes, true));
+        $this->loggerInstance->debug(5, "EAP-Level Attributes: "./** @scrutinizer ignore-type */ print_r($this->eapLevelAttributes, true));
+        $this->loggerInstance->debug(5, "All low-Level Attributes: "./** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
 
         // now fetch and merge profile-level attributes if not already set on deeper level
 
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
             }
         }
 
-        $this->loggerInstance->debug(5, "Merged Attributes: " . /** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
+        $this->loggerInstance->debug(5, "Merged Attributes: "./** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
 
         // now, fetch and merge IdP-wide attributes
 
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
         // add the internal attribute to that effect
         
         if (isset($this->attributes['media:openroaming_always'])) {
-            $this->attributes = array_merge($this->attributes, $this->addInternalAttributes([ "internal:openroaming" => TRUE ] ));
+            $this->attributes = array_merge($this->attributes, $this->addInternalAttributes(["internal:openroaming" => TRUE]));
         }
         
         $this->loggerInstance->debug(3, "--- END Constructing new Profile object ... ---\n");
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
                 "row_id" => $attributeQuery->row_id,
                 "flag" => $optinfo['flag'],
                 "device" => ($devicesOrEAPMethods == "DEVICES" ? $attributeQuery->deviceormethod : NULL),
-                "eapmethod" => ($devicesOrEAPMethods == "DEVICES" ? 0 : (new \core\common\EAP($attributeQuery->deviceormethod))->getArrayRep() )];
+                "eapmethod" => ($devicesOrEAPMethods == "DEVICES" ? 0 : (new \core\common\EAP($attributeQuery->deviceormethod))->getArrayRep())];
         }
         return $temparray;
     }
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
      */
     public function setAnonymousIDSupport($shallwe)
     {
-        $this->databaseHandle->exec("UPDATE profile SET use_anon_outer = " . ($shallwe === true ? "1" : "0") . " WHERE profile_id = $this->identifier");
+        $this->databaseHandle->exec("UPDATE profile SET use_anon_outer = ".($shallwe === true ? "1" : "0")." WHERE profile_id = $this->identifier");
     }
 
     /** Toggle special username for realm checks
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
      * @return void
      */
     public function setRealmCheckUser($shallwe, $localpart = NULL) {
-        $this->databaseHandle->exec("UPDATE profile SET checkuser_outer = " . ($shallwe === true ? "1" : "0") . " WHERE profile_id = $this->identifier");
+        $this->databaseHandle->exec("UPDATE profile SET checkuser_outer = ".($shallwe === true ? "1" : "0")." WHERE profile_id = $this->identifier");
         if ($localpart !== NULL) {
             $this->databaseHandle->exec("UPDATE profile SET checkuser_value = ? WHERE profile_id = $this->identifier", "s", $localpart);
         }
@@ -334,8 +334,8 @@  discard block
 block discarded – undo
      */
     public function setInputVerificationPreference($verify, $hint)
     {
-        $this->databaseHandle->exec("UPDATE profile SET verify_userinput_suffix = " . ($verify === true ? "1" : "0") .
-                ", hint_userinput_suffix = " . ($hint === true ? "1" : "0") .
+        $this->databaseHandle->exec("UPDATE profile SET verify_userinput_suffix = ".($verify === true ? "1" : "0").
+                ", hint_userinput_suffix = ".($hint === true ? "1" : "0").
                 " WHERE profile_id = $this->identifier");
     }
 

Please login to merge, or discard this patch.

		@@ -109,7 +109,7 @@ discard block
		block discarded – undo
109	109	parent::__construct();
110	110	common\Entity::intoThePotatoes();
111	111
112		- $this->catVersionString = sprintf("Unreleased %s Git Revision" , "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>") . "</a>";
	112	+ $this->catVersionString = sprintf("Unreleased %s Git Revision", "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>")."</a>";
113	113
114	114	if (CAT::RELEASE_VERSION) {
115	115	$major = CAT::VERSION_MAJOR;
		@@ -117,14 +117,14 @@ discard block
		block discarded – undo
117	117	$patch = CAT::VERSION_PATCH;
118	118	$extra = CAT::VERSION_EXTRA;
119	119	$temp_version = "CAT-$major.$minor";
120		- $branch = "release_$major" . "_$minor";
	120	+ $branch = "release_$major"."_$minor";
121	121	if (CAT::VERSION_PATCH != 0) {
122	122	$temp_version .= ".$patch";
123	123	}
124	124	if (CAT::VERSION_EXTRA != "") {
125	125	$temp_version .= "-$extra";
126	126	}
127		- $this->catVersionString = sprintf("Release <a href='%s'>%s</a>", "https://github.com/GEANT/CAT/tree/" . $branch . "/Changes.md", $temp_version);
	127	+ $this->catVersionString = sprintf("Release <a href='%s'>%s</a>", "https://github.com/GEANT/CAT/tree/".$branch."/Changes.md", $temp_version);
128	128
129	129	}
130	130	$product = \config\Master::APPEARANCE['productname'];
		@@ -132,9 +132,9 @@ discard block
		block discarded – undo
132	132	$maxYear = self::COPYRIGHT_MAX_YEAR;
133	133	$holder = self::COPYRIGHT_HOLDER;
134	134	$consortia = self::COPYRIGHT_CONSORTIA;
135		- $this->catCopyright = "$product - " . $this->catVersionString . " © $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
	135	+ $this->catCopyright = "$product - ".$this->catVersionString." © $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
136	136	$this->catCopyrifhtAndLicense = "© $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
137		- $this->catVersion = "$product<br>" . $this->catVersionString;
	137	+ $this->catVersion = "$product<br>".$this->catVersionString;
138	138
139	139	/* Federations are created in DB with bootstrapFederation, and listed via listFederations
140	140	*/

		@@ -105,9 +105,9 @@ discard block
		block discarded – undo
105	105
106	106	$attributesLowLevel = array_merge($this->deviceLevelAttributes, $this->eapLevelAttributes);
107	107
108		- $this->loggerInstance->debug(5, "Device-Level Attributes: " . /** @scrutinizer ignore-type */ print_r($this->deviceLevelAttributes, true));
109		- $this->loggerInstance->debug(5, "EAP-Level Attributes: " . /** @scrutinizer ignore-type */ print_r($this->eapLevelAttributes, true));
110		- $this->loggerInstance->debug(5, "All low-Level Attributes: " . /** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
	108	+ $this->loggerInstance->debug(5, "Device-Level Attributes: "./** @scrutinizer ignore-type */ print_r($this->deviceLevelAttributes, true));
	109	+ $this->loggerInstance->debug(5, "EAP-Level Attributes: "./** @scrutinizer ignore-type */ print_r($this->eapLevelAttributes, true));
	110	+ $this->loggerInstance->debug(5, "All low-Level Attributes: "./** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
111	111
112	112	// now fetch and merge profile-level attributes if not already set on deeper level
113	113
		@@ -137,7 +137,7 @@ discard block
		block discarded – undo
137	137	}
138	138	}
139	139
140		- $this->loggerInstance->debug(5, "Merged Attributes: " . /** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
	140	+ $this->loggerInstance->debug(5, "Merged Attributes: "./** @scrutinizer ignore-type */ print_r($attributesLowLevel, true));
141	141
142	142	// now, fetch and merge IdP-wide attributes
143	143
		@@ -152,7 +152,7 @@ discard block
		block discarded – undo
152	152	// add the internal attribute to that effect
153	153
154	154	if (isset($this->attributes['media:openroaming_always'])) {
155		- $this->attributes = array_merge($this->attributes, $this->addInternalAttributes([ "internal:openroaming" => TRUE ] ));
	155	+ $this->attributes = array_merge($this->attributes, $this->addInternalAttributes(["internal:openroaming" => TRUE]));
156	156	}
157	157
158	158	$this->loggerInstance->debug(3, "--- END Constructing new Profile object ... ---\n");
		@@ -200,7 +200,7 @@ discard block
		block discarded – undo
200	200	"row_id" => $attributeQuery->row_id,
201	201	"flag" => $optinfo['flag'],
202	202	"device" => ($devicesOrEAPMethods == "DEVICES" ? $attributeQuery->deviceormethod : NULL),
203		- "eapmethod" => ($devicesOrEAPMethods == "DEVICES" ? 0 : (new \core\common\EAP($attributeQuery->deviceormethod))->getArrayRep() )];
	203	+ "eapmethod" => ($devicesOrEAPMethods == "DEVICES" ? 0 : (new \core\common\EAP($attributeQuery->deviceormethod))->getArrayRep())];
204	204	}
205	205	return $temparray;
206	206	}
		@@ -309,7 +309,7 @@ discard block
		block discarded – undo
309	309	*/
310	310	public function setAnonymousIDSupport($shallwe)
311	311	{
312		- $this->databaseHandle->exec("UPDATE profile SET use_anon_outer = " . ($shallwe === true ? "1" : "0") . " WHERE profile_id = $this->identifier");
	312	+ $this->databaseHandle->exec("UPDATE profile SET use_anon_outer = ".($shallwe === true ? "1" : "0")." WHERE profile_id = $this->identifier");
313	313	}
314	314
315	315	/** Toggle special username for realm checks
		@@ -319,7 +319,7 @@ discard block
		block discarded – undo
319	319	* @return void
320	320	*/
321	321	public function setRealmCheckUser($shallwe, $localpart = NULL) {
322		- $this->databaseHandle->exec("UPDATE profile SET checkuser_outer = " . ($shallwe === true ? "1" : "0") . " WHERE profile_id = $this->identifier");
	322	+ $this->databaseHandle->exec("UPDATE profile SET checkuser_outer = ".($shallwe === true ? "1" : "0")." WHERE profile_id = $this->identifier");
323	323	if ($localpart !== NULL) {
324	324	$this->databaseHandle->exec("UPDATE profile SET checkuser_value = ? WHERE profile_id = $this->identifier", "s", $localpart);
325	325	}
		@@ -334,8 +334,8 @@ discard block
		block discarded – undo
334	334	*/
335	335	public function setInputVerificationPreference($verify, $hint)
336	336	{
337		- $this->databaseHandle->exec("UPDATE profile SET verify_userinput_suffix = " . ($verify === true ? "1" : "0") .
338		- ", hint_userinput_suffix = " . ($hint === true ? "1" : "0") .
	337	+ $this->databaseHandle->exec("UPDATE profile SET verify_userinput_suffix = ".($verify === true ? "1" : "0").
	338	+ ", hint_userinput_suffix = ".($hint === true ? "1" : "0").
339	339	" WHERE profile_id = $this->identifier");
340	340	}
341	341

		@@ -73,13 +73,13 @@ discard block
		block discarded – undo
73	73	$retval = "<div class='sidebar'><p>";
74	74
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		- <a href='" . \core\CAT::getRootUrlPath() . "/admin/overview_user.php'>" . _("Go to your Profile page") . "</a>
80		- <a href='" . \core\CAT::getRootUrlPath() . "/admin/inc/logout.php'>" . _("Logout") . "</a> ";
	79	+ <a href='" . \core\CAT::getRootUrlPath()."/admin/overview_user.php'>"._("Go to your Profile page")."</a>
	80	+ <a href='" . \core\CAT::getRootUrlPath()."/admin/inc/logout.php'>"._("Logout")."</a> ";
81	81	}
82		- $retval .= "<a href='" . \core\CAT::getRootUrlPath() . "/'>" . _("Start page") . "</a>
	82	+ $retval .= "<a href='".\core\CAT::getRootUrlPath()."/'>"._("Start page")."</a>
83	83	</p>
84	84	</div> <!-- sidebar -->";
85	85	\core\common\Entity::outOfThePotatoes();
		@@ -103,23 +103,23 @@ discard block
		block discarded – undo
103	103	<h1>$cap1</h1>
104	104	</div><!--header_captions-->
105	105	<div id='langselection' style='padding-top:20px; padding-".$this->start.":10px;'>
106		- <form action='$place' method='GET' accept-charset='UTF-8'>" . _("View this page in") . "
	106	+ <form action='$place' method='GET' accept-charset='UTF-8'>"._("View this page in")."
107	107	<select id='lang' name='lang' onchange='this.form.submit()'>";
108	108
109	109	foreach (\config\Master::LANGUAGES as $lang => $getValue) {
110		- $retval .= "<option value='$lang' " . (strtoupper($language) == strtoupper($lang) ? "selected" : "" ) . " >" . $getValue['display'] . "</option> ";
	110	+ $retval .= "<option value='$lang' ".(strtoupper($language) == strtoupper($lang) ? "selected" : "")." >".$getValue['display']."</option> ";
111	111	}
112	112	$retval .= "</select>";
113	113
114	114	foreach ($_GET as $getVar => $getValue) {
115	115	$filterValue = filter_input(INPUT_GET, $getVar, FILTER_SANITIZE_STRING);
116	116	if ($getVar != "lang" && $getValue != "") {
117		- $retval .= "<input type='hidden' name='" . htmlspecialchars($getVar) . "' value='" . htmlspecialchars($filterValue) . "'>";
	117	+ $retval .= "<input type='hidden' name='".htmlspecialchars($getVar)."' value='".htmlspecialchars($filterValue)."'>";
118	118	}
119	119	}
120	120	$retval .= "</form>
121	121	</div><!--langselection-->";
122		- $logoUrl = \core\CAT::getRootUrlPath() . "/resources/images/consortium_logo.png";
	122	+ $logoUrl = \core\CAT::getRootUrlPath()."/resources/images/consortium_logo.png";
123	123	$retval .= "<div class='consortium_logo'>
124	124	<img id='test_locate' src='$logoUrl' alt='Consortium Logo'>
125	125	</div> <!-- consortium_logo -->
		@@ -212,7 +212,7 @@ discard block
		block discarded – undo
212	212
213	213	if (isset(\config\Master::APPEARANCE['MOTD']) && \config\Master::APPEARANCE['MOTD'] != "") {
214	214	$retval .= "<div id='header_MOTD' style='display:inline-block; padding-".$this->start.":20px;vertical-align:top;'>
215		- <p class='MOTD'>" . \config\Master::APPEARANCE['MOTD'] . "</p>
	215	+ <p class='MOTD'>" . \config\Master::APPEARANCE['MOTD']."</p>
216	216	</div><!--header_MOTD-->";
217	217	}
218	218	$retval .= $this->sidebar($advancedControls);
		@@ -238,9 +238,9 @@ discard block
		block discarded – undo
238	238	<html xmlns='http://www.w3.org/1999/xhtml' lang='$ourlocale'".($this->langObject->rtl ? "dir='rtl'" : "").">
239	239	<head lang='$ourlocale'>
240	240	<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>";
241		- $cssUrl = \core\CAT::getRootUrlPath() . "/resources/css/cat.css.php";
	241	+ $cssUrl = \core\CAT::getRootUrlPath()."/resources/css/cat.css.php";
242	242	$retval .= "<link rel='stylesheet' type='text/css' href='$cssUrl' />";
243		- $retval .= "<title>" . htmlspecialchars($pagetitle) . "</title>";
	243	+ $retval .= "<title>".htmlspecialchars($pagetitle)."</title>";
244	244	return $retval;
245	245	}
246	246
		@@ -254,7 +254,7 @@ discard block
		block discarded – undo
254	254	// we may need to jump up one dir if we are either in admin/ or accountstatus/
255	255	// (accountstatus courtesy of my good mood. It's userspace not admin space so
256	256	// it shouldn't be using this function any more.)
257		- $logoBase = \core\CAT::getRootUrlPath() . "/resources/images";
	257	+ $logoBase = \core\CAT::getRootUrlPath()."/resources/images";
258	258	return "<span id='logos'><img src='$logoBase/dante.png' alt='DANTE' style='height:23px;width:47px'/>
259	259	<img src='$logoBase/eu.png' alt='EU' style='height:23px;width:27px;border-width:0px;'/></span>
260	260	<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>";

		@@ -17,12 +17,12 @@
		block discarded – undo
17	17	* <base_url>/copyright.php after deploying the software
18	18	*/
19	19	header("Content-Type:text/css");
20		-require_once dirname(dirname(dirname(dirname(dirname(dirname(__DIR__)))))) . "/config/_config.php";
	20	+require_once dirname(dirname(dirname(dirname(dirname(dirname(__DIR__))))))."/config/_config.php";
21	21	$langInstance = new core\common\Language();
22	22	$start = $langInstance->rtl ? "right" : "left";
23	23	?>
24	24	#sb_info {
25		- padding-<?php echo $start;?>: 30px;
	25	+ padding-<?php echo $start; ?>: 30px;
26	26	font-size: 12px;
27	27	font-weight: normal;
28	28	}

		@@ -21,7 +21,7 @@ discard block
		block discarded – undo
21	21	// we need to know if we are serving a RTL language so we can flip some heading
22	22	// items
23	23	header("Content-Type:text/css");
24		-require_once dirname(dirname(dirname(__DIR__))) . "/config/_config.php";
	24	+require_once dirname(dirname(dirname(__DIR__)))."/config/_config.php";
25	25	$langInstance = new core\common\Language();
26	26	$start = $langInstance->rtl ? "right" : "left";
27	27	$end = $langInstance->rtl ? "left" : "right";
		@@ -82,16 +82,16 @@ discard block
		block discarded – undo
82	82	margin-bottom:3px;
83	83	}
84	84	.sb-date-picker{
85		- padding-<?php echo $end;?>:25px;
	85	+ padding-<?php echo $end; ?>:25px;
86	86	width: 140px;
87	87	}
88	88	.sb-date-button{
89		- margin-<?php echo $start;?>:-30px;
	89	+ margin-<?php echo $start; ?>:-30px;
90	90	min-height: 22px;
91		- border-<?php echo $start;?>-style: solid;
	91	+ border-<?php echo $start; ?>-style: solid;
92	92	border-top-style: solid;
93		- border-<?php echo $end;?>-style: solid;
94		- border-<?php echo $end;?>-width: 1px;
	93	+ border-<?php echo $end; ?>-style: solid;
	94	+ border-<?php echo $end; ?>-width: 1px;
95	95	border-bottom-width: 1px;
96	96	border-radius: 1px;
97	97	box-shadow: 0px 0px 0px #666666;

		@@ -22,7 +22,7 @@ discard block
		block discarded – undo
22	22	// we need to know if we are serving a RTL language so we can flip some heading
23	23	// items
24	24	header("Content-Type:text/css");
25		-require_once dirname(dirname(dirname(__DIR__))) . "/config/_config.php";
	25	+require_once dirname(dirname(dirname(__DIR__)))."/config/_config.php";
26	26
27	27	$langInstance = new core\common\Language();
28	28	$start = $langInstance->rtl ? "right" : "left";
		@@ -32,15 +32,15 @@ discard block
		block discarded – undo
32	32	ol.eapmethods { list-style-position: inside; margin: 0; padding: 0px; padding-top: 20px; padding-bottom: 0px; width: 20em; }
33	33	ol.eapmethods li{
34	34	background: #CCF;
35		- border-<?php echo $start;?>-style: inset;
36		- border-<?php echo $start;?>-width: 1px;
37		- border-<?php echo $start;?>-color: #8BBACB;
	35	+ border-<?php echo $start; ?>-style: inset;
	36	+ border-<?php echo $start; ?>-width: 1px;
	37	+ border-<?php echo $start; ?>-color: #8BBACB;
38	38	border-top-style: inset;
39	39	border-top-width: 1px;
40	40	border-top-color: #8BBACB;
41		- border-<?php echo $end;?>-style: outset;
42		- border-<?php echo $end;?>-width: 2px;
43		- border-<?php echo $end;?>-color: #043D52;
	41	+ border-<?php echo $end; ?>-style: outset;
	42	+ border-<?php echo $end; ?>-width: 2px;
	43	+ border-<?php echo $end; ?>-color: #043D52;
44	44	border-bottom-style: outset;
45	45	border-bottom-width: 2px;
46	46	border-bottom-color: #043D52;
		@@ -51,8 +51,8 @@ discard block
		block discarded – undo
51	51	background-position:95% 50%;
52	52	margin: 2px 0px 2px 0px;
53	53	padding: 3px;
54		- padding-<?php echo $start;?>: 1em;
55		- padding-<?php echo $end;?>: 0px;
	54	+ padding-<?php echo $start; ?>: 1em;
	55	+ padding-<?php echo $end; ?>: 0px;
56	56	}
57	57
58	58	table.eaptable td {

		@@ -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 " . $cat->knownFederations[strtoupper($fed->tld)];
	108	+ $DN[] = "O=NRO of ".$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=$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);
		@@ -171,7 +171,7 @@ discard block
		block discarded – undo
171	171	"FED" => $country];
172	172	// our certs can be good for max 5 years
173	173	$fed->requestCertificate($user->identifier, $newCsrWithMeta, $expiryDays);
174		- echo "<p>" . _("The certificate was requested.") . "</p>";
	174	+ echo "<p>"._("The certificate was requested.")."</p>";
175	175	?>
176	176	<form action="overview_certificates.php" method="GET">
177	177	<button type="submit"><?php echo _("Back to Certificate Overview"); ?></button>
		@@ -189,23 +189,23 @@ discard block
		block discarded – undo
189	189	switch (count($feds)) {
190	190	case 0:
191	191	echo "<div>";
192		- 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."));
	192	+ 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."));
193	193	echo "</div>";
194	194	break;
195	195	case 1:
196		- echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>' . sprintf(_("Certificate for %s") ." ", $uiElements->nomenclatureFed) . '</input>';
197		- echo " <strong>" . $cat->knownFederations[$feds[0]->tld] . "</strong>";
198		- echo '<input type="hidden" name="NRO-list" id="NRO-list" value="' . $feds[0]->tld . '"/>';
	196	+ echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>'.sprintf(_("Certificate for %s")." ", $uiElements->nomenclatureFed).'</input>';
	197	+ echo " <strong>".$cat->knownFederations[$feds[0]->tld]."</strong>";
	198	+ echo '<input type="hidden" name="NRO-list" id="NRO-list" value="'.$feds[0]->tld.'"/>';
199	199	break;
200	200	default:
201		- echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>' . sprintf(_("Certificate for %s") ." ", $uiElements->nomenclatureFed) . '</input>';
	201	+ echo '<input type="radio" name="LEVEL" id="NRO" value="NRO" checked>'.sprintf(_("Certificate for %s")." ", $uiElements->nomenclatureFed).'</input>';
202	202	?>
203	203	<select name="NRO-list" id="NRO-list">
204	204	<option value="notset"><?php echo _("---PPPLEASE CHOOSE---"); ?></option>
205	205	<?php
206	206	foreach ($feds as $oneFed) {
207	207	#echo '<option value="' . strtoupper($oneFed->tld) . '">' . $cat->knownFederations[$oneFed->tld] . "</option>";
208		- echo '<option value="AAA' . strtoupper($oneFed->tld) . '">' . $oneIdP["names"][$langObject->getLang()] . "</option>";
	208	+ echo '<option value="AAA'.strtoupper($oneFed->tld).'">'.$oneIdP["names"][$langObject->getLang()]."</option>";
209	209
210	210	}
211	211	?>
		@@ -215,7 +215,7 @@ discard block
		block discarded – undo
215	215	$allIdPs = [];
216	216	foreach ($allAuthorizedFeds as $oneFed) {
217	217	foreach ($externalDb->listExternalTlsServersInstitution($oneFed['value']) as $id => $oneIdP) {
218		- $allIdPs[$id] = '[' . substr($id, 0, 2) . '] ' . $oneIdP["names"][$langObject->getLang()];
	218	+ $allIdPs[$id] = '['.substr($id, 0, 2).'] '.$oneIdP["names"][$langObject->getLang()];
219	219	}
220	220	}
221	221	if (count($allIdPs) > 0) {
		@@ -226,14 +226,14 @@ discard block
		block discarded – undo
226	226	<option value="notset"><?php echo _("---PLEASE CHOOSE---"); ?></option>
227	227	<?php
228	228	foreach ($allIdPs as $id => $name) {
229		- echo '<option value="' . $id . '">' . $name . "</option>";
	229	+ echo '<option value="'.$id.'">'.$name."</option>";
230	230	}
231	231	?>
232	232	</select>
233	233	<?php
234	234	} else {
235	235	echo "<div>";
236		- 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);
	236	+ 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);
237	237	echo "</div>";
238	238	}
239	239	?>
		@@ -243,7 +243,7 @@ discard block
		block discarded – undo
243	243	<h2><?php echo _("2. CSR generation"); ?></h2>
244	244	<p><?php echo _("One way to generate an acceptable certificate request is via this openssl one-liner:"); ?></p>
245	245	<?php
246		- 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";
	246	+ 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";
247	247	?>
248	248	<h2><?php echo _("3. Submission"); ?></h2>
249	249	<?php echo _("Please paste your CSR here:"); ?><br/><textarea name="CSR" id="CSR" rows="20" cols="85"/></textarea><br/>

		@@ -19,7 +19,7 @@ discard block
		block discarded – undo
19	19	* <base_url>/copyright.php after deploying the software
20	20	*/
21	21	header("Content-Type:text/css");
22		-require dirname(dirname(dirname(dirname(dirname(dirname(__FILE__)))))) . "/config/_config.php";
	22	+require dirname(dirname(dirname(dirname(dirname(dirname(__FILE__))))))."/config/_config.php";
23	23	$langInstance = new core\common\Language();
24	24	$start = $langInstance->rtl ? "right" : "left";
25	25	$end = $langInstance->rtl ? "left" : "right";
		@@ -399,8 +399,8 @@ discard block
		block discarded – undo
399	399
400	400	#message_only {
401	401	padding-top: 20px;
402		- padding-<?php echo $start;?>: 30px;
403		- padding-<?php echo $end;?>: 30px;
	402	+ padding-<?php echo $start; ?>: 30px;
	403	+ padding-<?php echo $end; ?>: 30px;
404	404	font-weight: normal;
405	405	position: relative;
406	406	font-size: 15px;

		@@ -139,7 +139,7 @@ discard block
		block discarded – undo
139	139	case "core\User":
140	140	return $this->userName;
141	141	default:
142		- throw new Exception("Operating on a class where we don't know the relevant identifier in the DB - " . get_class($this) . "!");
	142	+ throw new Exception("Operating on a class where we don't know the relevant identifier in the DB - ".get_class($this)."!");
143	143	}
144	144	}
145	145
		@@ -177,7 +177,7 @@ discard block
		block discarded – undo
177	177	*/
178	178	public function beginFlushAttributes($extracondition = "")
179	179	{
180		- $quotedIdentifier = (!is_int($this->getRelevantIdentifier()) ? "\"" : "") . $this->getRelevantIdentifier() . (!is_int($this->getRelevantIdentifier()) ? "\"" : "");
	180	+ $quotedIdentifier = (!is_int($this->getRelevantIdentifier()) ? "\"" : "").$this->getRelevantIdentifier().(!is_int($this->getRelevantIdentifier()) ? "\"" : "");
181	181	$this->databaseHandle->exec("DELETE FROM $this->entityOptionTable WHERE $this->entityIdColumn = $quotedIdentifier AND option_name NOT LIKE '%_file' $extracondition");
182	182	$this->updateFreshness();
183	183	$execFlush = $this->databaseHandle->exec("SELECT row_id FROM $this->entityOptionTable WHERE $this->entityIdColumn = $quotedIdentifier $extracondition");
		@@ -197,7 +197,7 @@ discard block
		block discarded – undo
197	197	*/
198	198	public function commitFlushAttributes(array $tobedeleted)
199	199	{
200		- $quotedIdentifier = (!is_int($this->getRelevantIdentifier()) ? "\"" : "") . $this->getRelevantIdentifier() . (!is_int($this->getRelevantIdentifier()) ? "\"" : "");
	200	+ $quotedIdentifier = (!is_int($this->getRelevantIdentifier()) ? "\"" : "").$this->getRelevantIdentifier().(!is_int($this->getRelevantIdentifier()) ? "\"" : "");
201	201	foreach (array_keys($tobedeleted) as $row_id) {
202	202	$this->databaseHandle->exec("DELETE FROM $this->entityOptionTable WHERE $this->entityIdColumn = $quotedIdentifier AND row_id = $row_id");
203	203	$this->updateFreshness();
		@@ -226,7 +226,7 @@ discard block
		block discarded – undo
226	226	{
227	227	$relevantId = $this->getRelevantIdentifier();
228	228	$identifierType = (is_int($relevantId) ? "i" : "s");
229		- $this->databaseHandle->exec("INSERT INTO $this->entityOptionTable ($this->entityIdColumn, option_name, option_lang, option_value) VALUES(?,?,?,?)", $identifierType . "sss", $relevantId, $attrName, $attrLang, $attrValue);
	229	+ $this->databaseHandle->exec("INSERT INTO $this->entityOptionTable ($this->entityIdColumn, option_name, option_lang, option_value) VALUES(?,?,?,?)", $identifierType."sss", $relevantId, $attrName, $attrLang, $attrValue);
230	230	$this->updateFreshness();
231	231	}
232	232

GEANT / CAT

Pull Request — master (#300)

Status

Category

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

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

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

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

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

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

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

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

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