GEANT / CAT

web/diag/diag.php

Indentation +2 added lines, -2 removed lines

@@ -42,8 +42,8 @@
     $auth->authenticate();
 }
 if (isset($_SESSION['admin_diag_auth'])) {
-   $admin =  1;
-   unset($_SESSION['admin_diag_auth']);
+    $admin =  1;
+    unset($_SESSION['admin_diag_auth']);
 }
 $Gui = new \web\lib\user\Gui();
 $skinObject = new \web\lib\user\Skinjob($_REQUEST['skin'] ?? $_SESSION['skin'] ?? $fedskin[0] ?? \config\Master::APPEARANCE['skins'][0]);

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 $admin = filter_input(INPUT_GET, 'admin', FILTER_VALIDATE_INT);
 $auth = new \web\lib\admin\Authentication();
 $isauth = 0;
@@ -33,7 +33,7 @@ 
             unset($q_el[$idx]);
             $q_r = preg_replace("/\?.*/", "", $_SERVER['REQUEST_URI']);
             if (count($q_el)) {
-                $q_r = $q_r . '?' . implode('&', $q_el);
+                $q_r = $q_r.'?'.implode('&', $q_el);
             }
             $_SERVER['REQUEST_URI'] = $q_r;
         }
@@ -42,11 +42,11 @@ 
     $auth->authenticate();
 }
 if (isset($_SESSION['admin_diag_auth'])) {
-   $admin =  1;
+   $admin = 1;
    unset($_SESSION['admin_diag_auth']);
 }
 $Gui = new \web\lib\user\Gui();
 $skinObject = new \web\lib\user\Skinjob($_REQUEST['skin'] ?? $_SESSION['skin'] ?? $fedskin[0] ?? \config\Master::APPEARANCE['skins'][0]);
-require "../skins/" . $skinObject->skin . "/diag/diag.php";
+require "../skins/".$skinObject->skin."/diag/diag.php";
 
 

web/diag/action_realmcheck.php

Spacing +57 added lines, -57 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
+require_once dirname(dirname(__DIR__))."/config/_config.php";
 
 $loggerInstance = new \core\common\Logging();
 
@@ -55,13 +55,13 @@ 
         $testsuite = new \core\diag\RADIUSTests($check_realm, $my_profile->getRealmCheckOuterUsername(), $my_profile->getEapMethodsinOrderOfPreference(1), $my_profile->getCollapsedAttributes()['eap:server_name'], $my_profile->getCollapsedAttributes()["eap:ca_file"]);
         $rfc7585suite = new \core\diag\RFC7585Tests($check_realm);
     } else {
-        $error_message = _("You asked for a realm check, but we don't know the realm for this profile!") . "</p>";
+        $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
     $check_realm = $validator->realm($realm ?? $_SESSION['check_realm'] ?? "");
     if ($check_realm !== FALSE) {
         $_SESSION['check_realm'] = $check_realm;
-        $testsuite = new \core\diag\RADIUSTests($check_realm, "@" . $check_realm);
+        $testsuite = new \core\diag\RADIUSTests($check_realm, "@".$check_realm);
         $rfc7585suite = new \core\diag\RFC7585Tests($check_realm);
     } else {
         $error_message = _("No valid realm name given, cannot execute any checks!");
@@ -109,7 +109,7 @@ 
     var listofcas = "<?php echo _("You should update your list of accredited CAs") ?>";
     var getitfrom = "<?php echo _("Get it from here.") ?>";
     var listsource = "<?php echo \config\Diagnostics::RADIUSTESTS['accreditedCAsURL'] ?>";
-    var moretext = "<?php echo _("more") . "&raquo;" ?>";
+    var moretext = "<?php echo _("more")."&raquo;" ?>";
     var lesstext = "<?php echo "&laquo" ?>";
     var morealltext = "<?php echo _("Show detailed information for all tests") ?>";
     var unknownca_code = "<?php echo \core\diag\RADIUSTests::CERTPROB_UNKNOWN_CA ?>";
@@ -246,7 +246,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>';
@@ -416,8 +416,8 @@ 
 <?php
 foreach (\config\Diagnostics::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',
@@ -447,15 +447,15 @@ 
 <?php
 foreach (\config\Diagnostics::RADIUSTESTS['UDP-hosts'] as $hostindex => $host) {
     if ($my_profile !== NULL) {
-        $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: '" . $gui->languageInstance->getLang() . "', hostindex: '$hostindex'  }, udp, 'json');
+$.get('radius_tests.php',{test_type: 'udp', $extraarg realm: realm, src: $hostindex, lang: '".$gui->languageInstance->getLang()."', hostindex: '$hostindex'  }, udp, 'json');
 
 ";
 }
@@ -482,7 +482,7 @@ 
     if ($check_realm === FALSE) {
         print "<p>$error_message</p>";
     } else {
-        print "<h1>" . sprintf(_("Realm testing for: %s"), $check_realm) . "</h1>\n";
+        print "<h1>".sprintf(_("Realm testing for: %s"), $check_realm)."</h1>\n";
         ?>
         <div id="debug_out" style="display: none"></div>
         <div id="tabs" style="min-width: 600px; max-width:800px">
@@ -499,12 +499,12 @@ 
                     </legend>
                     <?php
                     // NAPTR existence check
-                    echo "<strong>" . _("DNS chekcs") . "</strong><div>";
+                    echo "<strong>"._("DNS chekcs")."</strong><div>";
                     $naptr = $rfc7585suite->relevantNAPTR();
                     if ($naptr != \core\diag\RADIUSTests::RETVAL_NOTCONFIGURED) {
                         echo "<table>";
                         // output in friendly words
-                        echo "<tr><td>" . _("Checking NAPTR existence:") . "</td><td>";
+                        echo "<tr><td>"._("Checking NAPTR existence:")."</td><td>";
                         switch ($naptr) {
                             case \core\diag\RFC7585Tests::RETVAL_NONAPTR:
                                 echo _("This realm has no NAPTR records.");
@@ -519,7 +519,7 @@ 
 
                         // compliance checks for NAPTRs
                         if ($naptr > 0) {
-                            echo "<tr><td>" . _("Checking NAPTR compliance (flag = S and regex = {empty}):") . "</td><td>";
+                            echo "<tr><td>"._("Checking NAPTR compliance (flag = S and regex = {empty}):")."</td><td>";
                             $naptr_valid = $rfc7585suite->relevantNAPTRcompliance();
                             switch ($naptr_valid) {
                                 case \core\diag\RADIUSTests::RETVAL_OK:
@@ -536,7 +536,7 @@ 
 
                         if ($naptr > 0 && $naptr_valid == \core\diag\RADIUSTests::RETVAL_OK) {
                             $srv = $rfc7585suite->relevantNAPTRsrvResolution();
-                            echo "<tr><td>" . _("Checking SRVs:") . "</td><td>";
+                            echo "<tr><td>"._("Checking SRVs:")."</td><td>";
                             switch ($srv) {
                                 case \core\diag\RADIUSTests::RETVAL_SKIPPED:
                                     echo _("This check was skipped.");
@@ -552,7 +552,7 @@ 
                         // IP addresses for the hosts
                         if ($naptr > 0 && $naptr_valid == \core\diag\RADIUSTests::RETVAL_OK && $srv > 0) {
                             $hosts = $rfc7585suite->relevantNAPTRhostnameResolution();
-                            echo "<tr><td>" . _("Checking IP address resolution:") . "</td><td>";
+                            echo "<tr><td>"._("Checking IP address resolution:")."</td><td>";
                             switch ($srv) {
                                 case \core\diag\RADIUSTests::RETVAL_SKIPPED:
                                     echo _("This check was skipped.");
@@ -568,12 +568,12 @@ 
 
                         echo "</table><br/><br/>";
                         if (count($testsuite->listerrors()) == 0) {
-                            echo sprintf(_("Realm is <strong>%s</strong> "), _(($naptr > 0 ? "DYNAMIC" : "STATIC"))) . _("with no DNS errors encountered. Congratulations!");
+                            echo sprintf(_("Realm is <strong>%s</strong> "), _(($naptr > 0 ? "DYNAMIC" : "STATIC")))._("with no DNS errors encountered. Congratulations!");
                         } else {
-                            echo 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 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 "<div class='notacceptable'><table>";
                             foreach ($testsuite->listerrors() as $details) {
-                                echo "<tr><td>" . $details['TYPE'] . "</td><td>" . $details['TARGET'] . "</td></tr>";
+                                echo "<tr><td>".$details['TYPE']."</td><td>".$details['TARGET']."</td></tr>";
                             }
                             echo "</table></div>";
                         }
@@ -589,25 +589,25 @@ 
                  $("#dynamic_tests").show();
               ';
                         foreach ($rfc7585suite->NAPTR_hostname_records as $hostindex => $addr) {
-                            $host = ($addr['family'] == "IPv6" ? "[" : "") . $addr['IP'] . ($addr['family'] == "IPv6" ? "]" : "") . ":" . $addr['port'];
+                            $host = ($addr['family'] == "IPv6" ? "[" : "").$addr['IP'].($addr['family'] == "IPv6" ? "]" : "").":".$addr['port'];
                             print "
                             running_ajax_dyn++;
-                            $.ajax({url:'radius_tests.php', data:{test_type: 'capath', realm: realm, src: '$host', lang: '" . $gui->languageInstance->getLang() . "', hostindex: '$hostindex' }, error: eee, success: capath, dataType: 'json'}); 
+                            $.ajax({url:'radius_tests.php', data:{test_type: 'capath', realm: realm, src: '$host', lang: '".$gui->languageInstance->getLang()."', 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: '" . $gui->languageInstance->getLang() . "', hostindex: '$hostindex' }, error: eee, success: clients, dataType: 'json'}); 
+                            $.ajax({url:'radius_tests.php', data:{test_type: 'clients', realm: realm, src: '$host', lang: '".$gui->languageInstance->getLang()."', hostindex: '$hostindex' }, error: eee, success: clients, dataType: 'json'}); 
                        ";
                         }
                         echo "}
               </script><hr>";
                     } else {
-                        echo "<tr><td>" . _("Dynamic discovery test is not configured") . "</td><td>";
+                        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>
+                        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>";
@@ -627,12 +627,12 @@ 
                     print "<p>";
                     foreach (\config\Diagnostics::RADIUSTESTS['UDP-hosts'] as $hostindex => $host) {
                         print "<hr>";
-                        printf(_("Testing from: %s"), "<strong>" . \config\Diagnostics::RADIUSTESTS['UDP-hosts'][$hostindex]['display_name'] . "</strong>");
+                        printf(_("Testing from: %s"), "<strong>".\config\Diagnostics::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>
 </table>";
@@ -651,21 +651,21 @@ 
 
                     <?php
                     echo "<div id='dynamic_tests'><fieldset class='option_container'>
-                <legend><strong>" . _("DYNAMIC connectivity tests") . "</strong></legend>";
+                <legend><strong>" . _("DYNAMIC connectivity tests")."</strong></legend>";
 
                     $resultstoprint = [];
                     if (count($rfc7585suite->NAPTR_hostname_records) > 0) {
-                        $resultstoprint[] = '<table style="align:right; display: none;" id="dynamic_result_fail">' . _("Some errors were found during the tests, see below") . '</table><table style="align:right; display: none;" id="dynamic_result_pass">' . _("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>";
+                        $resultstoprint[] = '<table style="align:right; display: none;" id="dynamic_result_fail">'._("Some errors were found during the tests, see below").'</table><table style="align:right; display: none;" id="dynamic_result_pass">'._("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 ($rfc7585suite->NAPTR_hostname_records as $hostindex => $addr) {
-                            $bracketaddr = ($addr["family"] == "IPv6" ? "[" . $addr["IP"] . "]" : $addr["IP"]);
-                            $resultstoprint[] = '<p><strong>' . $bracketaddr . ' TCP/' . $addr['port'] . '</strong>';
+                            $bracketaddr = ($addr["family"] == "IPv6" ? "[".$addr["IP"]."]" : $addr["IP"]);
+                            $resultstoprint[] = '<p><strong>'.$bracketaddr.' TCP/'.$addr['port'].'</strong>';
                             $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>";
@@ -673,12 +673,12 @@ 
                         }
                         $clientstest = [];
                         foreach ($rfc7585suite->NAPTR_hostname_records as $hostindex => $addr) {
-                            $clientstest[] = '<p><strong>' . $addr['IP'] . ' TCP/' . $addr['port'] . '</strong></p><ol>';
+                            $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>";
@@ -686,7 +686,7 @@ 
                         }
                         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>';
+                        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>';
@@ -700,7 +700,7 @@ 
                 //     check if truncates/dies on Operator-Name
                 if ($my_profile !== NULL) {
                     echo "<div id='tabs-4'><fieldset class='option_container'>
-                <legend><strong>" . _("Live login test") . "</strong></legend>";
+                <legend><strong>" . _("Live login test")."</strong></legend>";
                     $prof_compl = $my_profile->getEapMethodsinOrderOfPreference(1);
                     if (count($prof_compl) > 0) {
                         $passwordReqired = FALSE;
@@ -713,34 +713,34 @@ 
                                 $clientCertRequired = TRUE;
                             }
                         }
-                        echo "<div id='disposable_credential_container'><p>" . _("If you enter an existing login credential here, you can test the actual authentication from various checkpoints all over the world.") . "</p>
-                    <p>" . _("The test will use all EAP types you have set in your profile information to check whether the right CAs and server names are used, and of course whether the login with these credentials and the given EAP type actually worked. If you have set anonymous outer ID, the test will use that.") . "</p>
-                    <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>
+                        echo "<div id='disposable_credential_container'><p>"._("If you enter an existing login credential here, you can test the actual authentication from various checkpoints all over the world.")."</p>
+                    <p>" . _("The test will use all EAP types you have set in your profile information to check whether the right CAs and server names are used, and of course whether the login with these credentials and the given EAP type actually worked. If you have set anonymous outer ID, the test will use that.")."</p>
+                    <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='" . $gui->languageInstance->getLang() . "'>
-                    <input type='hidden' name='profile_id' value='" . $my_profile->identifier . "'>
+                    <input type='hidden' name='lang' value='" . $gui->languageInstance->getLang()."'>
+                    <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 ($passwordReqired) {
-                            echo "<tr><td colspan='2'><strong>" . _("Password-based EAP types") . "</strong></td></tr>
-                        <tr><td>" . _("Real (inner) username:") . "</td><td><input type='text' id='username' class='mandatory' name='username'/></td></tr>";
-                            echo "<tr><td>" . _("Anonymous outer ID (optional):") . "</td><td><input type='text' id='outer_username' name='outer_username'/></td></tr>";
-                            echo "<tr><td>" . _("Password:") . "</td><td><input type='text' id='password' class='mandatory' name='password'/></td></tr>";
+                            echo "<tr><td colspan='2'><strong>"._("Password-based EAP types")."</strong></td></tr>
+                        <tr><td>" . _("Real (inner) username:")."</td><td><input type='text' id='username' class='mandatory' name='username'/></td></tr>";
+                            echo "<tr><td>"._("Anonymous outer ID (optional):")."</td><td><input type='text' id='outer_username' name='outer_username'/></td></tr>";
+                            echo "<tr><td>"._("Password:")."</td><td><input type='text' id='password' class='mandatory' name='password'/></td></tr>";
                         }
                         // ask for cert + privkey if TLS-based method is active
                         if ($clientCertRequired) {
-                            echo "<tr><td colspan='2'><strong>" . _("Certificate-based EAP types") . "</strong></td></tr>
-                        <tr><td>" . _("Certificate file (.p12 or .pfx):") . "</td><td><input type='file' id='cert' accept='application/x-pkcs12' name='cert'/></td></tr>
-                        <tr><td>" . _("Certificate password, if any:") . "</td><td><input type='text' id='privkey' name='privkey_pass'/></td></tr>
-                        <tr><td>" . _("Username, if different from certificate Subject:") . "</td><td><input type='text' id='tls_username' name='tls_username'/></td></tr>";
+                            echo "<tr><td colspan='2'><strong>"._("Certificate-based EAP types")."</strong></td></tr>
+                        <tr><td>" . _("Certificate file (.p12 or .pfx):")."</td><td><input type='file' id='cert' accept='application/x-pkcs12' name='cert'/></td></tr>
+                        <tr><td>" . _("Certificate password, if any:")."</td><td><input type='text' id='privkey' name='privkey_pass'/></td></tr>
+                        <tr><td>" . _("Username, if different from certificate Subject:")."</td><td><input type='text' id='tls_username' name='tls_username'/></td></tr>";
                         }
-                        echo "<tr><td colspan='2'><button id='submit_credentials'>" . _("Submit credentials") . "</button></td></tr></table></form>";
+                        echo "<tr><td colspan='2'><button id='submit_credentials'>"._("Submit credentials")."</button></td></tr></table></form>";
                         echo "<div id='live_login_results' style='display:none'>";
                         foreach (\config\Diagnostics::RADIUSTESTS['UDP-hosts'] as $hostindex => $host) {
                             print "<hr>";
-                            printf(_("Testing from: %s"), "<strong>" . \config\Diagnostics::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\Diagnostics::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>";
@@ -757,7 +757,7 @@ 
             if (isset($_POST['comefrom'])) {
                 $return = htmlspecialchars_decode($_POST['comefrom'])."?inst_id=".$my_inst->identifier;
                 echo "<form method='post' action='$return' accept-charset='UTF-8'>
-                    <button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_CLOSE . "'>" . sprintf(_("Return to %s administrator area"), core\common\Entity::$nomenclature_inst) . "</button>"
+                    <button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_CLOSE."'>".sprintf(_("Return to %s administrator area"), core\common\Entity::$nomenclature_inst)."</button>"
                 . "</form>";
             }
             if ($check_realm !== FALSE) {

web/admin/logout_check.php

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 require_once \config\Master::AUTHENTICATION['ssp-path-to-autoloader'];
 
 $deco = new \web\lib\admin\PageDecoration();
@@ -38,13 +38,13 @@ 
     if ($cutoff !== FALSE) {    
         $substring = substr($_SERVER['PHP_SELF'], 0, $cutoff);
         if ($substring !== FALSE) {
-            $url = "//" . htmlspecialchars($_SERVER['SERVER_NAME']) . $substring;
+            $url = "//".htmlspecialchars($_SERVER['SERVER_NAME']).$substring;
         }
     }
     header("Location: $url");
 } else {
     /* Logout failed. Tell the user to close the browser. */
     echo $deco->pageheader(_("Incomplete Logout"), "ADMIN", FALSE);
-    echo "<p>" . _("We were unable to log you out of all your sessions. To be completely sure that you are logged out, you need to close your web browser.") . "</p>";
+    echo "<p>"._("We were unable to log you out of all your sessions. To be completely sure that you are logged out, you need to close your web browser.")."</p>";
     echo $deco->footer();
 }

web/admin/inc/manageDBLink.inc.php

Spacing +20 added lines, -20 removed lines

@@ -20,7 +20,7 @@ 
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $auth->authenticate();
@@ -35,7 +35,7 @@ 
 
 // if we have a pushed close button, submit attributes and send user back to the overview page
 // if external DB sync is disabled globally, the user never gets to this page. If he came here *anyway* -> send him back immediately.
-if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == web\lib\common\FormElements::BUTTON_CLOSE ) || \config\Master::DB['enforce-external-sync'] == FALSE) {
+if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == web\lib\common\FormElements::BUTTON_CLOSE) || \config\Master::DB['enforce-external-sync'] == FALSE) {
     header("Location: ../overview_federation.php");
     exit;
 }
@@ -92,9 +92,9 @@ 
     $cat = new \core\CAT();
     switch ($my_inst->getExternalDBSyncState()) {
         case \core\IdP::EXTERNAL_DB_SYNCSTATE_SYNCED:
-            printf(_("This %s is linked to the %s database."), $uiElements->nomenclatureInst, \config\ConfAssistant::CONSORTIUM['display_name']) . "</p>";
-            echo "<p>" . sprintf(_("The following information about the IdP is stored in the %s DB and %s DB:"), \config\Master::APPEARANCE['productname'], \config\ConfAssistant::CONSORTIUM['display_name']) . "</p>";
-            echo "<table><tr><td>" . sprintf(_("Information in <strong>%s Database</strong>"), \config\Master::APPEARANCE['productname']) . "</td><td>" . sprintf(_("Information in <strong>%s Database</strong>"), \config\ConfAssistant::CONSORTIUM['display_name']) . "</td></tr>";
+            printf(_("This %s is linked to the %s database."), $uiElements->nomenclatureInst, \config\ConfAssistant::CONSORTIUM['display_name'])."</p>";
+            echo "<p>".sprintf(_("The following information about the IdP is stored in the %s DB and %s DB:"), \config\Master::APPEARANCE['productname'], \config\ConfAssistant::CONSORTIUM['display_name'])."</p>";
+            echo "<table><tr><td>".sprintf(_("Information in <strong>%s Database</strong>"), \config\Master::APPEARANCE['productname'])."</td><td>".sprintf(_("Information in <strong>%s Database</strong>"), \config\ConfAssistant::CONSORTIUM['display_name'])."</td></tr>";
             echo "<tr><td>";
             // left-hand side: CAT DB
             echo "<table>";
@@ -106,7 +106,7 @@ 
                 } else {
                     $language = \config\Master::LANGUAGES[$name['lang']]['display'] ?? "(unsupported language)";
                 }
-                echo "<tr><td>" . sprintf(_("%s Name (%s)"), $uiElements->nomenclatureInst, $language) . "</td><td>" . $name['value'] . "</td></tr>";
+                echo "<tr><td>".sprintf(_("%s Name (%s)"), $uiElements->nomenclatureInst, $language)."</td><td>".$name['value']."</td></tr>";
             }
 
             $admins = $my_inst->listOwners();
@@ -117,7 +117,7 @@ 
                 if (count($username) == 0) {
                     $username[0]['value'] = _("Unnamed User");
                 }
-                echo "<tr><td>" . _("Administrator [invited as]") . "</td><td>" . $username[0]['value'] . " [" . $admin['MAIL'] . "]</td></tr>";
+                echo "<tr><td>"._("Administrator [invited as]")."</td><td>".$username[0]['value']." [".$admin['MAIL']."]</td></tr>";
             }
             echo "</table>";
             // end of left-hand side
@@ -125,38 +125,38 @@ 
             // right-hand side: external DB
             $externalid = $my_inst->getExternalDBId();
             if (is_bool($externalid)) { // we are in SYNCED state so this cannot happen
-                throw new Exception("We are in SYNCSTATE_SYNCED but still there is no external DB Id available for the " . \config\ConfAssistant::CONSORTIUM['nomenclature_institution'] . "!");
+                throw new Exception("We are in SYNCSTATE_SYNCED but still there is no external DB Id available for the ".\config\ConfAssistant::CONSORTIUM['nomenclature_institution']."!");
             }
 
             $extinfo = $cat->getExternalDBEntityDetails($externalid);
 
             echo "<table>";
             foreach ($extinfo['names'] as $lang => $name) {
-                echo "<tr><td>" . sprintf(_("%s Name (%s)"), $uiElements->nomenclatureInst, $lang) . "</td><td>$name</td>";
+                echo "<tr><td>".sprintf(_("%s Name (%s)"), $uiElements->nomenclatureInst, $lang)."</td><td>$name</td>";
             }
             foreach ($extinfo['admins'] as $number => $admin_details) {
-                echo "<tr><td>" . _("Administrator email") . "</td><td>" . $admin_details['email'] . "</td></tr>";
+                echo "<tr><td>"._("Administrator email")."</td><td>".$admin_details['email']."</td></tr>";
             }
             echo "</table>";
             // end of right-hand side
             echo "</td></tr></table>";
-            echo "<p>" . _("If this mapping is not correct any more, you can remove the link:") . " ";
+            echo "<p>"._("If this mapping is not correct any more, you can remove the link:")." ";
             echo "<form name='form-unlink-inst' action='inc/manageDBLink.inc.php?inst_id=$my_inst->identifier' method='post' accept-charset='UTF-8'>";
-            echo "<button type='submit' class='delete' name='submitbutton' id='submit' value='" . web\lib\common\FormElements::BUTTON_DELETE . "'>" . _("Unlink") . "</button></form>";
+            echo "<button type='submit' class='delete' name='submitbutton' id='submit' value='".web\lib\common\FormElements::BUTTON_DELETE."'>"._("Unlink")."</button></form>";
             break;
         case \core\IdP::EXTERNAL_DB_SYNCSTATE_NOT_SYNCED:
             $temparray = [];
-            printf(_("This %s is not yet linked to the %s database."), $uiElements->nomenclatureInst, \config\ConfAssistant::CONSORTIUM['display_name']) . " ";
-            echo "<strong>" . _("This means that its profiles are not made available on the user download page.") . "</strong> ";
+            printf(_("This %s is not yet linked to the %s database."), $uiElements->nomenclatureInst, \config\ConfAssistant::CONSORTIUM['display_name'])." ";
+            echo "<strong>"._("This means that its profiles are not made available on the user download page.")."</strong> ";
             printf(_("You can link it to the %s database below."), \config\ConfAssistant::CONSORTIUM['display_name']);
             $candidates = $my_inst->getExternalDBSyncCandidates($my_inst->type);
             echo "<br/><form name='form-link-inst' action='inc/manageDBLink.inc.php?inst_id=$my_inst->identifier' method='post' accept-charset='UTF-8'>";
-            printf(_("Please select an entity from the %s DB which corresponds to this CAT %s."), \config\ConfAssistant::CONSORTIUM['display_name'], $uiElements->nomenclatureInst) . " ";
+            printf(_("Please select an entity from the %s DB which corresponds to this CAT %s."), \config\ConfAssistant::CONSORTIUM['display_name'], $uiElements->nomenclatureInst)." ";
             if (count($candidates) > 0) {
                 printf(_("Particularly promising entries (names in CAT and %s DB are a 100%% match) are on top of the list."), \config\ConfAssistant::CONSORTIUM['display_name']);
             }
             echo "<table>";
-            echo "<tr><th>" . _("Link to this entity?") . "</th><th>" . sprintf(_("%s Name"), $uiElements->nomenclatureInst) . "</th><th>" . _("Administrators") . "</th></tr>";
+            echo "<tr><th>"._("Link to this entity?")."</th><th>".sprintf(_("%s Name"), $uiElements->nomenclatureInst)."</th><th>"._("Administrators")."</th></tr>";
 
             foreach ($candidates as $candidate) {
                 $info = $cat->getExternalDBEntityDetails($candidate);
@@ -166,7 +166,7 @@ 
                 }
                 echo "</td><td>";
                 foreach ($info['admins'] as $number => $admin_details) {
-                    echo "[E-Mail] " . $admin_details['email'] . "<br/>";
+                    echo "[E-Mail] ".$admin_details['email']."<br/>";
                 }
                 echo "</td></tr>";
                 $temparray[] = $candidate;
@@ -178,7 +178,7 @@ 
             $buffer = "";
 
             foreach ($unmappedentities as $v) {
-                $buffer .= "<option value='" . $v['ID'] . "'>[ID " . $v['ID'] . "] " . $v['name'] . "</option>";
+                $buffer .= "<option value='".$v['ID']."'>[ID ".$v['ID']."] ".$v['name']."</option>";
             }
 
             if ($buffer != "") {
@@ -189,9 +189,9 @@ 
             }
             // issue a big red warning if there are no link candidates at all in the federation
             if (empty($buffer) && empty($candidates)) {
-                echo "<tr><td style='color:#ff0000' colspan='2'>" . sprintf(_('There is no single unmapped %s in the external database for this %s!'), $uiElements->nomenclatureInst, $uiElements->nomenclatureFed) . "</td></tr>";
+                echo "<tr><td style='color:#ff0000' colspan='2'>".sprintf(_('There is no single unmapped %s in the external database for this %s!'), $uiElements->nomenclatureInst, $uiElements->nomenclatureFed)."</td></tr>";
             }
-            echo "</table><button type='submit' name='submitbutton' id='submit' value='" . web\lib\common\FormElements::BUTTON_SAVE . "' disabled >" . _("Create Link") . "</button></form>";
+            echo "</table><button type='submit' name='submitbutton' id='submit' value='".web\lib\common\FormElements::BUTTON_SAVE."' disabled >"._("Create Link")."</button></form>";
             break;
         default:
     }

web/admin/inc/manageNewInst.inc.php

Spacing +10 added lines, -10 removed lines

@@ -20,7 +20,7 @@ 
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $uiElements = new \web\lib\admin\UIElements();
@@ -57,8 +57,8 @@ 
 <?php
 echo sprintf(_("On this page, you can add a new %s to your %s. Please fill out the form below to send out an email invitation to the new %s administrator."), $uiElements->nomenclatureInst, $uiElements->nomenclatureFed, $uiElements->nomenclatureInst);
 if (\config\Master::DB['enforce-external-sync']) {
-    echo "<p>" . sprintf(_("You can either register a known %s (as defined in the %s database) or create a totally new %s."), $uiElements->nomenclatureInst, \config\ConfAssistant::CONSORTIUM['display_name'], $uiElements->nomenclatureInst) . "</p>";
-    echo "<p>" . sprintf(_("The latter one is typically for an %s which is yet in a testing phase and therefore doesn't appear in the %s database yet."), $uiElements->nomenclatureInst, \config\ConfAssistant::CONSORTIUM['display_name']) . "</p>";    
+    echo "<p>".sprintf(_("You can either register a known %s (as defined in the %s database) or create a totally new %s."), $uiElements->nomenclatureInst, \config\ConfAssistant::CONSORTIUM['display_name'], $uiElements->nomenclatureInst)."</p>";
+    echo "<p>".sprintf(_("The latter one is typically for an %s which is yet in a testing phase and therefore doesn't appear in the %s database yet."), $uiElements->nomenclatureInst, \config\ConfAssistant::CONSORTIUM['display_name'])."</p>";    
 }
 ?>
 <hr/>
@@ -68,12 +68,12 @@ 
         <?php
         if (\config\Master::DB['enforce-external-sync']) {
             echo "<tr><td>
-                <input type='radio' name='creation' value='existing'>" . sprintf(_("Existing %s:"), $uiElements->nomenclatureParticipant) . "</input>
+                <input type='radio' name='creation' value='existing'>" . sprintf(_("Existing %s:"), $uiElements->nomenclatureParticipant)."</input>
                      </td>";
 
             echo "<td colspan='4'>
                 <select id='externals' name='externals' onchange='document.sendinvite.creation[0].checked=true; document.sendinvite.mailaddr.value=this.options[this.selectedIndex].id;'>
-                    <option value='FREETEXT'>" . sprintf(_("--- select %s here ---"),$uiElements->nomenclatureParticipant) . "</option>";
+                    <option value='FREETEXT'>" . sprintf(_("--- select %s here ---"), $uiElements->nomenclatureParticipant)."</option>";
 
             foreach ($feds as $fed_value) {
                 $thefed = new \core\Federation(strtoupper($fed_value['value']));
@@ -82,7 +82,7 @@ 
                 $entities = $thefed->listExternalEntities(TRUE, NULL);
 
                 foreach ($entities as $v) {
-                    echo "<option id='" . $v['contactlist'] . "' value='" . $v['ID'] . "'>[" . $fed_value['value'] . "] " . $v['name'] . "</option>";
+                    echo "<option id='".$v['contactlist']."' value='".$v['ID']."'>[".$fed_value['value']."] ".$v['name']."</option>";
                 }
             }
 
@@ -91,16 +91,16 @@ 
         ?>
         <tr>
             <td>
-                <input type='radio' name='creation' value='new'><?php echo sprintf(_("New %s"),$uiElements->nomenclatureParticipant); ?></input>
+                <input type='radio' name='creation' value='new'><?php echo sprintf(_("New %s"), $uiElements->nomenclatureParticipant); ?></input>
             </td>
             <td>
                 <?php echo _("Name"); ?><input type='text' size='30' id='name' name='name' onchange='document.sendinvite.creation[1].checked = true'/>
             </td>
             <td>
                 <select name="participant_type">
-                    <option value="IdPSP" selected><?php printf(_("%s and %s"),$uiElements->nomenclatureInst, $uiElements->nomenclatureHotspot)?></option>
-                    <option value="IdP"><?php printf(_("%s"),$uiElements->nomenclatureInst)?></option>
-                    <option value="SP"><?php printf(_("%s"),$uiElements->nomenclatureHotspot)?></option>
+                    <option value="IdPSP" selected><?php printf(_("%s and %s"), $uiElements->nomenclatureInst, $uiElements->nomenclatureHotspot)?></option>
+                    <option value="IdP"><?php printf(_("%s"), $uiElements->nomenclatureInst)?></option>
+                    <option value="SP"><?php printf(_("%s"), $uiElements->nomenclatureHotspot)?></option>
                 </select>
             </td>
             <td><?php echo $uiElements->nomenclatureFed; ?>

web/user/about_cat.inc.php

Indentation +3 added lines, -3 removed lines

@@ -34,9 +34,9 @@
 $skinObject = new \web\lib\user\Skinjob("classic");
 /// eduroam CAT, twice the consortium name eduroam, twice eduroam CAT
 $out = sprintf(_("<span class='edu_cat'>%s</span> is built as a cooperation platform."))."<p>".
-       sprintf(_("Local %s administrators enter their %s configuration details and based on them, <span class='edu_cat'>%s</span> builds customised installers for a number of popular platforms. ".
-                 "An installer prepared for one organisation will not work for users of another one, therefore if your organisation is not on the list, you cannot use this system. ".
-                 "Please contact your local administrators and try to influence them to add your %s configuration to <span class='edu_cat'>%s</span>."), 
+        sprintf(_("Local %s administrators enter their %s configuration details and based on them, <span class='edu_cat'>%s</span> builds customised installers for a number of popular platforms. ".
+                    "An installer prepared for one organisation will not work for users of another one, therefore if your organisation is not on the list, you cannot use this system. ".
+                    "Please contact your local administrators and try to influence them to add your %s configuration to <span class='edu_cat'>%s</span>."), 
         \config\Master::APPEARANCE['productname'], 
         \config\ConfAssistant::CONSORTIUM['display_name'], 
         \config\ConfAssistant::CONSORTIUM['display_name'], 

Spacing +5 added lines, -5 removed lines

@@ -42,10 +42,10 @@ 
         \config\ConfAssistant::CONSORTIUM['display_name'], 
         \config\Master::APPEARANCE['productname'], 
         \config\Master::APPEARANCE['productname']);
-$out .= "<p>" . sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), \config\Master::APPEARANCE['productname']) . "</p>";
-$out .= "<table><tr><th>" . _("Device Group") . "</th><th>" . _("Device") . "</th>";
+$out .= "<p>".sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), \config\Master::APPEARANCE['productname'])."</p>";
+$out .= "<table><tr><th>"._("Device Group")."</th><th>"._("Device")."</th>";
 foreach (\core\common\EAP::listKnownEAPTypes() as $oneeap) {
-    $out .= "<th style='min-width: 80px;'>" . $oneeap->getPrintableRep() . "</th>";
+    $out .= "<th style='min-width: 80px;'>".$oneeap->getPrintableRep()."</th>";
 }
 $out .= "</tr>";
 foreach (\devices\Devices::listDevices() as $index => $onedevice) {
@@ -54,12 +54,12 @@ 
             continue;
         }
     }
-    $vendor = (new \web\lib\user\Skinjob())->findResourceUrl("IMAGES", "vendorlogo/" . $onedevice['group'] . ".png");
+    $vendor = (new \web\lib\user\Skinjob())->findResourceUrl("IMAGES", "vendorlogo/".$onedevice['group'].".png");
     $vendorImg = "";
     if ($vendor !== FALSE) {
         $vendorImg = "<img src='$vendor' alt='logo'>";
     }
-    $out .= "<tr><td class='vendor'>$vendorImg</td><td>" . $onedevice['display'] . "</td>";
+    $out .= "<tr><td class='vendor'>$vendorImg</td><td>".$onedevice['display']."</td>";
     $device_instance = new \core\DeviceFactory($index);
     foreach (\core\common\EAP::listKnownEAPTypes() as $oneeap) {
         $out .= "<td>";

web/user/devel.inc.php

Spacing +7 added lines, -7 removed lines

@@ -19,13 +19,13 @@
  *          <base_url>/copyright.php after deploying the software
  */
 
-$out = "<h3>" . _("Access the sources") . "</h3>" .
-        sprintf(_("%s is an opensource project. If you are interested in the details of the implementation, please visit <a href='%s'>GitHub</a>."), \config\Master::APPEARANCE['productname'], "https://github.com/GEANT/CAT" ) .
-        "<h3>" . _("Join the developers mailing list.") . "</h3>" .
-        sprintf(_("The list is available at: %s"), \config\Master::APPEARANCE['support-contact']['display']) .
-        "<h3>" . _("Add a translation") . "</h3>" .
-        _("If you would like to add a new language to CAT then please contact us ...") .
-        "<h3><a href='" . \core\CAT::getRootUrlPath() . "/apidoc' target='_blank'>". _("Documentation") . "</a></h3>" ;
+$out = "<h3>"._("Access the sources")."</h3>".
+        sprintf(_("%s is an opensource project. If you are interested in the details of the implementation, please visit <a href='%s'>GitHub</a>."), \config\Master::APPEARANCE['productname'], "https://github.com/GEANT/CAT").
+        "<h3>"._("Join the developers mailing list.")."</h3>".
+        sprintf(_("The list is available at: %s"), \config\Master::APPEARANCE['support-contact']['display']).
+        "<h3>"._("Add a translation")."</h3>".
+        _("If you would like to add a new language to CAT then please contact us ...").
+        "<h3><a href='".\core\CAT::getRootUrlPath()."/apidoc' target='_blank'>"._("Documentation")."</a></h3>";
 
         
 

web/404.php

Spacing +10 added lines, -10 removed lines

@@ -26,7 +26,7 @@ 
  * @package UserGUI
  */
 error_reporting(E_ALL | E_STRICT);
-require dirname(dirname(__FILE__)) . "/config/_config.php";
+require dirname(dirname(__FILE__))."/config/_config.php";
 $langObject = new \core\common\Language();
 $langObject->setTextDomain("web_user");
 
@@ -38,25 +38,25 @@ 
 <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
     <div id="heading">
         <?php
-        print '<img src="'. dirname($_SERVER['SCRIPT_NAME']) .'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
-        print '<div id="motd">' . ( isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp' ) . '</div>';
-        print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']) . '</h1>
-<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . \config\Master::APPEARANCE['productname_long'] . '</h2>';
+        print '<img src="'.dirname($_SERVER['SCRIPT_NAME']).'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>';
+        print '<div id="motd">'.(isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : '&nbsp').'</div>';
+        print '<h1 style="padding-bottom:0px; height:1em;">'.sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']).'</h1>
+<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . \config\Master::APPEARANCE['productname_long'].'</h2>';
         echo '<table id="lang_select"><tr><td>';
         echo _("View this page in");
         ?>
         <?php
         foreach (\config\Master::LANGUAGES as $lang => $value) {
-            echo "<a href='javascript:changeLang(\"$lang\")'>" . $value['display'] . "</a> ";
+            echo "<a href='javascript:changeLang(\"$lang\")'>".$value['display']."</a> ";
         }
-        echo '</td><td style="text-align:right;padding-right:20px"><a href="' . dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang() . '">' . _("Start page") . '</a></td></tr></table>';
+        echo '</td><td style="text-align:right;padding-right:20px"><a href="'.dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang().'">'._("Start page").'</a></td></tr></table>';
         ?>
     </div> <!-- id="heading" -->
     <div id="main_body" style='padding:20px;'>
-        <h1><?php echo _("This is not the CAT you are looking for.");?></h1>
-        <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number");?></p>
+        <h1><?php echo _("This is not the CAT you are looking for."); ?></h1>
+        <p><?php echo _("Whatever you expected to see at this URL - it's not here. The only thing here is the number"); ?></p>
         <h2>404</h2>
-        <p><?php echo sprintf(_("staring at you. Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang());?></p>
+        <p><?php echo sprintf(_("staring at you. Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang()); ?></p>
     </div> <!-- id="main_body" -->
 
         <?php echo $deco->footer();

web/accountstatus/accountstatus.php

Spacing +6 added lines, -6 removed lines

@@ -26,7 +26,7 @@ 
  * @author Stefan Winter <stefan.winter@restena.lu>
  * @package Core
  */
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $cleanToken = FALSE;
 $invitationObject = new core\SilverbulletInvitation("INVALID");
@@ -73,7 +73,7 @@ 
 
 $statusInfo = ["token" => $cleanToken,
     "invitation_object" => $invitationObject,
-    "OS" => $Gui->operatingSystem,];
+    "OS" => $Gui->operatingSystem, ];
 
 if ($profile !== NULL) {
     $attributes = $Gui->profileAttributes($profile->identifier);
@@ -86,7 +86,7 @@ 
 $caAndSerial = filter_input(INPUT_GET, 'serial', FILTER_SANITIZE_STRING);
 
 if ($action !== NULL && $action !== FALSE && $action === \web\lib\common\FormElements::BUTTON_DELETE && $caAndSerial !== NULL && $caAndSerial !== FALSE) {
-    $tuple = explode(':',$caAndSerial);
+    $tuple = explode(':', $caAndSerial);
     $ca_type = $tuple[0];
     $serial = $tuple[1];
     if ($statusInfo['invitation_object']->invitationTokenStatus != \core\SilverbulletInvitation::SB_TOKENSTATUS_INVALID) {
@@ -101,12 +101,12 @@ 
                 print "//REVOKING\n";
                 $certObject = new \core\SilverbulletCertificate($serial, $ca_type);
                 $certObject->revokeCertificate();
-                header("Location: accountstatus.php?token=" . $statusInfo['token']);
+                header("Location: accountstatus.php?token=".$statusInfo['token']);
                 exit;
             }
         }
     }
-    header("Location: accountstatus.php?token=" . $statusInfo['token']);
+    header("Location: accountstatus.php?token=".$statusInfo['token']);
     exit;
 }
 
@@ -131,4 +131,4 @@ 
 $skinObject = new \web\lib\user\Skinjob($_REQUEST['skin'] ?? $_SESSION['skin'] ?? $fedskin[0] ?? \config\Master::APPEARANCE['skins'][0]);
 
 // and now, serve actual data
-require "../skins/" . $skinObject->skin . "/accountstatus/accountstatus.php";
+require "../skins/".$skinObject->skin."/accountstatus/accountstatus.php";