GEANT / CAT

web/skins/modern/Divs.php

Indentation +5 added lines, -5 removed lines

@@ -124,7 +124,7 @@ 
     public function divSilverbullet() {
         $retval = "
 <div id='silverbullet'>"
-               .$this->Gui->textTemplates->templates[user\SB_GO_AWAY] .
+                .$this->Gui->textTemplates->templates[user\SB_GO_AWAY] .
                 "</div>
     ";
         return $retval;
@@ -293,8 +293,8 @@ 
                 }
 
                 $retval .= "<td><button name='$d' class='other_os' id='$d'>".$D['display']."</button>"
-                       ."</td>"
-                       ."<td><button name='$d' class='more_info_b' id='info_b_$d'>i</button></td></tr>\n";
+                        ."</td>"
+                        ."<td><button name='$d' class='more_info_b' id='info_b_$d'>i</button></td></tr>\n";
                 $deviceIndex++;
             }
             $retval .= "</tbody>";
@@ -341,11 +341,11 @@ 
         <tr>
             <td>" .
                 $this->Gui->catVersion
-               ."
+                ."
             </td>";
 
         if (!empty(\config\Master::APPEARANCE['privacy_notice_url'])) {
-              $retval .= "<td>".$this->Gui->catCopyrifhtAndLicense."<br><span id='privacy_notice_cons'>".\config\ConfAssistant::CONSORTIUM['display_name']."</span> <a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), '')."</a></td>";
+                $retval .= "<td>".$this->Gui->catCopyrifhtAndLicense."<br><span id='privacy_notice_cons'>".\config\ConfAssistant::CONSORTIUM['display_name']."</span> <a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), '')."</a></td>";
         }
         $retval .= "<td>";
         if (\config\ConfAssistant::CONSORTIUM['name'] == "eduroam" && isset(\config\ConfAssistant::CONSORTIUM['deployment-voodoo']) && \config\ConfAssistant::CONSORTIUM['deployment-voodoo'] == "Operations Team") {

web/lib/admin/OptionDisplay.php

Indentation +1 added lines, -1 removed lines

@@ -218,7 +218,7 @@
                         }
                     }
                 }
-                 break;
+                    break;
             default:
                 break;
         }

config/Master-template.php

Indentation +2 added lines, -3 removed lines

@@ -150,7 +150,6 @@ 
          *    mails, just configure the signing cert with these parameters. All must
          *    be non-NULL for signing to happen. If you don't need a keypass, make 
          *    it an empty string instead.
-
          * @var array
          */
         const MAILSETTINGS = [// we always use Submission
@@ -163,8 +162,8 @@ 
             'keyfilename' => NULL,
             'keypass' => NULL,
             'notify_nro' => false, // normally should be set to TRUE abd causes 
-                                   // notifications being sent to NRO admins when
-                                   // important changes are made
+                                    // notifications being sent to NRO admins when
+                                    // important changes are made
         ];
         /**
          * List of all supported languages in CAT. Comment some if you want to disable them

web/diag/action_realmcheck.php

Indentation +16 added lines, -16 removed lines

@@ -578,9 +578,9 @@ 
                     $naptr = $rfc7585suite->relevantNAPTR();
                     if ($naptr == \core\diag\RADIUSTests::RETVAL_NOTCONFIGURED) {
                         if ($dynType == "") {
-                        	echo "<tr><td>" . _("Dynamic discovery test is not configured") . "</td><td>";
+                            echo "<tr><td>" . _("Dynamic discovery test is not configured") . "</td><td>";
                         } else {
-                        	echo "<tr><td>" . _("OpenRoaming connectivity test is not configured") . "</td><td>";
+                            echo "<tr><td>" . _("OpenRoaming connectivity test is not configured") . "</td><td>";
                         }
                     } else {
                         echo "<table>";
@@ -698,7 +698,7 @@ 
                         echo "}
               </script>";
                         } else {
-                   echo ' 
+                    echo ' 
               function run_openroaming() {
                  running_ajax_openroaming = 0;
                  $("#main_openroaming_ico").attr("src",icon_loading);
@@ -720,10 +720,10 @@ 
                         } 
                     }
                     if ($dynType == '') {
-                         $naptrs[0] = $naptr;
-                     } else {
-                         $naptrs[1] = $naptr;
-                     }
+                            $naptrs[0] = $naptr;
+                        } else {
+                            $naptrs[1] = $naptr;
+                        }
                 }
                     echo "<strong>" . _("Static connectivity tests") . "</strong>
          <table><tr>
@@ -736,7 +736,7 @@ 
          </tr></table>";
                     }
                     if (isset($orrealm) && count($orrealm) && ($naptrs[1] > 0)) {
-                      echo "<hr><strong>" . _("OpenRoaming connectivity tests") . "</strong>
+                        echo "<hr><strong>" . _("OpenRoaming connectivity tests") . "</strong>
          <table><tr>
          <td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='main_openroaming_ico' class='icon'></td><td id='main_openroaming_result' style='display:none'>&nbsp;</td>
          </tr></table>";
@@ -774,12 +774,12 @@ 
             <?php
             for ($i=3; $i<5; $i++) {
                 if ($i == 3 && $naptrs[0] <= 0) {
-                   continue;
+                    continue;
                 }
                 if ($i == 4) {
-                   if ((count($orrealm) == 0) || ($naptrs[1] <= 0)) {
-                       continue;
-                   }
+                    if ((count($orrealm) == 0) || ($naptrs[1] <= 0)) {
+                        continue;
+                    }
                 }
                 if ($i == 3) {
                     $rfc7585suite = $dnsChecks;
@@ -796,16 +796,16 @@ 
                     echo "_tests'><fieldset class='option_container'>
                 <legend><strong>";
                     if ($i==3) {
-                     echo _("DYNAMIC connectivity tests");
+                        echo _("DYNAMIC connectivity tests");
                     } else {
-                     echo _("OpenRoaming connectivity tests");
+                        echo _("OpenRoaming connectivity tests");
                     }
                     echo  "</strong></legend>";
                     $prefix1 = 'dynamic';
                     $prefix2 = '';
                     if ($i == 4) {
-                    	$prefix1 = 'openroaming';
-                    	$prefix2 = $prefix1;
+                        $prefix1 = 'openroaming';
+                        $prefix2 = $prefix1;
                     }
                     $resultstoprint = [];
                     if (count($rfc7585suite->NAPTR_hostname_records) > 0) {

core/ProfileSilverbullet.php

Indentation +1 added lines, -1 removed lines

@@ -361,7 +361,7 @@
                 . "     OR"
                 . "  ( u.id = c.silverbullet_user_id AND c.expiry >= NOW() AND c.revocation_status != 'REVOKED' ) "
                 . ")", "i", $this->identifier);
-      // SELECT -> resource, not boolean
+        // SELECT -> resource, not boolean
         while ($res = mysqli_fetch_object(/** @scrutinizer ignore-type */ $users)) {
             $userCount[$res->usercount] = "ACTIVE";
         }

web/admin/sort_profiles.php

Indentation +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
     foreach ($D as $id=>$priority) {
         echo "<input type='hidden' class='profiles' id='profile-$id' name='profile-$id' value='$priority'>";
     }
-  ?>
+    ?>
 </form>
 <?php echo $deco->footer();
 

web/admin/edit_profile.php

Indentation +3 added lines, -3 removed lines

@@ -181,9 +181,9 @@ 
         </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    
@@ -330,7 +330,7 @@ 
 
     <?php
     echo $wizard->displayHelp("redirect");
-     ?>
+        ?>
     <p>
 
         <?php

web/lib/admin/Wizard.php

Indentation +9 added lines, -9 removed lines

@@ -89,13 +89,13 @@ 
                 $ssidlist .= ", '<strong>" . $ssid . "</strong>'";
             }
             $ssidlist = substr($ssidlist, 2);
-             $h .= sprintf(ngettext("We will always configure this SSID for WPA2/AES: %s.", "We will always configure these SSIDs for WPA2/AES: %s.", count(\config\ConfAssistant::CONSORTIUM['ssid'])), $ssidlist);
-             $h .= "<br/>" . sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $this->displayName("media:SSID"));
+                $h .= sprintf(ngettext("We will always configure this SSID for WPA2/AES: %s.", "We will always configure these SSIDs for WPA2/AES: %s.", count(\config\ConfAssistant::CONSORTIUM['ssid'])), $ssidlist);
+                $h .= "<br/>" . sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $this->displayName("media:SSID"));
         } else {
-             $h .=  _("Please configure which SSIDs should be configured in the installers.");
+                $h .=  _("Please configure which SSIDs should be configured in the installers.");
         }
-         $h .= " " . _("By default, we will only configure the SSIDs with WPA2/AES encryption. By using the '(with WPA/TKIP)' option you can specify that we should include legacy support for WPA/TKIP where possible.");
-         $h .= "</li>";
+            $h .= " " . _("By default, we will only configure the SSIDs with WPA2/AES encryption. By using the '(with WPA/TKIP)' option you can specify that we should include legacy support for WPA/TKIP where possible.");
+            $h .= "</li>";
 
         $h .= "<li>";
         $h .= "<strong>" . ( count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>";
@@ -135,19 +135,19 @@ 
             "<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>".
             "<p>" . _("You can also tell us your RADIUS realm. ");
             if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] !== NULL) {
-               $h .= sprintf(_("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']);
+                $h .= sprintf(_("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']);
             }
         $h .= _("It is required to enter the realm name if you want to support anonymous outer identities (see below).") . "</p>";
         $this->helpMessage['profile'] = $h;
         
         // REALM
         $h = "<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>".
-          "<p>"._("On some platforms, the installers can suggest username endings and/or verify the user input to contain the realm suffix.")."</p>".
-          "<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>"._("On some platforms, the installers can suggest username endings and/or verify the user input to contain the realm suffix.")."</p>".
+            "<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>";
         $this->helpMessage['realm'] = $h;
         
         // REDIRECT
-         $h ="<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>";
+            $h ="<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>";
         $this->helpMessage['redirect'] = $h;
         
         // EAP

web/admin/inc/sendZip.inc.php

Indentation +21 added lines, -21 removed lines

@@ -20,11 +20,11 @@ 
  *          <base_url>/copyright.php after deploying the software
  * */
  
- /**
- * This file is used to pack and send RADSEC credentials.
- * 
- * @author Maja Gorecka-Wolniewicz <mgw@umk.pl>
- */
+    /**
+     * This file is used to pack and send RADSEC credentials.
+     * 
+     * @author Maja Gorecka-Wolniewicz <mgw@umk.pl>
+     */
 ?>
 <?php
 
@@ -36,26 +36,26 @@ 
 if ($editMode == 'fullaccess') {
     $hotspotProfiles = $my_inst->listDeployments();
     if (count($hotspotProfiles) > 0) { // no profiles yet.
-       foreach ($hotspotProfiles as $counter => $deploymentObject) {
-           if ($deploymentObject->institution == $_GET['inst_id'] && $deploymentObject->identifier == $_GET['dep_id']) {
-               $cacert = file_get_contents(ROOT .  "/config/ManagedSPCerts/eduroamSP-CA.pem");
-               $zip = new ZipArchive;
-               $zip->open(ROOT . '/var/tmp/' . $deploymentObject->identifier.'.zip', ZipArchive::CREATE);
-               if ($deploymentObject->radsec_priv != '') {
+        foreach ($hotspotProfiles as $counter => $deploymentObject) {
+            if ($deploymentObject->institution == $_GET['inst_id'] && $deploymentObject->identifier == $_GET['dep_id']) {
+                $cacert = file_get_contents(ROOT .  "/config/ManagedSPCerts/eduroamSP-CA.pem");
+                $zip = new ZipArchive;
+                $zip->open(ROOT . '/var/tmp/' . $deploymentObject->identifier.'.zip', ZipArchive::CREATE);
+                if ($deploymentObject->radsec_priv != '') {
                     $zip->addFromString('priv.key', $deploymentObject->radsec_priv);
-               }
-               $zip->addFromString('cert.pem', $deploymentObject->radsec_cert);
-               $zip->addFromString('ca.pem', $cacert);
-               $zip->close();
-               $data = file_get_contents(ROOT . '/var/tmp/' . $deploymentObject->identifier.'.zip');
-               unlink(ROOT . '/var/tmp/' . $deploymentObject->identifier.'.zip');
-               if ($data !== FALSE) {
+                }
+                $zip->addFromString('cert.pem', $deploymentObject->radsec_cert);
+                $zip->addFromString('ca.pem', $cacert);
+                $zip->close();
+                $data = file_get_contents(ROOT . '/var/tmp/' . $deploymentObject->identifier.'.zip');
+                unlink(ROOT . '/var/tmp/' . $deploymentObject->identifier.'.zip');
+                if ($data !== FALSE) {
                     header('Content-Type: application/zip');
                     header("Content-Disposition: attachment; filename=\"full_".$deploymentObject->identifier.".zip\"");
                     header("Content-Transfer-Encoding: binary");
                     echo $data;
-               }
-           }
-       }
+                }
+            }
+        }
     }
 }
\ No newline at end of file