GEANT / CAT

core/Federation.php

Indentation +4 added lines, -4 removed lines

@@ -367,7 +367,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");
@@ -434,7 +434,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', ?)";
@@ -494,7 +494,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);
@@ -579,7 +579,7 @@ 
                 'country' => strtoupper($idp->federation),
                 'instance' => $idp,
                 'realms' => $idpQuery->realms]
-                 ;
+                    ;
             $returnarray[$idp->identifier] = $idpInfo;
         }
         if ($activeOnly != 0) { // we're only doing this once.

web/admin/overview_federation.php

Indentation +13 added lines, -13 removed lines

@@ -493,17 +493,17 @@ 
                 }
                 echo "<td class='inst_td'>
                          <input type='hidden' name='inst' value='" 
-                       . $index."'>"
-                       . "<span style='display:none' class='inst_name'>".$my_idp."</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>") 
-                       . implode("</li><li>", $listOfSilverbulletRealms) 
-                       . (empty($listOfSilverbulletRealms) ? "" : "</li><ul>")
-                       . "</td>";
+                        . $index."'>"
+                        . "<span style='display:none' class='inst_name'>".$my_idp."</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>") 
+                        . implode("</li><li>", $listOfSilverbulletRealms) 
+                        . (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') {
@@ -560,8 +560,8 @@ 
                             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> "
-                           . sprintf(_("(expires %s)"), $oneinvite['expiry'])
-                           . "</form>";
+                            . sprintf(_("(expires %s)"), $oneinvite['expiry'])
+                            . "</form>";
                         }
                         echo "      </td>";                          
                         echo "         </tr>";