GEANT / CAT

web/admin/overview_user.php

Spacing +18 added lines, -18 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();
@@ -51,7 +51,7 @@ 
 <?php echo $uiElements->infoblock($user->getAttributes(), "user", "User"); ?>
             <tr>
                 <td>
-<?php echo "" . _("Unique Identifier") ?>
+<?php echo ""._("Unique Identifier") ?>
                 </td>
                 <td>
                 </td>
@@ -64,14 +64,14 @@ 
     <div>
         <?php
         if (CONFIG['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>
@@ -83,7 +83,7 @@ 
         if (CONFIG['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 = "";
     }
@@ -92,7 +92,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->nomenclatureInst) . "</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->nomenclatureInst)."</h2>";
         $instlist = [];
         $my_idps = [];
         $myFeds = [];
@@ -114,10 +114,10 @@ 
             $country[$key] = $row['country'];
             $name[$key] = $row['name'];
         }
-        echo "<tr><th>" . sprintf(_("%s Name"), $uiElements->nomenclatureInst) . "</th><th>" . sprintf(_("Other admins of this %s"), $uiElements->nomenclatureInst) . "</th><th>" . ( CONFIG['DB']['INST']['readonly'] === FALSE ? _("Administrator Management") : "") . "</th></tr>";
+        echo "<tr><th>".sprintf(_("%s Name"), $uiElements->nomenclatureInst)."</th><th>".sprintf(_("Other admins of this %s"), $uiElements->nomenclatureInst)."</th><th>".(CONFIG['DB']['INST']['readonly'] === FALSE ? _("Administrator Management") : "")."</th></tr>";
         foreach ($myFeds as $fed_id => $fed_name) {
             /// nomenclature 'fed', fed name, nomenclature 'inst'
-            echo "<tr><td colspan='3'><strong>" . sprintf(_("%s %s: %s list"), $uiElements->nomenclatureFed, $fed_name, $uiElements->nomenclatureInst) . "</strong></td></tr>";
+            echo "<tr><td colspan='3'><strong>".sprintf(_("%s %s: %s list"), $uiElements->nomenclatureFed, $fed_name, $uiElements->nomenclatureInst)."</strong></td></tr>";
 
             $fed_idps = $my_idps[$fed_id];
             asort($fed_idps);
@@ -125,7 +125,7 @@ 
                 $oneinst = $instlist[$index];
                 $the_inst = $oneinst['object'];
 
-                echo "<tr><td><a href='overview_idp.php?inst_id=$the_inst->identifier'>" . $oneinst['name'] . "</a></td><td>";
+                echo "<tr><td><a href='overview_idp.php?inst_id=$the_inst->identifier'>".$oneinst['name']."</a></td><td>";
                 echo "<input type='hidden' name='inst' value='$the_inst->identifier'>";
                 $admins = $the_inst->listOwners();
                 $blessedUser = FALSE;
@@ -134,7 +134,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
@@ -146,31 +146,31 @@ 
                 }
                 $otherAdminCount = count($admins); // only the unnamed remain
                 if ($otherAdminCount > 0) {
-                    echo sprintf(ngettext("%d other user", "%d other users", $otherAdminCount),$otherAdminCount);
+                    echo sprintf(ngettext("%d other user", "%d other users", $otherAdminCount), $otherAdminCount);
                 }
                 echo "</td><td>";
                 $isAdminMgmtAvailable = FALSE;
                 if ($blessedUser && CONFIG['DB']['INST']['readonly'] === FALSE) {
                     $isAdminMgmtAvailable = TRUE;
                 }
-                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' ". ($isAdminMgmtAvailable ? "" : "disabled") .">" . _("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' ".($isAdminMgmtAvailable ? "" : "disabled").">"._("Add/Remove Administrators")."</button></form></div>";
                 echo "</td></tr>";
             }
         }
         echo "</table>";
     } 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['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->nomenclatureInst) . "</p>";
+            echo "<p>".sprintf(_("Please ask your %s administrator to invite you to become an %s administrator."), $uiElements->nomenclatureFed, $uiElements->nomenclatureInst)."</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->nomenclatureInst) .
+            sprintf(_("Did you receive an invitation token to manage an %s? Please paste it here:"), $uiElements->nomenclatureInst).
             "        <input type='text' id='token' name='token'/>
                     <button type='submit'>" .
-            _("Go!") . "
+            _("Go!")."
                     </button>
                 </form>
              </div>";
@@ -179,7 +179,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->nomenclatureInst) . "
+            sprintf(_("New %s Registration"), $uiElements->nomenclatureInst)."
             </button>
         </form>
         </div>";