GEANT / CAT

web/admin/inc/manageNewInst.inc.php

Spacing +16 added lines, -16 removed lines

@@ -20,7 +20,7 @@ 
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $uiElements = new \web\lib\admin\UIElements();
@@ -57,30 +57,30 @@ 
 <?php
 echo sprintf(_("On this page, you can add a new %s to your %s. Please fill out the form below to send out an email invitation to the new %s administrator."), $uiElements->nomenclatureParticipant, $uiElements->nomenclatureFed, $uiElements->nomenclatureParticipant);
 if (\config\Master::DB['enforce-external-sync']) {
-    echo "<p>" . sprintf(_("You can either register a known %s (as defined in the %s database) or create a totally new %s."), $uiElements->nomenclatureParticipant, \config\ConfAssistant::CONSORTIUM['display_name'], $uiElements->nomenclatureParticipant) . "</p>";
-    echo "<p>" . sprintf(_("The latter one is typically for an %s which is yet in a testing phase and therefore doesn't appear in the %s database yet."), $uiElements->nomenclatureParticipant, \config\ConfAssistant::CONSORTIUM['display_name']) . "</p>";    
+    echo "<p>".sprintf(_("You can either register a known %s (as defined in the %s database) or create a totally new %s."), $uiElements->nomenclatureParticipant, \config\ConfAssistant::CONSORTIUM['display_name'], $uiElements->nomenclatureParticipant)."</p>";
+    echo "<p>".sprintf(_("The latter one is typically for an %s which is yet in a testing phase and therefore doesn't appear in the %s database yet."), $uiElements->nomenclatureParticipant, \config\ConfAssistant::CONSORTIUM['display_name'])."</p>";    
 }
 ?>
 <hr/>
 <img alt='Loading ...' src='../resources/images/icons/loading51.gif' id='spin' style='position:absolute;left: 50%; top: 50%; transform: translate(-100px, -50px); display:none;'>
 <form name='sendinvite' action='inc/sendinvite.inc.php' method='post' accept-charset='UTF-8'>
     <table>
-            <caption><?php echo _("Invitation Details");?></caption>
+            <caption><?php echo _("Invitation Details"); ?></caption>
             <tr>
-                <th class="wai-invisible" scope="col"><?php echo _("From database or ad-hoc?");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Name");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Type");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Country");?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("From database or ad-hoc?"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Name"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Type"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Country"); ?></th>
             </tr>
         <?php
         if (\config\Master::DB['enforce-external-sync']) {
             echo "<tr><td>
-                <input type='radio' name='creation' value='existing'>" . sprintf(_("Existing %s:"), $uiElements->nomenclatureParticipant) . "</input>
+                <input type='radio' name='creation' value='existing'>" . sprintf(_("Existing %s:"), $uiElements->nomenclatureParticipant)."</input>
                      </td>";
 
             echo "<td colspan='3'>
                 <select id='externals' name='externals' onchange='document.sendinvite.creation[0].checked=true; document.sendinvite.mailaddr.value=this.options[this.selectedIndex].id;'>
-                    <option value='FREETEXT'>" . sprintf(_("--- select %s here ---"),$uiElements->nomenclatureParticipant) . "</option>";
+                    <option value='FREETEXT'>" . sprintf(_("--- select %s here ---"), $uiElements->nomenclatureParticipant)."</option>";
 
             foreach ($feds as $fed_value) {
                 $thefed = new \core\Federation(strtoupper($fed_value['value']));
@@ -89,7 +89,7 @@ 
                 $entities = $thefed->listExternalEntities(TRUE, NULL);
 
                 foreach ($entities as $v) {
-                    echo "<option id='" . $v['contactlist'] . "' value='" . $fed_value['value']. '-' . $v['ID'] . "'>[" . $fed_value['value'] . "] " . $v['name'] . "</option>";
+                    echo "<option id='".$v['contactlist']."' value='".$fed_value['value'].'-'.$v['ID']."'>[".$fed_value['value']."] ".$v['name']."</option>";
                 }
             }
 
@@ -98,19 +98,19 @@ 
         ?>
         <tr>
             <td>
-                <input type='radio' name='creation' value='new'><?php echo sprintf(_("New %s"),$uiElements->nomenclatureParticipant); ?></input>
+                <input type='radio' name='creation' value='new'><?php echo sprintf(_("New %s"), $uiElements->nomenclatureParticipant); ?></input>
             </td>
             <td>
                 <?php echo _("Name"); ?> <input type='text' size='30' id='name' name='name' onchange='document.sendinvite.creation[1].checked = true'/>
             </td>
             <td>
-                <?php if(\config\Master::FUNCTIONALITY_FLAGS['SINGLE_SERVICE'] === 'MSP') { ?>
+                <?php if (\config\Master::FUNCTIONALITY_FLAGS['SINGLE_SERVICE'] === 'MSP') { ?>
                 &nbsp; <input type='hidden' name='participant_type' value='SP'>
                 <?php } else { ?>
                 <select name="participant_type">
-                    <option value="IdPSP" selected><?php printf(_("%s and %s"),$uiElements->nomenclatureIdP, $uiElements->nomenclatureHotspot)?></option>
-                    <option value="IdP"><?php printf(_("%s"),$uiElements->nomenclatureIdP)?></option>
-                    <option value="SP"><?php printf(_("%s"),$uiElements->nomenclatureHotspot)?></option>
+                    <option value="IdPSP" selected><?php printf(_("%s and %s"), $uiElements->nomenclatureIdP, $uiElements->nomenclatureHotspot)?></option>
+                    <option value="IdP"><?php printf(_("%s"), $uiElements->nomenclatureIdP)?></option>
+                    <option value="SP"><?php printf(_("%s"), $uiElements->nomenclatureHotspot)?></option>
                 </select>
                 <?php } ?>
             </td>

web/admin/inc/manageAdmins.inc.php

Spacing +7 added lines, -7 removed lines

@@ -20,7 +20,7 @@ 
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $languageInstance = new \core\common\Language();
@@ -120,7 +120,7 @@ 
                 default:
                     throw new Exception("Error: unknown encryption status of invitation!?!");
             }
-            echo $uiElements->boxRemark(ngettext("The invitation email was sent successfully.", "All invitation emails were sent successfully.", $counter) . " " . $cryptText, _("Sent successfully."));
+            echo $uiElements->boxRemark(ngettext("The invitation email was sent successfully.", "All invitation emails were sent successfully.", $counter)." ".$cryptText, _("Sent successfully."));
             break;
         case "FAILURE":
             echo $uiElements->boxError(_("No invitation email could be sent!"), _("Sending failure!"));
@@ -140,7 +140,7 @@ 
                 default:
                     throw new Exception("Error: unknown encryption status of invitation!?!");
             }
-            echo $uiElements->boxWarning(sprintf(_("Some invitation emails were sent successfully (%s in total), the others failed."), $counter) . " " . $cryptText, _("Partial success."));
+            echo $uiElements->boxWarning(sprintf(_("Some invitation emails were sent successfully (%s in total), the others failed."), $counter)." ".$cryptText, _("Partial success."));
             break;
         case "INVALIDSYNTAX":
             echo $uiElements->boxError(_("The invitation email address was malformed, no invitation was sent!"), _("The invitation email address was malformed, no invitation was sent!"));
@@ -192,7 +192,7 @@ 
                 <?php echo $invite; ?>
             </td>
             <td>
-                <form action='inc/manageAdmins.inc.php?inst_id=<?php echo $my_inst->identifier ?>' method='post' <?php echo ( $oneowner['ID'] != $_SESSION['user'] ? "onsubmit='popupRedirectWindow(this); return false;'" : "" ); ?> accept-charset='UTF-8'>
+                <form action='inc/manageAdmins.inc.php?inst_id=<?php echo $my_inst->identifier ?>' method='post' <?php echo ($oneowner['ID'] != $_SESSION['user'] ? "onsubmit='popupRedirectWindow(this); return false;'" : ""); ?> accept-charset='UTF-8'>
                     <input type='hidden' name='admin_id' value='<?php echo $oneowner['ID']; ?>'></input>
                     <button type='submit' name='submitbutton' class='delete' value='<?php echo web\lib\common\FormElements::BUTTON_DELETE; ?>'><?php echo _("Delete Administrator") ?></button>
                 </form>
@@ -216,10 +216,10 @@ 
 $pending_invites = $mgmt->listPendingInvitations($my_inst->identifier);
 $loggerInstance->debug(4, "Displaying pending invitations for $my_inst->identifier.\n");
 if (count($pending_invites) > 0) {
-    echo "<strong>" . _("Pending invitations for this IdP") . "</strong>";
+    echo "<strong>"._("Pending invitations for this IdP")."</strong>";
     echo "<table>";
     foreach ($pending_invites as $invitee) {
-        echo "<tr><td>" . $invitee['mail'] . "</td><td>" . sprintf(_("(expires %s)"), $invitee['expiry']) . "</td></tr>";
+        echo "<tr><td>".$invitee['mail']."</td><td>".sprintf(_("(expires %s)"), $invitee['expiry'])."</td></tr>";
     }
     echo "</table>";
 }
@@ -241,7 +241,7 @@ 
 
     if (!$is_admin_himself) {
         echo "<form action='inc/manageAdmins.inc.php?inst_id=$my_inst->identifier' method='post' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
-    <button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_TAKECONTROL . "'>" . sprintf(_("Take control of this %s"), $uiElements->nomenclatureParticipant) . "</button>
+    <button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_TAKECONTROL."'>".sprintf(_("Take control of this %s"), $uiElements->nomenclatureParticipant)."</button>
 </form>";
     }
 }

web/admin/inc/option_xhr.inc.php

Spacing +3 added lines, -3 removed lines

@@ -19,12 +19,12 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 \core\CAT::sessionStart();
 $validator = new \web\lib\common\InputValidation();
 
-if (!isset($_GET["class"] )) {
+if (!isset($_GET["class"])) {
     throw new Exception("Unknown type of option!");
 }
 
@@ -42,6 +42,6 @@ 
 
 // add one option of the specified class
 
-$list = \web\lib\admin\OptionDisplay::enumerateOptionsToDisplay($_GET["class"], $_GET['fedid'], (isset($_GET["device"])?$_GET["device"]:NULL));
+$list = \web\lib\admin\OptionDisplay::enumerateOptionsToDisplay($_GET["class"], $_GET['fedid'], (isset($_GET["device"]) ? $_GET["device"] : NULL));
 $optionDisplay = new \web\lib\admin\OptionDisplay($list);
 echo $optionDisplay->optiontext(array_values($list));

web/admin/action_enrollment.php

Spacing +15 added lines, -15 removed lines

@@ -30,7 +30,7 @@ 
 ?>
 <?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();
@@ -44,24 +44,24 @@ 
 
 
 if (!isset($_GET['token'])) {
-    $elements->errorPage(_("Error creating new IdP binding!"),_("This page needs to be called with a valid invitation token!"));
+    $elements->errorPage(_("Error creating new IdP binding!"), _("This page needs to be called with a valid invitation token!"));
 }
 
 if (\config\ConfAssistant::CONSORTIUM['selfservice_registration'] === NULL && $_GET['token'] == "SELF-REGISTER") {
-    $elements->errorPage(_("Error creating new IdP binding!"),_("You tried to register in self-service, but this deployment does not allow self-service!"));
+    $elements->errorPage(_("Error creating new IdP binding!"), _("You tried to register in self-service, but this deployment does not allow self-service!"));
 }
 
 switch ($_GET['token']) {
     case "EDUGAIN-SELF-REGISTER":
         $token = "EDUGAIN-SELF-REGISTER";
-        $extIdUnfiltered = filter_input(INPUT_GET,'extid');
+        $extIdUnfiltered = filter_input(INPUT_GET, 'extid');
         $extIdArray = explode('-', htmlspecialchars(strip_tags($extIdUnfiltered)), 2);
         $ROid = $extIdArray[0];
         $extId = $extIdArray[1];
-        $fed = new \core\Federation(strtoupper(substr($ROid,0,2)));
+        $fed = new \core\Federation(strtoupper(substr($ROid, 0, 2)));
         $newInstFlag = $fed->getAttributes('fed:autoregister-new-inst');
         if ($newInstFlag === []) {
-            $elements->errorPage(_("Error creating new IdP!"),_("You tried to register in self-service, but this federation does not allow self-service!"));
+            $elements->errorPage(_("Error creating new IdP!"), _("You tried to register in self-service, but this federation does not allow self-service!"));
         }
         // we must be sure that this person admins the ext institution and that it falls into the current federation
         if ($validator->existingExtInstitution($extId, $userEmail, $ROid) === 1) {
@@ -70,7 +70,7 @@ 
         // and check that this institution does not match anuthing in CAT.
         $usermgmt = new \core\UserManagement();
         if ($usermgmt->checkForCatMatch($extId, $ROid) === 1) {
-            $elements->errorPage(_("Error creating new IdP!"),_("You tried to register a new institution while it already has a match in CAT or your email is not not listed as admin for this institution in the eduroam DB!"));            
+            $elements->errorPage(_("Error creating new IdP!"), _("You tried to register a new institution while it already has a match in CAT or your email is not not listed as admin for this institution in the eduroam DB!"));            
         }
         break;
     case "SELF-REGISTER":
@@ -79,23 +79,23 @@ 
         $federation = \config\ConfAssistant::CONSORTIUM['selfservice_registration'];
         break;
     default:
-        $tokenUnfiltered = $validator->token(filter_input(INPUT_GET,'token'));
+        $tokenUnfiltered = $validator->token(filter_input(INPUT_GET, 'token'));
         $token = htmlspecialchars(strip_tags($tokenUnfiltered));
         $checkval = $usermgmt->checkTokenValidity($token);
 }
 
 if ($checkval < 0) {
     echo $deco->pageheader(_("Error creating new IdP binding!"), "ADMIN-IDP");
-    echo "<h1>" . _("Error creating new IdP binding!") . "</h1>";
+    echo "<h1>"._("Error creating new IdP binding!")."</h1>";
     switch ($checkval) {
         case \core\UserManagement::TOKENSTATUS_FAIL_ALREADYCONSUMED:
-            echo "<p>" . sprintf(_("Sorry... this token has already been used. The %s is already created. If you got the invitation from a mailing list, probably someone else used it before you."), $elements->nomenclatureParticipant) . "</p>";
+            echo "<p>".sprintf(_("Sorry... this token has already been used. The %s is already created. If you got the invitation from a mailing list, probably someone else used it before you."), $elements->nomenclatureParticipant)."</p>";
             break;
         case \core\UserManagement::TOKENSTATUS_FAIL_EXPIRED:
-            echo "<p>" . sprintf(_("Sorry... this token has expired. Invitation tokens are valid for 24 hours. The %s administrator can create a new one for you."), $elements->nomenclatureFed) . "</p>";
+            echo "<p>".sprintf(_("Sorry... this token has expired. Invitation tokens are valid for 24 hours. The %s administrator can create a new one for you."), $elements->nomenclatureFed)."</p>";
             break;
         default:
-            echo "<p>" . _("Sorry... you have come to the enrollment page without a valid token. Are you a nasty person? If not, you should go to <a href='overview_user.php'>your profile page</a> instead.") . "</p>";
+            echo "<p>"._("Sorry... you have come to the enrollment page without a valid token. Are you a nasty person? If not, you should go to <a href='overview_user.php'>your profile page</a> instead.")."</p>";
     }
     echo $deco->footer();
     throw new Exception("Terminating because something is wrong with the token we received.");
@@ -109,17 +109,17 @@ 
 switch ($token) {
     case "EDUGAIN-SELF-REGISTER":
         $newidp = $usermgmt->createIdPFromExternal($extId, $fed, $user);
-        $loggerInstance->writeAudit($user, "MOD", "IdP " . $newidp->identifier . " - selfservice eduGAIN registration");
+        $loggerInstance->writeAudit($user, "MOD", "IdP ".$newidp->identifier." - selfservice eduGAIN registration");
         break;    
     case "SELF-REGISTER":
         $fed = new \core\Federation($federation);
         $newidp = new \core\IdP($fed->newIdP('SELF', core\IdP::TYPE_IDPSP, $user, "FED", "SELFSERVICE"));
-        $loggerInstance->writeAudit($user, "MOD", "IdP " . $newidp->identifier . " - selfservice registration");
+        $loggerInstance->writeAudit($user, "MOD", "IdP ".$newidp->identifier." - selfservice registration");
         break;
     default:
         $newidp = $usermgmt->createIdPFromToken($token, $user);
         $usermgmt->invalidateToken($token);
-        $loggerInstance->writeAudit($user, "MOD", "IdP " . $newidp->identifier . " - Token used and invalidated");
+        $loggerInstance->writeAudit($user, "MOD", "IdP ".$newidp->identifier." - Token used and invalidated");
         break;
 }
 

web/lib/admin/PageDecoration.php

Spacing +13 added lines, -13 removed lines

@@ -73,17 +73,17 @@ 
         $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 @@ 
                     <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 = htmlspecialchars(strip_tags(filter_input(INPUT_GET, $getVar)));
             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 @@ 
 
         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,11 +242,11 @@ 
           <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 .= "<script src='".\core\CAT::getRootUrlPath()."/external/jquery/jquery.js'></script>";
         $retval .= "<script src='".\core\CAT::getRootUrlPath()."/admin/js/click_button.js'></script>";
-        $retval .= "<title>" . htmlspecialchars($pagetitle) . "</title>";
+        $retval .= "<title>".htmlspecialchars($pagetitle)."</title>";
         return $retval;
     }
 
@@ -260,7 +260,7 @@ 
             // 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>";

web/lib/admin/AbstractMap.php

Spacing +2 added lines, -2 removed lines

@@ -138,7 +138,7 @@ 
         $wizard = new \web\lib\admin\Wizard($wizardMode);
         $wizard->setMessages();
         $retval = "<fieldset class='option_container_map'>
-        <legend><strong>" . _("Location") . "</strong></legend>";
+        <legend><strong>" . _("Location")."</strong></legend>";
         $retval .= $wizard->displayHelp("location");
         if ($additional) {
             $retval .= _("You can enter an <strong>additional</strong> location here. You can see the already defined locations in the 'General Information' field.");
@@ -155,7 +155,7 @@ 
      */
     protected function htmlPostEdit($allowDirectInput) {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<br/>" . _("Latitude:") . " <input style='width:80px' name='geo_lat' id='geo_lat' " .($allowDirectInput ? "": "readonly"). ">" . _("Longitude:") . " <input name='geo_long' id='geo_long' style='width:80px' " .($allowDirectInput ? "": "readonly"). "></fieldset>";
+        $retval = "<br/>"._("Latitude:")." <input style='width:80px' name='geo_lat' id='geo_lat' ".($allowDirectInput ? "" : "readonly").">"._("Longitude:")." <input name='geo_long' id='geo_long' style='width:80px' ".($allowDirectInput ? "" : "readonly")."></fieldset>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }

web/lib/admin/OptionDisplay.php

Spacing +43 added lines, -43 removed lines

@@ -112,7 +112,7 @@ 
      */
     public function prefilledOptionTable(string $attributePrefix, $fed)
     {
-        $retval = "<table id='expandable_$attributePrefix" . "_options'>";
+        $retval = "<table id='expandable_$attributePrefix"."_options'>";
 
         $prepopulate = [];
         foreach ($this->listOfOptions as $existingAttribute) {
@@ -120,7 +120,7 @@ 
                 $prepopulate[] = $existingAttribute;
             }
         }
-        if (is_array($prepopulate) && ( count($prepopulate) > 0 || $attributePrefix == "device-specific" || $attributePrefix == "eap-specific" )) { // editing... fill with values
+        if (is_array($prepopulate) && (count($prepopulate) > 0 || $attributePrefix == "device-specific" || $attributePrefix == "eap-specific")) { // editing... fill with values
             $retval .= $this->addOptionEdit($attributePrefix, $prepopulate);
         } else {
             $retval .= $this->addOptionNew($attributePrefix, $fed);
@@ -154,7 +154,7 @@ 
             if (preg_match("/^$class:/", $option['name']) && !preg_match("/($blackListOnPrefill)/", $option['name'])) {
                 $optiontypearray = $optioninfo->optionType($option['name']);
                 $loggerInstance->debug(5, "About to execute optiontext with PREFILL!\n");
-                $retval .= $this->optiontext([$option['name']], ($optiontypearray["type"] == "file" ? 'ROWID-' . $option['level'] . '-' . $option['row_id'] : $option['value']), $option['lang']);
+                $retval .= $this->optiontext([$option['name']], ($optiontypearray["type"] == "file" ? 'ROWID-'.$option['level'].'-'.$option['row_id'] : $option['value']), $option['lang']);
             }
         }
         return $retval;
@@ -170,7 +170,7 @@ 
      * @param string $fed   the federation TLD, to determine fed ops preference context
      * @return array the list of options to display
      */
-    public static function enumerateOptionsToDisplay($class, $fed, $device='')
+    public static function enumerateOptionsToDisplay($class, $fed, $device = '')
     {
         $optioninfo = \core\Options::instance();
         $loggerInstance = new \core\common\Logging();
@@ -266,18 +266,18 @@ 
         }
         $descriptions["media:force_proxy"] = sprintf(_("The format of this option is: IPv4|IPv6|hostname:port . Forcing your users through a content filter of your own is a significant invasion of user self-determination. It also has technical issues. Please thoroughly read the discussion at %s before specifying a proxy with this option. This feature is currently experimental and only has an effect in Apple installers."), "https://github.com/GEANT/CAT/issues/96");
         $descriptions["managedsp:realmforvlan"] = sprintf(_("If you are also using %s, then your own realm is automatically tagged with the VLAN you choose, there is no need to add it here manually."), \core\ProfileSilverbullet::PRODUCTNAME);
-        $descriptions["media:openroaming"] = sprintf(_("By opting in to OpenRoaming, you agree to be bound by the %s."), "eduroam Ecosystem Broker OpenRoaming Identity Provider Policy") .
-                " " .
-                sprintf(_("Note that your requirement to inform users about the OpenRoaming End User Terms and Conditions is fulfilled when directing your end users to the %s download portal for installer download. Any other means of providing the installers needs to present this information via its own channel."), \config\Master::APPEARANCE['productname']) .
-                " " .
-                _("You are also aware that for best technical interoperability, you need to add a DNS entry into the DNS zone of your RADIUS realm.") .
-                " " .
+        $descriptions["media:openroaming"] = sprintf(_("By opting in to OpenRoaming, you agree to be bound by the %s."), "eduroam Ecosystem Broker OpenRoaming Identity Provider Policy").
+                " ".
+                sprintf(_("Note that your requirement to inform users about the OpenRoaming End User Terms and Conditions is fulfilled when directing your end users to the %s download portal for installer download. Any other means of providing the installers needs to present this information via its own channel."), \config\Master::APPEARANCE['productname']).
+                " ".
+                _("You are also aware that for best technical interoperability, you need to add a DNS entry into the DNS zone of your RADIUS realm.").
+                " ".
                 _("Read the instructions in the wiki.");
         \core\common\Entity::outOfThePotatoes();
         if (!isset($descriptions[$input])) {
             return "";
         }
-        return "<span class='tooltip' id='S$rowid-tooltip-$input' style='display:" . ($isVisible ? "block" : "none") . "' onclick='alert(\"" . $descriptions[$input] . "\")'><img src='../resources/images/icons/question-mark-icon.png" . "'></span>";
+        return "<span class='tooltip' id='S$rowid-tooltip-$input' style='display:".($isVisible ? "block" : "none")."' onclick='alert(\"".$descriptions[$input]."\")'><img src='../resources/images/icons/question-mark-icon.png"."'></span>";
     }
 
     /**
@@ -291,19 +291,19 @@ 
     private function selectElement($rowid, $list)
     {
         $jsmagic = "onchange='
-                               if (/#ML#/.test(document.getElementById(\"option-S" . $rowid . "-select\").value)) {
+                               if (/#ML#/.test(document.getElementById(\"option-S" . $rowid."-select\").value)) {
                                    document.getElementById(\"S$rowid-input-langselect\").style.display = \"block\";
                                    } else {
                                    document.getElementById(\"S$rowid-input-langselect\").style.display = \"none\";
                                    }";
         foreach (array_keys($this->htmlDatatypeTexts) as $key) {
-            $jsmagic .= "if (/#" . $key . "#/.test(document.getElementById(\"option-S" . $rowid . "-select\").value)) {
-                                  document.getElementById(\"S$rowid-input-file\").style.display = \"" . ($key == \core\Options::TYPECODE_FILE ? "block" : "none") . "\";
-                                  document.getElementById(\"S$rowid-input-text\").style.display = \"" . ($key == \core\Options::TYPECODE_TEXT ? "block" : "none") . "\";
-                                  document.getElementById(\"S$rowid-input-string\").style.display = \"" . ($key == \core\Options::TYPECODE_STRING ? "block" : "none") . "\";
-                                  document.getElementById(\"S$rowid-input-enum_openroaming\").style.display = \"" . ($key == \core\Options::TYPECODE_ENUM_OPENROAMING ? "block" : "none") . "\";
-                                  document.getElementById(\"S$rowid-input-boolean\").style.display = \"" . ($key == \core\Options::TYPECODE_BOOLEAN ? "block" : "none") . "\";
-                                  document.getElementById(\"S$rowid-input-integer\").style.display = \"" . ($key == \core\Options::TYPECODE_INTEGER ? "block" : "none") . "\";
+            $jsmagic .= "if (/#".$key."#/.test(document.getElementById(\"option-S".$rowid."-select\").value)) {
+                                  document.getElementById(\"S$rowid-input-file\").style.display = \"".($key == \core\Options::TYPECODE_FILE ? "block" : "none")."\";
+                                  document.getElementById(\"S$rowid-input-text\").style.display = \"".($key == \core\Options::TYPECODE_TEXT ? "block" : "none")."\";
+                                  document.getElementById(\"S$rowid-input-string\").style.display = \"".($key == \core\Options::TYPECODE_STRING ? "block" : "none")."\";
+                                  document.getElementById(\"S$rowid-input-enum_openroaming\").style.display = \"".($key == \core\Options::TYPECODE_ENUM_OPENROAMING ? "block" : "none")."\";
+                                  document.getElementById(\"S$rowid-input-boolean\").style.display = \"".($key == \core\Options::TYPECODE_BOOLEAN ? "block" : "none")."\";
+                                  document.getElementById(\"S$rowid-input-integer\").style.display = \"".($key == \core\Options::TYPECODE_INTEGER ? "block" : "none")."\";
                              }
                              ";
             // hide all tooltips (each is a <span>, and there are no other <span>s)
@@ -334,7 +334,7 @@ 
                 $value = array_shift($list);
                 $listtype = $optioninfo->optionType($value);
                 $retval .= $uiElements->displayName($value);
-                $retval .= "<input type='hidden' name='option[S$rowid]' value='$value#" . $listtype["type"] . "#" . $listtype["flag"] . "#'/>";
+                $retval .= "<input type='hidden' name='option[S$rowid]' value='$value#".$listtype["type"]."#".$listtype["flag"]."#'/>";
                 $activelisttype = $listtype;
                 $tooltips = $this->tooltip($rowid, $value, TRUE);
                 break;
@@ -347,7 +347,7 @@ 
                 array_multisort($sortArray, SORT_ASC, $list);
                 foreach ($list as $value) {
                     $listtype = $optioninfo->optionType($value);
-                    $retval .= "<option id='option-S$rowid-v-$value' value='$value#" . $listtype["type"] . "#" . $listtype["flag"] . "#' ";
+                    $retval .= "<option id='option-S$rowid-v-$value' value='$value#".$listtype["type"]."#".$listtype["flag"]."#' ";
                     if ($iterator == $this->optionIterator) {
                         $retval .= "selected='selected'";
                         $activelisttype = $listtype;
@@ -355,7 +355,7 @@ 
                     } else {
                         $tooltips .= $this->tooltip($rowid, $value, FALSE);
                     }
-                    $retval .= ">" . $uiElements->displayName($value) . "</option>";
+                    $retval .= ">".$uiElements->displayName($value)."</option>";
                     $iterator++;
                 }
 
@@ -381,9 +381,9 @@ 
     private function selectLanguage($rowid, $makeVisible)
     {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<select style='display:" . ($makeVisible ? "block" : "none") . "' name='value[S$rowid-lang]' id='S" . $rowid . "-input-langselect'>
-            <option value='' name='select_language' selected>" . _("select language") . "</option>
-            <option value='C' name='all_languages'>" . _("default/other languages") . "</option>";
+        $retval = "<select style='display:".($makeVisible ? "block" : "none")."' name='value[S$rowid-lang]' id='S".$rowid."-input-langselect'>
+            <option value='' name='select_language' selected>" . _("select language")."</option>
+            <option value='C' name='all_languages'>" . _("default/other languages")."</option>";
         foreach (\config\Master::LANGUAGES as $langindex => $possibleLang) {
             $thislang = $possibleLang['display'];
             $retval .= "<option value='$langindex' name='$langindex'>$thislang</option>";
@@ -404,7 +404,7 @@ 
     {
         $retval = "";
         foreach ($this->htmlDatatypeTexts as $key => $type) {
-            $retval .= "<" . $type['html'] . " style='display:" . ($activetype['type'] == $key ? "block" : "none") . "' name='value[S$rowid-$key]' id='S" . $rowid . "-input-" . $key . "'" . $type['tail'] . ">";
+            $retval .= "<".$type['html']." style='display:".($activetype['type'] == $key ? "block" : "none")."' name='value[S$rowid-$key]' id='S".$rowid."-input-".$key."'".$type['tail'].">";
         }
         return $retval;
     }
@@ -420,11 +420,11 @@ 
     {
         // first column: the <select> element with the names of options and their field-toggling JS magic
         $selectorInfo = $this->selectElement($rowid, $list);
-        $retval = "<td>" . $selectorInfo["TEXT"] . "</td>";
+        $retval = "<td>".$selectorInfo["TEXT"]."</td>";
         // second column: the <select> element for language selection - only visible if the active option is multi-lang
-        $retval .= "<td>" . $this->selectLanguage($rowid, $selectorInfo['ACTIVE']['flag'] == "ML") . "</td>";
+        $retval .= "<td>".$this->selectLanguage($rowid, $selectorInfo['ACTIVE']['flag'] == "ML")."</td>";
         // third column: the actual input fields; the data type of the active option is visible, all others hidden
-        $retval .= "<td>" . $this->inputFields($rowid, $selectorInfo['ACTIVE']) . "</td>";
+        $retval .= "<td>".$this->inputFields($rowid, $selectorInfo['ACTIVE'])."</td>";
         return $retval;
     }
 
@@ -448,20 +448,20 @@ 
         $retval .= "<td>";
         $uiElements = new UIElements();
         $listtype = $optioninfo->optionType($optionName);
-        $retval .= "<span style='display:flex;'>" . $uiElements->displayName($optionName);
-        $retval .= $this->tooltip($rowid, $optionName, TRUE) . "</span>";
-        $retval .= "<input type='hidden' id='option-S$rowid-select' name='option[S$rowid]' value='$optionName#" . $listtype["type"] . "#" . $listtype["flag"] . "#' ></td>";
+        $retval .= "<span style='display:flex;'>".$uiElements->displayName($optionName);
+        $retval .= $this->tooltip($rowid, $optionName, TRUE)."</span>";
+        $retval .= "<input type='hidden' id='option-S$rowid-select' name='option[S$rowid]' value='$optionName#".$listtype["type"]."#".$listtype["flag"]."#' ></td>";
 
         // language tag if any
         $retval .= "<td>";
         if ($listtype["flag"] == "ML") {
 
-            $language = "(" . strtoupper($optionLang) . ")";
+            $language = "(".strtoupper($optionLang).")";
             if ($optionLang == 'C') {
                 $language = _("(default/other languages)");
             }
             $retval .= $language;
-            $retval .= "<input type='hidden' name='value[S$rowid-lang]' id='S" . $rowid . "-input-langselect' value='" . $optionLang . "' style='display:block'>";
+            $retval .= "<input type='hidden' name='value[S$rowid-lang]' id='S".$rowid."-input-langselect' value='".$optionLang."' style='display:block'>";
         }
         $retval .= "</td>";
 // attribute content
@@ -471,12 +471,12 @@ 
             case \core\Options::TYPECODE_COORDINATES:
                 $this->allLocationCount = $this->allLocationCount + 1;
                 // display of the locations varies by map provider
-                $classname = "\web\lib\admin\Map" . \config\ConfAssistant::MAPPROVIDER['PROVIDER'];
+                $classname = "\web\lib\admin\Map".\config\ConfAssistant::MAPPROVIDER['PROVIDER'];
                 $link = $classname::optionListDisplayCode($optionValue, $this->allLocationCount);
-                $retval .= "<input readonly style='display:none' type='text' name='value[S$rowid-" . \core\Options::TYPECODE_TEXT . "]' id='S$rowid-input-text' value='$optionValue'>$link";
+                $retval .= "<input readonly style='display:none' type='text' name='value[S$rowid-".\core\Options::TYPECODE_TEXT."]' id='S$rowid-input-text' value='$optionValue'>$link";
                 break;
             case \core\Options::TYPECODE_FILE:
-                $retval .= "<input readonly type='text' name='value[S$rowid-" . \core\Options::TYPECODE_STRING . "]' id='S" . $rowid . "-input-string' style='display:none' value='" . urlencode($optionValue) . "'>";
+                $retval .= "<input readonly type='text' name='value[S$rowid-".\core\Options::TYPECODE_STRING."]' id='S".$rowid."-input-string' style='display:none' value='".urlencode($optionValue)."'>";
                 $uiElements = new UIElements();
                 switch ($optionName) {
                     case "eap:ca_file":
@@ -498,7 +498,7 @@ 
                 break;
             case \core\Options::TYPECODE_ENUM_OPENROAMING: // is a string after all
                 $displayedVariant = $this->enumPrettyPrints[$optionValue];
-                $retval .= "<strong>$displayedVariant</strong><input type='hidden' name='value[S$rowid-" . $listtype['type'] . "]' id='S" . $rowid . "-input-" . $listtype["type"] . "' value=\"" . htmlspecialchars($optionValue) . "\" style='display:block'>";
+                $retval .= "<strong>$displayedVariant</strong><input type='hidden' name='value[S$rowid-".$listtype['type']."]' id='S".$rowid."-input-".$listtype["type"]."' value=\"".htmlspecialchars($optionValue)."\" style='display:block'>";
                 break;
             case \core\Options::TYPECODE_STRING:
             // fall-thorugh is intentional; mostly identical HTML code for the three types
@@ -506,11 +506,11 @@ 
             // fall-thorugh is intentional; mostly identical HTML code for the three types
             case \core\Options::TYPECODE_TEXT:
                 $displayedVariant = $optionValue; // for all three types, value tag and actual display are identical
-                $retval .= "<strong>$displayedVariant</strong><input type='hidden' name='value[S$rowid-" . $listtype['type'] . "]' id='S" . $rowid . "-input-" . $listtype["type"] . "' value=\"" . htmlspecialchars($optionValue) . "\" style='display:block'>";
+                $retval .= "<strong>$displayedVariant</strong><input type='hidden' name='value[S$rowid-".$listtype['type']."]' id='S".$rowid."-input-".$listtype["type"]."' value=\"".htmlspecialchars($optionValue)."\" style='display:block'>";
                 break;
             case \core\Options::TYPECODE_BOOLEAN:
                 $displayedVariant = ($optionValue == "on" ? _("on") : _("off"));
-                $retval .= "<strong>$displayedVariant</strong><input type='hidden' name='value[S$rowid-" . $listtype['type'] . "]' id='S" . $rowid . "-input-" . $listtype["type"] . "' value=\"" . htmlspecialchars($optionValue) . "\" style='display:block'>";
+                $retval .= "<strong>$displayedVariant</strong><input type='hidden' name='value[S$rowid-".$listtype['type']."]' id='S".$rowid."-input-".$listtype["type"]."' value=\"".htmlspecialchars($optionValue)."\" style='display:block'>";
                 break;
             default:
                 // this should never happen!
@@ -556,10 +556,10 @@ 
        <td>
           <button type='button' class='delete' onclick='";
         if ($prefillValue !== NULL && $item == "general:geo_coordinates") {
-            $funcname = "Map" . \config\ConfAssistant::MAPPROVIDER['PROVIDER'] . 'DeleteCoord';
-            $retval .= 'if (typeof ' . $funcname . ' === "function") { ' . $funcname . '(' . $this->allLocationCount . '); } ';
+            $funcname = "Map".\config\ConfAssistant::MAPPROVIDER['PROVIDER'].'DeleteCoord';
+            $retval .= 'if (typeof '.$funcname.' === "function") { '.$funcname.'('.$this->allLocationCount.'); } ';
         }
-        $retval .= 'deleteOption("option-S' . $rowid . '")';
+        $retval .= 'deleteOption("option-S'.$rowid.'")';
         $retval .= "'>-</button>
        </td>
     </tr>";

web/lib/admin/UIElements.php

Spacing +38 added lines, -38 removed lines

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

web/skins/msp/copyright.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 <head>
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
 <link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
-<title><?php echo config\Master::APPEARANCE['productname'];?> Copyright and Licensing</title>
+<title><?php echo config\Master::APPEARANCE['productname']; ?> Copyright and Licensing</title>
 </head>
 <body>
 <div id="wrap">
@@ -35,7 +35,7 @@ 
             <div id="user_page" style="display:block">
                 <?php echo $divs->divPagetitle(config\Master::APPEARANCE['productname']." Copyright and Licensing", ""); ?>
                 <div style="padding:20px">
-            <?php require dirname(dirname(__DIR__)) . "/copyright.inc.php"; ?>
+            <?php require dirname(dirname(__DIR__))."/copyright.inc.php"; ?>
                 </div>
             </div>
         </div>