GEANT / CAT

web/admin/edit_user.php

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $deco = new \web\lib\admin\PageDecoration();
 $uiElements = new web\lib\admin\UIElements();
@@ -37,14 +37,14 @@ 
     </h1>
     <div class='infobox'>
         <h2>
-            <?php $tablecaption = _("Current User Attributes"); echo $tablecaption;?>
+            <?php $tablecaption = _("Current User Attributes"); 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 _("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>
             <?php echo $uiElements->infoblock($user->getAttributes(), "user", "User"); ?>
         </table>

web/admin/edit_user_result.php

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $loggerInstance = new \core\common\Logging();
 $deco = new \web\lib\admin\PageDecoration();
@@ -29,7 +29,7 @@ 
 
 $user = new \core\User($_SESSION['user']);
 if (!isset($_POST['submitbutton']) || $_POST['submitbutton'] != web\lib\common\FormElements::BUTTON_SAVE) { // what are we supposed to do?
-    echo "<p>" . _("The page was called with insufficient data. Please report this as an error.") . "</p>";
+    echo "<p>"._("The page was called with insufficient data. Please report this as an error.")."</p>";
     echo $deco->footer();
     exit(0);
 }
@@ -46,7 +46,7 @@ 
 if (isset($_POST['option'])) {
     foreach ($_POST['option'] as $opt_id => $optname) {
         if ($optname == "user:fedadmin") {
-            echo "Security violation: user tried to make himself " . \config\ConfAssistant::CONSORTIUM['nomenclature_federation'] . " administrator!";
+            echo "Security violation: user tried to make himself ".\config\ConfAssistant::CONSORTIUM['nomenclature_federation']." administrator!";
             exit(1);
         }
     }
@@ -71,11 +71,11 @@ 
 ?>
 <h1><?php $tablecaption = _("Submitted attributes for this user"); echo $tablecaption; ?></h1>
 <table>
-            <caption><?php echo $tablecaption;?></caption>
+            <caption><?php echo $tablecaption; ?></caption>
             <tr>
                             <tr>
-                <th class="wai-invisible" scope="col"><?php echo _("Overall Result");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Details");?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Overall Result"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Details"); ?></th>
             </tr>
     <?php
     echo $optionParser->processSubmittedFields($user, $_POST, $_FILES);

web/admin/overview_federation.php

Spacing +34 added lines, -34 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $deco = new \web\lib\admin\PageDecoration();
 $uiElements = new web\lib\admin\UIElements();
@@ -50,16 +50,16 @@ 
     <div class="infobox">
         <h2><?php $tablecaption = _("Your Personal Information"); 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 _("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>            
             <?php echo $uiElements->infoblock($user->getAttributes(), "user", "User"); ?>
             <tr>
                 <td>
-                    <?php echo "" . _("Unique Identifier") ?>
+                    <?php echo ""._("Unique Identifier") ?>
                 </td>
                 <td>
                 </td>
@@ -74,7 +74,7 @@ 
     $mgmt = new \core\UserManagement();
 
     if (!$user->isFederationAdmin()) {
-        echo "<p>" . sprintf(_("You are not a %s manager."), $uiElements->nomenclatureFed) . "</p>";
+        echo "<p>".sprintf(_("You are not a %s manager."), $uiElements->nomenclatureFed)."</p>";
         echo $deco->footer();
         exit(0);
     }
@@ -88,16 +88,16 @@ 
                 <?php $tablecaption2 = sprintf(_("%s Properties: %s"), $uiElements->nomenclatureFed, $thefed->name); echo $tablecaption2; ?>
             </h2>
             <table>
-            <caption><?php echo $tablecaption2;?></caption>
+            <caption><?php echo $tablecaption2; ?></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>
                 <!-- fed properties -->
                 <tr>
                     <td>
-                        <?php echo "" . _("Country") ?>
+                        <?php echo ""._("Country") ?>
                     </td>
                     <td>
                     </td>
@@ -178,7 +178,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!"));
@@ -198,7 +198,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!"));
@@ -214,27 +214,27 @@ 
     } else {
         $link = 'http://';
     }
-    $link .= $_SERVER['SERVER_NAME'] . $_SERVER['SCRIPT_NAME'];
+    $link .= $_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME'];
     $link = htmlspecialchars($link);
     if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == 'LOCAL' && \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == 'LOCAL') {
         echo "<table><tr>
-                        <td>" . sprintf(_("Diagnose reachability and connection parameters of any %s %s"), \config\ConfAssistant::CONSORTIUM['display_name'], $uiElements->nomenclatureInst) . "</td>
+                        <td>" . sprintf(_("Diagnose reachability and connection parameters of any %s %s"), \config\ConfAssistant::CONSORTIUM['display_name'], $uiElements->nomenclatureInst)."</td>
                         <td><form method='post' action='../diag/action_realmcheck.php' accept-charset='UTF-8'>
                               <input type='hidden' name='comefrom' id='comefrom' value='$link'/>
-                              <button id='realmcheck' style='cursor:pointer;' type='submit'>" . _("Go!") . "</button>
+                              <button id='realmcheck' style='cursor:pointer;' type='submit'>"._("Go!")."</button>
                             </form>
                         </td>
                     </tr>
                     </table>";
     }
     if (\config\ConfAssistant::CONSORTIUM['name'] == 'eduroam') {
-        $helptext = "<h3>" . sprintf(_("Need help? Refer to the <a href='%s'>%s manual</a>"), "https://wiki.geant.org/x/qJg7Bw", $uiElements->nomenclatureFed) . "</h3>";
+        $helptext = "<h3>".sprintf(_("Need help? Refer to the <a href='%s'>%s manual</a>"), "https://wiki.geant.org/x/qJg7Bw", $uiElements->nomenclatureFed)."</h3>";
     } else {
         $helptext = "";
     }
     ?>
     <table class='user_overview' style='border:0px;'>
-        <caption><?php echo _("Participant Details");?></caption>
+        <caption><?php echo _("Participant Details"); ?></caption>
         <tr>
             <th scope='col'><?php echo _("Deployment Status"); ?></th>
             <th scope='col'><?php echo sprintf(_("%s Name"), $uiElements->nomenclatureInst); ?></th>
@@ -243,7 +243,7 @@ 
             $pending_invites = $mgmt->listPendingInvitations();
 
             if (\config\Master::DB['enforce-external-sync']) {
-                echo "<th scope='col'>" . sprintf(_("%s Database Sync Status"), \config\ConfAssistant::CONSORTIUM['display_name']) . "</th>";
+                echo "<th scope='col'>".sprintf(_("%s Database Sync Status"), \config\ConfAssistant::CONSORTIUM['display_name'])."</th>";
             }
             ?>
             <th scope='col'>
@@ -258,7 +258,7 @@ 
         foreach ($feds as $onefed) {
             $thefed = new \core\Federation(strtoupper($onefed['value']));
             /// nomenclature for 'federation', federation name, nomenclature for 'inst'
-            echo "<tr><td colspan='8'><strong>" . sprintf(_("The following %s are in your %s %s:"), $uiElements->nomenclatureInst, $uiElements->nomenclatureFed, '<span style="color:green">' . $thefed->name . '</span>') . "</strong></td></tr>";
+            echo "<tr><td colspan='8'><strong>".sprintf(_("The following %s are in your %s %s:"), $uiElements->nomenclatureInst, $uiElements->nomenclatureFed, '<span style="color:green">'.$thefed->name.'</span>')."</strong></td></tr>";
 
             // extract only pending invitations for *this* fed
             $display_pendings = FALSE;
@@ -283,7 +283,7 @@ 
                 // deployment status; need to dive into profiles for this
                 // show happy eyeballs if at least one profile is configured/showtime                    
                 echo "<td>";
-                echo ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_CONFIGURED ? "C" : "" ) . " " . ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_SHOWTIME ? "V" : "" );
+                echo ($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_CONFIGURED ? "C" : "")." ".($idp_instance->maxProfileStatus() >= \core\IdP::PROFILES_SHOWTIME ? "V" : "");
                 echo "</td>";
                 // name; and realm of silverbullet profiles if any
                 // instantiating all profiles is costly, so we only do this if
@@ -297,23 +297,23 @@ 
                     }
                 }
                 echo "<td style='vertical-align:top;'>
-                         <input type='hidden' name='inst' value='" . $index . "'>" . $idp_instance->name . (empty($listOfSilverbulletRealms) ? "" : "<ul><li>" ) . implode("</li><li>", $listOfSilverbulletRealms) . (empty($listOfSilverbulletRealms) ? "" : "</li><ul>" ) . "
+                         <input type='hidden' name='inst' value='" . $index."'>".$idp_instance->name.(empty($listOfSilverbulletRealms) ? "" : "<ul><li>").implode("</li><li>", $listOfSilverbulletRealms).(empty($listOfSilverbulletRealms) ? "" : "</li><ul>")."
                       </td>";
                 // external DB sync, if configured as being necessary
                 if (\config\Master::DB['enforce-external-sync']) {
                     echo "<td style='display: ruby;'>";
                     if ($readonly === FALSE) {
-                        echo "<form method='post' action='inc/manageDBLink.inc.php?inst_id=" . $idp_instance->identifier . "' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
-                                    <button type='submit'>" . _("Manage DB Link") . "</button></form>&nbsp;&nbsp;";
+                        echo "<form method='post' action='inc/manageDBLink.inc.php?inst_id=".$idp_instance->identifier."' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
+                                    <button type='submit'>" . _("Manage DB Link")."</button></form>&nbsp;&nbsp;";
                     }
                     switch ($idp_instance->getExternalDBSyncState()) {
                         case \core\IdP::EXTERNAL_DB_SYNCSTATE_NOTSUBJECTTOSYNCING:
                             break;
                         case \core\IdP::EXTERNAL_DB_SYNCSTATE_SYNCED:
-                            echo "<div class='acceptable'>" . _("Linked") . "</div>";
+                            echo "<div class='acceptable'>"._("Linked")."</div>";
                             break;
                         case \core\IdP::EXTERNAL_DB_SYNCSTATE_NOT_SYNCED:
-                            echo "<div class='notacceptable'>" . _("NOT linked") . "</div>";
+                            echo "<div class='notacceptable'>"._("NOT linked")."</div>";
 
 
                             break;
@@ -326,9 +326,9 @@ 
                 echo "<td style='vertical-align: top;'>";
                 if ($readonly === FALSE) {
                     echo "<div style='white-space: nowrap;'>
-                                  <form method='post' action='inc/manageAdmins.inc.php?inst_id=" . $index . "' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
+                                  <form method='post' action='inc/manageAdmins.inc.php?inst_id=" . $index."' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
                                       <button type='submit'>" .
-                    _("Add/Remove Administrators") . "
+                    _("Add/Remove Administrators")."
                                       </button>
                                   </form>
                                 </div>";
@@ -341,7 +341,7 @@ 
                 echo "<tr>
                             <td colspan='2'>
                                <strong>" .
-                sprintf(_("Pending invitations in the %s:"), $uiElements->nomenclatureFed) . "
+                sprintf(_("Pending invitations in the %s:"), $uiElements->nomenclatureFed)."
                                </strong>
                             </td>
                          </tr>";
@@ -349,16 +349,16 @@ 
                     if (strtoupper($oneinvite['country']) == strtoupper($thefed->tld)) {
                         echo "<tr>
                                     <td>" .
-                        $oneinvite['name'] . "
+                        $oneinvite['name']."
                                     </td>
                                     <td>" .
-                        $oneinvite['mail'] . "
+                        $oneinvite['mail']."
                                     </td>
                                     <td colspan=2>";
                         if ($readonly === FALSE) {
                             echo "<form method='post' action='overview_federation.php' accept-charset='UTF-8'>
-                                <input type='hidden' name='invitation_id' value='" . $oneinvite['token'] . "'/>
-                                <button class='delete' type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_DELETE . "'>" . _("Revoke Invitation") . "</button> "
+                                <input type='hidden' name='invitation_id' value='" . $oneinvite['token']."'/>
+                                <button class='delete' type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_DELETE."'>"._("Revoke Invitation")."</button> "
                             . sprintf(_("(expires %s)"), $oneinvite['expiry'])
                             . "</form>";
                         }

web/admin/inc/manageAdmins.inc.php

Spacing +8 added lines, -8 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();
@@ -82,7 +82,7 @@ 
                 $ownermgmt = new \core\UserManagement();
                 $ownermgmt->addAdminToIdp($my_inst, $_SESSION['user']);
             } else {
-                echo "Fatal Error: you wanted to take control over an " . \config\ConfAssistant::CONSORTIUM['nomenclature_institution'] . ", but are not a " . \config\ConfAssistant::CONSORTIUM['nomenclature_federation'] . " operator!";
+                echo "Fatal Error: you wanted to take control over an ".\config\ConfAssistant::CONSORTIUM['nomenclature_institution'].", but are not a ".\config\ConfAssistant::CONSORTIUM['nomenclature_federation']." operator!";
                 exit(1);
             }
             break;
@@ -118,7 +118,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!"));
@@ -138,7 +138,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!"));
@@ -190,7 +190,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>
@@ -207,10 +207,10 @@ 
 $loggerInstance = new \core\common\Logging();
 $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>";
 }
@@ -232,7 +232,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->nomenclatureInst) . "</button>
+    <button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_TAKECONTROL."'>".sprintf(_("Take control of this %s"), $uiElements->nomenclatureInst)."</button>
 </form>";
     }
 }

web/admin/inc/manageNewInst.inc.php

Spacing +15 added lines, -15 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->nomenclatureInst, $uiElements->nomenclatureFed, $uiElements->nomenclatureInst);
 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->nomenclatureInst, \config\ConfAssistant::CONSORTIUM['display_name'], $uiElements->nomenclatureInst) . "</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->nomenclatureInst, \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->nomenclatureInst, \config\ConfAssistant::CONSORTIUM['display_name'], $uiElements->nomenclatureInst)."</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->nomenclatureInst, \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='" . $v['ID'] . "'>[" . $fed_value['value'] . "] " . $v['name'] . "</option>";
+                    echo "<option id='".$v['contactlist']."' value='".$v['ID']."'>[".$fed_value['value']."] ".$v['name']."</option>";
                 }
             }
 
@@ -98,16 +98,16 @@ 
         ?>
         <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>
                 <select name="participant_type">
-                    <option value="IdPSP" selected><?php printf(_("%s and %s"),$uiElements->nomenclatureInst, $uiElements->nomenclatureHotspot)?></option>
-                    <option value="IdP"><?php printf(_("%s"),$uiElements->nomenclatureInst)?></option>
-                    <option value="SP"><?php printf(_("%s"),$uiElements->nomenclatureHotspot)?></option>
+                    <option value="IdPSP" selected><?php printf(_("%s and %s"), $uiElements->nomenclatureInst, $uiElements->nomenclatureHotspot)?></option>
+                    <option value="IdP"><?php printf(_("%s"), $uiElements->nomenclatureInst)?></option>
+                    <option value="SP"><?php printf(_("%s"), $uiElements->nomenclatureHotspot)?></option>
                 </select>
             </td>
             <td><?php echo $uiElements->nomenclatureFed; ?>

web/admin/inc/displayQRcode.inc.php

Spacing +5 added lines, -5 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();
@@ -38,8 +38,8 @@ 
 $invitationObject = new core\SilverbulletInvitation($validator->token(filter_input(INPUT_POST, 'token')));
 header("Content-Type:text/html;charset=utf-8");
 ?>
-<h1 style='text-align:center;'><?php echo _("Invitation Token QR Code");?></h1>
-<img alt='<?php echo _("Invitation Token QR Code");?>' style='float:none' src='data:image/png;base64,<?php 
+<h1 style='text-align:center;'><?php echo _("Invitation Token QR Code"); ?></h1>
+<img alt='<?php echo _("Invitation Token QR Code"); ?>' style='float:none' src='data:image/png;base64,<?php 
 $size = 10;
 $qrCode = new \chillerlan\QRCode\QRCode(new \chillerlan\QRCode\QROptions([
                     'outputType' => \chillerlan\QRCode\QRCode::OUTPUT_IMAGE_PNG,
@@ -51,5 +51,5 @@ 
 if (empty($rawQr)) {
     throw new Exception("Something went seriously wrong during QR code generation!");
 }
-echo base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, $size));?>'/>
-<p>(<a href='<?php echo $invitationObject->link();?>'><?php echo $invitationObject->link();?>)</a></p>
+echo base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, $size)); ?>'/>
+<p>(<a href='<?php echo $invitationObject->link(); ?>'><?php echo $invitationObject->link(); ?>)</a></p>

web/admin/overview_idp.php

Spacing +31 added lines, -31 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->nomenclatureInst));
@@ -87,10 +87,10 @@ 
     $readonly = \config\Master::DB['INST']['readonly'];
     $profiles_for_this_idp = $my_inst->listProfiles();
     if (count($profiles_for_this_idp) == 0) { // no profiles yet.
-        echo "<h2>" . sprintf(_("There are not yet any profiles for your %s."), $uiElements->nomenclatureInst) . "</h2>";
+        echo "<h2>".sprintf(_("There are not yet any profiles for your %s."), $uiElements->nomenclatureInst)."</h2>";
     }
     if (count($profiles_for_this_idp) > 0) { // no profiles yet.
-        echo "<h2>" . sprintf(_("Profiles for this %s"), $uiElements->nomenclatureInst) . "</h2>";
+        echo "<h2>".sprintf(_("Profiles for this %s"), $uiElements->nomenclatureInst)."</h2>";
     }
 // if there is one profile and it is of type Silver Bullet, display a very
 // simple widget with just a "Manage" button
@@ -116,7 +116,7 @@ 
                             echo _("Information needed!");
                             echo "<ul style='margin:1px'>";
                             foreach ($completeness as $missing_attrib) {
-                                echo "<li>" . $uiElements->displayName($missing_attrib) . "</li>";
+                                echo "<li>".$uiElements->displayName($missing_attrib)."</li>";
                             }
                             echo "</ul>";
                             echo "</div>";
@@ -130,7 +130,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
                         }
@@ -139,12 +139,12 @@ 
 
                     <div style='width:20px;'></div>
                     <div style='display: table-cell; min-width:200px;'>
-                        <p><strong><?php $tablecaption = _("User Downloads"); echo $tablecaption;?></strong></p>
+                        <p><strong><?php $tablecaption = _("User Downloads"); echo $tablecaption; ?></strong></p>
                         <table>
-                            <caption><?php echo $tablecaption;?></caption>
+                            <caption><?php echo $tablecaption; ?></caption>
                             <tr>
-                                <th scope='col'><?php echo _("Device");?></th>
-                                <th scope='col'><?php echo _("Count");?></th>
+                                <th scope='col'><?php echo _("Device"); ?></th>
+                                <th scope='col'><?php echo _("Count"); ?></th>
                             </tr>
                                 <?php
                                 $stats = $profile_list->getUserDownloadStats();
@@ -169,21 +169,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>";
                         }
@@ -195,12 +195,12 @@ 
                     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/>";
                 }
-                $buffer_headline = "<div style='padding-bottom:20px;'><h2 style='overflow:auto; display:inline; padding-bottom: 10px;'>" . sprintf(_("Profile: %s"), $profile_name) . "</h2>";
+                $buffer_headline = "<div style='padding-bottom:20px;'><h2 style='overflow:auto; display:inline; padding-bottom: 10px;'>".sprintf(_("Profile: %s"), $profile_name)."</h2>";
 
                 $buffer_headline .= "<span style='float:right;'>";
                 $readiness = $profile_list->readinessLevel();
@@ -232,18 +232,18 @@ 
                     if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == "LOCAL") {
                         $diagUrl = "../diag/";
                     } else {
-                        $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] . "/diag/";
+                        $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS']."/diag/";
                     }
-                    echo "<form action='" . $diagUrl . "action_realmcheck.php?inst_id=$my_inst->identifier&amp;profile_id=$profile_list->identifier' method='post' accept-charset='UTF-8'>
+                    echo "<form action='".$diagUrl."action_realmcheck.php?inst_id=$my_inst->identifier&amp;profile_id=$profile_list->identifier' method='post' accept-charset='UTF-8'>
                               <input type='hidden' name='comefrom' id='comefrom-$profilecount' value='$link'/>
-                              <button type='submit' name='profile_action' value='check' " . ($has_realm ? "" : "disabled='disabled' title='" . _("The realm can only be checked if you configure the realm!") . "'") . ">
-                                  " . _("Check realm reachability") . "
+                              <button type='submit' name='profile_action' value='check' ".($has_realm ? "" : "disabled='disabled' title='"._("The realm can only be checked if you configure the realm!")."'").">
+                                  " . _("Check realm reachability")."
                               </button>
                           </form>";
                 }
                 echo "<form action='overview_installers.php?inst_id=$my_inst->identifier&amp;profile_id=$profile_list->identifier' method='post' accept-charset='UTF-8'>
-                              <button type='submit' name='profile_action' value='check' " . ($has_eaptypes ? "" : "disabled='disabled'  title='" . _("You have not fully configured any supported EAP types!") . "'") . ">
-                                  " . _("Installer Fine-Tuning and Download") . "
+                              <button type='submit' name='profile_action' value='check' ".($has_eaptypes ? "" : "disabled='disabled'  title='"._("You have not fully configured any supported EAP types!")."'").">
+                                  " . _("Installer Fine-Tuning and Download")."
                               </button>
                  </form>
                    </div>";
@@ -252,11 +252,11 @@ 
                     echo "        <div class='buttongroupprofilebox' style='clear:both;'>
                           <form action='edit_profile.php?inst_id=$my_inst->identifier&amp;profile_id=$profile_list->identifier' method='post' accept-charset='UTF-8'>
                                <hr/>
-                               <button type='submit' name='profile_action' value='edit'>" . _("Edit") . "</button>
+                               <button type='submit' name='profile_action' value='edit'>"._("Edit")."</button>
                           </form>
                           <form action='edit_profile_result.php?inst_id=$my_inst->identifier&amp;profile_id=$profile_list->identifier' method='post' accept-charset='UTF-8'>
-                               <button class='delete' type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_DELETE . "' onclick=\"return confirm('" . sprintf(_("Do you really want to delete the profile %s?"), $profile_name) . "')\">
-                                   " . _("Delete") . "
+                               <button class='delete' type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_DELETE."' onclick=\"return confirm('".sprintf(_("Do you really want to delete the profile %s?"), $profile_name)."')\">
+                                   " . _("Delete")."
                                </button>
                            </form>
                       </div>";
@@ -265,10 +265,10 @@ 
 // dummy width to keep a little distance
                 echo "<div style='width:20px;'></div>";
                 if ($readiness == core\AbstractProfile::READINESS_LEVEL_SHOWTIME) {
-                    $idpLevelUrl = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier;
-                    echo "<div style='display: table-cell; text-align:center;'><p><strong>" . _("User Download Link") . "</strong></p>";
-                    $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;
+                    echo "<div style='display: table-cell; text-align:center;'><p><strong>"._("User Download Link")."</strong></p>";
+                    $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,
@@ -280,16 +280,16 @@ 
                     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>";
                     echo "</div>";
                     // dummy width to keep a little distance
                     echo "<div style='width:20px;'></div>";
-                    echo "<div style='display: table-cell; min-width:200px;'><p><strong>" . _("User Downloads") . "</strong></p><table>";
+                    echo "<div style='display: table-cell; min-width:200px;'><p><strong>"._("User Downloads")."</strong></p><table>";
                     $stats = $profile_list->getUserDownloadStats();
                     foreach ($stats as $dev => $count) {
                         echo "<tr><td><strong>$dev</strong></td><td>$count</td></tr>";

web/skins/modern/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>

web/skins/example/accountstatus.php

Spacing +5 added lines, -5 removed lines

@@ -16,12 +16,12 @@
  * License: see the web/copyright.inc.php file in the file structure or
  *          <base_url>/copyright.php after deploying the software
  */?>
-<h1>Example Skin (Pick-Up and Status page for <?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>)</h1>
-<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","consortium_logo.png");?>"/>
+<h1>Example Skin (Pick-Up and Status page for <?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>)</h1>
+<img alt='Consortium logo' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "consortium_logo.png"); ?>"/>
 <p>This skin is much more sober and less bloated than the default one. As it happens, it also doesn't do anything.</p>
 <p>But at least it goes to show that it's possible to include custom images/CSS/external software using findResourceUrl(..., $filename):
-<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","custom.png");?>"/>
-<p>For <?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>, this page can make use of the request status info we have collected prior to invocation of the skinned page:</p>
+<img alt='Custom image' src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "custom.png"); ?>"/>
+<p>For <?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>, this page can make use of the request status info we have collected prior to invocation of the skinned page:</p>
 <pre>
-    <?php print_r($statusInfo);?>
+    <?php print_r($statusInfo); ?>
 </pre>