GEANT / CAT

web/admin/edit_silverbullet.php

Spacing +73 added lines, -73 removed lines

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

web/admin/edit_profile.php

Spacing +36 added lines, -36 removed lines

@@ -26,7 +26,7 @@ 
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $deco = new \web\lib\admin\PageDecoration();
 $validator = new \web\lib\common\InputValidation();
@@ -126,8 +126,8 @@ 
     <?php
     echo $uiElements->instLevelInfoBoxes($my_inst);
 
-    echo "<form enctype='multipart/form-data' action='edit_profile_result.php?inst_id=$my_inst->identifier" . ($my_profile !== NULL ? "&amp;profile_id=" . $my_profile->identifier : "") . "' method='post' accept-charset='UTF-8'>
-                <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>";
+    echo "<form enctype='multipart/form-data' action='edit_profile_result.php?inst_id=$my_inst->identifier".($my_profile !== NULL ? "&amp;profile_id=".$my_profile->identifier : "")."' method='post' accept-charset='UTF-8'>
+                <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE."'>";
     $optionDisplay = new \web\lib\admin\OptionDisplay($profile_options, \core\Options::LEVEL_PROFILE);
     ?>
     <fieldset class="option_container">
@@ -136,19 +136,19 @@ 
         </legend>
         <?php
         if ($wizardStyle) {
-            echo "<p>" . _("We will now define a profile for your user group(s).  You can add as many profiles as you like by choosing the appropriate button on the end of the page. After we are done, the wizard is finished and you will be taken to the main IdP administration page.") . "</p>";
+            echo "<p>"._("We will now define a profile for your user group(s).  You can add as many profiles as you like by choosing the appropriate button on the end of the page. After we are done, the wizard is finished and you will be taken to the main IdP administration page.")."</p>";
         }
         ?>
         <h3><?php echo _("Profile Name and RADIUS realm"); ?></h3>
         <?php
         if ($wizardStyle) {
-            echo "<p>" . _("First of all we need a name for the profile. This will be displayed to end users, so you may want to choose a descriptive name like 'Professors', 'Students of the Faculty of Bioscience', etc.") . "</p>";
-            echo "<p>" . _("Optionally, you can provide a longer descriptive text about who this profile is for. If you specify it, it will be displayed on the download page after the user has selected the profile name in the list.") . "</p>";
-            echo "<p>" . _("You can also tell us your RADIUS realm. ");
+            echo "<p>"._("First of all we need a name for the profile. This will be displayed to end users, so you may want to choose a descriptive name like 'Professors', 'Students of the Faculty of Bioscience', etc.")."</p>";
+            echo "<p>"._("Optionally, you can provide a longer descriptive text about who this profile is for. If you specify it, it will be displayed on the download page after the user has selected the profile name in the list.")."</p>";
+            echo "<p>"._("You can also tell us your RADIUS realm. ");
             if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] !== NULL) {
                 printf(_("This is useful if you want to use the sanity check module later, which tests reachability of your realm in the %s infrastructure. "), \config\ConfAssistant::CONSORTIUM['display_name']);
             }
-            echo _("It is required to enter the realm name if you want to support anonymous outer identities (see below).") . "</p>";
+            echo _("It is required to enter the realm name if you want to support anonymous outer identities (see below).")."</p>";
         }
 
         echo $optionDisplay->prefilledOptionTable("profile", $my_inst->federation);
@@ -203,9 +203,9 @@ 
 
         <?php
         if ($wizardStyle) {
-            echo "<p>" . sprintf(_("Some installers support a feature called 'Anonymous outer identity'. If you don't know what this is, please read <a href='%s'>this article</a>."), "https://confluence.terena.org/display/H2eduroam/eap-types") . "</p>";
-            echo "<p>" . _("On some platforms, the installers can suggest username endings and/or verify the user input to contain the realm suffix.") . "</p>";
-            echo "<p>" . _("The realm check feature needs to know an outer ID which actually gets a chance to authenticate. If your RADIUS server lets only select usernames pass, it is useful to supply the information which of those (outer ID) username we can use for testing.") . "</p>";
+            echo "<p>".sprintf(_("Some installers support a feature called 'Anonymous outer identity'. If you don't know what this is, please read <a href='%s'>this article</a>."), "https://confluence.terena.org/display/H2eduroam/eap-types")."</p>";
+            echo "<p>"._("On some platforms, the installers can suggest username endings and/or verify the user input to contain the realm suffix.")."</p>";
+            echo "<p>"._("The realm check feature needs to know an outer ID which actually gets a chance to authenticate. If your RADIUS server lets only select usernames pass, it is useful to supply the information which of those (outer ID) username we can use for testing.")."</p>";
         }
         ?>
         <p>
@@ -224,37 +224,37 @@ 
             <tr>
                 <!-- checkbox and input field for anonymity support, available only when realm is known-->
                 <td>
-                    <span id='anon_support_label' style='<?php echo ($realm == "" ? "color:#999999" : "" ); ?>'>
+                    <span id='anon_support_label' style='<?php echo ($realm == "" ? "color:#999999" : ""); ?>'>
                         <?php echo _("Enable Anonymous Outer Identity:"); ?>
                     </span>
                 </td>
                 <td>
-                    <input type='checkbox' <?php echo ($useAnon != FALSE ? "checked" : "" ) . ($realm == "" ? " disabled" : "" ); ?> name='anon_support' onclick='
+                    <input type='checkbox' <?php echo ($useAnon != FALSE ? "checked" : "").($realm == "" ? " disabled" : ""); ?> name='anon_support' onclick='
                             if (this.form.elements["anon_support"].checked !== true) {
                                 this.form.elements["anon_local"].setAttribute("disabled", "disabled");
                             } else {
                                 this.form.elements["anon_local"].removeAttribute("disabled");
                             }
                             ;'/>
-                    <input type='text' <?php echo ($useAnon == FALSE ? "disabled" : "" ); ?> name='anon_local' value='<?php echo $anonLocal; ?>'/>
+                    <input type='text' <?php echo ($useAnon == FALSE ? "disabled" : ""); ?> name='anon_local' value='<?php echo $anonLocal; ?>'/>
                 </td>
             </tr>
             <tr>
                 <!-- checkbox and input field for check realm outer id, available only when realm is known-->
                 <td>
-                    <span id='checkuser_label' style='<?php echo ($realm == "" ? "color:#999999" : "" ); ?>'>
+                    <span id='checkuser_label' style='<?php echo ($realm == "" ? "color:#999999" : ""); ?>'>
                         <?php echo _("Use special Outer Identity for realm checks:"); ?>
                     </span>
                 </td>
                 <td>
-                    <input type='checkbox' <?php echo ($checkuserOuter != FALSE ? "checked" : "" ) . ($realm == "" ? " disabled" : "" ); ?> name='checkuser_support' onclick='
+                    <input type='checkbox' <?php echo ($checkuserOuter != FALSE ? "checked" : "").($realm == "" ? " disabled" : ""); ?> name='checkuser_support' onclick='
                             if (this.form.elements["checkuser_support"].checked !== true) {
                                 this.form.elements["checkuser_local"].setAttribute("disabled", "disabled");
                             } else {
                                 this.form.elements["checkuser_local"].removeAttribute("disabled");
                             }
                             ;'/>
-                    <input type='text' <?php echo ($checkuserOuter == FALSE ? "disabled" : "" ); ?> name='checkuser_local' value='<?php echo $checkuserValue; ?>'/>
+                    <input type='text' <?php echo ($checkuserOuter == FALSE ? "disabled" : ""); ?> name='checkuser_local' value='<?php echo $checkuserValue; ?>'/>
                 </td>
             </tr>
             <tr>
@@ -269,7 +269,7 @@ 
                 </td>
                 <td>
                     <input type='checkbox' <?php
-                        echo ($verify != FALSE ? "checked" : "" );
+                        echo ($verify != FALSE ? "checked" : "");
                         ?> name='verify_support' onclick='
                             if (this.form.elements["verify_support"].checked !== true || this.form.elements["realm"].value.length == 0) {
                                 this.form.elements["hint_support"].setAttribute("disabled", "disabled");
@@ -281,12 +281,12 @@ 
             </tr>
             <tr>
                 <td>
-                    <span id='hint_label' style='<?php echo ($realm == "" ? "color:#999999" : "" ); ?>'>
+                    <span id='hint_label' style='<?php echo ($realm == "" ? "color:#999999" : ""); ?>'>
                         <?php echo _("Enforce exact realm in username"); ?>
                     </span>
                 </td>
                 <td>
-                    <input type='checkbox' <?php echo ($verify == FALSE ? "disabled" : "" ); ?> name='hint_support' <?php echo ( $hint != FALSE ? "checked" : "" ); ?> />
+                    <input type='checkbox' <?php echo ($verify == FALSE ? "disabled" : ""); ?> name='hint_support' <?php echo ($hint != FALSE ? "checked" : ""); ?> />
                 </td>
             </tr>
         </table>
@@ -296,20 +296,20 @@ 
 
     <?php
     if ($wizardStyle) {
-        echo "<p>" . _("The CAT has a download area for end users. There, they will, for example, learn about the support pointers you entered earlier. The CAT can also immediately offer the installers for the profile for download. If you don't want that, you can instead enter a web site location where you want your users to be redirected to. You, as the administrator, can still download the profiles to place them on that page (see the 'Compatibility Matrix' button on the dashboard).") . "</p>";
+        echo "<p>"._("The CAT has a download area for end users. There, they will, for example, learn about the support pointers you entered earlier. The CAT can also immediately offer the installers for the profile for download. If you don't want that, you can instead enter a web site location where you want your users to be redirected to. You, as the administrator, can still download the profiles to place them on that page (see the 'Compatibility Matrix' button on the dashboard).")."</p>";
     }
     ?>
     <p>
 
         <?php
-        echo "<span id='redirect_label' style='" . ($realm == "" ? "color:#999999" : "" ) . "'><label for='redirect'>" . _("Redirect end users to own web page:") . "</label></span>
-                          <input type='checkbox'  name='redirect' id='redirect' " . ($blacklisted === FALSE ? "" : "checked " ) . "onclick='
+        echo "<span id='redirect_label' style='".($realm == "" ? "color:#999999" : "")."'><label for='redirect'>"._("Redirect end users to own web page:")."</label></span>
+                          <input type='checkbox'  name='redirect' id='redirect' " . ($blacklisted === FALSE ? "" : "checked ")."onclick='
                               if (this.form.elements[\"redirect\"].checked != true) {
                                 this.form.elements[\"redirect_target\"].setAttribute(\"disabled\", \"disabled\");
                               } else {
                                 this.form.elements[\"redirect_target\"].removeAttribute(\"disabled\");
                               };'/>
-                          <input type='text' name='redirect_target' " . ($blacklisted !== FALSE ? "value='$blacklisted'" : "disabled" ) . "/>";
+                          <input type='text' name='redirect_target' " . ($blacklisted !== FALSE ? "value='$blacklisted'" : "disabled")."/>";
         ?>
     </p>
 
@@ -318,7 +318,7 @@ 
     <legend><strong><?php echo _("Supported EAP types"); ?></strong></legend>
     <?php
     if ($wizardStyle) {
-        echo "<p>" . _("Now, we need to know which EAP types your IdP supports. If you support multiple EAP types, you can assign every type a priority (1=highest). This tool will always generate an automatic installer for the EAP type with the highest priority; only if the user's device can't use that EAP type, we will use an EAP type further down in the list.") . "</p>";
+        echo "<p>"._("Now, we need to know which EAP types your IdP supports. If you support multiple EAP types, you can assign every type a priority (1=highest). This tool will always generate an automatic installer for the EAP type with the highest priority; only if the user's device can't use that EAP type, we will use an EAP type further down in the list.")."</p>";
     }
     ?>
     <?php
@@ -351,7 +351,7 @@ 
 <?php
 $D = [];
 foreach ($prefill_methods as $prio => $value) {
-    print '<li>' . $value->getPrintableRep() . "</li>\n";
+    print '<li>'.$value->getPrintableRep()."</li>\n";
     $D[$value->getPrintableRep()] = $prio;
 }
 ?>
@@ -377,7 +377,7 @@ 
     }
     $display = $a->getPrintableRep();
     if (!isset($D[$a->getPrintableRep()])) {
-        print '<li class="eap1">' . $a->getPrintableRep() . "</li>\n";
+        print '<li class="eap1">'.$a->getPrintableRep()."</li>\n";
     }
 }
 ?>
@@ -390,8 +390,8 @@ 
 foreach ($methods as $a) {
     $display = $a->getPrintableRep();
     $v = isset($D[$display]) ? $D[$display] : '';
-    print '<input type="hidden" class="eapm" name="' . $display . '" id="EAP-' . $display . '" value="' . $display . '">';
-    print '<input type="hidden" class="eapmv" name="' . $display . '-priority" id="EAP-' . $display . '-priority" value="' . $v . '">';
+    print '<input type="hidden" class="eapm" name="'.$display.'" id="EAP-'.$display.'" value="'.$display.'">';
+    print '<input type="hidden" class="eapmv" name="'.$display.'-priority" id="EAP-'.$display.'-priority" value="'.$v.'">';
 }
 ?>
     <br style="clear:both;" />
@@ -411,11 +411,11 @@ 
 foreach ($optionsAlreadySet as $optionNames) {
     if (preg_match("/^support:/", $optionNames)) {
         $has_support_options[$optionNames] = "SET";
-        $support_text .= "<li><strong>" . $uiElements->displayName($optionNames) . "</strong></li>";
+        $support_text .= "<li><strong>".$uiElements->displayName($optionNames)."</strong></li>";
     }
     if (preg_match("/^media:/", $optionNames)) {
         $has_media_options[$optionNames] = "SET";
-        $media_text .= "<li><strong>" . $uiElements->displayName($optionNames) . "</strong></li>";
+        $media_text .= "<li><strong>".$uiElements->displayName($optionNames)."</strong></li>";
     }
 }
 $fields = [
@@ -424,12 +424,12 @@ 
     "media" => _("Media Properties for this profile")];
 
 foreach ($fields as $name => $description) {
-    echo "<fieldset class='option_container' id='" . $name . "_override'>
+    echo "<fieldset class='option_container' id='".$name."_override'>
     <legend><strong>$description</strong></legend>
     <p>";
 
-    if (count(${"has_" . $name . "_options"}) > 0) {
-        printf(ngettext("The option %s is already defined IdP-wide. If you set it here on profile level, this setting will override the IdP-wide one.", "The options %s are already defined IdP-wide. If you set them here on profile level, these settings will override the IdP-wide ones.", count(${"has_" . $name . "_options"})), "<ul>" . ${$name . "_text"} . "</ul>");
+    if (count(${"has_".$name."_options"}) > 0) {
+        printf(ngettext("The option %s is already defined IdP-wide. If you set it here on profile level, this setting will override the IdP-wide one.", "The options %s are already defined IdP-wide. If you set them here on profile level, these settings will override the IdP-wide ones.", count(${"has_".$name."_options"})), "<ul>".${$name."_text"}."</ul>");
     }
 
     echo "</p>";
@@ -442,7 +442,7 @@ 
 }
 
 if ($wizardStyle) {
-    echo "<p>" . _("When you are sure that everything is correct, please click on 'Save data' and you will be taken to your IdP Dashboard page.") . "</p>";
+    echo "<p>"._("When you are sure that everything is correct, please click on 'Save data' and you will be taken to your IdP Dashboard page.")."</p>";
 }
-echo "<p><button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>" . _("Discard changes") . "</button></p></form>";
+echo "<p><button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>"._("Discard changes")."</button></p></form>";
 echo $deco->footer();

web/admin/edit_hotspot.php

Spacing +14 added lines, -14 removed lines

@@ -26,7 +26,7 @@ 
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $deco = new \web\lib\admin\PageDecoration();
 $validator = new \web\lib\common\InputValidation();
@@ -36,7 +36,7 @@ 
 
 if (!isset($_GET['deployment_id'])) {
     $my_inst->newDeployment(\core\AbstractDeployment::DEPLOYMENTTYPE_MANAGED);
-    header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
+    header("Location: overview_org.php?inst_id=".$my_inst->identifier);
     exit(0);
 }
 // if we have come this far, we are editing an existing deployment
@@ -48,7 +48,7 @@ 
         if (in_array('OK', $response)) {
             $deployment->deactivate();
         }
-        header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)));
+        header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)));
         exit(0);
     }
 
@@ -57,7 +57,7 @@ 
         if (in_array('OK', $response)) {
             $deployment->activate();
         }
-        header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)));
+        header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)));
         exit(0);
     }
     
@@ -78,7 +78,7 @@ 
             $deployment->status = core\DeploymentManaged::INACTIVE;
             $response = $deployment->setRADIUSconfig();
         }
-        header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)));
+        header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)));
         exit(0);
     }
 }
@@ -106,21 +106,21 @@ 
     echo $uiElements->instLevelInfoBoxes($my_inst);
     $deploymentOptions = $deployment->getAttributes();
     echo "<form enctype='multipart/form-data' action='edit_hotspot.php?inst_id=$my_inst->identifier&amp;deployment_id=$deployment->identifier' method='post' accept-charset='UTF-8'>
-                <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>";
+                <input type='hidden' name='MAX_FILE_SIZE' value='".\config\Master::MAX_UPLOAD_SIZE."'>";
     $optionDisplay = new \web\lib\admin\OptionDisplay($deploymentOptions, \core\Options::LEVEL_PROFILE);
     ?>
     <fieldset class='option_container' id='managedsp_override'>
     <legend>
         <strong>
-    <?php $tablecaption = _("Options for this deployment"); echo $tablecaption;?>
+    <?php $tablecaption = _("Options for this deployment"); echo $tablecaption; ?>
         </strong>
     </legend>
     <table>
-            <caption><?php echo $tablecaption;?></caption>
+            <caption><?php echo $tablecaption; ?></caption>
             <tr>
-                <th class="wai-invisible" scope="col"><?php echo _("Property Type");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Language if applicable");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Property Value");?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Property Type"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Language if applicable"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Property Value"); ?></th>
             </tr>
         <tr>
             <!-- input for Operator-Name override-->
@@ -137,7 +137,7 @@ 
             <!-- input for VLAN identifier for home users-->
             <td>
                 <span id='vlan_label'>
-                    <?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " " . _("(unset with '0')"))); ?>
+                    <?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " "._("(unset with '0')"))); ?>
                 </span>
             </td>
             <td>
@@ -153,10 +153,10 @@ 
     <?php
     echo $optionDisplay->prefilledOptionTable("managedsp", $my_inst->federation);
     ?>
-    <button type='button' class='newoption' onclick='getXML("managedsp", "<?php echo $my_inst->federation ?>")'><?php echo _("Add new option");?></button>
+    <button type='button' class='newoption' onclick='getXML("managedsp", "<?php echo $my_inst->federation ?>")'><?php echo _("Add new option"); ?></button>
     </fieldset>
 
 <?php
-    echo "<p><button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>" . _("Discard changes") . "</button></p></form>";
+    echo "<p><button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>"._("Discard changes")."</button></p></form>";
     echo $deco->footer();
     

web/admin/overview_user.php

Spacing +15 added lines, -15 removed lines

@@ -21,7 +21,7 @@ 
 
 namespace core;
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $instMgmt = new \core\UserManagement();
 $deco = new \web\lib\admin\PageDecoration();
@@ -61,7 +61,7 @@ 
             <?php echo $uiElements->infoblock($user->getAttributes(), "user", "User"); ?>
             <tr>
                 <td>
-                    <?php echo "" . _("Unique Identifier") ?>
+                    <?php echo ""._("Unique Identifier") ?>
                 </td>
                 <td>
                 </td>
@@ -74,14 +74,14 @@ 
     <div>
         <?php
         if (\config\Master::DB['USER']['readonly'] === FALSE) {
-            echo "<a href='edit_user.php'><button>" . _("Edit User Details") . "</button></a>";
+            echo "<a href='edit_user.php'><button>"._("Edit User Details")."</button></a>";
         }
 
         if ($user->isFederationAdmin()) {
-            echo "<form action='overview_federation.php' method='GET' accept-charset='UTF-8'><button type='submit'>" . sprintf(_('Click here for %s management tasks'), $uiElements->nomenclatureFed) . "</button></form>";
+            echo "<form action='overview_federation.php' method='GET' accept-charset='UTF-8'><button type='submit'>".sprintf(_('Click here for %s management tasks'), $uiElements->nomenclatureFed)."</button></form>";
         }
         if ($user->isSuperadmin()) {
-            echo "<form action='112365365321.php' method='GET' accept-charset='UTF-8'><button type='submit'>" . _('Click here to access the superadmin page') . "</button></form>";
+            echo "<form action='112365365321.php' method='GET' accept-charset='UTF-8'><button type='submit'>"._('Click here to access the superadmin page')."</button></form>";
         }
         ?>
     </div>
@@ -94,7 +94,7 @@ 
         if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL") {
             $target = "https://wiki.geant.org/x/6Zg7Bw"; // Managed IdP manual
         }
-        $helptext = "<h3 style='display:inline;'>" . sprintf(_("(Need help? Refer to the <a href='%s'>%s administrator manual</a>)"), $target, $uiElements->nomenclatureInst) . "</h3>";
+        $helptext = "<h3 style='display:inline;'>".sprintf(_("(Need help? Refer to the <a href='%s'>%s administrator manual</a>)"), $target, $uiElements->nomenclatureInst)."</h3>";
     } else {
         $helptext = "";
     }
@@ -103,7 +103,7 @@ 
         // we need to run the Federation constructor
         $cat = new \core\CAT;
         /// first parameter: number of Identity Providers; second param is the literal configured term for 'Identity Provider' (you may or may not be able to add a plural suffix for your locale)
-        echo "<h2>" . sprintf(ngettext("You are managing the following <span style='display:none'>%d </span>%s:", "You are managing the following <strong>%d</strong> %s:", sizeof($hasInst)), sizeof($hasInst), $uiElements->nomenclatureParticipant) . "</h2>";
+        echo "<h2>".sprintf(ngettext("You are managing the following <span style='display:none'>%d </span>%s:", "You are managing the following <strong>%d</strong> %s:", sizeof($hasInst)), sizeof($hasInst), $uiElements->nomenclatureParticipant)."</h2>";
         $instlist = [];
         $my_idps = [];
         $myFeds = [];
@@ -174,7 +174,7 @@ 
                                     $coadmin = new \core\User($username['ID']);
                                     $coadmin_name = $coadmin->getAttributes('user:realname');
                                     if (count($coadmin_name) > 0) {
-                                        echo $coadmin_name[0]['value'] . "<br/>";
+                                        echo $coadmin_name[0]['value']."<br/>";
                                         unset($admins[$number]);
                                     }
                                 } else { // don't list self
@@ -193,14 +193,14 @@ 
                         <td>
                             <?php
                             if ($blessedUser && \config\Master::DB['INST']['readonly'] === FALSE) {
-                                echo "<div style='white-space: nowrap;'><form method='post' action='inc/manageAdmins.inc.php?inst_id=" . $the_inst->identifier . "' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'><button type='submit'>" . _("Add/Remove Administrators") . "</button></form></div>";
+                                echo "<div style='white-space: nowrap;'><form method='post' action='inc/manageAdmins.inc.php?inst_id=".$the_inst->identifier."' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'><button type='submit'>"._("Add/Remove Administrators")."</button></form></div>";
                             }
                             ?>
                         </td>
                         <td> <!-- danger zone --> 
 
                             <form action='edit_participant_result.php?inst_id=<?php echo $the_inst->identifier; ?>' method='post' accept-charset='UTF-8'>
-                                <button class='delete' type='submit' name='submitbutton' value='<?php echo \web\lib\common\FormElements::BUTTON_DELETE; ?>' onclick="return confirm('<?php echo ( \config\ConfAssistant::CONSORTIUM['selfservice_registration'] === NULL ? sprintf(_("After deleting the %s, you can not recreate it yourself - you need a new invitation token from the %s administrator!"), $uiElements->nomenclatureInst, $uiElements->nomenclatureFed) . " " : "" ) . sprintf(_("Do you really want to delete your %s %s?"), $uiElements->nomenclatureParticipant, $the_inst->name); ?>')"><?php echo sprintf(_("Delete %s"), $uiElements->nomenclatureParticipant); ?></button>
+                                <button class='delete' type='submit' name='submitbutton' value='<?php echo \web\lib\common\FormElements::BUTTON_DELETE; ?>' onclick="return confirm('<?php echo (\config\ConfAssistant::CONSORTIUM['selfservice_registration'] === NULL ? sprintf(_("After deleting the %s, you can not recreate it yourself - you need a new invitation token from the %s administrator!"), $uiElements->nomenclatureInst, $uiElements->nomenclatureFed)." " : "").sprintf(_("Do you really want to delete your %s %s?"), $uiElements->nomenclatureParticipant, $the_inst->name); ?>')"><?php echo sprintf(_("Delete %s"), $uiElements->nomenclatureParticipant); ?></button>
                             </form>
                             <form action='edit_participant_result.php?inst_id=<?php echo $the_inst->identifier; ?>' method='post' accept-charset='UTF-8'>
                                 <button class='delete' type='submit' name='submitbutton' value='<?php echo \web\lib\common\FormElements::BUTTON_FLUSH_AND_RESTART; ?>' onclick="return confirm('<?php echo sprintf(_("This action will delete all properties of the %s and start over the configuration from scratch. Do you really want to reset all settings of the %s %s?"), $uiElements->nomenclatureParticipant, $uiElements->nomenclatureParticipant, $the_inst->name); ?>')"><?php echo sprintf(_("Reset all %s settings"), $uiElements->nomenclatureParticipant); ?></button>
@@ -215,18 +215,18 @@ 
             <?php
         }
     } else {
-        echo "<h2>" . sprintf(_("You are not managing any %s."), $uiElements->nomenclatureInst) . "</h2>";
+        echo "<h2>".sprintf(_("You are not managing any %s."), $uiElements->nomenclatureInst)."</h2>";
     }
     if (\config\Master::DB['INST']['readonly'] === FALSE) {
         if (\config\ConfAssistant::CONSORTIUM['selfservice_registration'] === NULL) {
-            echo "<p>" . sprintf(_("Please ask your %s administrator to invite you to become an %s administrator."), $uiElements->nomenclatureFed, $uiElements->nomenclatureParticipant) . "</p>";
+            echo "<p>".sprintf(_("Please ask your %s administrator to invite you to become an %s administrator."), $uiElements->nomenclatureFed, $uiElements->nomenclatureParticipant)."</p>";
             echo "<hr/>
              <div style='white-space: nowrap;'>
                 <form action='action_enrollment.php' method='get' accept-charset='UTF-8'>" .
-            sprintf(_("Did you receive an invitation token to manage an %s? Please paste it here:"), $uiElements->nomenclatureParticipant) .
+            sprintf(_("Did you receive an invitation token to manage an %s? Please paste it here:"), $uiElements->nomenclatureParticipant).
             "        <input type='text' id='token' name='token'/>
                     <button type='submit'>" .
-            _("Go!") . "
+            _("Go!")."
                     </button>
                 </form>
              </div>";
@@ -235,7 +235,7 @@ 
             <div style='white-space: nowrap;'>
         <form action='action_enrollment.php' method='get'><button type='submit' accept-charset='UTF-8'>
                 <input type='hidden' id='token' name='token' value='SELF-REGISTER'/>" .
-            sprintf(_("New %s Registration"), $uiElements->nomenclatureParticipant) . "
+            sprintf(_("New %s Registration"), $uiElements->nomenclatureParticipant)."
             </button>
         </form>
         </div>";

web/admin/overview_org.php

Switch Indentation +52 added lines, -52 removed lines

@@ -190,70 +190,70 @@ 
                     </div>
                     <?php
                     break;
-                case "core\ProfileRADIUS":
-                    ?>
+                    case "core\ProfileRADIUS":
+                        ?>
                     <div style='padding-bottom:20px;'>
                         <h2 style='overflow:auto; display:inline; padding-bottom: 10px;'><?php printf(_("Profile: %s"), $profile_name); ?></h2>
                         <?php
-                        $profile_name = $profile_list->name;
-                        // see if there are any profile-level overrides
-                        $attribs = $profile_list->getAttributes();
-                        // write things into a buffer; we need some function calls to determine
-                        // readiness - but want to display it before!
-                        $has_overrides = FALSE;
-                        foreach ($attribs as $attrib) {
-                            if ($attrib['level'] == \core\Options::LEVEL_PROFILE && !preg_match("/^(internal:|profile:name|profile:description|eap:)/", $attrib['name'])) {
-                                $has_overrides = TRUE;
+                            $profile_name = $profile_list->name;
+                            // see if there are any profile-level overrides
+                            $attribs = $profile_list->getAttributes();
+                            // write things into a buffer; we need some function calls to determine
+                            // readiness - but want to display it before!
+                            $has_overrides = FALSE;
+                            foreach ($attribs as $attrib) {
+                                if ($attrib['level'] == \core\Options::LEVEL_PROFILE && !preg_match("/^(internal:|profile:name|profile:description|eap:)/", $attrib['name'])) {
+                                    $has_overrides = TRUE;
+                                }
                             }
-                        }
-                        $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>";
-                        $typelist = $profile_list->getEapMethodsinOrderOfPreference();
-                        $allcomplete = TRUE;
-                        foreach ($typelist as $eaptype) {
-                            $buffer_eaptypediv .= $eaptype->getPrintableRep();
-                            $completeness = $profile_list->isEapTypeDefinitionComplete($eaptype);
-                            if ($completeness === true) {
-                                $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>";
-                            } else {
-                                $buffer_eaptypediv .= " <div class='notacceptable'>";
-                                $buffer_eaptypediv .= _("Information needed!");
-                                if (is_array($completeness)) {
-                                    $buffer_eaptypediv .= "<ul style='margin:1px'>";
-                                    foreach ($completeness as $missing_attrib) {
-                                        $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>";
+                            $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>";
+                            $typelist = $profile_list->getEapMethodsinOrderOfPreference();
+                            $allcomplete = TRUE;
+                            foreach ($typelist as $eaptype) {
+                                $buffer_eaptypediv .= $eaptype->getPrintableRep();
+                                $completeness = $profile_list->isEapTypeDefinitionComplete($eaptype);
+                                if ($completeness === true) {
+                                    $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>";
+                                } else {
+                                    $buffer_eaptypediv .= " <div class='notacceptable'>";
+                                    $buffer_eaptypediv .= _("Information needed!");
+                                    if (is_array($completeness)) {
+                                        $buffer_eaptypediv .= "<ul style='margin:1px'>";
+                                        foreach ($completeness as $missing_attrib) {
+                                            $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>";
+                                        }
+                                        $buffer_eaptypediv .= "</ul>";
                                     }
-                                    $buffer_eaptypediv .= "</ul>";
+                                    $buffer_eaptypediv .= "</div>";
+                                    $allcomplete = FALSE;
                                 }
-                                $buffer_eaptypediv .= "</div>";
-                                $allcomplete = FALSE;
-                            }
-                            $attribs = $profile_list->getAttributes();
-                            $justOnce = FALSE;
-                            foreach ($attribs as $attrib) {
-                                if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) {
-                                    $justOnce = TRUE;
-                                    $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>";
+                                $attribs = $profile_list->getAttributes();
+                                $justOnce = FALSE;
+                                foreach ($attribs as $attrib) {
+                                    if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) {
+                                        $justOnce = TRUE;
+                                        $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>";
+                                    }
                                 }
+                                $buffer_eaptypediv .= "<br/>";
                             }
-                            $buffer_eaptypediv .= "<br/>";
-                        }
-                        $buffer_eaptypediv .= "</div>";
+                            $buffer_eaptypediv .= "</div>";
 
-                        $buffer_headline = "<span style='float:right;'>";
-                        $readiness = $profile_list->readinessLevel();
-                        if ($has_overrides) {
-                            $buffer_headline .= $uiElements->boxRemark("", _("Option override on profile level is in effect."), TRUE);
-                        }
-                        if (!$allcomplete) {
-                            $buffer_headline .= $uiElements->boxError("", _("The information in this profile is incomplete."), TRUE);
-                        }
-                        switch ($readiness) {
+                            $buffer_headline = "<span style='float:right;'>";
+                            $readiness = $profile_list->readinessLevel();
+                            if ($has_overrides) {
+                                $buffer_headline .= $uiElements->boxRemark("", _("Option override on profile level is in effect."), TRUE);
+                            }
+                            if (!$allcomplete) {
+                                $buffer_headline .= $uiElements->boxError("", _("The information in this profile is incomplete."), TRUE);
+                            }
+                            switch ($readiness) {
                             case core\AbstractProfile::READINESS_LEVEL_SHOWTIME:
                                 $buffer_headline .= $uiElements->boxOkay("", _("This profile is shown on the user download interface."), TRUE);
                                 break;
                             case core\AbstractProfile::READINESS_LEVEL_SUFFICIENTCONFIG:
                                 $buffer_headline .= $uiElements->boxWarning("", sprintf(_("This profile is NOT shown on the user download interface, even though we have enough information to show. To enable the profile, add the attribute \"%s\" and tick the corresponding box."), $uiElements->displayName("profile:production")), TRUE);
-                        }
+                            }
 
                         $buffer_headline .= "</span></div>";
 
@@ -336,8 +336,8 @@ 
                     </div>
                     <?php
                     break;
-                default:
-                    throw new Exception("We were asked to operate on something that is neither a RADIUS nor Silverbullet profile!");
+                    default:
+                        throw new Exception("We were asked to operate on something that is neither a RADIUS nor Silverbullet profile!");
             }
             ?>
             <!-- dummy width to keep a little distance -->

Spacing +33 added lines, -33 removed lines

@@ -26,7 +26,7 @@ 
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $deco = new \web\lib\admin\PageDecoration();
 $validator = new \web\lib\common\InputValidation();
@@ -38,7 +38,7 @@ 
 } else {
     $link = 'http://';
 }
-$link .= $_SERVER['SERVER_NAME'] . $_SERVER['SCRIPT_NAME'];
+$link .= $_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME'];
 $link = htmlspecialchars($link);
 
 echo $deco->defaultPagePrelude(sprintf(_("%s: %s Dashboard"), \config\Master::APPEARANCE['productname'], $uiElements->nomenclatureParticipant));
@@ -165,14 +165,14 @@ 
                                     <ul style='margin:1px'>
                                         <?php
                                         foreach ($completeness as $missing_attrib) {
-                                            echo "<li>" . $uiElements->displayName($missing_attrib) . "</li>";
+                                            echo "<li>".$uiElements->displayName($missing_attrib)."</li>";
                                         }
                                         ?>
                                     </ul>
                                 </div>
                                 <?php
                             } else {
-                                echo sprintf(_("You can create up to %d users."), $maxusers[0]['value']) . "<br/>" . sprintf(_("Their credentials will carry the name <strong>%s</strong>."), $profile_list->realm);
+                                echo sprintf(_("You can create up to %d users."), $maxusers[0]['value'])."<br/>".sprintf(_("Their credentials will carry the name <strong>%s</strong>."), $profile_list->realm);
                             }
                             ?>
                             <br/>
@@ -181,7 +181,7 @@ 
                             if ($readonly === FALSE) {
                                 ?>
                                 <form action='edit_silverbullet.php?inst_id=<?php echo $my_inst->identifier; ?>&amp;profile_id=<?php echo $profile_list->identifier; ?>' method='POST'>
-                                    <button <?php echo ( is_array($completeness) ? "disabled" : "" ); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button>
+                                    <button <?php echo (is_array($completeness) ? "disabled" : ""); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button>
                                 </form>
                                 <?php
                             }
@@ -206,21 +206,21 @@ 
                                 $has_overrides = TRUE;
                             }
                         }
-                        $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>";
+                        $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>"._("<strong>EAP Types</strong> (in order of preference):")."<br/>";
                         $typelist = $profile_list->getEapMethodsinOrderOfPreference();
                         $allcomplete = TRUE;
                         foreach ($typelist as $eaptype) {
                             $buffer_eaptypediv .= $eaptype->getPrintableRep();
                             $completeness = $profile_list->isEapTypeDefinitionComplete($eaptype);
                             if ($completeness === true) {
-                                $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>";
+                                $buffer_eaptypediv .= " <div class='acceptable'>"._("OK")."</div>";
                             } else {
                                 $buffer_eaptypediv .= " <div class='notacceptable'>";
                                 $buffer_eaptypediv .= _("Information needed!");
                                 if (is_array($completeness)) {
                                     $buffer_eaptypediv .= "<ul style='margin:1px'>";
                                     foreach ($completeness as $missing_attrib) {
-                                        $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>";
+                                        $buffer_eaptypediv .= "<li>".$uiElements->displayName($missing_attrib)."</li>";
                                     }
                                     $buffer_eaptypediv .= "</ul>";
                                 }
@@ -232,7 +232,7 @@ 
                             foreach ($attribs as $attrib) {
                                 if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) {
                                     $justOnce = TRUE;
-                                    $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>";
+                                    $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='"._("Options on EAP Method/Device level are in effect.")."'>";
                                 }
                             }
                             $buffer_eaptypediv .= "<br/>";
@@ -270,7 +270,7 @@ 
                                 if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == "LOCAL") {
                                     $diagUrl = "../diag/";
                                 } else {
-                                    $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] . "/diag/";
+                                    $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS']."/diag/";
                                 }
                                 ?>
                                 <form action='<?php echo $diagUrl; ?>action_realmcheck.php?inst_id=$my_inst->identifier&amp;profile_id=$profile_list->identifier' method='post' accept-charset='UTF-8'>
@@ -307,9 +307,9 @@ 
                                 ?>
                                 <div style='display: flex;'>
                                     <?php
-                                    $idpLevelUrl = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier;
-                                    $displayurl = $idpLevelUrl . "&amp;profile=" . $profile_list->identifier;
-                                    $QRurl = $idpLevelUrl . "&profile=" . $profile_list->identifier;
+                                    $idpLevelUrl = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://').$_SERVER['SERVER_NAME'].dirname(dirname($_SERVER['SCRIPT_NAME']))."?idp=".$my_inst->identifier;
+                                    $displayurl = $idpLevelUrl."&amp;profile=".$profile_list->identifier;
+                                    $QRurl = $idpLevelUrl."&profile=".$profile_list->identifier;
                                     $qrCode = new \chillerlan\QRCode\QRCode(new \chillerlan\QRCode\QROptions([
                                                 'outputType' => \chillerlan\QRCode\QRCode::OUTPUT_IMAGE_PNG,
                                                 'eccLevel' => \chillerlan\QRCode\QRCode::ECC_H,
@@ -321,9 +321,9 @@ 
                                     if (empty($rawQr)) {
                                         throw new Exception("Something went seriously wrong during QR code generation!");
                                     }
-                                    $uri = "data:image/png;base64," . base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL));
+                                    $uri = "data:image/png;base64,".base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL));
                                     $size = getimagesize($uri);
-                                    echo "<img width='" . ($size[0] / 4) . "' height='" . ($size[1] / 4) . "' src='$uri' alt='QR-code'/>";
+                                    echo "<img width='".($size[0] / 4)."' height='".($size[1] / 4)."' src='$uri' alt='QR-code'/>";
 
                                     //echo "<nobr>$displayurl</nobr></a>";
                                     echo "<p>$displayurl</p></a>";
@@ -385,7 +385,7 @@ 
     <?php
     $hotspotProfiles = $my_inst->listDeployments();
     if (count($hotspotProfiles) == 0) { // no profiles yet.
-        echo "<h2>" . sprintf(_("There are not yet any known deployments for your %s."), $uiElements->nomenclatureHotspot) . "</h2>";
+        echo "<h2>".sprintf(_("There are not yet any known deployments for your %s."), $uiElements->nomenclatureHotspot)."</h2>";
     }
 
     foreach ($hotspotProfiles as $counter => $deploymentObject) {
@@ -403,7 +403,7 @@ 
         ?>
         <div style='display: table-row;'>
             <div class='profilebox' style='display: table-cell;'>
-                <h2><?php echo core\DeploymentManaged::PRODUCTNAME . " (<span style='color:" . ( $deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>" . _("inactive") : "green;'>" . _("active") ) . "</span>)"; ?></h2>
+                <h2><?php echo core\DeploymentManaged::PRODUCTNAME." (<span style='color:".($deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>"._("inactive") : "green;'>"._("active"))."</span>)"; ?></h2>
                 <table>
                     <caption><?php echo _("Deployment Details"); ?></caption>
                     <tr>
@@ -416,13 +416,13 @@ 
                         <td><strong><?php echo _("Your primary RADIUS server") ?></strong><br/>
                             <?php
                             if ($deploymentObject->host1_v4 !== NULL) {
-                                echo _("IPv4") . ": " . $deploymentObject->host1_v4;
+                                echo _("IPv4").": ".$deploymentObject->host1_v4;
                             }
                             if ($deploymentObject->host1_v4 !== NULL && $deploymentObject->host1_v6 !== NULL) {
                                 echo "<br/>";
                             }
                             if ($deploymentObject->host1_v6 !== NULL) {
-                                echo _("IPv6") . ": " . $deploymentObject->host1_v6;
+                                echo _("IPv6").": ".$deploymentObject->host1_v6;
                             }
                             ?>
                         </td>
@@ -430,9 +430,9 @@ 
                         <td><?php echo $deploymentObject->port1; ?></td>
                         <td>
                             <?php
-                            echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] .
-                            "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] .
-                            "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "'>";
+                            echo "<img src='".$radiusMessages[$deploymentObject->radius_status_1]['icon'].
+                            "' alt='".$radiusMessages[$deploymentObject->radius_status_1]['text'].
+                            "' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."'>";
                             ?>
                         </td>
                     </tr>
@@ -440,22 +440,22 @@ 
                         <td><strong><?php echo _("Your backup RADIUS server") ?><br/></strong>
                             <?php
                             if ($deploymentObject->host2_v4 !== NULL) {
-                                echo _("IPv4") . ": " . $deploymentObject->host2_v4;
+                                echo _("IPv4").": ".$deploymentObject->host2_v4;
                             }
                             if ($deploymentObject->host2_v4 !== NULL && $deploymentObject->host2_v6 !== NULL) {
                                 echo "<br/>";
                             }
                             if ($deploymentObject->host2_v6 !== NULL) {
-                                echo _("IPv6") . ": " . $deploymentObject->host2_v6;
+                                echo _("IPv6").": ".$deploymentObject->host2_v6;
                             }
                             ?></td>
                         <td><?php echo _("RADIUS port number: ") ?></td>
                         <td><?php echo $deploymentObject->port2; ?></td>
                         <td>
                             <?php
-                            echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] .
-                            "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] .
-                            "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "'>";
+                            echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon'].
+                            "' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text'].
+                            "' title='".$radiusMessages[$deploymentObject->radius_status_2]['text']."'>";
                             ?>
                         </td>
                     </tr>
@@ -507,12 +507,12 @@ 
                                 if (isset($res['FAILURE']) && $res['FAILURE'] > 0) {
                                     echo '<br>';
                                     if ($res['FAILURE'] == 2) {
-                                        echo ' <span style="color: red;">' . _("Activation failure.") . '</span>';
+                                        echo ' <span style="color: red;">'._("Activation failure.").'</span>';
                                     } else {
                                         if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') {
-                                            echo ' <span style="color: red;">' . _("Activation failure for your primary RADIUS server.") . '</span>';
+                                            echo ' <span style="color: red;">'._("Activation failure for your primary RADIUS server.").'</span>';
                                         } else {
-                                            echo ' <span style="color: red;">' . _("Activation failure for your backup RADIUS server.") . '</span>';
+                                            echo ' <span style="color: red;">'._("Activation failure for your backup RADIUS server.").'</span>';
                                         }
                                     }
                                 }
@@ -532,12 +532,12 @@ 
                                 if ($res['FAILURE'] > 0) {
                                     echo '<br>';
                                     if ($res['FAILURE'] == 2) {
-                                        echo ' <span style="color: red;">' . _("Failure during deactivation, your request is queued for handling") . '</span>';
+                                        echo ' <span style="color: red;">'._("Failure during deactivation, your request is queued for handling").'</span>';
                                     } else {
                                         if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') {
-                                            echo ' <span style="color: red;">' . _("Deactivation failure for your primary RADIUS server, your request is queued.") . '</span>';
+                                            echo ' <span style="color: red;">'._("Deactivation failure for your primary RADIUS server, your request is queued.").'</span>';
                                         } else {
-                                            echo ' <span style="color: red;">' . _("Deactivation failure for your backup RADIUS server, your request is queued.") . '</span>';
+                                            echo ' <span style="color: red;">'._("Deactivation failure for your backup RADIUS server, your request is queued.").'</span>';
                                         }
                                     }
                                 }