GEANT / CAT

config/_config.php

Spacing +1 added lines, -1 removed lines

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

config/config-template.php

Spacing +16 added lines, -16 removed lines

@@ -163,7 +163,7 @@ 
      * pass: password for the username
      * @var array
      */
-    public static $MAILSETTINGS = [ // we always use Submission
+    public static $MAILSETTINGS = [// we always use Submission
         'host' => 'submission.capable.mta',
         'user'=> 'mailuser',
         'pass' => 'mailpass',
@@ -174,21 +174,21 @@ 
      * @var array
      */
     public static $LANGUAGES = [
-      'ca' => ['display' => 'Català',      'locale' => 'ca_ES.utf8'],
-      'de' => ['display' => 'Deutsch',     'locale' => 'de_DE.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'],
+      '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'],
+      '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
@@ -343,9 +343,9 @@ 
      * NSIS version - with version 3 UTF installers will be created
      * see also $PATHS['makensis']
      */
-    public static $NSIS_VERSION = 2 ;
+    public static $NSIS_VERSION = 2;
 
-    public static $SUPERADMINS =  [
+    public static $SUPERADMINS = [
         'eptid:someuser',
         'http://sommeopenid.example/anotheruser',
         'I do not care about security!',

web/admin/edit_idp.php

Spacing +6 added lines, -6 removed lines

@@ -137,10 +137,10 @@ 
 <?php
 if ($wizard_style) {
     echo "<p>" .
-    sprintf(_("In this section, you define on which media %s should be configured on user devices."),Config::$CONSORTIUM['name']) . "</p>
+    sprintf(_("In this section, you define on which media %s should be configured on user devices."), Config::$CONSORTIUM['name']) . "</p>
           <ul>";
     echo "<li>";
-    echo "<strong>" . ( count(Config::$CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>";
+    echo "<strong>" . (count(Config::$CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>";
     if (count(Config::$CONSORTIUM['ssid']) > 0) {
         $ssidlist = "";
         foreach (Config::$CONSORTIUM['ssid'] as $ssid)
@@ -157,7 +157,7 @@ 
     echo "</li>";
 
     echo "<li>";
-    echo "<strong>" . ( count(Config::$CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>";
+    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)
@@ -170,10 +170,10 @@ 
         echo _("Please configure which Consortium OIs should be configured in the installers.");
     }   
     echo "</li>";
-    echo "<li><strong>"._("Support for wired IEEE 802.1X:")." </strong>"
-    . _("If you want to configure your users' devices with IEEE 802.1X support for wired ethernet, please check the corresponding box. Note that this makes the installation process a bit more difficult on some platforms (Windows: needs administrator privileges; Apple: attempting to install a profile with wired support on a device without an active wired ethernet card will fail).").
+    echo "<li><strong>" . _("Support for wired IEEE 802.1X:") . " </strong>"
+    . _("If you want to configure your users' devices with IEEE 802.1X support for wired ethernet, please check the corresponding box. Note that this makes the installation process a bit more difficult on some platforms (Windows: needs administrator privileges; Apple: attempting to install a profile with wired support on a device without an active wired ethernet card will fail).") .
             "</li>";
-    echo "<li><strong>"._("Removal of bootstrap/onboarding SSIDs:")." </strong>"
+    echo "<li><strong>" . _("Removal of bootstrap/onboarding SSIDs:") . " </strong>"
             . _("If you use a captive portal to distribute configurations, you may want to unconfigure/disable that SSID after the bootstrap process. With this option, the SSID will either be removed, or be defined as 'Only connect manually'.")
             . "</li>";
     echo "</ul>";

web/admin/overview_federation.php

Spacing +2 added lines, -2 removed lines

@@ -138,7 +138,7 @@ 
         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>";
+        $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;
@@ -186,7 +186,7 @@ 
                 // deployment status; need to dive into profiles for this
                 // show happy eyeballs if at least one profile is configured/showtime                    
                 echo "<td>";
-                echo ($idp_instance->isOneProfileConfigured() ? "C" : "" ) . " " . ($idp_instance->isOneProfileShowtime() ? "V" : "" );
+                echo ($idp_instance->isOneProfileConfigured() ? "C" : "") . " " . ($idp_instance->isOneProfileShowtime() ? "V" : "");
                 echo "</td>";
                 // get the coarse status overview
                 $status = $idp_instance->getAllProfileStatusOverview();

web/admin/radius_tests.php

Spacing +29 added lines, -29 removed lines

@@ -18,7 +18,7 @@ 
 $Cat = new CAT();
 $Cat->set_locale("web_admin");
 
-$additional_message =  [
+$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."),
@@ -28,20 +28,20 @@ 
 
 function disp_name($eap) {
     $D = EAP::eapDisplayName($eap);
-    return $D['OUTER'] . ( $D['INNER'] != '' ? '-' . $D['INNER'] : '');
+    return $D['OUTER'] . ($D['INNER'] != '' ? '-' . $D['INNER'] : '');
 }
 
 function printDN($dn) {
   $out = '';
   foreach (array_reverse($dn) as $k => $v) {
-      if(is_array ($v)) {
+      if (is_array($v)) {
          foreach ($v as $V) {
-            if($out) 
+            if ($out) 
                $out .= ',';
             $out .= "$k=$V";
          }
       } else {
-         if($out) 
+         if ($out) 
             $out .= ',';
          $out .= "$k=$v";
       }
@@ -50,32 +50,32 @@ 
 }
 
 function printTm($tm) {
-  return(gmdate(DateTime::COOKIE,$tm));
+  return(gmdate(DateTime::COOKIE, $tm));
 }
 
 
 
-function process_result($testsuite,$host) {
+function process_result($testsuite, $host) {
     $ret = [];
     $server_info = [];
     $udp_result = $testsuite->UDP_reachability_result[$host];
-    if(isset($udp_result['certdata']) && count($udp_result['certdata'])) {
+    if (isset($udp_result['certdata']) && count($udp_result['certdata'])) {
        foreach ($udp_result['certdata'] as $certdata) {
-          if($certdata['type'] != 'server' && $certdata['type'] != 'totally_selfsigned' )
+          if ($certdata['type'] != 'server' && $certdata['type'] != 'totally_selfsigned')
              continue;
-          $server_cert =  [
+          $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']),
+             '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]) ) {
+    if (isset($udp_result['incoming_server_names'][0])) {
         $ret['server'] = sprintf(_("Connected to %s."), $udp_result['incoming_server_names'][0]);
     }
     else
@@ -119,7 +119,7 @@ 
    exit;
 */
 $hostindex = $_REQUEST['hostindex']; 
-if(!is_numeric($hostindex))
+if (!is_numeric($hostindex))
   exit;
 
 
@@ -140,14 +140,14 @@ 
                 if ($_FILES['cert']['error'] == UPLOAD_ERR_OK) {
                     $clientcertdata = file_get_contents($_FILES['cert']['tmp_name']);
                     $privkey_pass = isset($_REQUEST['privkey_pass']) && $_REQUEST['privkey_pass'] ? $_REQUEST['privkey_pass'] : ""; //!!
-                    if(isset($_REQUEST['tls_username']) && $_REQUEST['tls_username']) {
+                    if (isset($_REQUEST['tls_username']) && $_REQUEST['tls_username']) {
                         $tls_username = valid_user($_REQUEST['tls_username']);
                     } else {
-                        if(openssl_pkcs12_read($clientcertdata,$certs,$privkey_pass)) {
+                        if (openssl_pkcs12_read($clientcertdata, $certs, $privkey_pass)) {
                             $mydetails = openssl_x509_parse($certs['cert']);
-                            if(isset($mydetails['subject']['CN']) && $mydetails['subject']['CN']) {
-                                $tls_username=$mydetails['subject']['CN'];
-                                debug(4,"PKCS12-CN=$tls_username\n");
+                            if (isset($mydetails['subject']['CN']) && $mydetails['subject']['CN']) {
+                                $tls_username = $mydetails['subject']['CN'];
+                                debug(4, "PKCS12-CN=$tls_username\n");
                             } else {
                                 $testresult = RETVAL_INCOMPLETE_DATA;
                                 $run_test = FALSE;
@@ -161,14 +161,14 @@ 
                     $testresult = RETVAL_INCOMPLETE_DATA;
                     $run_test = FALSE;
                 }
-                    if($run_test) {
-                        debug(4,"TLS-USERNAME=$tls_username\n");
-                        $testresult = $testsuite->UDP_login($hostindex, $eap, $tls_username, $privkey_pass,'', TRUE, TRUE, $clientcertdata);
+                    if ($run_test) {
+                        debug(4, "TLS-USERNAME=$tls_username\n");
+                        $testresult = $testsuite->UDP_login($hostindex, $eap, $tls_username, $privkey_pass, '', TRUE, TRUE, $clientcertdata);
                     }
             } else {
-                $testresult = $testsuite->UDP_login($hostindex, $eap, $user_name, $user_password,$outer_user_name);
+                $testresult = $testsuite->UDP_login($hostindex, $eap, $user_name, $user_password, $outer_user_name);
             }
-        $returnarray['result'][$i] = process_result($testsuite,$hostindex);
+        $returnarray['result'][$i] = process_result($testsuite, $hostindex);
         $returnarray['result'][$i]['eap'] = display_name($eap);
         $returnarray['returncode'][$i] = $testresult;
 
@@ -176,7 +176,7 @@ 
             switch ($testresult) {
                 case RETVAL_OK :
                     $level = $returnarray['result'][$i]['level'];
-                    switch($level) {
+                    switch ($level) {
                          case L_OK :
                              $message = _("<strong>Test successful.</strong>");
                              break;
@@ -228,21 +228,21 @@ 
         $i = 0;
         $returnarray['hostindex'] = $hostindex;
         $testresult = $testsuite->UDP_reachability($hostindex);
-        $returnarray['result'][$i] = process_result($testsuite,$hostindex);
+        $returnarray['result'][$i] = process_result($testsuite, $hostindex);
         $returnarray['result'][$i]['eap'] = 'ALL';
         $returnarray['returncode'][$i] = $testresult;
         // a failed check may not have gotten any certificate, be prepared for that
         switch ($testresult) {
             case RETVAL_CONVERSATION_REJECT:
                 $level = $returnarray['result'][$i]['level'];
-                if($level > L_OK)
+                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.");
-                $level= L_WARN;
+                $level = L_WARN;
                 break;
             case RETVAL_NO_RESPONSE:
                     $returnarray['result'][$i]['server'] = 0;
@@ -255,10 +255,10 @@ 
                 break;
             default:
                 $message = _("unhandled error");
-                $level= L_ERROR;
+                $level = L_ERROR;
                 break;
         }
-debug(4,"SERVER=".$returnarray['result'][$i]['server']."\n");
+debug(4, "SERVER=" . $returnarray['result'][$i]['server'] . "\n");
         $returnarray['result'][$i]['level'] = $level;
         $returnarray['result'][$i]['message'] = $message;
         break;

web/admin/sanity_tests.php

Spacing +11 added lines, -11 removed lines

@@ -37,7 +37,7 @@ 
 
 function print_test_results($t) {
    $out = '';
-   switch($t->test_result['global']) {
+   switch ($t->test_result['global']) {
        case L_OK:
          $message = "Your configuration appears to be fine.";
          break;
@@ -51,10 +51,10 @@ 
          $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']);
+   $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);
@@ -62,7 +62,7 @@ 
 
 function return_test_results($t) {
    $out = '';
-   switch($t->test_result['global']) {
+   switch ($t->test_result['global']) {
        case L_OK:
          $message = "Your configuration appears to be fine.";
          break;
@@ -76,10 +76,10 @@ 
          $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']);
+   $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);
@@ -100,7 +100,7 @@ 
 }
 $test = new SanityTest();
 $test->run_tests($Tests);
-$format =  empty($_REQUEST['format']) ? 'include' : $_REQUEST['format'];
+$format = empty($_REQUEST['format']) ? 'include' : $_REQUEST['format'];
 switch ($format) {
     case 'include':
         $o = print_test_results($test);

web/admin/overview_idp.php

Spacing +4 added lines, -4 removed lines

@@ -85,7 +85,7 @@ 
         <div class='infobox' style='text-align:center;'>
             <h2><?php echo _("Institution Download Area QR Code"); ?></h2>
             <?php
-            $displayurl = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier;
+            $displayurl = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier;
             $uri = "data:image/png;base64," . base64_encode(png_inject_consortium_logo(QRcode::png($displayurl, FALSE, QR_ECLEVEL_Q, 12)));
             $size = getimagesize($uri);
             echo "<img width='" . ($size[0] / 4) . "' height='" . ($size[1] / 4) . "' src='$uri' alt='QR-code'/>";
@@ -115,7 +115,7 @@ 
             </td>
             <td>
                 <form action='edit_idp_result.php?inst_id=<?php echo $my_inst->identifier; ?>' method='post' accept-charset='UTF-8'>
-                    <button class='delete' type='submit' name='submitbutton' value='<?php echo BUTTON_DELETE; ?>' onclick="return confirm('<?php echo ( Config::$CONSORTIUM['selfservice_registration'] === NULL ? _("After deleting the IdP, you can not recreate it yourself - you need a new invitation token from the federation administrator!") . " " : "" ) . sprintf(_("Do you really want to delete your IdP %s?"), $my_inst->name); ?>')"><?php echo _("Delete IdP"); ?></button>
+                    <button class='delete' type='submit' name='submitbutton' value='<?php echo BUTTON_DELETE; ?>' onclick="return confirm('<?php echo (Config::$CONSORTIUM['selfservice_registration'] === NULL ? _("After deleting the IdP, you can not recreate it yourself - you need a new invitation token from the federation administrator!") . " " : "") . sprintf(_("Do you really want to delete your IdP %s?"), $my_inst->name); ?>')"><?php echo _("Delete IdP"); ?></button>
                 </form>
 
             </td>
@@ -230,7 +230,7 @@ 
         $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'] != ""))
+        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") . "
@@ -264,7 +264,7 @@ 
             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;
+                $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);

web/admin/action_realmcheck.php

Spacing +41 added lines, -41 removed lines

@@ -20,7 +20,7 @@ 
 
 $cat = defaultPagePrelude(_("Sanity check for dynamic discovery of realms"));
 $check_thorough = FALSE;
-$error_message ='';
+$error_message = '';
 $my_inst = valid_IdP($_REQUEST['inst_id'], $_SESSION['user']);
 
 if (isset($_GET['profile_id']))
@@ -38,17 +38,17 @@ 
       $error_message = _("You asked for a realm check, but we don't know the realm for this profile!") . "</p>";
    }
 } else { // someone else's realm... only shallow checks
-   if(!empty($_REQUEST['realm'])) {
-      if($check_realm = valid_Realm($_REQUEST['realm'])) {
+   if (!empty($_REQUEST['realm'])) {
+      if ($check_realm = valid_Realm($_REQUEST['realm'])) {
          $_SESSION['check_realm'] = $check_realm;
       }
    } else {
-      if(!empty($_SESSION['check_realm']))
+      if (!empty($_SESSION['check_realm']))
          $check_realm = $_SESSION['check_realm'];
       else
          $check_realm = FALSE;
    }
-   if($check_realm)
+   if ($check_realm)
       $testsuite = new RADIUSTests($check_realm);
    else
       $error_message = _("No valid realm name given, cannot execute any checks!");
@@ -226,7 +226,7 @@ 
      }
  }
  cliinfo = cliinfo + '<li><table><tbody><tr><td class="icon_td"><img class="icon" src="' + icons[level] +'" style="width: 24px;"></td><td>' + state;
- cliinfo = cliinfo + ' <?php echo "(".sprintf(_("elapsed time: %sms."),"'+data.ca[key].certificate[c].time_millisec+'&nbsp;").")"; ?>' + add + '</td></tr>';
+ cliinfo = cliinfo + ' <?php echo "(" . sprintf(_("elapsed time: %sms."), "'+data.ca[key].certificate[c].time_millisec+'&nbsp;") . ")"; ?>' + add + '</td></tr>';
  cliinfo = cliinfo + '</tbody></table></ul></li>';
  if (data.ca[key].certificate[c].finalerror==1) {
      cliinfo = cliinfo + '<li>' + restskipped + '</li>';
@@ -316,7 +316,7 @@ 
    var v = data.result[0];
    $("#src"+data.hostindex+"_img").attr('src',icons[v.level]);
    if(v.server != 0 ) {
-      $("#src"+data.hostindex).html('<strong>'+v.server+'</strong><br/><?php printf(_("elapsed time: %sms."),"'+v.time_millisec+'&nbsp;") ?><p>'+v.message+'</p>');
+      $("#src"+data.hostindex).html('<strong>'+v.server+'</strong><br/><?php printf(_("elapsed time: %sms."), "'+v.time_millisec+'&nbsp;") ?><p>'+v.message+'</p>');
       var cert_data = "<tr class='server_cert'><td>&nbsp;</td><td colspan=2><div><dl class='server_cert_list'>";
       $.each(server_cert, function(l,s) {
          cert_data = cert_data + "<dt>" + s + "</dt><dd>"+ v.server_cert[l] + "</dd>";
@@ -339,7 +339,7 @@ 
       }
       $("#src"+data.hostindex).append(cert_data);
    } else {
-       $("#src"+data.hostindex).html('<br/><?php printf(_("elapsed time: %sms."),"'+v.time_millisec+'&nbsp;") ?><p>'+v.message+'</p>');
+       $("#src"+data.hostindex).html('<br/><?php printf(_("elapsed time: %sms."), "'+v.time_millisec+'&nbsp;") ?><p>'+v.message+'</p>');
    }
       global_level_udp = Math.max(global_level_udp,v.level);  
       $(".server_cert").show();
@@ -391,7 +391,7 @@ 
          });
       }
       o = o +  cert_data+'</table>';
-      $("#eap_test"+data.hostindex).append('<strong><img style="position: relative; top: 2px;" src="'+icons[v.level]+'"><span style="position: relative; top: -5px; left: 1em">'+v.eap+' &ndash; <?php printf(_("elapsed time: %sms."),"'+v.time_millisec+'&nbsp;") ?></span></strong><div class="more" style="padding-left: 40px"><div class="morecontent"><div style="display:none; background: #eee;">'+o+'</div><a href="" class="morelink">' + moretext + '</a></div></div>');
+      $("#eap_test"+data.hostindex).append('<strong><img style="position: relative; top: 2px;" src="'+icons[v.level]+'"><span style="position: relative; top: -5px; left: 1em">'+v.eap+' &ndash; <?php printf(_("elapsed time: %sms."), "'+v.time_millisec+'&nbsp;") ?></span></strong><div class="more" style="padding-left: 40px"><div class="morecontent"><div style="display:none; background: #eee;">'+o+'</div><a href="" class="morelink">' + moretext + '</a></div></div>');
    });
 }
 
@@ -402,8 +402,8 @@ 
 <?php
 foreach (Config::$RADIUSTESTS['UDP-hosts'] as $hostindex => $host) {
    print "
-$(\"#live_src".$hostindex."_img\").attr('src',icon_loading);
-$(\"#live_src".$hostindex."_img\").show();
+$(\"#live_src".$hostindex . "_img\").attr('src',icon_loading);
+$(\"#live_src".$hostindex . "_img\").show();
     $.ajax({
         url: 'radius_tests.php?src=0&hostindex=$hostindex&realm='+realm,
         type: 'POST',
@@ -434,15 +434,15 @@ 
 <?php
 foreach (Config::$RADIUSTESTS['UDP-hosts'] as $hostindex => $host) {
     if ($check_thorough)
-        $extraarg = "profile_id: ".$my_profile->identifier.", ";
+        $extraarg = "profile_id: " . $my_profile->identifier . ", ";
     else
         $extraarg = "";
     
    print "
-$(\"#src".$hostindex."_img\").attr('src',icon_loading);
+$(\"#src".$hostindex . "_img\").attr('src',icon_loading);
 $(\"#src$hostindex\").html('');
 running_ajax_stat++;
-$.get('radius_tests.php',{test_type: 'udp', $extraarg realm: realm, src: $hostindex, lang: '".CAT::get_lang()."', hostindex: '$hostindex'  }, udp, 'json');
+$.get('radius_tests.php',{test_type: 'udp', $extraarg realm: realm, src: $hostindex, lang: '" . CAT::get_lang() . "', hostindex: '$hostindex'  }, udp, 'json');
 
 ";
 }
@@ -461,8 +461,8 @@ 
 </script>
    <?php
     productheader("ADMIN", CAT::get_lang());
-    print "<h1>".sprintf(_("Realm testing for: %s"),$check_realm)."</h1>\n";
-    if($error_message) {
+    print "<h1>" . sprintf(_("Realm testing for: %s"), $check_realm) . "</h1>\n";
+    if ($error_message) {
         print "<p>$error_message</p>";
     } else {
 ?>
@@ -481,7 +481,7 @@ 
    </legend>
       <?php
       // NAPTR existence check
-      echo "<strong>"._("DNS chekcs")."</strong><div>";
+      echo "<strong>" . _("DNS chekcs") . "</strong><div>";
       $naptr = $testsuite->NAPTR();
       if ($naptr != RETVAL_NOTCONFIGURED) {
            echo "<table>";
@@ -551,10 +551,10 @@ 
 
             echo "</table><table>";
               if (count($testsuite->listerrors()) == 0) {
-                echo UI_message(L_OK,sprintf(_("Realm is <strong>%s</strong> "), _(($naptr > 0 ? "DYNAMIC" : "STATIC"))) . _("with no DNS errors encountered. Congratulations!"));
+                echo UI_message(L_OK, sprintf(_("Realm is <strong>%s</strong> "), _(($naptr > 0 ? "DYNAMIC" : "STATIC"))) . _("with no DNS errors encountered. Congratulations!"));
                 echo "</table>";
               } else {
-                echo UI_message(L_ERROR,sprintf(_("Realm is <strong>%s</strong> "), _(($naptr > 0 ? "DYNAMIC" : "STATIC"))) . _("but there were DNS errors! Check them!") . " " . _("You should re-run the tests after fixing the errors; more errors might be uncovered at that point. The exact error causes are listed below."));
+                echo UI_message(L_ERROR, sprintf(_("Realm is <strong>%s</strong> "), _(($naptr > 0 ? "DYNAMIC" : "STATIC"))) . _("but there were DNS errors! Check them!") . " " . _("You should re-run the tests after fixing the errors; more errors might be uncovered at that point. The exact error causes are listed below."));
                 echo "</table><div class='notacceptable'><table>";
                 foreach ($testsuite->listerrors() as $details)
                    echo "<tr><td>" . $details['TYPE'] . "</td><td>" . $details['TARGET'] . "</td></tr>";
@@ -581,9 +581,9 @@ 
    continue;*/
                       print "
                             running_ajax_dyn++;
-                            $.ajax({url:'radius_tests.php', data:{test_type: 'capath', realm: realm, src: '$host', lang: '".CAT::get_lang()."', hostindex: '$hostindex' }, error: eee, success: capath, dataType: 'json'}); 
+                            $.ajax({url:'radius_tests.php', data:{test_type: 'capath', realm: realm, src: '$host', lang: '" . CAT::get_lang() . "', hostindex: '$hostindex' }, error: eee, success: capath, dataType: 'json'}); 
                             running_ajax_dyn++;
-                            $.ajax({url:'radius_tests.php', data:{test_type: 'clients', realm: realm, src: '$host', lang: '".CAT::get_lang()."', hostindex: '$hostindex' }, error: eee, success: clients, dataType: 'json'}); 
+                            $.ajax({url:'radius_tests.php', data:{test_type: 'clients', realm: realm, src: '$host', lang: '" . CAT::get_lang() . "', hostindex: '$hostindex' }, error: eee, success: clients, dataType: 'json'}); 
                        ";
                    }
               echo "}
@@ -592,12 +592,12 @@ 
          } else {
           echo "<tr><td>" . _("Dynamic discovery test is not configured") . "</td><td>";
          }
-         echo "<strong>"._("Static connectivity tests")."</strong>
+         echo "<strong>" . _("Static connectivity tests") . "</strong>
          <table><tr>
          <td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='main_static_ico' class='icon'></td><td id='main_static_result' style='display:none'>&nbsp;</td>
          </tr></table>";
-         if($naptr > 0) {
-             echo "<hr><strong>"._("Dynamic connectivity tests")."</strong>
+         if ($naptr > 0) {
+             echo "<hr><strong>" . _("Dynamic connectivity tests") . "</strong>
          <table><tr>
          <td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='main_dynamic_ico' class='icon'></td><td id='main_dynamic_result' style='display:none'>&nbsp;</td>
          </tr></table>";
@@ -611,19 +611,19 @@ 
      <button id="run_s_tests" onclick="run_udp()"><?php echo _("Repeat static connectivity tests") ?></button>
      <p>
      <fieldset class="option_container" id="static_tests">
-     <legend><strong> <?php echo _("STATIC connectivity tests");?> </strong> </legend>
+     <legend><strong> <?php echo _("STATIC connectivity tests"); ?> </strong> </legend>
 <?php
      echo sprintf(_("This check sends a request for the realm through various entry points of the %s infrastructure. The request will contain the 'Operator-Name' attribute, and will be larger than 1500 Bytes to catch two common configuration problems.<br/>Since we don't have actual credentials for the realm, we can't authenticate successfully - so the expected outcome is to get an Access-Reject after having gone through an EAP conversation."), Config::$CONSORTIUM['name']);
 print "<p>";
 
 foreach (Config::$RADIUSTESTS['UDP-hosts'] as $hostindex => $host) {
   print "<hr>";
-printf(_("Testing from: %s"), "<strong>".Config::$RADIUSTESTS['UDP-hosts'][$hostindex]['display_name']."</strong>");
+printf(_("Testing from: %s"), "<strong>" . Config::$RADIUSTESTS['UDP-hosts'][$hostindex]['display_name'] . "</strong>");
 print "<table id='results$hostindex'  style='width:100%' class='udp_results'>
 <tr>
-<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='src".$hostindex."_img'></td>
+<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='src" . $hostindex . "_img'></td>
 <td id='src$hostindex' colspan=2>
-"._("testing...")."
+" . _("testing...") . "
 </td>
 </tr>" .
 //server_cert('udp-'.$hostindex) .
@@ -647,8 +647,8 @@ 
                 <legend><strong>" . _("DYNAMIC connectivity tests") . "</strong></legend>";
 
                   $resultstoprint = [];
-                  if (count($testsuite->NAPTR_hostname_records)>0) {
-                      $resultstoprint[] = '<table style="align:right; display: none;" id="dynamic_result_fail">' .  UI_message(L_ERROR,_("Some errors were found during the tests, see below")) . '</table><table style="align:right; display: none;" id="dynamic_result_pass">' . UI_message(L_OK,_("All tests passed, congratulations!")) . '</table>';
+                  if (count($testsuite->NAPTR_hostname_records) > 0) {
+                      $resultstoprint[] = '<table style="align:right; display: none;" id="dynamic_result_fail">' . UI_message(L_ERROR, _("Some errors were found during the tests, see below")) . '</table><table style="align:right; display: none;" id="dynamic_result_pass">' . UI_message(L_OK, _("All tests passed, congratulations!")) . '</table>';
                       $resultstoprint[] = '<div style="align:right;"><a href="" class="moreall">' . _('Show detailed information for all tests') . '</a></div>' . '<p><strong>' . _("Checking server handshake...") . "</strong><p>";
                       foreach ($testsuite->NAPTR_hostname_records as $hostindex => $addr) {
 /*                          if ($addr['family'] == "IPv6") {
@@ -660,9 +660,9 @@ 
                           $resultstoprint[] = '<ul style="list-style-type: none;" class="caresult"><li>';
                           $resultstoprint[] = "<table id='caresults$hostindex'  style='width:100%'>
 <tr>
-<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='srcca".$hostindex."_img'></td>
+<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='srcca" . $hostindex . "_img'></td>
 <td id='srcca$hostindex'>
-"._("testing...")."
+" . _("testing...") . "
 </td>
 </tr>
 </table>";
@@ -678,18 +678,18 @@ 
                           $clientstest[] = '<p><strong>' . $addr['IP'] . ' TCP/' . $addr['port'] . '</strong></p><ol>';
                           $clientstest[] = "<span id='clientresults$hostindex$clinx'><table style='width:100%'>
 <tr>
-<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='srcclient".$hostindex."_img'></td>
+<td class='icon_td'><img src='../resources/images/icons/loading51.gif' id='srcclient" . $hostindex . "_img'></td>
 <td id='srcclient$hostindex'>
-"._("testing...")."
+" . _("testing...") . "
 </td>
 </tr>
 </table></span>";
                           $clientstest[] = '</ol>';
                       }
                       echo '<div style="align:right;">';
-                      echo join('',$resultstoprint);
-                      echo '<span id="clientstest" style="display: none;"><p><hr><b>' . _('Checking if certificates from  CAs are accepted...') . '</b><p>' .  _('A few client certificates will be tested to check if servers are resistant to some certificate problems.') . '<p>';
-                      print join('',$clientstest);
+                      echo join('', $resultstoprint);
+                      echo '<span id="clientstest" style="display: none;"><p><hr><b>' . _('Checking if certificates from  CAs are accepted...') . '</b><p>' . _('A few client certificates will be tested to check if servers are resistant to some certificate problems.') . '<p>';
+                      print join('', $clientstest);
                       echo '</span>';
                       echo '</div>';
                   }
@@ -711,8 +711,8 @@ 
                     <p>" . _("Note: the tool purposefully does not offer you to save these credentials, and they will never be saved in any way on the server side. Please use only <strong>temporary test accounts</strong> here; permanently valid test accounts in the wild are considered harmful!") . "</p></div>
                     <form enctype='multipart/form-data' id='live_form' accept-charset='UTF-8'>
                     <input type='hidden' name='test_type' value='udp_login'>
-                    <input type='hidden' name='lang' value='".CAT::get_lang()."'>
-                    <input type='hidden' name='profile_id' value='".$my_profile->identifier."'>
+                    <input type='hidden' name='lang' value='".CAT::get_lang() . "'>
+                    <input type='hidden' name='profile_id' value='".$my_profile->identifier . "'>
                     <table id='live_tests'>";
 // if any password based EAP methods are available enable this section
               if (in_array(EAP::$PEAP_MSCHAP2, $prof_compl) ||
@@ -737,8 +737,8 @@ 
                       echo "<div id='live_login_results' style='display:none'>";
                       foreach (Config::$RADIUSTESTS['UDP-hosts'] as $hostindex => $host) {
                         print "<hr>";
-                      printf(_("Testing from: %s"), "<strong>".Config::$RADIUSTESTS['UDP-hosts'][$hostindex]['display_name']."</strong>");
-                      print "<span style='position:relative'><img src='../resources/images/icons/loading51.gif' id='live_src".$hostindex."_img' style='width:24px; position: absolute; left: 20px; bottom: 0px; '></span>";
+                      printf(_("Testing from: %s"), "<strong>" . Config::$RADIUSTESTS['UDP-hosts'][$hostindex]['display_name'] . "</strong>");
+                      print "<span style='position:relative'><img src='../resources/images/icons/loading51.gif' id='live_src" . $hostindex . "_img' style='width:24px; position: absolute; left: 20px; bottom: 0px; '></span>";
 print "<div id='eap_test$hostindex' class='eap_test_results'></div>";
 }
                       echo "</div>";

web/admin/action_fedcheck.php

Spacing +20 added lines, -20 removed lines

@@ -18,7 +18,7 @@ 
 require_once("../resources/inc/header.php");
 require_once("../resources/inc/footer.php");
 
-function profilechecks(IdP $idpinfo,Profile $profile) {
+function profilechecks(IdP $idpinfo, Profile $profile) {
 
     $tabletext = "<tr><td>" . $idpinfo->name . "</td><td>" . $profile->name . "</td>";
     
@@ -30,12 +30,12 @@ 
         // update database with the findings
         
         DBConnection::exec("INST", "UPDATE profile SET "
-                . "status_dns = ".RETVAL_SKIPPED.", "
-                . "status_cert = ".RETVAL_SKIPPED.", "
-                . "status_reachability = ". RETVAL_SKIPPED.", "
-                . "status_TLS = ".RETVAL_SKIPPED.", "
+                . "status_dns = " . RETVAL_SKIPPED . ", "
+                . "status_cert = " . RETVAL_SKIPPED . ", "
+                . "status_reachability = " . RETVAL_SKIPPED . ", "
+                . "status_TLS = " . RETVAL_SKIPPED . ", "
                 . "last_status_check = NOW() "
-                . "WHERE profile_id = ".$profile->identifier);
+                . "WHERE profile_id = " . $profile->identifier);
         
         return $tabletext;
     }
@@ -82,9 +82,9 @@ 
     }
 
     if ($NAPTR_issues) {
-        $tabletext .= UI_error(0,0,true);
+        $tabletext .= UI_error(0, 0, true);
     } else {
-        $tabletext .= UI_okay(0,0,true);
+        $tabletext .= UI_okay(0, 0, true);
     }
     
     $UDP_errors = false;
@@ -106,13 +106,13 @@ 
     }
     
     $tabletext .= "</td><td>";
-    $tabletext .= UI_message($cert_biggest_oddity,0,0,true);
+    $tabletext .= UI_message($cert_biggest_oddity, 0, 0, true);
         
     $tabletext .= "</td><td>";
     if (!$UDP_errors) {
-        $tabletext .= UI_okay(0,0,true);
+        $tabletext .= UI_okay(0, 0, true);
     } else {
-        $tabletext .= UI_error(0,0,true);
+        $tabletext .= UI_error(0, 0, true);
     }
     
     $tabletext .= "</td><td>";
@@ -127,19 +127,19 @@ 
         }
     }
     if (!$dynamic_errors) {
-        $tabletext .= UI_okay(0,0,true);
+        $tabletext .= UI_okay(0, 0, true);
     } else {
-        $tabletext .= UI_error(0,0,true);
+        $tabletext .= UI_error(0, 0, true);
     }
     $tabletext .= "</td></tr>";
 
     DBConnection::exec("INST", "UPDATE profile SET "
-                . "status_dns = ".($NAPTR_issues ? RETVAL_INVALID : RETVAL_OK) . ", "
-                . "status_cert = ".($cert_biggest_oddity) . ", "
-                . "status_reachability = ".($UDP_errors ? RETVAL_INVALID : RETVAL_OK) . ", "
-                . "status_TLS = ".($dynamic_errors ? RETVAL_INVALID : RETVAL_OK) . ", "
+                . "status_dns = " . ($NAPTR_issues ? RETVAL_INVALID : RETVAL_OK) . ", "
+                . "status_cert = " . ($cert_biggest_oddity) . ", "
+                . "status_reachability = " . ($UDP_errors ? RETVAL_INVALID : RETVAL_OK) . ", "
+                . "status_TLS = " . ($dynamic_errors ? RETVAL_INVALID : RETVAL_OK) . ", "
                 . "last_status_check = NOW() "
-                . "WHERE profile_id = ".$profile->identifier);    
+                . "WHERE profile_id = " . $profile->identifier);    
         
     return $tabletext;
 }
@@ -177,7 +177,7 @@ 
     echo "<h2>" . _("Profiles marked as visible (V)") . "</h2>" . "<table>";
     echo rowdescription();
     foreach ($profiles_showtime as $oneprofile)
-        echo profilechecks($oneprofile['idp'],$oneprofile['profile']);
+        echo profilechecks($oneprofile['idp'], $oneprofile['profile']);
     echo "</table>";
 }
 
@@ -185,7 +185,7 @@ 
     echo "<h2>" . _("Profiles with sufficient configuration, not marked as visible (C)") . "</h2>" . "<table>";
     echo rowdescription();
     foreach ($profiles_confready as $oneprofile)
-        echo profilechecks($oneprofile['idp'],$oneprofile['profile']);
+        echo profilechecks($oneprofile['idp'], $oneprofile['profile']);
     echo "</table>";
 }
 ?>