GEANT / CAT

config/_config.php

Indentation +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@
 /**
  * 
  */
-  $root = dirname(dirname(__FILE__));
-  include($root."/config/config.php");
-  set_include_path(get_include_path() . PATH_SEPARATOR . "$root/core" . PATH_SEPARATOR . "$root");
+    $root = dirname(dirname(__FILE__));
+    include($root."/config/config.php");
+    set_include_path(get_include_path() . PATH_SEPARATOR . "$root/core" . PATH_SEPARATOR . "$root");
 ?>

config/config-template.php

Indentation +37 added lines, -37 removed lines

@@ -141,13 +141,13 @@ 
     ];
 
     /**
-      * Configuration for GeoIP2 
-      * Beware, the legacy version does not really work with IPv6 addresses
-      * version: set to 2 if you wish to use GeoIP2, to 1 for the legacy version or set to 0 to turn off geolocation service
-      * geoip2-path-to-autoloader: points to the GeoIP2 autoloader 
-      * geoip2-path-to-db: points to the GeoIP2 city database
-      * @var array
-      */
+     * Configuration for GeoIP2 
+     * Beware, the legacy version does not really work with IPv6 addresses
+     * version: set to 2 if you wish to use GeoIP2, to 1 for the legacy version or set to 0 to turn off geolocation service
+     * geoip2-path-to-autoloader: points to the GeoIP2 autoloader 
+     * geoip2-path-to-db: points to the GeoIP2 city database
+     * @var array
+     */
       
     public static $GEOIP = [
         'version' => 0,
@@ -174,21 +174,21 @@ 
      * @var array
      */
     public static $LANGUAGES = [
-      'ca' => ['display' => 'Català',      'locale' => 'ca_ES.utf8'],
-      'de' => ['display' => 'Deutsch',     'locale' => 'de_DE.utf8'],
-      'en' => ['display' => 'English(GB)', 'locale' => 'en_GB.utf8'],
-      'es' => ['display' => 'Español',     'locale' => 'es_ES.utf8'],
-      'gl' => ['display' => 'Galego',      'locale' => 'gl_ES.utf8'],
-      'hr' => ['display' => 'Hrvatski',    'locale' => 'hr_HR.utf8'],
-      'it' => ['display' => 'Italiano',    'locale' => 'it_IT.utf8'],
-      'nb' => ['display' => 'Norsk',       'locale' => 'nb_NO.utf8'],
-      'pl' => ['display' => 'Polski',      'locale' => 'pl_PL.utf8'],
-      'sl' => ['display' => 'Slovenščina', 'locale' => 'sl_SI.utf8'],
-      'sr' => ['display' => 'Srpski',      'locale' => 'sr_RS@latin'],
-      'fi' => ['display' => 'Suomi',       'locale' => 'fi_FI.utf8'],
-      'el' => ['display' => 'Ελληνικά',    'locale' => 'el_GR.utf8'],
-      'hu' => ['display' => 'Magyar',      'locale' => 'hu_HU.utf8'],
-      'pt' => ['display' => 'Português',   'locale' => 'pt_PT.utf8'],
+        'ca' => ['display' => 'Català',      'locale' => 'ca_ES.utf8'],
+        'de' => ['display' => 'Deutsch',     'locale' => 'de_DE.utf8'],
+        'en' => ['display' => 'English(GB)', 'locale' => 'en_GB.utf8'],
+        'es' => ['display' => 'Español',     'locale' => 'es_ES.utf8'],
+        'gl' => ['display' => 'Galego',      'locale' => 'gl_ES.utf8'],
+        'hr' => ['display' => 'Hrvatski',    'locale' => 'hr_HR.utf8'],
+        'it' => ['display' => 'Italiano',    'locale' => 'it_IT.utf8'],
+        'nb' => ['display' => 'Norsk',       'locale' => 'nb_NO.utf8'],
+        'pl' => ['display' => 'Polski',      'locale' => 'pl_PL.utf8'],
+        'sl' => ['display' => 'Slovenščina', 'locale' => 'sl_SI.utf8'],
+        'sr' => ['display' => 'Srpski',      'locale' => 'sr_RS@latin'],
+        'fi' => ['display' => 'Suomi',       'locale' => 'fi_FI.utf8'],
+        'el' => ['display' => 'Ελληνικά',    'locale' => 'el_GR.utf8'],
+        'hu' => ['display' => 'Magyar',      'locale' => 'hu_HU.utf8'],
+        'pt' => ['display' => 'Português',   'locale' => 'pt_PT.utf8'],
 
 // For the following languages, partial translations exist in Transifex, but
 // they are not complete enough for display. Their Transifex content is not
@@ -237,45 +237,45 @@ 
         ],
 
         'TLS-clientcerts' => [
-          'CA1' => [
+            'CA1' => [
             'status' => 'ACCREDITED',
             'issuerCA' => '/DC=org/DC=pki1/CN=PKI 1',
             'certificates' => [
-              [
+                [
                 'status' => 'CORRECT',
                 'public' => 'ca1-client-cert.pem',
                 'private' => 'ca1-client-key.pem',
                 'expected' => 'PASS'],
-              [
+                [
                 'status' => 'WRONGPOLICY',
                 'public' => 'ca1-nopolicy-cert.pem',
                 'private' => 'ca1-nopolicy-key.key',
                 'expected' => 'FAIL'],
-              [
+                [
                 'status' => 'EXPIRED',
                 'public' => 'ca1-exp.pem',
                 'private' => 'ca1-exp.key',
                 'expected' => 'FAIL'],
-              [
+                [
                 'status' => 'REVOKED',
                 'public' => 'ca1-revoked.pem',
                 'private' => 'ca1-revoked.key',
                 'expected' => 'FAIL'],
             ]
-          ],
-          'CA-N' => [
+            ],
+            'CA-N' => [
             'status' => 'NONACCREDITED',
             'issuerCA' => '/DC=org/DC=pkiN/CN=PKI N',
             'certificates' => [
-               [
+                [
                 'status' => 'CORRECT',
                 'public' => 'caN-client-cert.pem',
                 'private' => 'caN-client-cert.key',
                 'expected' => 'FAIL'],
-               ]
-          ]
-      ],
-      'accreditedCAsURL' => '',
+                ]
+            ]
+        ],
+        'accreditedCAsURL' => '',
     ];
 
     /**
@@ -313,11 +313,11 @@ 
             'db' => 'customer_db',
             'user' => 'customerservice',
             'pass' => '2lame4u'],
-         'enforce-external-sync' => TRUE,
-         /* if you feed your user database from a third-party source and do not want CAT to update it on its own, you can 
+            'enforce-external-sync' => TRUE,
+            /* if you feed your user database from a third-party source and do not want CAT to update it on its own, you can 
           * make it read-only
           */
-         'userdb-readonly' => FALSE,
+            'userdb-readonly' => FALSE,
     ];
 
     /**

web/admin/edit_idp.php

Braces +23 added lines, -14 removed lines

@@ -31,10 +31,11 @@ 
 $idpoptions = $my_inst->getAttributes();
 $inst_name = $my_inst->name;
 
-if ($wizard_style)
+if ($wizard_style) {
     $cat = defaultPagePrelude(sprintf(_("%s: IdP enrollment wizard (step 2)"), Config::$APPEARANCE['productname']));
-else
+} else {
     $cat = defaultPagePrelude(sprintf(_("%s: Editing IdP '%s'"), Config::$APPEARANCE['productname'], $inst_name));
+}
 // let's check if the inst handle actually exists in the DB and user is authorised
 ?>
 <script src="js/option_expand.js" type="text/javascript"></script>
@@ -43,9 +44,10 @@ 
 
 <?php
 $additional = FALSE;
-foreach ($idpoptions as $optionname => $optionvalue)
+foreach ($idpoptions as $optionname => $optionvalue) {
     if ($optionvalue['name'] == "general:geo_coordinates")
         $additional = TRUE;
+}
 geo_widget_head($my_inst->federation, $inst_name)
 ?>
 <script>
@@ -74,10 +76,11 @@ 
 
     <h1>
 <?php
-if ($wizard_style)
+if ($wizard_style) {
     echo _("Step 2: General Information about your IdP");
-else
+} else {
     printf(_("Editing IdP information for '%s'"), $inst_name);
+}
 ?>
     </h1>
     <div class='infobox'>
@@ -98,9 +101,10 @@ 
 echo "<form enctype='multipart/form-data' action='edit_idp_result.php?inst_id=$my_inst->identifier" . ($wizard_style ? "&wizard=true" : "") . "' method='post' accept-charset='UTF-8'>
               <input type='hidden' name='MAX_FILE_SIZE' value='" . Config::$MAX_UPLOAD_SIZE . "'>";
 
-if ($wizard_style)
+if ($wizard_style) {
     echo "<p>" .
     _("Hello, newcomer. Your institution is new to us. This wizard will ask you several questions about your IdP, so that we can generate beautiful profiles for you in the end. All of the information below is optional, but it is important to fill out as many fields as possible for the benefit of your end users.") . "</p>";
+}
 ?>
     <fieldset class="option_container">
         <legend><strong><?php echo _("General Information"); ?></strong></legend>
@@ -143,12 +147,14 @@ 
     echo "<strong>" . ( count(Config::$CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>";
     if (count(Config::$CONSORTIUM['ssid']) > 0) {
         $ssidlist = "";
-        foreach (Config::$CONSORTIUM['ssid'] as $ssid)
-            $ssidlist .= ", '<strong>" . $ssid . "</strong>'";
+        foreach (Config::$CONSORTIUM['ssid'] as $ssid) {
+                    $ssidlist .= ", '<strong>" . $ssid . "</strong>'";
+        }
         $ssidlist = substr($ssidlist, 2);
         echo sprintf(ngettext("We will always configure this SSID for WPA2/AES: %s.", "We will always configure these SSIDs for WPA2/AES: %s.", count(Config::$CONSORTIUM['ssid'])), $ssidlist);
-        if (Config::$CONSORTIUM['tkipsupport'])
-            echo " " . _("They will also be configured for WPA/TKIP if the device supports multiple encryption types.");
+        if (Config::$CONSORTIUM['tkipsupport']) {
+                    echo " " . _("They will also be configured for WPA/TKIP if the device supports multiple encryption types.");
+        }
         echo "<br/>" . sprintf(_("It is also possible to define custom additional SSIDs with the options '%s' and '%s' below."), display_name("media:SSID"), display_name("media:SSID_with_legacy"));
     } else {
         echo _("Please configure which SSIDs should be configured in the installers.");
@@ -160,8 +166,9 @@ 
     echo "<strong>" . ( count(Config::$CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>";
     if (count(Config::$CONSORTIUM['interworking-consortium-oi']) > 0) {
         $consortiumlist = "";
-        foreach (Config::$CONSORTIUM['interworking-consortium-oi'] as $oi)
-            $consortiumlist .= ", '<strong>" . $oi . "</strong>'";
+        foreach (Config::$CONSORTIUM['interworking-consortium-oi'] as $oi) {
+                    $consortiumlist .= ", '<strong>" . $oi . "</strong>'";
+        }
         $consortiumlist = substr($consortiumlist, 2);
         echo sprintf(ngettext("We will always configure this Consortium OI: %s.", "We will always configure these Consortium OIs: %s.", count(Config::$CONSORTIUM['interworking-consortium-oi'])), $consortiumlist);
         
@@ -190,11 +197,12 @@ 
     <fieldset class="option_container">
         <legend><strong><?php echo _("Helpdesk Details for all users"); ?></strong></legend>
 <?php
-if ($wizard_style)
+if ($wizard_style) {
     echo "<p>" .
     _("If your IdP provides a helpdesk for its users, it would be nice if you would tell us the pointers to this helpdesk. Some site installers might be able to signal this information to the user if he gets stuck.") . "</p>
         <p>" .
     _("If you enter a value here, it will be added to the site installers for all your users, and will be displayed on the download page. If you operate separate helpdesks for different user groups (we call this 'profiles'), or operate no help desk at all (shame on you!), you can also leave any of these fields empty and optionally specify per-profile helpdesk information later in this wizard.") . "</p>";
+}
 ?>
 
         <table id="expandable_support_options">
@@ -206,9 +214,10 @@ 
 <!--    <fieldset class="option_container">
         <legend><strong><?php echo _("EAP details for all users"); ?></strong></legend>
 <?php
-if ($wizard_style)
+if ($wizard_style) {
     echo "<p>" . _("Most EAP methods need server-side authentication details, like the CA certificate and/or server name(s) of your authentication servers. If all the EAP methods you support work with the same CA and or Common Names of servers, you can enter them here and they will be added as trust anchors in all profiles. If the details differ per profile or per EAP-type, you can also enter them in the individual profiles later.") . "</p>
         <p>" . sprintf(_("<strong>Note well: </strong>The server-side validation is a cornerstone of %s; without it, users are subject to man-in-the-middle attacks! We will not generate site installers without Trusted CA anchors and server names."), Config::$CONSORTIUM['name']) . "</p>";
+}
 ?>
         <table id="expandable_eapserver_options">
         <?php

web/admin/logout_check.php

Braces +5 added lines, -4 removed lines

@@ -18,10 +18,11 @@
 if ($ls['Code'] === 'urn:oasis:names:tc:SAML:2.0:status:Success' && !isset($ls['SubCode'])) {
     /* Successful logout. */
     $url = htmlspecialchars($_SERVER['HTTP_HOST']) . substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], "/admin/logout_check.php"));
-    if ($_SERVER['HTTPS'] == "on")
-        $url = "https://" . $url;
-    else
-        $url = "http://" . $url;
+    if ($_SERVER['HTTPS'] == "on") {
+            $url = "https://" . $url;
+    } else {
+            $url = "http://" . $url;
+    }
 
     header("Location: $url");
 } else {

web/admin/edit_user_result.php

Braces +2 added lines, -1 removed lines

@@ -31,10 +31,11 @@
 <?php
 $remaining_attribs = $user->beginflushAttributes();
 
-if (isset($_POST['option']))
+if (isset($_POST['option'])) {
     foreach ($_POST['option'] as $opt_id => $optname)
         if ($optname == "user:fedadmin") {
             echo "Security violation: user tried to make himself federation administrator!";
+}
             exit(1);
         }
 ?>

web/admin/overview_federation.php

Braces +21 added lines, -16 removed lines

@@ -128,19 +128,21 @@ 
     if (isset($_GET['invitation'])) {
         echo "<div class='ca-summary' style='position:relative;'><table>";
 
-        if ($_GET['invitation'] == "SUCCESS")
-            echo UI_remark(_("The invitation email was sent successfully."), _("The invitation email was sent."));
-        else if ($_GET['invitation'] == "FAILURE")
-            echo UI_error(_("The invitation email could not be sent!"), _("The invitation email could not be sent!"));
-        else
-            echo UI_error(_("Error: unknown result code of invitation!?!"), _("Unknown result!"));
+        if ($_GET['invitation'] == "SUCCESS") {
+                    echo UI_remark(_("The invitation email was sent successfully."), _("The invitation email was sent."));
+        } else if ($_GET['invitation'] == "FAILURE") {
+                    echo UI_error(_("The invitation email could not be sent!"), _("The invitation email could not be sent!"));
+        } else {
+                    echo UI_error(_("Error: unknown result code of invitation!?!"), _("Unknown result!"));
+        }
 
         echo "</table></div>";
     }
-    if (Config::$CONSORTIUM['name'] == 'eduroam')
-        $helptext = "<h3>" . sprintf(_("Need help? Refer to the <a href='%s'>Federation Operator manual</a>"),"https://wiki.geant.org/x/KQB_AQ")."</h3>";
-    else
-        $helptext = "";
+    if (Config::$CONSORTIUM['name'] == 'eduroam') {
+            $helptext = "<h3>" . sprintf(_("Need help? Refer to the <a href='%s'>Federation Operator manual</a>"),"https://wiki.geant.org/x/KQB_AQ")."</h3>";
+    } else {
+            $helptext = "";
+    }
     echo $helptext;
 
     ?>
@@ -153,8 +155,9 @@ 
             $feds = $user->getAttributes("user:fedadmin");
             $pending_invites = $mgmt->listPendingInvitations();
 
-            if (Config::$DB['enforce-external-sync'])
-                echo "<th>" . sprintf(_("%s Database Sync Status"), Config::$CONSORTIUM['name']) . "</th>";
+            if (Config::$DB['enforce-external-sync']) {
+                            echo "<th>" . sprintf(_("%s Database Sync Status"), Config::$CONSORTIUM['name']) . "</th>";
+            }
             ?>
             <th><?php echo _("Administrator Management"); ?></th>
         </tr>
@@ -165,10 +168,11 @@ 
 
             // extract only pending invitations for *this* fed
             $display_pendings = FALSE;
-            foreach ($pending_invites as $oneinvite)
-                if (strtoupper($oneinvite['country']) == strtoupper($thefed->identifier)) {
+            foreach ($pending_invites as $oneinvite) {
+                            if (strtoupper($oneinvite['country']) == strtoupper($thefed->identifier)) {
                     // echo "PENDINGS!";
                     $display_pendings = TRUE;
+            }
                 }
 
             $idps = $thefed->listIdentityProviders();
@@ -253,8 +257,8 @@ 
                                </strong>
                             </td>
                          </tr>";
-                foreach ($pending_invites as $oneinvite)
-                    if (strtoupper($oneinvite['country']) == strtoupper($thefed->identifier)) {
+                foreach ($pending_invites as $oneinvite) {
+                                    if (strtoupper($oneinvite['country']) == strtoupper($thefed->identifier)) {
                         echo "<tr>
                                     <td>" .
                         $oneinvite['name'] . "
@@ -263,6 +267,7 @@ 
                         $oneinvite['mail'] . "
                                     </td>
                                     <td colspan=2>";
+                }
                         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='" . BUTTON_DELETE . "'>" . _("Revoke Invitation") . "</button>

web/admin/radius_tests.php

Indentation +37 added lines, -37 removed lines

@@ -19,10 +19,10 @@ 
 $Cat->set_locale("web_admin");
 
 $additional_message =  [
-   L_OK => '',
-   L_REMARK => _("Some properties of the connection attempt were sub-optimal; the list is below."),
-   L_WARN => _("Some properties of the connection attempt were sub-optimal; the list is below."),
-   L_ERROR => _("Some configuration errors were observed; the list is below."),
+    L_OK => '',
+    L_REMARK => _("Some properties of the connection attempt were sub-optimal; the list is below."),
+    L_WARN => _("Some properties of the connection attempt were sub-optimal; the list is below."),
+    L_ERROR => _("Some configuration errors were observed; the list is below."),
  
 ];
 
@@ -32,25 +32,25 @@ 
 }
 
 function printDN($dn) {
-  $out = '';
-  foreach (array_reverse($dn) as $k => $v) {
-      if(is_array ($v)) {
-         foreach ($v as $V) {
+    $out = '';
+    foreach (array_reverse($dn) as $k => $v) {
+        if(is_array ($v)) {
+            foreach ($v as $V) {
             if($out) 
-               $out .= ',';
+                $out .= ',';
             $out .= "$k=$V";
-         }
-      } else {
-         if($out) 
+            }
+        } else {
+            if($out) 
             $out .= ',';
-         $out .= "$k=$v";
-      }
-  }
-  return($out);
+            $out .= "$k=$v";
+        }
+    }
+    return($out);
 }
 
 function printTm($tm) {
-  return(gmdate(DateTime::COOKIE,$tm));
+    return(gmdate(DateTime::COOKIE,$tm));
 }
 
 
@@ -60,19 +60,19 @@ 
     $server_info = [];
     $udp_result = $testsuite->UDP_reachability_result[$host];
     if(isset($udp_result['certdata']) && count($udp_result['certdata'])) {
-       foreach ($udp_result['certdata'] as $certdata) {
-          if($certdata['type'] != 'server' && $certdata['type'] != 'totally_selfsigned' )
-             continue;
-          $server_cert =  [
-             'subject' => printDN($certdata['subject']),
-             'issuer' => printDN($certdata['issuer']),
-             'validFrom' => printTm($certdata['validFrom_time_t']),
-             'validTo' => printTm($certdata['validTo_time_t']),
-             'serialNumber' => $certdata['serialNumber'].sprintf(" (0x%X)",$certdata['serialNumber']),
-             'sha1' => $certdata['sha1'],
-             'extensions' => $certdata['extensions']
-          ];
-       }
+        foreach ($udp_result['certdata'] as $certdata) {
+            if($certdata['type'] != 'server' && $certdata['type'] != 'totally_selfsigned' )
+                continue;
+            $server_cert =  [
+                'subject' => printDN($certdata['subject']),
+                'issuer' => printDN($certdata['issuer']),
+                'validFrom' => printTm($certdata['validFrom_time_t']),
+                'validTo' => printTm($certdata['validTo_time_t']),
+                'serialNumber' => $certdata['serialNumber'].sprintf(" (0x%X)",$certdata['serialNumber']),
+                'sha1' => $certdata['sha1'],
+                'extensions' => $certdata['extensions']
+            ];
+        }
     }
     $ret['server_cert'] = $server_cert;
     if(isset($udp_result['incoming_server_names'][0]) ) {
@@ -120,7 +120,7 @@ 
 */
 $hostindex = $_REQUEST['hostindex']; 
 if(!is_numeric($hostindex))
-  exit;
+    exit;
 
 
 $returnarray = [];
@@ -177,16 +177,16 @@ 
                 case RETVAL_OK :
                     $level = $returnarray['result'][$i]['level'];
                     switch($level) {
-                         case L_OK :
+                            case L_OK :
                              $message = _("<strong>Test successful.</strong>");
-                             break;
-                         case L_REMARK :
+                                break;
+                            case L_REMARK :
                          case L_WARN :
                              $message = _("<strong>Test partially successful</strong>: authentication succeded.") . ' ' . $additional_message[$level];
-                             break;
-                         case L_ERROR :
+                                break;
+                            case L_ERROR :
                              $message = _("<strong>Test FAILED</strong>: authentication succeded.") . ' ' . $additional_message[$level];
-                             break;
+                                break;
                     }
                     break;
                 case RETVAL_CONVERSATION_REJECT:

Braces +43 added lines, -30 removed lines

@@ -36,13 +36,15 @@ 
   foreach (array_reverse($dn) as $k => $v) {
       if(is_array ($v)) {
          foreach ($v as $V) {
-            if($out) 
-               $out .= ',';
+            if($out) {
+                           $out .= ',';
+            }
             $out .= "$k=$V";
          }
       } else {
-         if($out) 
-            $out .= ',';
+         if($out) {
+                     $out .= ',';
+         }
          $out .= "$k=$v";
       }
   }
@@ -61,8 +63,9 @@ 
     $udp_result = $testsuite->UDP_reachability_result[$host];
     if(isset($udp_result['certdata']) && count($udp_result['certdata'])) {
        foreach ($udp_result['certdata'] as $certdata) {
-          if($certdata['type'] != 'server' && $certdata['type'] != 'totally_selfsigned' )
-             continue;
+          if($certdata['type'] != 'server' && $certdata['type'] != 'totally_selfsigned' ) {
+                       continue;
+          }
           $server_cert =  [
              'subject' => printDN($certdata['subject']),
              'issuer' => printDN($certdata['issuer']),
@@ -77,9 +80,9 @@ 
     $ret['server_cert'] = $server_cert;
     if(isset($udp_result['incoming_server_names'][0]) ) {
         $ret['server'] = sprintf(_("Connected to %s."), $udp_result['incoming_server_names'][0]);
+    } else {
+            $ret['server'] = 0;
     }
-    else
-        $ret['server'] = 0;
     $ret['level'] = L_OK;
     $ret['time_millisec'] = sprintf("%d", $udp_result['time_millisec']);
     if (isset($udp_result['cert_oddities']) && count($udp_result['cert_oddities']) > 0) {
@@ -100,8 +103,9 @@ 
     return $ret;
 }
 
-if (!isset($_REQUEST['test_type']) || !$_REQUEST['test_type'])
+if (!isset($_REQUEST['test_type']) || !$_REQUEST['test_type']) {
     exit;
+}
 
 $test_type = $_REQUEST['test_type']; 
 $check_realm = valid_Realm($_REQUEST['realm']); 
@@ -119,8 +123,9 @@ 
    exit;
 */
 $hostindex = $_REQUEST['hostindex']; 
-if(!is_numeric($hostindex))
+if(!is_numeric($hostindex)) {
   exit;
+}
 
 
 $returnarray = [];
@@ -235,10 +240,11 @@ 
         switch ($testresult) {
             case RETVAL_CONVERSATION_REJECT:
                 $level = $returnarray['result'][$i]['level'];
-                if($level > L_OK)
-                    $message = _("<strong>Test partially successful</strong>: a bidirectional RADIUS conversation with multiple round-trips was carried out, and ended in an Access-Reject as planned.") . ' ' . $additional_message[$level];
-                else
-                    $message = _("<strong>Test successful</strong>: a bidirectional RADIUS conversation with multiple round-trips was carried out, and ended in an Access-Reject as planned.");
+                if($level > L_OK) {
+                                    $message = _("<strong>Test partially successful</strong>: a bidirectional RADIUS conversation with multiple round-trips was carried out, and ended in an Access-Reject as planned.") . ' ' . $additional_message[$level];
+                } else {
+                                    $message = _("<strong>Test successful</strong>: a bidirectional RADIUS conversation with multiple round-trips was carried out, and ended in an Access-Reject as planned.");
+                }
                 break;
             case RETVAL_IMMEDIATE_REJECT:
                 $message = _("<strong>Test FAILED</strong>: the request was rejected immediately, without EAP conversation. This is not necessarily an error: if the RADIUS server enforces that outer identities correspond to an existing username, then this result is expected (Note: you could configure a valid outer identity in your profile settings to get past this hurdle). In all other cases, the server appears misconfigured or it is unreachable.");
@@ -276,23 +282,28 @@ 
             } else {
                 $returnarray['message'] = $testsuite->return_codes[$testsuite->TLS_CA_checks_result[$host]['status']]["message"];
                 $returnarray['level'] = L_OK;
-                if ($testsuite->TLS_CA_checks_result[$host]['status'] != RETVAL_CONNECTION_REFUSED)
-                    $returnarray['message'] .= ' (' . sprintf(_("elapsed time: %d"), $testsuite->TLS_CA_checks_result[$host]['time_millisec']) . '&nbsp;ms)';
-                else
-                    $returnarray['level'] = L_ERROR;
+                if ($testsuite->TLS_CA_checks_result[$host]['status'] != RETVAL_CONNECTION_REFUSED) {
+                                    $returnarray['message'] .= ' (' . sprintf(_("elapsed time: %d"), $testsuite->TLS_CA_checks_result[$host]['time_millisec']) . '&nbsp;ms)';
+                } else {
+                                    $returnarray['level'] = L_ERROR;
+                }
                 if ($testsuite->TLS_CA_checks_result[$host]['status'] == RETVAL_OK) {
                     $returnarray['certdata'] = [];
                     $returnarray['certdata']['subject'] = $testsuite->TLS_CA_checks_result[$host]['certdata']['subject'];
                     $returnarray['certdata']['issuer'] = $testsuite->TLS_CA_checks_result[$host]['certdata']['issuer'];
                     $returnarray['certdata']['extensions'] = [];
-                    if (isset($testsuite->TLS_CA_checks_result[$host]['certdata']['extensions']['subjectaltname']))
-                        $returnarray['certdata']['extensions']['subjectaltname'] = $testsuite->TLS_CA_checks_result[$host]['certdata']['extensions']['subjectaltname'];
-                    if (isset($testsuite->TLS_CA_checks_result[$host]['certdata']['extensions']['policyoid']))
-                        $returnarray['certdata']['extensions']['policies'] = join(' ', $testsuite->TLS_CA_checks_result[$host]['certdata']['extensions']['policyoid']);
-                    if (isset($testsuite->TLS_CA_checks_result[$host]['certdata']['extensions']['crlDistributionPoint']))
-                        $returnarray['certdata']['extensions']['crldistributionpoints'] = $testsuite->TLS_CA_checks_result[$host]['certdata']['extensions']['crlDistributionPoint'];
-                    if (isset($testsuite->TLS_CA_checks_result[$host]['certdata']['extensions']['authorityInfoAccess']))
-                        $returnarray['certdata']['extensions']['authorityinfoaccess'] = $testsuite->TLS_CA_checks_result[$host]['certdata']['extensions']['authorityInfoAccess'];
+                    if (isset($testsuite->TLS_CA_checks_result[$host]['certdata']['extensions']['subjectaltname'])) {
+                                            $returnarray['certdata']['extensions']['subjectaltname'] = $testsuite->TLS_CA_checks_result[$host]['certdata']['extensions']['subjectaltname'];
+                    }
+                    if (isset($testsuite->TLS_CA_checks_result[$host]['certdata']['extensions']['policyoid'])) {
+                                            $returnarray['certdata']['extensions']['policies'] = join(' ', $testsuite->TLS_CA_checks_result[$host]['certdata']['extensions']['policyoid']);
+                    }
+                    if (isset($testsuite->TLS_CA_checks_result[$host]['certdata']['extensions']['crlDistributionPoint'])) {
+                                            $returnarray['certdata']['extensions']['crldistributionpoints'] = $testsuite->TLS_CA_checks_result[$host]['certdata']['extensions']['crlDistributionPoint'];
+                    }
+                    if (isset($testsuite->TLS_CA_checks_result[$host]['certdata']['extensions']['authorityInfoAccess'])) {
+                                            $returnarray['certdata']['extensions']['authorityinfoaccess'] = $testsuite->TLS_CA_checks_result[$host]['certdata']['extensions']['authorityInfoAccess'];
+                    }
                 }
                 $returnarray['cert_oddities'] = [];
             }
@@ -306,10 +317,11 @@ 
         $k = 0;
         // the host member of the array may not exist if RETVAL_SKIPPED came out
         // (e.g. no client cert to test with). Be prepared for that
-        if (isset($testsuite->TLS_clients_checks_result[$host]))
-            foreach ($testsuite->TLS_clients_checks_result[$host]['ca'] as $type => $cli) {
+        if (isset($testsuite->TLS_clients_checks_result[$host])) {
+                    foreach ($testsuite->TLS_clients_checks_result[$host]['ca'] as $type => $cli) {
                 foreach ($cli as $key => $val) {
                     $returnarray['ca'][$k][$key] = $val;
+        }
                 }
                 $k++;
             }
@@ -347,8 +359,9 @@ 
             $oids = check_policy($data);
             if (!empty($oids)) {
                 $printedres .= '<li>' . _("Certificate policies") . ':';
-                foreach ($oids as $k => $o)
-                    $printedres .= " $o ($k)";
+                foreach ($oids as $k => $o) {
+                                    $printedres .= " $o ($k)";
+                }
             }
             if (($crl = certificate_get_field($data, 'crlDistributionPoints'))) {
                 $printedres .= '<li>' . _("crlDistributionPoints") . ': ' . $crl;

web/admin/sanity_tests.php

Indentation +39 added lines, -39 removed lines

@@ -36,53 +36,53 @@ 
 require_once("SanityTests.php");
 
 function print_test_results($t) {
-   $out = '';
-   switch($t->test_result['global']) {
-       case L_OK:
+    $out = '';
+    switch($t->test_result['global']) {
+        case L_OK:
          $message = "Your configuration appears to be fine.";
-         break;
-       case L_WARN:
+            break;
+        case L_WARN:
          $message = "There were some warnings, but your configuration should work.";
-         break;
-       case L_ERROR:
+            break;
+        case L_ERROR:
          $message = "Your configuration appears to be broken, please fix the errors.";
-         break;
-       case L_NOTICE:
+            break;
+        case L_NOTICE:
          $message = "Your configuration appears to be fine.";
-         break;
-   }
-   $out .= UI_message($t->test_result['global'],"<br><strong>Test Summary</strong><br>".$message."<br>See below for details<br><hr>");
-   foreach ($t->out as $test => $test_val)  {
-   foreach ($test_val as $o)  {
-       $out .= UI_message($o['level'],$o['message']);
-   }
-   }
-   return($out);
+            break;
+    }
+    $out .= UI_message($t->test_result['global'],"<br><strong>Test Summary</strong><br>".$message."<br>See below for details<br><hr>");
+    foreach ($t->out as $test => $test_val)  {
+    foreach ($test_val as $o)  {
+        $out .= UI_message($o['level'],$o['message']);
+    }
+    }
+    return($out);
 }
 
 function return_test_results($t) {
-   $out = '';
-   switch($t->test_result['global']) {
-       case L_OK:
+    $out = '';
+    switch($t->test_result['global']) {
+        case L_OK:
          $message = "Your configuration appears to be fine.";
-         break;
-       case L_WARN:
+            break;
+        case L_WARN:
          $message = "There were some warnings, but your configuration should work.";
-         break;
-       case L_ERROR:
+            break;
+        case L_ERROR:
          $message = "Your configuration appears to be broken, please fix the errors.";
-         break;
-       case L_NOTICE:
+            break;
+        case L_NOTICE:
          $message = "Your configuration appears to be fine.";
-         break;
-   }
-   $out .= UI_message($t->test_result['global'],"<br><strong>Test Summary</strong><br>".$message."<br>See below for details<br><hr>");
-   foreach ($t->out as $test => $test_val)  {
-   foreach ($test_val as $o)  {
-       $out .= UI_message($o['level'],$o['message']);
-   }
-   }
-   return($out);
+            break;
+    }
+    $out .= UI_message($t->test_result['global'],"<br><strong>Test Summary</strong><br>".$message."<br>See below for details<br><hr>");
+    foreach ($t->out as $test => $test_val)  {
+    foreach ($test_val as $o)  {
+        $out .= UI_message($o['level'],$o['message']);
+    }
+    }
+    return($out);
 }
 
 
@@ -93,8 +93,8 @@ 
     authenticate();
     $user = new User($_SESSION['user']);
     if (!$user->isSuperadmin()) {
-         print "Not Superadmin";
-         exit;
+            print "Not Superadmin";
+            exit;
     }
     
 }
@@ -108,7 +108,7 @@ 
         break;
     case 'html':
     header("Content-Type:text/html;charset=utf-8");
-      echo "<!DOCTYPE html>
+        echo "<!DOCTYPE html>
           <html xmlns='http://www.w3.org/1999/xhtml' lang='$ourlocale'>
           <head lang='$ourlocale'>
           <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'></head>";

web/admin/overview_idp.php

Braces +48 added lines, -31 removed lines

@@ -28,8 +28,9 @@ 
 
 // delete stored realm
 
-if (isset($_SESSION['check_realm']))
+if (isset($_SESSION['check_realm'])) {
     unset($_SESSION['check_realm']);
+}
 
 
 geo_widget_head($my_inst->federation, $my_inst->name);
@@ -95,15 +96,17 @@ 
         </div>
         <?php
         $loadmap = FALSE;
-        foreach ($idpoptions as $optionname => $optionvalue)
-            if ($optionvalue['name'] == "general:geo_coordinates")
+        foreach ($idpoptions as $optionname => $optionvalue) {
+                    if ($optionvalue['name'] == "general:geo_coordinates")
                 $loadmap = TRUE;
-        if ($loadmap)
-            echo '
+        }
+        if ($loadmap) {
+                    echo '
 <div class="infobox"  style="width:270px;">
 <div id="map" style="width:100%; height:150px"></div>
 </div>
 ';
+        }
         ?>
     </div>
     <table>
@@ -131,8 +134,8 @@ 
     <h2><?php _("Available Support actions"); ?></h2>
     <table>
         <?php
-        if (count(Config::$RADIUSTESTS['UDP-hosts']) > 0 || Config::$RADIUSTESTS['TLS-discoverytag'] != "")
-            echo "<tr>
+        if (count(Config::$RADIUSTESTS['UDP-hosts']) > 0 || Config::$RADIUSTESTS['TLS-discoverytag'] != "") {
+                    echo "<tr>
                         <td>" . _("Check another realm's reachability") . "</td>
                         <td><form method='post' action='action_realmcheck.php?inst_id=$my_inst->identifier' accept-charset='UTF-8'>
                               <input type='text' name='realm' id='realm'>
@@ -140,7 +143,9 @@ 
                             </form>
                         </td>
                     </tr>";
-        if (Config::$CONSORTIUM['name'] == "eduroam") // SW: APPROVED
+        }
+        if (Config::$CONSORTIUM['name'] == "eduroam") {
+            // SW: APPROVED
             echo "<tr>
                         <td>" . _("Check server status of European federations") . "</td>
                         <td>
@@ -149,14 +154,17 @@ 
                            </form>
                         </td>
                     </tr>";
+        }
         ?>
     </table>
     <hr/>
     <h2><?php echo _("Profiles for this institution"); ?></h2>
     <?php
     $profiles_for_this_idp = $my_inst->listProfiles();
-    if (count($profiles_for_this_idp) == 0) // no profiles yet.
+    if (count($profiles_for_this_idp) == 0) {
+        // no profiles yet.
         echo _("There are not yet any profiles for your institution.");
+    }
 
     foreach ($profiles_for_this_idp as $profile_list) {
         echo "<div style='display: table-row; margin-bottom: 20px;'>";
@@ -170,9 +178,10 @@ 
         // readiness - but want to display it before!
 
         $has_overrides = FALSE;
-        foreach ($attribs as $attrib)
-            if ($attrib['level'] == "Profile" && !preg_match("/^(internal:|profile:name|profile:description)/", $attrib['name']))
+        foreach ($attribs as $attrib) {
+                    if ($attrib['level'] == "Profile" && !preg_match("/^(internal:|profile:name|profile:description)/", $attrib['name']))
                 $has_overrides = TRUE;
+        }
 
         $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>";
         $typelist = $profile_list->getEapMethodsinOrderOfPreference();
@@ -196,9 +205,10 @@ 
                 $allcomplete = FALSE;
             };
             $eapattribs = $profile_list->getAttributes(0, $eaptype);
-            foreach ($attribs as $attrib)
-                if ($attrib['level'] == "Method" && !preg_match("/^internal:/", $attrib['name']))
+            foreach ($attribs as $attrib) {
+                            if ($attrib['level'] == "Method" && !preg_match("/^internal:/", $attrib['name']))
                     $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='" . _("Option override on EAP Method level is in effect.") . "'>";
+            }
             $buffer_eaptypediv .= "<br/>";
         }
         $buffer_headline = "<h2 style='overflow:auto;'>";
@@ -206,23 +216,27 @@ 
         $buffer_headline .= "<div style='float:right;'>";
         $sufficient_config = $profile_list->getSufficientConfig();
         $showtime = $profile_list->getShowtime();
-        if ($has_overrides)
-            $buffer_headline .= UI_remark("", _("Option override on profile level is in effect."), TRUE);
-        if (!$allcomplete)
-            $buffer_headline .= UI_error("", _("The information in this profile is incomplete."), TRUE);
-        if ($showtime)
-            $buffer_headline .= UI_okay("", _("This profile is shown on the user download interface."), TRUE);
-        else if ($sufficient_config)
-            $buffer_headline .= UI_warning("", sprintf(_("This profile is NOT shown on the user download interface, even though we have enough information to show. To enable the profile, add the attribute \"%s\" and tick the corresponding box."), display_name("profile:production")), TRUE);
+        if ($has_overrides) {
+                    $buffer_headline .= UI_remark("", _("Option override on profile level is in effect."), TRUE);
+        }
+        if (!$allcomplete) {
+                    $buffer_headline .= UI_error("", _("The information in this profile is incomplete."), TRUE);
+        }
+        if ($showtime) {
+                    $buffer_headline .= UI_okay("", _("This profile is shown on the user download interface."), TRUE);
+        } else if ($sufficient_config) {
+                    $buffer_headline .= UI_warning("", sprintf(_("This profile is NOT shown on the user download interface, even though we have enough information to show. To enable the profile, add the attribute \"%s\" and tick the corresponding box."), display_name("profile:production")), TRUE);
+        }
         $buffer_headline .= "</div>";
 
         $buffer_headline .= sprintf(_("Profile: %s"), $profile_name) . "</h2>";
 
         echo $buffer_headline;
 
-        if (array_search(EAP::$TTLS_PAP, $typelist) !== FALSE && array_search(EAP::$TTLS_GTC, $typelist) === FALSE && array_search(EAP::$PEAP_MSCHAP2, $typelist) === FALSE && array_search(EAP::$TTLS_MSCHAP2, $typelist) === FALSE)
-        /// Hmmm... IdP Supports TTLS-PAP, but not TTLS-GTC nor anything based on MSCHAPv2. That locks out Symbian users; and is easy to circumvent. Tell the admin...
+        if (array_search(EAP::$TTLS_PAP, $typelist) !== FALSE && array_search(EAP::$TTLS_GTC, $typelist) === FALSE && array_search(EAP::$PEAP_MSCHAP2, $typelist) === FALSE && array_search(EAP::$TTLS_MSCHAP2, $typelist) === FALSE) {
+                /// Hmmm... IdP Supports TTLS-PAP, but not TTLS-GTC nor anything based on MSCHAPv2. That locks out Symbian users; and is easy to circumvent. Tell the admin...
             $buffer_eaptypediv .= "<p>" . sprintf(_("Read this <a href='%s'>tip</a>."), "https://confluence.terena.org/display/H2eduroam/eap-types#eap-types-choices") . "</p>";
+        }
 
         $buffer_eaptypediv .= "</div>";
         echo $buffer_eaptypediv;
@@ -230,12 +244,13 @@ 
         $has_realm = $profile_list->getAttributes("internal:realm");
         $has_realm = $has_realm[0]['value'];
         echo "<div class='profilemodulebuttons' style='float:right;'>";
-        if (count(Config::$RADIUSTESTS['UDP-hosts']) > 0 || ( count(Config::$RADIUSTESTS['TLS-clientcerts']) > 0 && Config::$RADIUSTESTS['TLS-discoverytag'] != ""))
-            echo "<form action='action_realmcheck.php?inst_id=$my_inst->identifier&amp;profile_id=$profile_list->identifier' method='post' accept-charset='UTF-8'>
+        if (count(Config::$RADIUSTESTS['UDP-hosts']) > 0 || ( count(Config::$RADIUSTESTS['TLS-clientcerts']) > 0 && Config::$RADIUSTESTS['TLS-discoverytag'] != "")) {
+                    echo "<form action='action_realmcheck.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_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") . "
@@ -261,10 +276,11 @@ 
         if ($profile_list->getShowtime()) {
             echo "<div style='display: table-cell; text-align:center;'><p><strong>" . _("User Download Link") . "</strong></p>";
             $URL = $profile_list->getCollapsedAttributes();
-            if (isset($URL['device-specific:redirect']))
-                $displayurl = $URL['device-specific:redirect'][0];
-            else
-                $displayurl = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://' ) . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier . "&amp;profile=" . $profile_list->identifier;
+            if (isset($URL['device-specific:redirect'])) {
+                            $displayurl = $URL['device-specific:redirect'][0];
+            } else {
+                            $displayurl = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://' ) . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier . "&amp;profile=" . $profile_list->identifier;
+            }
             echo "<a href='$displayurl' style='white-space: nowrap; text-align: center;'>";
             $uri = "data:image/png;base64," . base64_encode(png_inject_consortium_logo(QRcode::png($displayurl, FALSE, QR_ECLEVEL_Q, 12)));
             $size = getimagesize($uri);
@@ -277,8 +293,9 @@ 
             echo "<div style='width:20px;'></div>";
             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>";
+            foreach ($stats as $dev => $count) {
+                            echo "<tr><td><strong>$dev</strong></td><td>$count</td></tr>";
+            }
             echo "</table></div>";
         }
         echo "</div>";