GEANT / CAT

web/admin/overview_federation.php

Spacing +12 added lines, -12 removed lines

@@ -109,7 +109,7 @@ 
     <?php
     foreach ($cat->printCountryList(1) as $country => $name) {
         $selected = '';
-        if ($country == strtoupper($fed_id) ) {
+        if ($country == strtoupper($fed_id)) {
             $selected = 'selected';
         }
     echo "<option value='$country' $selected>$name</option>\n";
@@ -182,7 +182,7 @@ 
                 ?>
             </table>
         </div>
-        <?php if(\config\Master::FUNCTIONALITY_FLAGS['SINGLE_SERVICE'] !== 'MSP') { ?>
+        <?php if (\config\Master::FUNCTIONALITY_FLAGS['SINGLE_SERVICE'] !== 'MSP') { ?>
         <div class='infobox'>
             <h2>
                 <?php $tablecaption3 = sprintf(_("%s Statistics: %s"), $uiElements->nomenclatureFed, $thefed->name); echo $tablecaption3; ?>
@@ -328,7 +328,7 @@ 
             ?>
         <tr>
             <th scope='col'><?php echo sprintf(_("%s Name"), $uiElements->nomenclatureParticipant); ?></th>
-            <?php if(\config\Master::FUNCTIONALITY_FLAGS['SINGLE_SERVICE'] !== 'MSP') { ?>
+            <?php if (\config\Master::FUNCTIONALITY_FLAGS['SINGLE_SERVICE'] !== 'MSP') { ?>
             <th scope='col'><?php echo _("Status") ?></th>
             <th scope='col'><?php echo $OpenRoamingSymbol ?></th>
             <th scope='col'><?php echo _("Cert"); ?></th>
@@ -351,14 +351,14 @@ 
         <?php
             /// nomenclature for 'federation', federation name, nomenclature for 'inst'
             echo "<tbody class='fedlist'>";
-            echo "<tr><td colspan='1'><strong>". _("Quick search:")." </strong><input style='background:#eeeeee;' type='text' id='qsearch_".$fedId."'></td>";
-            if(\config\Master::FUNCTIONALITY_FLAGS['SINGLE_SERVICE'] !== 'MSP') {
+            echo "<tr><td colspan='1'><strong>"._("Quick search:")." </strong><input style='background:#eeeeee;' type='text' id='qsearch_".$fedId."'></td>";
+            if (\config\Master::FUNCTIONALITY_FLAGS['SINGLE_SERVICE'] !== 'MSP') {
                 echo "<td style='border-bottom-style: dotted;border-bottom-width: 1px;'><input type='checkbox' name='profilecheck' id='profile_ck_".$fedId."'></td>";
                 echo "<td style='border-bottom-style: dotted;border-bottom-width: 1px;'><input type='checkbox' name='orcheck' id='or_ck_".$fedId."'></td>";
                 echo "<td style='border-bottom-style: dotted;border-bottom-width: 1px;'><input type='checkbox' name='brokencert' id='brokencert_ck_".$fedId."'></td>";
             }
             echo "<td style='border-bottom-style: dotted;border-bottom-width: 1px;'><input type='checkbox' name='unlinked' id='unlinked_ck_".$fedId."'></td>";
-            if($hideWarnings) {
+            if ($hideWarnings) {
                 $adminCheckbox = '&nbsp;';
             } else {
                 $adminCheckbox = "<input type='checkbox' name='adminproblem' id='adminproblem_ck_".$fedId."'>";
@@ -467,7 +467,7 @@ 
                     
                 $adminClass = 'adminok';
                 $adminIcon = '<span style="padding-left:20px"></span>';
-                if(!$hideWarnings) {
+                if (!$hideWarnings) {
                     if (!isset($thefed->adminLogins[$index])) {
                         $adminIcon = $uiElements->catIcon($uiElements->iconData('ADMINS_MISSING'));
                         $adminClass = 'adminproblem';
@@ -495,18 +495,18 @@ 
                          <input type='hidden' name='inst' value='" 
                        . $index."'>"
                        . "<span style='display:none' class='inst_name'>".$my_idp."</span>"
-                       . "<span>". $idp_instance->name."</span>"
+                       . "<span>".$idp_instance->name."</span>"
                        . " (<a href='overview_org.php?inst_id="
                        . $idp_instance->identifier."'>" 
                        . (in_array($index, $userIdps) ? _("manage") : _("view"))
                        . "</a>)"
-                       . (empty($listOfSilverbulletRealms) ? "" : "<ul><li>" ) 
+                       . (empty($listOfSilverbulletRealms) ? "" : "<ul><li>") 
                        . implode("</li><li>", $listOfSilverbulletRealms) 
-                       . (empty($listOfSilverbulletRealms) ? "" : "</li><ul>" )
+                       . (empty($listOfSilverbulletRealms) ? "" : "</li><ul>")
                        . "</td>";
                 // deployment status; need to dive into profiles for this
                 // show happy eyeballs if at least one profile is configured/showtime     
-                if(\config\Master::FUNCTIONALITY_FLAGS['SINGLE_SERVICE'] !== 'MSP') {
+                if (\config\Master::FUNCTIONALITY_FLAGS['SINGLE_SERVICE'] !== 'MSP') {
                     echo  "<td>$profileIcon</td>";
                     echo "<td style='text-align: center'>$orIcon</td>";
                     echo "<td>$certIcon</td>";
@@ -528,7 +528,7 @@ 
                 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'>
-                                      <button type='submit' style='vertical-align:middle'>" .$adminIcon."&nbsp;&nbsp;" .
+                                      <button type='submit' style='vertical-align:middle'>" .$adminIcon."&nbsp;&nbsp;".
                     _("Add/Remove Administrators")."
                                       </button>
                                   </form>

core/Federation.php

Indentation +6 added lines, -6 removed lines

@@ -374,7 +374,7 @@ 
         if (\config\Master::MAILSETTINGS['notify_nro']) {
             foreach ($admins as $id) {
                 $user = new User($id);
-                 /// organisation
+                    /// organisation
                 $retval = $user->sendMailToUser(sprintf(_("%s in your federation was created"), common\Entity::$nomenclature_participant), $message);
                 if ($retval === FALSE) {
                     $this->loggerInstance->debug(2, "Mail to federation admin was NOT sent!\n");
@@ -441,7 +441,7 @@ 
         $newReq = new CertificationAuthorityEduPkiServer();
         $reqserial = $newReq->sendRequestToCa($csr, $revocationPin, $expiryDays);
         if ($reqserial > 0) {
-             $this->loggerInstance->writeAudit($user, "NEW", "Certificate request - NRO: ".$this->tld." - serial: ".$reqserial." - subject: ".$csr['SUBJECT']);
+                $this->loggerInstance->writeAudit($user, "NEW", "Certificate request - NRO: ".$this->tld." - serial: ".$reqserial." - subject: ".$csr['SUBJECT']);
             $reqQuery = "INSERT INTO federation_servercerts "
                 ."(federation_id, ca_name, request_serial, distinguished_name, status, revocation_pin) "
                 ."VALUES (?, 'eduPKI', ?, ?, 'REQUESTED', ?)";
@@ -501,7 +501,7 @@ 
         $result = $this->databaseHandle->exec($query);
         $rows = $result->fetch_all();
         foreach ($rows as $row) {
-           $activeProfiles[] = $row[0];
+            $activeProfiles[] = $row[0];
         }
         $query = "SELECT institution.inst_id AS inst_id, profile.profile_id AS profile_id, profile_option.option_value AS cert FROM profile_option JOIN profile ON profile_option.profile_id=profile.profile_id JOIN institution ON profile.inst_id=institution.inst_id WHERE profile_option.option_name='eap:ca_file' and institution.country='".$this->tld."'";        
         $result = $this->databaseHandle->exec($query);
@@ -586,7 +586,7 @@ 
                 'country' => strtoupper($idp->federation),
                 'instance' => $idp,
                 'realms' => $idpQuery->realms]
-                 ;
+                    ;
             $returnarray[$idp->identifier] = $idpInfo;
         }
         if ($activeOnly != 0) { // we're only doing this once.
@@ -728,8 +728,8 @@ 
         return ["CAT" => $candidatesCat, "EXTERNAL" => $candidatesExternalDb, "FEDERATION" => $country];
     }
 /**
- * TMW
- */    
+     * TMW
+     */    
     public function loadAdminsLogins() {
         $returnarray = [];
         $inactivityOverride = $this->getAttributes('fed:max-inactivity');

Spacing +2 added lines, -2 removed lines

@@ -740,7 +740,7 @@ 
             if ($inactivityOverride == []) {
                 $inactivityTimestamp = time() - \config\ConfAssistant::ADMIN_LOGINS['allowed_inactivity_days'];
             } else {
-                $inactivityTimestamp = time() - $inactivityOverride[0]['value']*24*3600;
+                $inactivityTimestamp = time() - $inactivityOverride[0]['value'] * 24 * 3600;
             }
             // $active shows the time difference between the moment when a login thime would be considered as inactive
             // and the start of the recording system. If this is negative then we we cannot tell that someone who
@@ -765,7 +765,7 @@ 
                 $this->adminLogins[$idp] = 1;
                 continue;
             }
-            if (strtotime($adminLoginQuery->last_login) <  $inactivityTimestamp) {
+            if (strtotime($adminLoginQuery->last_login) < $inactivityTimestamp) {
                 $this->adminLogins[$idp] = 1;
                 continue;
             }