GEANT / CAT

web/diag/action_realmcheck.php

Spacing +58 added lines, -58 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();
 
@@ -65,13 +65,13 @@ 
         $testsuite = new \core\diag\RADIUSTests($check_realm, $testedProfile->getRealmCheckOuterUsername(), $testedProfile->getEapMethodsinOrderOfPreference(1), $testedProfile->getCollapsedAttributes()['eap:server_name'], $testedProfile->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, and we don't know anything about it... 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!");
@@ -119,7 +119,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 ?>";
@@ -256,7 +256,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>';
@@ -426,8 +426,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',
@@ -457,15 +457,15 @@ 
 <?php
 foreach (\config\Diagnostics::RADIUSTESTS['UDP-hosts'] as $hostindex => $host) {
     if ($testedProfile !== NULL) {
-        $extraarg = "profile_id: " . $testedProfile->identifier . ", ";
+        $extraarg = "profile_id: ".$testedProfile->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');
 
 ";
 }
@@ -492,7 +492,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">
@@ -509,12 +509,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.");
@@ -529,7 +529,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:
@@ -546,7 +546,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.");
@@ -562,7 +562,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.");
@@ -578,12 +578,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>";
                         }
@@ -599,26 +599,26 @@ 
                  $("#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'];
                             $expectedName = $addr['hostname'];
                             print "
                             running_ajax_dyn++;
-                            $.ajax({url:'radius_tests.php', data:{test_type: 'capath', realm: realm, src: '$host', lang: '" . $gui->languageInstance->getLang() . "', hostindex: '$hostindex', expectedname: '$expectedName' }, 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', expectedname: '$expectedName' }, 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>";
@@ -638,12 +638,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>";
@@ -662,21 +662,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[] = '<div style="align:right; display: none;" id="dynamic_result_fail">' . _("Some errors were found during the tests, see below") . '</div><div style="align:right; display: none;" id="dynamic_result_pass">' . _("All tests passed, congratulations!") . '</div>';
-                        $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[] = '<div style="align:right; display: none;" id="dynamic_result_fail">'._("Some errors were found during the tests, see below").'</div><div style="align:right; display: none;" id="dynamic_result_pass">'._("All tests passed, congratulations!").'</div>';
+                        $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>";
@@ -684,12 +684,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>";
@@ -697,7 +697,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>';
@@ -711,7 +711,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;
@@ -724,34 +724,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>";
@@ -766,9 +766,9 @@ 
             }
 
             if (isset($_POST['comefrom'])) {
-                $return = htmlspecialchars_decode($_POST['comefrom']) . "?inst_id=" . $my_inst->identifier;
+                $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/edit_profile_result.php

Spacing +22 added lines, -22 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";
 
 $auth = new \web\lib\admin\Authentication();
 $deco = new \web\lib\admin\PageDecoration();
@@ -52,7 +52,7 @@ 
             echo $deco->pageheader(sprintf(_("%s: Edit Profile - Result"), \config\Master::APPEARANCE['productname']), "ADMIN-IDP");
         } else {
             $profile = $my_inst->newProfile(core\AbstractProfile::PROFILETYPE_RADIUS);
-            $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP " . $my_inst->identifier . " - Profile created");
+            $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP ".$my_inst->identifier." - Profile created");
             echo $deco->pageheader(sprintf(_("%s: Profile wizard (step 3 completed)"), \config\Master::APPEARANCE['productname']), "ADMIN-IDP");
         }
         if (!$profile instanceof \core\ProfileRADIUS) {
@@ -113,7 +113,7 @@ 
             $uiElements = new web\lib\admin\UIElements();
             // set realm info, if submitted
             if ($realm !== FALSE) {
-                $profile->setRealm($anonLocal . "@" . $realm);
+                $profile->setRealm($anonLocal."@".$realm);
                 echo $uiElements->boxOkay(sprintf(_("Realm: <strong>%s</strong>"), $realm));
             } else {
                 $profile->setRealm("");
@@ -136,7 +136,7 @@ 
                     echo $uiElements->boxError(_("Realm check username cannot be configured: realm is missing!"));
                 } else {
                     $profile->setRealmcheckUser(true, $checkuser_name);
-                    echo $uiElements->boxOkay(sprintf(_("Special username for realm check is <strong>%s</strong>, the value is <strong>%s</strong>"), _("ON"), $checkuser_name . "@" . $realm));
+                    echo $uiElements->boxOkay(sprintf(_("Special username for realm check is <strong>%s</strong>, the value is <strong>%s</strong>"), _("ON"), $checkuser_name."@".$realm));
                 }
             } else {
                 $profile->setRealmCheckUser(false);
@@ -149,7 +149,7 @@ 
                 } else {
                     $profile->setInputVerificationPreference($verify, $hint);
                     if ($hint !== FALSE) {
-                        $extratext = " " . sprintf(_("and the input field will be prefilled with '<strong>@%s</strong>'."), $realm);
+                        $extratext = " ".sprintf(_("and the input field will be prefilled with '<strong>@%s</strong>'."), $realm);
                     } else {
                         $extratext = ".";
                     }
@@ -186,29 +186,29 @@ 
                 echo $uiElements->boxOkay(_("Redirection is <strong>OFF</strong>"));
             }
 
-            $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile " . $profile->identifier . " - attributes changed");
+            $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile ".$profile->identifier." - attributes changed");
 
             foreach (\core\common\EAP::listKnownEAPTypes() as $a) {
                 if ($a->getIntegerRep() == \core\common\EAP::INTEGER_SILVERBULLET) { // do not allow adding silverbullet via the backdoor
                     continue;
                 }
-                if (isset($_POST[$a->getPrintableRep()]) && isset($_POST[$a->getPrintableRep() . "-priority"]) && is_numeric($_POST[$a->getPrintableRep() . "-priority"])) {
-                    $priority = (int) $_POST[$a->getPrintableRep() . "-priority"];
+                if (isset($_POST[$a->getPrintableRep()]) && isset($_POST[$a->getPrintableRep()."-priority"]) && is_numeric($_POST[$a->getPrintableRep()."-priority"])) {
+                    $priority = (int) $_POST[$a->getPrintableRep()."-priority"];
                     // add EAP type to profile as requested, but ...
                     $profile->addSupportedEapMethod($a, $priority);
-                    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile " . $profile->identifier . " - supported EAP types changed");
+                    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile ".$profile->identifier." - supported EAP types changed");
                     // see if we can enable the EAP type, or if info is missing
                     $eapcompleteness = $profile->isEapTypeDefinitionComplete($a);
                     if ($eapcompleteness === true) {
-                        echo $uiElements->boxOkay(_("Supported EAP Type: ") . "<strong>" . $a->getPrintableRep() . "</strong>");
+                        echo $uiElements->boxOkay(_("Supported EAP Type: ")."<strong>".$a->getPrintableRep()."</strong>");
                     } else {
                         $warntext = "";
                         if (is_array($eapcompleteness)) {
                             foreach ($eapcompleteness as $item) {
-                                $warntext .= "<strong>" . $uiElements->displayName($item) . "</strong> ";
+                                $warntext .= "<strong>".$uiElements->displayName($item)."</strong> ";
                             }
                         }
-                        echo $uiElements->boxWarning(sprintf(_("Supported EAP Type: <strong>%s</strong> is missing required information %s !"), $a->getPrintableRep(), $warntext) . "<br/>" . _("The EAP type was added to the profile, but you need to complete the missing information before we can produce installers for you."));
+                        echo $uiElements->boxWarning(sprintf(_("Supported EAP Type: <strong>%s</strong> is missing required information %s !"), $a->getPrintableRep(), $warntext)."<br/>"._("The EAP type was added to the profile, but you need to complete the missing information before we can produce installers for you."));
                     }
                 }
             }
@@ -218,23 +218,23 @@ 
             if (count($significantChanges) > 0) {
                 $myInstOriginal = new \core\IdP($profile->institution);
                 // send a notification/alert mail to someone we know is in charge
-                $text = _("To whom it may concern,") . "\n\n";
+                $text = _("To whom it may concern,")."\n\n";
                 /// were made to the *Identity Provider* *LU* / integer number of IdP / (previously known as) Name
-                $text .= sprintf(_("significant changes were made to a RADIUS deployment profile of the %s %s / %s / '%s'."), $ui->nomenclatureInst, strtoupper($myInstOriginal->federation), $myInstOriginal->identifier, $myInstOriginal->name) . "\n\n";
+                $text .= sprintf(_("significant changes were made to a RADIUS deployment profile of the %s %s / %s / '%s'."), $ui->nomenclatureInst, strtoupper($myInstOriginal->federation), $myInstOriginal->identifier, $myInstOriginal->name)."\n\n";
                 if (isset($significantChanges[\core\AbstractProfile::CA_CLASH_ADDED])) {
-                    $text .= _("WARNING! A new trusted root CA was added, and it has the exact same name as a previously existing root CA. This may (but does not necessarily) mean that this is an attempt to insert an unauthorised trust root by disguising as the genuine one. The details are below:") . "\n\n";
-                    $text .= $significantChanges[\core\AbstractProfile::CA_CLASH_ADDED] . "\n\n";
+                    $text .= _("WARNING! A new trusted root CA was added, and it has the exact same name as a previously existing root CA. This may (but does not necessarily) mean that this is an attempt to insert an unauthorised trust root by disguising as the genuine one. The details are below:")."\n\n";
+                    $text .= $significantChanges[\core\AbstractProfile::CA_CLASH_ADDED]."\n\n";
                 }
                 if (isset($significantChanges[\core\AbstractProfile::CA_ADDED])) {
                     $text .= _("A new trusted root CA was added. The details are below:\n\n");
-                    $text .= $significantChanges[\core\AbstractProfile::CA_ADDED] . "\n\n";
+                    $text .= $significantChanges[\core\AbstractProfile::CA_ADDED]."\n\n";
                 }
                 if (isset($significantChanges[\core\AbstractProfile::SERVERNAME_ADDED])) {
-                    $text .= _("A new acceptable server name for the authentication server was added. The details are below:") . "\n\n";
-                    $text .= $significantChanges[\core\AbstractProfile::SERVERNAME_ADDED] . "\n\n";
+                    $text .= _("A new acceptable server name for the authentication server was added. The details are below:")."\n\n";
+                    $text .= $significantChanges[\core\AbstractProfile::SERVERNAME_ADDED]."\n\n";
                 }
-                $text .= _("This mail is merely a cross-check because these changes can be security-relevant. If the change was expected, you do not need to take any action.") . "\n\n";
-                $text .= _("Greetings, ") . "\n\n" . \config\Master::APPEARANCE['productname_long'];
+                $text .= _("This mail is merely a cross-check because these changes can be security-relevant. If the change was expected, you do not need to take any action.")."\n\n";
+                $text .= _("Greetings, ")."\n\n".\config\Master::APPEARANCE['productname_long'];
                 // (currently, send hard-wired to NRO - future: for linked insts, check eduroam DBv2 and send to registered admins directly)
                 $fed = new core\Federation($myInstOriginal->federation);
                 foreach ($fed->listFederationAdmins() as $id) {
@@ -253,7 +253,7 @@ 
         <?php
         if (count($reloadedProfile->getEapMethodsinOrderOfPreference(1)) > 0) {
             echo "<form method='post' action='overview_installers.php?inst_id=$my_inst->identifier&profile_id=$reloadedProfile->identifier' accept-charset='UTF-8'>
-        <button type='submit'>" . _("Continue to Installer Fine-Tuning and Download") . "</button>
+        <button type='submit'>"._("Continue to Installer Fine-Tuning and Download")."</button>
     </form>";
         }
         echo $deco->footer();

web/admin/edit_participant_result.php

Spacing +23 added lines, -23 removed lines

@@ -20,7 +20,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";
 
 $auth = new \web\lib\admin\Authentication();
 $loggerInstance = new \core\common\Logging();
@@ -35,7 +35,7 @@ 
     $instId = $my_inst->identifier;
     // delete the IdP and send user to enrollment
     $my_inst->destroy();
-    $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP " . $instId);
+    $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP ".$instId);
     header("Location: overview_user.php");
     exit;
 }
@@ -51,7 +51,7 @@ 
     }
     // flush all IdP attributes and send user to creation wizard
     $my_inst->flushAttributes();
-    $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP starting over" . $instId);
+    $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP starting over".$instId);
     header("Location: edit_participant.php?inst_id=$instId&wizard=true");
     exit;
 }
@@ -77,15 +77,15 @@ 
 $myInstOriginal = $validator->existingIdP($_GET['inst_id'], $_SESSION['user']);
 $instId = $myInstOriginal->identifier;
 
-$hello = _("To whom it may concern,") . "\n\n";
-$bye = _("This mail is merely a cross-check because these changes can be security-relevant. If the change was expected, you do not need to take any action.") . "\n\n" .
-        _("Greetings, ") . "\n\n" .
+$hello = _("To whom it may concern,")."\n\n";
+$bye = _("This mail is merely a cross-check because these changes can be security-relevant. If the change was expected, you do not need to take any action.")."\n\n".
+        _("Greetings, ")."\n\n".
         \config\Master::APPEARANCE['productname_long'];
 
 switch ($_POST['submitbutton']) {
     case web\lib\common\FormElements::BUTTON_DELETE:
         $myInstOriginal->destroy();
-        $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP " . $instId);
+        $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP ".$instId);
         header("Location: overview_user.php");
         exit;
     case web\lib\common\FormElements::BUTTON_FLUSH_AND_RESTART:
@@ -95,9 +95,9 @@ 
         }
         // flush all IdP attributes and send user to creation wizard
         $myInstOriginal->flushAttributes();
-        $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP starting over" . $instId);
-        $text = $hello .
-                sprintf(_("the %s %s / %s / (previously known as) '%s' has deleted all properties and is starting over freshly. This means that its not recognisable by its name any more, and it may assume a different name in the future. You will get another mail if and when the name change happens."), $ui->nomenclatureInst, strtoupper($myInstOriginal->federation), $myInstOriginal->identifier, $myInstOriginal->name) . "\n\n" .
+        $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP starting over".$instId);
+        $text = $hello.
+                sprintf(_("the %s %s / %s / (previously known as) '%s' has deleted all properties and is starting over freshly. This means that its not recognisable by its name any more, and it may assume a different name in the future. You will get another mail if and when the name change happens."), $ui->nomenclatureInst, strtoupper($myInstOriginal->federation), $myInstOriginal->identifier, $myInstOriginal->name)."\n\n".
                 $bye;
         $fed = new core\Federation($myInstOriginal->federation);
         foreach ($fed->listFederationAdmins() as $id) {
@@ -116,19 +116,19 @@ 
             exit(0);
         }
         $inst_name = $myInstOriginal->name;
-        echo "<h1>" . sprintf(_("Submitted attributes for IdP '%s'"), $inst_name) . "</h1>";
+        echo "<h1>".sprintf(_("Submitted attributes for IdP '%s'"), $inst_name)."</h1>";
         echo "<table>";
         echo $optionParser->processSubmittedFields($myInstOriginal, $_POST, $_FILES);
         echo "</table>";
 // delete cached logo, if present
-        $dir = ROOT . '/web/downloads/logos/';
-        $globResult = glob($dir . $myInstOriginal->identifier . "_*.png");
+        $dir = ROOT.'/web/downloads/logos/';
+        $globResult = glob($dir.$myInstOriginal->identifier."_*.png");
         if ($globResult === FALSE) { // we should catch the improbable error condition
             $globResult = [];
         }
         array_map('unlink', $globResult);
         $loggerInstance->debug(4, "UNLINK from $dir\n");
-        $loggerInstance->writeAudit($_SESSION['user'], "MOD", "IdP " . $myInstOriginal->identifier . " - attributes changed");
+        $loggerInstance->writeAudit($_SESSION['user'], "MOD", "IdP ".$myInstOriginal->identifier." - attributes changed");
 
 // re-instantiate ourselves... profiles need fresh data
         $myInstReinstantiated = $validator->existingIdP($_GET['inst_id'], $_SESSION['user']);
@@ -137,10 +137,10 @@ 
         if (count($significantChanges) > 0) {
             // send a notification/alert mail to someone we know is in charge
             /// were made to the *Identity Provider* *LU* / integer number of IdP / (previously known as) Name
-            $text = $hello . sprintf(_("significant changes were made to the %s %s / %s / (previously known as) '%s'."), $ui->nomenclatureInst, strtoupper($myInstOriginal->federation), $myInstOriginal->identifier, $myInstOriginal->name) . "\n\n";
+            $text = $hello.sprintf(_("significant changes were made to the %s %s / %s / (previously known as) '%s'."), $ui->nomenclatureInst, strtoupper($myInstOriginal->federation), $myInstOriginal->identifier, $myInstOriginal->name)."\n\n";
             if (isset($significantChanges[\core\IdP::INSTNAME_CHANGED])) {
-                $text .= sprintf(_("The %s has changed its name. The details are below:"), $ui->nomenclatureInst) . "\n\n";
-                $text .= $significantChanges[\core\IdP::INSTNAME_CHANGED] . "\n\n";
+                $text .= sprintf(_("The %s has changed its name. The details are below:"), $ui->nomenclatureInst)."\n\n";
+                $text .= $significantChanges[\core\IdP::INSTNAME_CHANGED]."\n\n";
             }
             $text .= $bye;
             // (currently, send hard-wired to NRO - future: for linked insts, check eduroam DBv2 and send to registered admins directly)
@@ -156,12 +156,12 @@ 
 
         if (isset(\config\ConfAssistant::CONSORTIUM['ssid']) && count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0) {
             foreach (\config\ConfAssistant::CONSORTIUM['ssid'] as $ssidname) {
-                $ssids[] = $ssidname . " " . (isset(\config\ConfAssistant::CONSORTIUM['tkipsupport']) && \config\ConfAssistant::CONSORTIUM['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)") );
+                $ssids[] = $ssidname." ".(isset(\config\ConfAssistant::CONSORTIUM['tkipsupport']) && \config\ConfAssistant::CONSORTIUM['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)"));
             }
         }
 
         foreach ($myInstReinstantiated->getAttributes("media:SSID") as $ssidname) {
-            $ssids[] = $ssidname['value'] . " " . _("(WPA2/AES)");
+            $ssids[] = $ssidname['value']." "._("(WPA2/AES)");
         }
 
         echo "<table>";
@@ -169,7 +169,7 @@ 
         if (count($ssids) > 0) {
             $printedlist = "";
             foreach ($ssids as $names) {
-                $printedlist = $printedlist . "$names ";
+                $printedlist = $printedlist."$names ";
             }
             echo $uiElements->boxOkay(sprintf(_("Your installers will configure the following SSIDs: <strong>%s</strong>"), $printedlist), _("SSIDs configured"));
         }
@@ -197,7 +197,7 @@ 
                 // did we get an email address? then, show the silverbullet jumpstart button
                 // otherwise, issue a smartass comment
                 if (count($my_inst->getAttributes("support:email")) > 0) {
-                    echo "<form method='post' action='edit_silverbullet.php?inst_id=$my_inst->identifier' accept-charset='UTF-8'><button type='submit'>" . sprintf(_("Continue to %s properties"), \core\ProfileSilverbullet::PRODUCTNAME) . "</button></form>";
+                    echo "<form method='post' action='edit_silverbullet.php?inst_id=$my_inst->identifier' accept-charset='UTF-8'><button type='submit'>".sprintf(_("Continue to %s properties"), \core\ProfileSilverbullet::PRODUCTNAME)."</button></form>";
                 } else {
                     echo "<table>";
                     echo $uiElements->boxError(sprintf(_("You did not submit an e-mail address. This is required for %s. Please go to the %s dashboard and edit your helpdesk settings to include a helpdesk e-mail address."), core\ProfileSilverbullet::PRODUCTNAME, $ui->nomenclatureInst), _("No support e-mail!"));
@@ -205,10 +205,10 @@ 
                 }
             }
             if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL") {
-                echo "<br/><form method='post' action='edit_profile.php?inst_id=$my_inst->identifier' accept-charset='UTF-8'><button type='submit'>" . _("Continue to RADIUS/EAP profile definition") . "</button></form>";
+                echo "<br/><form method='post' action='edit_profile.php?inst_id=$my_inst->identifier' accept-charset='UTF-8'><button type='submit'>"._("Continue to RADIUS/EAP profile definition")."</button></form>";
             }
         }
-        echo "<br/><form method='post' action='overview_user.php?inst_id=$my_inst->identifier' accept-charset='UTF-8'><button type='submit'>" . _("Continue to dashboard") . "</button></form>";
+        echo "<br/><form method='post' action='overview_user.php?inst_id=$my_inst->identifier' accept-charset='UTF-8'><button type='submit'>"._("Continue to dashboard")."</button></form>";
 
         break;
     default:

web/admin/edit_participant.php

Spacing +31 added lines, -31 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";
 
 $auth = new \web\lib\admin\Authentication();
 $deco = new \web\lib\admin\PageDecoration();
@@ -39,7 +39,7 @@ 
 $inst_name = $my_inst->name;
 
 if ($wizardStyle) {
-    echo $deco->defaultPagePrelude(sprintf(_("%s: %s enrollment wizard (step 2)"), \config\Master::APPEARANCE['productname'],  $uiElements->nomenclatureParticipant));
+    echo $deco->defaultPagePrelude(sprintf(_("%s: %s enrollment wizard (step 2)"), \config\Master::APPEARANCE['productname'], $uiElements->nomenclatureParticipant));
 } else {
     echo $deco->defaultPagePrelude(sprintf(_("%s: Editing %s '%s'"), \config\Master::APPEARANCE['productname'], $uiElements->nomenclatureParticipant, $inst_name));
 }
@@ -94,12 +94,12 @@ 
         </table>
     </div>
     <?php
-    echo "<form enctype='multipart/form-data' action='edit_participant_result.php?inst_id=$my_inst->identifier" . ($wizardStyle ? "&wizard=true" : "") . "' method='post' accept-charset='UTF-8'>
-              <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>";
+    echo "<form enctype='multipart/form-data' action='edit_participant_result.php?inst_id=$my_inst->identifier".($wizardStyle ? "&wizard=true" : "")."' method='post' accept-charset='UTF-8'>
+              <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE."'>";
 
     if ($wizardStyle) {
-        echo "<p>" .
-        sprintf(_("Hello, newcomer. The %s is new to us. This wizard will ask you several questions about it, so that we can generate beautiful profiles for you in the end. All of the information below is optional, but it is important to fill out as many fields as possible for the benefit of your end users."), $uiElements->nomenclatureParticipant) . "</p>";
+        echo "<p>".
+        sprintf(_("Hello, newcomer. The %s is new to us. This wizard will ask you several questions about it, so that we can generate beautiful profiles for you in the end. All of the information below is optional, but it is important to fill out as many fields as possible for the benefit of your end users."), $uiElements->nomenclatureParticipant)."</p>";
     }
     $optionDisplay = new web\lib\admin\OptionDisplay($idpoptions, "IdP");
     ?>
@@ -107,11 +107,11 @@ 
         <legend><strong><?php echo _("General Information"); ?></strong></legend>
         <?php
         if ($wizardStyle) {
-            echo "<p>" .
-            _("Some properties are valid across all deployment profiles. This is the place where you can describe those properties in a fine-grained way. The solicited information is used as follows:") . "</p>
+            echo "<p>".
+            _("Some properties are valid across all deployment profiles. This is the place where you can describe those properties in a fine-grained way. The solicited information is used as follows:")."</p>
                       <ul>
-                         <li>" . _("<strong>Logo</strong>: When you submit a logo, we will embed this logo into all installers where a custom logo is possible. We accept any image format, but for best results, we suggest SVG. If you don't upload a logo, we will use the generic logo instead (see top-right corner of this page).") . "</li>
-                         <li>" . sprintf(_("<strong>Name</strong>: The %s may have names in multiple languages. It is recommended to always populate at least the 'default/other' language, as it is used as a fallback if the system does not have a name in the exact language the user requests a download in."),$uiElements->nomenclatureParticipant) . "</li>";
+                         <li>" . _("<strong>Logo</strong>: When you submit a logo, we will embed this logo into all installers where a custom logo is possible. We accept any image format, but for best results, we suggest SVG. If you don't upload a logo, we will use the generic logo instead (see top-right corner of this page).")."</li>
+                         <li>" . sprintf(_("<strong>Name</strong>: The %s may have names in multiple languages. It is recommended to always populate at least the 'default/other' language, as it is used as a fallback if the system does not have a name in the exact language the user requests a download in."), $uiElements->nomenclatureParticipant)."</li>";
             echo "</ul>";
         }
         echo $optionDisplay->prefilledOptionTable("general");
@@ -125,47 +125,47 @@ 
         <legend><strong><?php echo _("Media Properties"); ?></strong></legend>
         <?php
         if ($wizardStyle) {
-            echo "<p>" .
-            sprintf(_("In this section, you define on which media %s should be configured on user devices."), \config\ConfAssistant::CONSORTIUM['display_name']) . "</p>
+            echo "<p>".
+            sprintf(_("In this section, you define on which media %s should be configured on user devices."), \config\ConfAssistant::CONSORTIUM['display_name'])."</p>
           <ul>";
             echo "<li>";
-            echo "<strong>" . ( count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>";
+            echo "<strong>".(count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:"))." </strong>";
             if (count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0) {
                 $ssidlist = "";
                 foreach (\config\ConfAssistant::CONSORTIUM['ssid'] as $ssid) {
-                    $ssidlist .= ", '<strong>" . $ssid . "</strong>'";
+                    $ssidlist .= ", '<strong>".$ssid."</strong>'";
                 }
                 $ssidlist = substr($ssidlist, 2);
                 echo sprintf(ngettext("We will always configure this SSID for WPA2/AES: %s.", "We will always configure these SSIDs for WPA2/AES: %s.", count(\config\ConfAssistant::CONSORTIUM['ssid'])), $ssidlist);
                 if (\config\ConfAssistant::CONSORTIUM['tkipsupport']) {
-                    echo " " . _("They will also be configured for WPA/TKIP if the device supports multiple encryption types.");
+                    echo " "._("They will also be configured for WPA/TKIP if the device supports multiple encryption types.");
                 }
-                echo "<br/>" . sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $uiElements->displayName("media:SSID"));
+                echo "<br/>".sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $uiElements->displayName("media:SSID"));
             } else {
                 echo _("Please configure which SSIDs should be configured in the installers.");
             }
-            echo " " . _("By default, we will only configure the SSIDs with WPA2/AES encryption. By using the '(with WPA/TKIP)' option you can specify that we should include legacy support for WPA/TKIP where possible.");
+            echo " "._("By default, we will only configure the SSIDs with WPA2/AES encryption. By using the '(with WPA/TKIP)' option you can specify that we should include legacy support for WPA/TKIP where possible.");
             echo "</li>";
 
             echo "<li>";
-            echo "<strong>" . ( count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>";
+            echo "<strong>".(count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:"))." </strong>";
             if (count(\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi']) > 0) {
                 $consortiumlist = "";
                 foreach (\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi'] as $oi) {
-                    $consortiumlist .= ", '<strong>" . $oi . "</strong>'";
+                    $consortiumlist .= ", '<strong>".$oi."</strong>'";
                 }
                 $consortiumlist = substr($consortiumlist, 2);
                 echo sprintf(ngettext("We will always configure this Consortium OI: %s.", "We will always configure these Consortium OIs: %s.", count(\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi'])), $consortiumlist);
 
-                echo "<br/>" . sprintf(_("It is also possible to define custom additional OIs with the option '%s' below."), $uiElements->displayName("media:consortium_OI"));
+                echo "<br/>".sprintf(_("It is also possible to define custom additional OIs with the option '%s' below."), $uiElements->displayName("media:consortium_OI"));
             } else {
                 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>";
@@ -181,16 +181,16 @@ 
             echo "<p>"._("This section can be used to upload specific Terms of Use for your users and to display details of how your users can reach your local helpdesk.")."</p>";
             
             if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL") {
-                echo "<p>" .
+                echo "<p>".
                         
-                sprintf(_("Do you provide helpdesk services for your users? If so, it would be nice if you would tell us the pointers to this helpdesk."),$uiElements->nomenclatureParticipant)  . "</p>" .
-                "<p>" .
-                _("If you enter a value here, it will be added to the installers for all your users, and will be displayed on the download page. If you operate separate helpdesks for different user groups (we call this 'profiles') specify per-profile helpdesk information later in this wizard. If you operate no help desk at all, just leave these fields empty.") . "</p>";
+                sprintf(_("Do you provide helpdesk services for your users? If so, it would be nice if you would tell us the pointers to this helpdesk."), $uiElements->nomenclatureParticipant)."</p>".
+                "<p>".
+                _("If you enter a value here, it will be added to the installers for all your users, and will be displayed on the download page. If you operate separate helpdesks for different user groups (we call this 'profiles') specify per-profile helpdesk information later in this wizard. If you operate no help desk at all, just leave these fields empty.")."</p>";
                 if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL") {
-                echo "<p>" . sprintf(_("For %s deployments, providing at least a local e-mail contact is required."), core\ProfileSilverbullet::PRODUCTNAME) ." " . _("This is the contact point for your end users' level 1 support.") . "</p>";
+                echo "<p>".sprintf(_("For %s deployments, providing at least a local e-mail contact is required."), core\ProfileSilverbullet::PRODUCTNAME)." "._("This is the contact point for your end users' level 1 support.")."</p>";
                 }
             } elseif (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL") {
-                echo "<p>". _("Providing at least a local support e-mail contact is required.")." "._("This is the contact point for your end users' level 1 support.")."</p>";
+                echo "<p>"._("Providing at least a local support e-mail contact is required.")." "._("This is the contact point for your end users' level 1 support.")."</p>";
             }
             
         }
@@ -200,8 +200,8 @@ 
         <button type='button' class='newoption' onclick='getXML("support")'><?php echo _("Add new option"); ?></button></fieldset>
     <?php
     if ($wizardStyle) {
-        echo "<p>" . sprintf(_("When you are sure that everything is correct, please click on %sContinue ...%s"), "<button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_CONTINUE . "'>", "</button>") . "</p></form>";
+        echo "<p>".sprintf(_("When you are sure that everything is correct, please click on %sContinue ...%s"), "<button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_CONTINUE."'>", "</button>")."</p></form>";
     } else {
-        echo "<div><button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button> <button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_user.php\"'>" . _("Discard changes") . "</button></div></form>";
+        echo "<div><button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button> <button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_user.php\"'>"._("Discard changes")."</button></div></form>";
     }
     echo $deco->footer();

web/diag/adminQuery.php

Spacing +44 added lines, -44 removed lines

@@ -19,7 +19,7 @@ 
  * License: see the web/copyright.inc.php file in the file structure or
  *          <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";
 $languageInstance = new \core\common\Language();
 $languageInstance->setTextDomain("diagnostics");
 $loggerInstance = new \core\common\Logging();
@@ -61,43 +61,43 @@ 
     $select = "<div id='sp_abuse_problem'>
 <select style='margin-left: 0px;' id='select_sp_problem'>";
     foreach ($sp_problem as $pname => $pdesc) {
-        $select = $select . "<option value='$pname'>$pdesc</option>\n";
+        $select = $select."<option value='$pname'>$pdesc</option>\n";
     }
-    $select = $select . "</select></div>";
+    $select = $select."</select></div>";
     $res = "
 <input type='hidden' name='token' id='token' value=''>
 <input type='hidden' name='tests_result' id='tests_result' value=''>
 <table id='sp_questions'>
     <tr>
-        <td>" . _("Select your problem") . "</td>
+        <td>" . _("Select your problem")."</td>
         <td>$select</td>
     </tr>
     <tr>
-        <td>" . _("What is the realm of the IdP in question?") . "</td>
+        <td>"._("What is the realm of the IdP in question?")."</td>
         <td>
                 <input type='text' name='admin_realm' id='admin_realm' value='$realmFromURL'>
-                <button class='diag_button' id='realm_in_db_admin' style='display: none;' accesskey='R' type='button'>" .
-                _("Check this realm") .
+                <button class='diag_button' id='realm_in_db_admin' style='display: none;' accesskey='R' type='button'>".
+                _("Check this realm").
                 "</button>
                 <div id='tests_info_area'></div>
         </td>
     </tr>
     <tr class='hidden_row'>
-        <td>" . _("What is the authentication timestamp of the user session in question?") . "</td>
+        <td>" . _("What is the authentication timestamp of the user session in question?")."</td>
         <td><input type='text' id='timestamp' name='timestamp'>
             <div id='datepicker'></div>
         </td>
     </tr>
     <tr class='hidden_row'>
-        <td>" . _("What is the MAC address of the user session in question?") . "</td>
+        <td>" . _("What is the MAC address of the user session in question?")."</td>
         <td><input type='text' id='mac' name='mac'></td>
     </tr>
     <tr class='hidden_row'>
-        <td>" . _("Additional comments") . "</td>
+        <td>" . _("Additional comments")."</td>
         <td><textarea id='freetext' name='freetext' cols='60' rows='5'></textarea></td>
     </tr>
     <tr class='hidden_row'>
-        <td>" . _("Please specify an email address on which the IdP can contact you") . "</td>
+        <td>" . _("Please specify an email address on which the IdP can contact you")."</td>
         <td><input type='text' id='email' name='email'></td>
     </tr>
     <tr>
@@ -105,82 +105,82 @@ 
         <td></td>
     </tr>
     <tr class='hidden_row' id='send_query_to_idp'>
-        <td>" . _("Now you can send your query") . "</td>
-        <td><button type='submit' class='diag_button' id='submit_idp_query' name='go'>" . _("Send") . "</button></td>
+        <td>" . _("Now you can send your query")."</td>
+        <td><button type='submit' class='diag_button' id='submit_idp_query' name='go'>" . _("Send")."</button></td>
     </tr>
  </table>";
-    $res = $res . $javascript;
+    $res = $res.$javascript;
 }
 if ($queryType == 'idp') {
     $select = "<div id='idp_reported_problem' style='display:;'>
 <select style='margin-left:0px;' id='select_idp_problem'>";
     foreach ($idp_problem as $pname => $pdesc) {
-        $select = $select . "<option value='$pname'>$pdesc</option>\n";
+        $select = $select."<option value='$pname'>$pdesc</option>\n";
     }
-    $select = $select . "</select></div>";
+    $select = $select."</select></div>";
     $res = "
 <table id='idp_questions'>
     <tr>
-        <td>" . _("Select your problem") . "</td>
+        <td>" . _("Select your problem")."</td>
         <td>$select</td>
     </tr>
     <tr>
-        <td>" . _("Identify the SP by one of following means") . "</td>
+        <td>"._("Identify the SP by one of following means")."</td>
         <td></td>
     </tr>
     <tr id='by_opname'>
-        <td>" . _("SP Operator-Name attribute") . "</td>
+        <td>" . _("SP Operator-Name attribute")."</td>
         <td><input type='text' id='opname' name='opname' value=''></td>
     </tr>
     <tr id='spmanually'>
-        <td>" . _("Select the SP manually:") . "</td>
+        <td>" . _("Select the SP manually:")."</td>
         <td>
             <div id='select_asp_country'><a href='' id='asp_countries_list'>
-            <span id='opnameselect'>" . _("click to select country and organisation") . "</a></span>
+            <span id='opnameselect'>" . _("click to select country and organisation")."</a></span>
             </div>
             <div id='select_asp_area'></div>
         </td>
     </tr>
     <tr id='asp_desc' style='display: none;'>
-        <td>" . _("or") . ' ' . _("at least describe the SP location") . "</td>
+        <td>" . _("or").' '._("at least describe the SP location")."</td>
         <td><input type='text' id='asp_location' name='asp_location' value=''></td>
     </tr>
     <tr>
-        <td>" . _("What is the outer ID of the user session in question?") . "</td>
+        <td>" . _("What is the outer ID of the user session in question?")."</td>
         <td><input type='text' id='outer_id' name='outer_id' value=''></td>
     </tr>
     <tr>
-        <td>" . _("What is the authentication timestamp of the user session in question?") . "</td>
+        <td>" . _("What is the authentication timestamp of the user session in question?")."</td>
         <td>
             <input type='text' id='timestamp' name='timestamp'>
             <div id='datepicker'></div>
         </td>
     </tr>
     <tr>
-        <td>" . _("What is the MAC address of the user session in question?") . "</td>
+        <td>" . _("What is the MAC address of the user session in question?")."</td>
         <td><input type='text' id='mac' name='mac'></td>
     </tr>
     <tr>
-        <td>" . _("Additional comments about the problem") . "</td>
+        <td>" . _("Additional comments about the problem")."</td>
         <td><textarea id='freetext' name='freetext' cols='60' rows='5'></textarea></td>
     </tr>
     <tr>
-        <td>" . _("Do you have any contact details by which the user wishes to be contacted by the SP?") . "</td>
+        <td>" . _("Do you have any contact details by which the user wishes to be contacted by the SP?")."</td>
         <td><textarea id='c_details' name='c_details' cols='60' rows='5'></textarea></td>
     </tr>
     <tr>
-        <td>" . _("Please specify an email address on which the SP can contact you") . "</td>
+        <td>" . _("Please specify an email address on which the SP can contact you")."</td>
         <td><input type='text' id='email' name='email'></td>
     </tr>
     <tr class='hidden_row' id='send_query_to_sp'>
-        <td>" . _("Now you can send your query") . "</td>
-        <td><button type='submit' class='diag_button' id='submit_sp_query' name='go'>" . _("Send") . "</button></td>
+        <td>" . _("Now you can send your query")."</td>
+        <td><button type='submit' class='diag_button' id='submit_sp_query' name='go'>" . _("Send")."</button></td>
     </tr>
 </table>";
-    $res = $res . $javascript;
+    $res = $res.$javascript;
 }
 if ($queryType == 'idp_send' || $queryType == 'sp_send') {
-    include_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+    include_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
     $cat = new \core\CAT();
     $returnArray = array();
     if (count((array) $o) > 0) {
@@ -189,8 +189,8 @@ 
             switch ($key) {
                 case 'realm':
                     $pos = strpos($value, '@');
-                    if ($pos !== FALSE ) {
-                        $value = substr($value, $pos+1);
+                    if ($pos !== FALSE) {
+                        $value = substr($value, $pos + 1);
                     }
                 case 'email':
                 case 'mac':
@@ -226,7 +226,7 @@ 
         $mail = \core\common\OutsideComm::mailHandle();
         $emails = ['mgw@umk.pl'];
         //$emails = explode(',', $returnArray['idpcontact']);
-        $mail->FromName = \config\Master::APPEARANCE['productname'] . " Notification System";
+        $mail->FromName = \config\Master::APPEARANCE['productname']." Notification System";
         foreach ($emails as $email) {
             $mail->addAddress($email);
         }
@@ -236,11 +236,11 @@ 
         } else {
             $link = 'http://';
         }
-        $link .= $_SERVER['SERVER_NAME'] . \core\CAT::getRootUrlPath() . '/diag/show_realmcheck.php?token=' . $returnArray['token'];
+        $link .= $_SERVER['SERVER_NAME'].\core\CAT::getRootUrlPath().'/diag/show_realmcheck.php?token='.$returnArray['token'];
         $returnArray['testurl'] = $link;
         $mail->Subject = _('Suspected a technical problem with the IdP');
-        $txt = _("We suspect a technical problem with the IdP handling the realm") . ' ' . 
-                $returnArray['realm'] . ".\n";
+        $txt = _("We suspect a technical problem with the IdP handling the realm").' '. 
+                $returnArray['realm'].".\n";
         $txt .= _("The CAT diagnostic test was run for this realm during reporting.\n");
         $txt .= _("The overall result was ");
         if ($returnArray['tests_result'] == 0) {
@@ -248,15 +248,15 @@ 
         } else {
             $txt .= _("failure");
         }
-        $txt .= ".\n" . _("To see details go to ");
+        $txt .= ".\n"._("To see details go to ");
         $txt .= "$link\n\n";
-        $txt .= _("The reported problem details are as follows") . "\n";
-        $txt .= _("timestamp") . ": " . $returnArray['timestamp'] . "\n";
-        $txt .= _("client MAC address") . ": " . $returnArray['mac'] . "\n";
+        $txt .= _("The reported problem details are as follows")."\n";
+        $txt .= _("timestamp").": ".$returnArray['timestamp']."\n";
+        $txt .= _("client MAC address").": ".$returnArray['mac']."\n";
         if ($returnArray['freetext']) {
-            $txt .= _("additional comments") . ': ' . $returnArray['freetext'] . "\n";
+            $txt .= _("additional comments").': '.$returnArray['freetext']."\n";
         }
-        $txt .= "\n" . _("You can contact the incident reporter at") . ' ' . $returnArray['email'];
+        $txt .= "\n"._("You can contact the incident reporter at").' '.$returnArray['email'];
         
         $mail->Body = $txt;
         $sent = $mail->send();

web/diag/findRealm.php

Spacing +10 added lines, -10 removed lines

@@ -30,12 +30,12 @@ 
  */
 
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 // we are referring to $_SESSION later in the file
 \core\CAT::sessionStart();
 
-$jsonDir = dirname(dirname(dirname(dirname(__FILE__)))) . "/CAT/var/json_cache";
+$jsonDir = dirname(dirname(dirname(dirname(__FILE__))))."/CAT/var/json_cache";
 
 $loggerInstance = new \core\common\Logging();
 $returnArray = [];
@@ -49,8 +49,8 @@ 
 $realmOu = filter_input(INPUT_GET, 'ou', FILTER_SANITIZE_STRING);
 $forTests = filter_input(INPUT_GET, 'addtest', FILTER_SANITIZE_STRING);
 $token = filter_input(INPUT_GET, 'token', FILTER_SANITIZE_STRING) ?? filter_input(INPUT_POST, 'token', FILTER_SANITIZE_STRING);
-if ($token && !is_dir($jsonDir . '/' . $token)) {
-    mkdir($jsonDir . '/' . $token, 0777, true);
+if ($token && !is_dir($jsonDir.'/'.$token)) {
+    mkdir($jsonDir.'/'.$token, 0777, true);
 }
 if (!is_null($givenRealm)) {
     $realmElems = explode('.', $givenRealm);
@@ -82,7 +82,7 @@ 
         }
         $admins = array();
         if ($allRealms[$found]['contact']) {
-            $elems =  explode(', ', $allRealms[$found]['contact']);
+            $elems = explode(', ', $allRealms[$found]['contact']);
             foreach ($elems as $admin) {
                 if (substr($admin, 0, 2) == 'e:') {
                     $admins[] = substr($admin, 3);
@@ -105,7 +105,7 @@ 
     }
     if ($forTests) {
         $rfc7585suite = new \core\diag\RFC7585Tests($givenRealm);
-        $testsuite = new \core\diag\RADIUSTests($givenRealm, "@" . $givenRealm);
+        $testsuite = new \core\diag\RADIUSTests($givenRealm, "@".$givenRealm);
         $naptr = $rfc7585suite->relevantNAPTR();
         if ($naptr != \core\diag\RADIUSTests::RETVAL_NOTCONFIGURED && $naptr > 0) {
             $naptr_valid = $rfc7585suite->relevantNAPTRcompliance();
@@ -119,12 +119,12 @@ 
         $loggerInstance->debug(4, "findRealm rfc7585suite end\n");
         $toTest = array();
         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'];
             $expectedName = $addr['hostname'];
             $toTest[$hostindex] = array(
                                         'host' => $host,
                                         'name' => $expectedName,
-                                        'bracketaddr' => ($addr["family"] == "IPv6" ? "[" . $addr["IP"] . "]" : $addr["IP"]) . ' TCP/' . $addr['port']
+                                        'bracketaddr' => ($addr["family"] == "IPv6" ? "[".$addr["IP"]."]" : $addr["IP"]).' TCP/'.$addr['port']
             );
         }
         $details['totest'] = $toTest;
@@ -196,8 +196,8 @@ 
 $loggerInstance->debug(4, "findRealm return end\n");
 $json_data = json_encode($returnArray);
 if ($token) {
-    $loggerInstance->debug(4, $jsonDir . '/' . $token);
-    file_put_contents($jsonDir . '/' . $token . '/realm' , $json_data);
+    $loggerInstance->debug(4, $jsonDir.'/'.$token);
+    file_put_contents($jsonDir.'/'.$token.'/realm', $json_data);
 }
 echo($json_data);
 

web/diag/show_realmcheck.php

Spacing +9 added lines, -9 removed lines

@@ -24,7 +24,7 @@ 
  * 
  * @author Maja Górecka-Wolniewicz <mgw@umk.pl>
  */
-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
+require_once dirname(dirname(__DIR__))."/config/_config.php";
 
 $loggerInstance = new \core\common\Logging();
 
@@ -53,9 +53,9 @@ 
 <script type="text/javascript" src="../external/jquery/jquery.js"></script>
 <script type="text/javascript" src="../external/jquery/jquery-ui.js"></script>
 <script type="text/javascript">
-var morealltext = "<?php echo '<i>' . _("Show detailed information for all tests") . '&raquo;</i>' ?>";
-var lessalltext = "<?php echo '<i>' . _("Hide detailed information for all tests") . '&raquo;</i>' ?>";
-var moretext = "<?php echo _("more") . "&raquo;" ?>";
+var morealltext = "<?php echo '<i>'._("Show detailed information for all tests").'&raquo;</i>' ?>";
+var lessalltext = "<?php echo '<i>'._("Hide detailed information for all tests").'&raquo;</i>' ?>";
+var moretext = "<?php echo _("more")."&raquo;" ?>";
 var lesstext = "<?php echo "&laquo" ?>";
     $(document).ready(function () {
         $('.caresult, .eap_test_results, .udp_results').on('click', '.morelink', function () {
@@ -99,7 +99,7 @@ 
 </head>
 <body>
 <?php
-require dirname(__DIR__) . '/skins/modern/diag/js/diag_js.php';
+require dirname(__DIR__).'/skins/modern/diag/js/diag_js.php';
 echo $deco->productheader("ADMIN");
 $check_realm = FALSE;
 $token = filter_input(INPUT_GET, 'token', FILTER_SANITIZE_STRING);
@@ -117,7 +117,7 @@ 
     </h1>
     <div id="debug_out" style="display: none"></div>
     <div id="timestamp" style="min-width: 600px; max-width:800px" align="right">
-        <?php echo _("Tests timestamp: ") . $realmTests->getTimeStamp() . ' UTC'; ?>
+        <?php echo _("Tests timestamp: ").$realmTests->getTimeStamp().' UTC'; ?>
     </div>
     <div id="tabs" style="min-width: 600px; max-width:800px">
         <ul>
@@ -134,7 +134,7 @@ 
             <div id="tabs-1">
                 <button id="run_tests" onclick="runRealmCheck('<?php echo $check_realm; ?>','<?php echo $ourlocale; ?>')"><?php echo _("Repeat connectivity tests") ?></button>
                 <div id="test_area"></div>
-                <?php print $realmTests->printOverview();?>
+                <?php print $realmTests->printOverview(); ?>
 
             </div>
             <div id="tabs-2">
@@ -157,9 +157,9 @@ 
             }
 } else {
         if (is_null($token)) {
-            echo '<p><h1>' . _("Token missing, no data can be presented") . '</h1>';
+            echo '<p><h1>'._("Token missing, no data can be presented").'</h1>';
         } else {
-            echo '<p><h1>' . _("The token given in the request does not exists, no data can be presented") . '</h1>';
+            echo '<p><h1>'._("The token given in the request does not exists, no data can be presented").'</h1>';
         }
 }
 echo $deco->footer();

web/diag/radius_tests.php

Spacing +15 added lines, -15 removed lines

@@ -20,14 +20,14 @@ 
  *          <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";
 
 $loggerInstance = new \core\common\Logging();
 $validator = new \web\lib\common\InputValidation();
 $languageInstance = new \core\common\Language();
 $languageInstance->setTextDomain("diagnostics");
 
-$jsonDir = dirname(dirname(dirname(dirname(__FILE__)))) . "/CAT/var/json_cache";
+$jsonDir = dirname(dirname(dirname(dirname(__FILE__))))."/CAT/var/json_cache";
 
 $additional_message = [
     \core\common\Entity::L_OK => '',
@@ -45,7 +45,7 @@ 
 function disp_name($eap)
 {
     $displayName = \core\common\EAP::eapDisplayName($eap);
-    return $displayName['OUTER'] . ( $displayName['INNER'] != '' ? '-' . $displayName['INNER'] : '');
+    return $displayName['OUTER'].($displayName['INNER'] != '' ? '-'.$displayName['INNER'] : '');
 }
 
 if (!isset($_REQUEST['test_type']) || !$_REQUEST['test_type']) {
@@ -68,7 +68,7 @@ 
     $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']);
 } else {
     $my_profile = NULL;
-    $testsuite = new \core\diag\RADIUSTests($check_realm, "@" . $check_realm);
+    $testsuite = new \core\diag\RADIUSTests($check_realm, "@".$check_realm);
 }
 
 
@@ -163,10 +163,10 @@ 
                             break;
                         case \core\common\Entity::L_REMARK:
                         case \core\common\Entity::L_WARN:
-                            $message = _("<strong>Test partially successful</strong>: authentication succeded.") . ' ' . $additional_message[$level];
+                            $message = _("<strong>Test partially successful</strong>: authentication succeded.").' '.$additional_message[$level];
                             break;
                         case \core\common\Entity::L_ERROR:
-                            $message = _("<strong>Test FAILED</strong>: authentication succeded.") . ' ' . $additional_message[$level];
+                            $message = _("<strong>Test FAILED</strong>: authentication succeded.").' '.$additional_message[$level];
                             break;
                     }
                     break;
@@ -217,7 +217,7 @@ 
             case \core\diag\RADIUSTests::RETVAL_CONVERSATION_REJECT:
                 $level = $returnarray['result'][$i]['level'];
                 if ($level > \core\common\Entity::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];
+                    $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.");
                 }
@@ -240,7 +240,7 @@ 
                 $level = \core\common\Entity::L_ERROR;
                 break;
         }
-        $loggerInstance->debug(4, "SERVER=" . $returnarray['result'][$i]['server'] . "\n");
+        $loggerInstance->debug(4, "SERVER=".$returnarray['result'][$i]['server']."\n");
         $returnarray['result'][$i]['level'] = $level;
         $returnarray['result'][$i]['message'] = $message;
         break;
@@ -257,9 +257,9 @@ 
         }
         // we tried to contact someone, and know how long that took
         $returnarray['time_millisec'] = sprintf("%d", $rfc6614suite->TLS_CA_checks_result[$host]['time_millisec']);
-        $timeDisplay = ' (' . sprintf(_("elapsed time: %d"), $rfc6614suite->TLS_CA_checks_result[$host]['time_millisec']) . '&nbsp;ms)';
+        $timeDisplay = ' ('.sprintf(_("elapsed time: %d"), $rfc6614suite->TLS_CA_checks_result[$host]['time_millisec']).'&nbsp;ms)';
         if (isset($rfc6614suite->TLS_CA_checks_result[$host]['cert_oddity']) && ($rfc6614suite->TLS_CA_checks_result[$host]['cert_oddity'] == \core\diag\RADIUSTests::CERTPROB_UNKNOWN_CA)) {
-            $returnarray['message'] = _("<strong>ERROR</strong>: the server presented a certificate which is from an unknown authority!") . $timeDisplay;
+            $returnarray['message'] = _("<strong>ERROR</strong>: the server presented a certificate which is from an unknown authority!").$timeDisplay;
             $returnarray['level'] = \core\common\Entity::L_ERROR;
             $returnarray['result'] = $testresult;
             break;
@@ -269,7 +269,7 @@ 
         $returnarray['level'] = \core\common\Entity::L_OK;
         // override if the connection was with a mismatching server name
         if (isset($rfc6614suite->TLS_CA_checks_result[$host]['cert_oddity']) && ($rfc6614suite->TLS_CA_checks_result[$host]['cert_oddity'] == \core\diag\RADIUSTests::CERTPROB_DYN_SERVER_NAME_MISMATCH)) {
-            $returnarray['message'] = _("<strong>WARNING</strong>: the server name as discovered in the SRV record does not match any name in the server certificate!") . $timeDisplay;
+            $returnarray['message'] = _("<strong>WARNING</strong>: the server name as discovered in the SRV record does not match any name in the server certificate!").$timeDisplay;
             $returnarray['level'] = \core\common\Entity::L_WARN;
         }
         switch ($rfc6614suite->TLS_CA_checks_result[$host]['status']) {
@@ -327,13 +327,13 @@ 
         throw new Exception("Unknown test requested: default case reached!");
 }
 $returnarray['datetime'] = date("Y-m-d H:i:s");
-if (!is_dir($jsonDir . '/' . $token)) {
-    mkdir($jsonDir . '/' . $token, 0777, true);
+if (!is_dir($jsonDir.'/'.$token)) {
+    mkdir($jsonDir.'/'.$token, 0777, true);
 }
 $json_data = json_encode($returnarray);
 if ($token != '') {
-    $loggerInstance->debug(4, $jsonDir . '/' . $returnarray['token']);
-    file_put_contents($jsonDir . '/' . $token . '/' . $test_type . '_' . $hostindex, $json_data);
+    $loggerInstance->debug(4, $jsonDir.'/'.$returnarray['token']);
+    file_put_contents($jsonDir.'/'.$token.'/'.$test_type.'_'.$hostindex, $json_data);
 }
 echo($json_data);
 

core/diag/RADIUSTestsUI.php

Indentation +5 added lines, -5 removed lines

@@ -125,7 +125,7 @@ 
             if ($this->allReachabilityResults['realm'][0]->realm) {
                 $this->realm = $this->allReachabilityResults['realm'][0]->realm;
                 foreach ($this->allReachabilityResults['realm'][0]->totest as $totest) {
-                  $this->hostMap[$totest->host] = $totest->bracketaddr;
+                    $this->hostMap[$totest->host] = $totest->bracketaddr;
                 }
                 $this->rfc7585suite = unserialize($this->allReachabilityResults['realm'][0]->rfc7585suite);
                 $this->srv = $this->allReachabilityResults['realm'][0]->srv;
@@ -460,7 +460,7 @@ 
                                     } else {
                                         if (property_exists($certificate, 'reason') && $certificate->reason == \core\diag\RADIUSTests::CERTPROB_UNKNOWN_CA) {
                                             $add = '<br>' . _('You should update your list of accredited CAs') .
-                                                           ' <a href=\"' . \config\Diagnostics::RADIUSTESTS['accreditedCAsURL'] . '\">' .
+                                                            ' <a href=\"' . \config\Diagnostics::RADIUSTESTS['accreditedCAsURL'] . '\">' .
                                                             _('Get it from here.') . '</a>';
                                         }
                                         $state = _('Server did not accept this client certificate - reason') . ': ' .
@@ -471,8 +471,8 @@ 
                                         $level = \core\common\Entity::L_WARN;
                                         $state = _('Server accepted this client certificate, but should not have');
                                     } else {
-                                       $level = \core\common\Entity::L_OK;
-                                       $state = _('Server did not accept this client certificate') . ': ' . $certificate->resultcomment;
+                                        $level = \core\common\Entity::L_OK;
+                                        $state = _('Server did not accept this client certificate') . ': ' . $certificate->resultcomment;
                                     }
                                 }
                                 $cliinfo .= '<li><table><tbody><tr><td class="icon_td"><img class="icon" src="' . $this->stateIcons[$level] . '" style="width: 24px;"></td><td>' . $state;
@@ -489,7 +489,7 @@ 
                         if ($srefused > 0) {
                             $cliinfo = _('Connection refused');
                             $clientstest[] = "<table><tr><td class='icon_td' id='srcclient$hostindex_img'><img src='" . $this->stateIcons[\core\common\Entity::L_ERROR] . "'></td>" .
-                                     "<td id='srcclient$hostname'><p>$cliinfo</p></td></tr></table>";
+                                        "<td id='srcclient$hostname'><p>$cliinfo</p></td></tr></table>";
                         } else {
                             $clientstest[] = "<p>$cliinfo</p>";
                         }

Spacing +70 added lines, -70 removed lines

@@ -111,8 +111,8 @@ 
             'authorityinfoaccess' => _("authorityInfoAccess"),
             'subjectaltname' => _("SubjectAltName"),
         ];
-        $jsondir = dirname(dirname(dirname(__FILE__))) . "/var/json_cache";
-        if ($token && is_dir($jsondir . '/' . $token)) {
+        $jsondir = dirname(dirname(dirname(__FILE__)))."/var/json_cache";
+        if ($token && is_dir($jsondir.'/'.$token)) {
             foreach (['realm', 'udp', 'clients', 'capath'] as $test_type) {
                 foreach (glob("$jsondir/$token/$test_type*") as $filename) {
                     $this->loggerInstance->debug(4, "\nIS_DIR $filename\n");
@@ -130,7 +130,7 @@ 
                 $this->rfc7585suite = unserialize($this->allReachabilityResults['realm'][0]->rfc7585suite);
                 $this->srv = $this->allReachabilityResults['realm'][0]->srv;
                 $this->naptr = $this->allReachabilityResults['realm'][0]->naptr;
-                $this->naptrValid= $this->allReachabilityResults['realm'][0]->naptr_valid;
+                $this->naptrValid = $this->allReachabilityResults['realm'][0]->naptr_valid;
                 $this->hosts = $this->allReachabilityResults['realm'][0]->hosts;
                 $this->testSuite = unserialize($this->allReachabilityResults['realm'][0]->testsuite);
             }
@@ -189,9 +189,9 @@ 
         }
     }           
 
-    public function isDynamic ()
+    public function isDynamic()
     {
-        if ($this->naptr> 0) {
+        if ($this->naptr > 0) {
             return TRUE;
         }
         return FALSE;
@@ -201,17 +201,17 @@ 
      * 
      * 
      */
-    public function printOverview ()
+    public function printOverview()
     {
         $out = [];
         $out[] = "<fieldset class='option_container'>
         <legend>
-        <strong>" . _("Overview") . '</strong> 
+        <strong>" . _("Overview").'</strong> 
         </legend>';
-        $out[] = "<strong>" . _("DNS chekcs") . "</strong><div>";
+        $out[] = "<strong>"._("DNS chekcs")."</strong><div>";
         if ($this->naptr != \core\diag\RADIUSTests::RETVAL_NOTCONFIGURED) {
             $out[] = "<table>";
-            $out[] = "<tr><td>" . _("Checking NAPTR existence:") . "</td><td>";
+            $out[] = "<tr><td>"._("Checking NAPTR existence:")."</td><td>";
             switch ($this->naptr) {
                 case \core\diag\RFC7585Tests::RETVAL_NONAPTR:
                     $out[] = _("This realm has no NAPTR records.");
@@ -226,7 +226,7 @@ 
             //print '<pre>'; print_r($out); print '</pre>'; exit;
             // compliance checks for NAPTRs
             if ($this->naptr > 0) {
-                $out[] = "<tr><td>" . _("Checking NAPTR compliance (flag = S and regex = {empty}):") . "</td><td>";
+                $out[] = "<tr><td>"._("Checking NAPTR compliance (flag = S and regex = {empty}):")."</td><td>";
                 switch ($this->naptrValid) {
                     case \core\diag\RADIUSTests::RETVAL_OK:
                         $out[] = "No issues found.";
@@ -239,7 +239,7 @@ 
             }
             // SRV resolution
             if ($this->naptr > 0 && $this->naptrValid == \core\diag\RADIUSTests::RETVAL_OK) {
-                $out[] = "<tr><td>" . _("Checking SRVs:") . "</td><td>";
+                $out[] = "<tr><td>"._("Checking SRVs:")."</td><td>";
                 switch ($this->srv) {
                     case \core\diag\RADIUSTests::RETVAL_SKIPPED:
                         $out[] = _("This check was skipped.");
@@ -254,7 +254,7 @@ 
             }
             // IP addresses for the hosts
             if ($this->naptr > 0 && $this->naptrValid == \core\diag\RADIUSTests::RETVAL_OK && $this->srv > 0) {
-                $out[] = "<tr><td>" . _("Checking IP address resolution:") . "</td><td>";
+                $out[] = "<tr><td>"._("Checking IP address resolution:")."</td><td>";
                 switch ($this->srv) {
                     case \core\diag\RADIUSTests::RETVAL_SKIPPED:
                         $out[] = _("This check was skipped.");
@@ -273,33 +273,33 @@ 
             if (count($this->testSuite->listerrors()) == 0) {
                 $out[] = _("with no DNS errors encountered. Congratulations!");
             } else {
-                $out[] = _("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.");
+                $out[] = _("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.");
                 $out[] = "<div class='notacceptable'><table>";
                 foreach ($this->testSuite->listerrors() as $details) {
-                    $out[] = "<tr><td>" . $details['TYPE'] . "</td><td>" . $details['TARGET'] . "</td></tr>";
+                    $out[] = "<tr><td>".$details['TYPE']."</td><td>".$details['TARGET']."</td></tr>";
                 }
                 $out[] = "</table></div>";
             }
             $out[] = '</div>';
 
             foreach ($this->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'];
                 $expectedName = $addr['hostname'];
             }
         } else {
-            $out[] = "<tr><td>" . _("Dynamic discovery test is not configured") . "</td><td>";
+            $out[] = "<tr><td>"._("Dynamic discovery test is not configured")."</td><td>";
         }
-        $out[] = "<hr><strong>" . _("Static connectivity tests") . "</strong>
+        $out[] = "<hr><strong>"._("Static connectivity tests")."</strong>
          <table><tr>
          <td class='icon_td'>";
-        $out[] = "<img src='" . $this->stateIcons[$this->globalLevelStatic] . "' id='main_static_ico' class='icon'></td><td id='main_static_result'>" .
-                            $this->globalInfo[$this->globalLevelStatic] . ' ' .  _("See the appropriate tab for details.") . '</td>
+        $out[] = "<img src='".$this->stateIcons[$this->globalLevelStatic]."' id='main_static_ico' class='icon'></td><td id='main_static_result'>".
+                            $this->globalInfo[$this->globalLevelStatic].' '._("See the appropriate tab for details.").'</td>
          </tr></table>';
         if ($this->naptr > 0) {
-            $out[] = "<hr><strong>" . _("Dynamic connectivity tests") . "</strong>
+            $out[] = "<hr><strong>"._("Dynamic connectivity tests")."</strong>
             <table><tr>
-            <td class='icon_td'><img src='" . $this->stateIcons[$this->globalLevelDynamic] . "' id='main_dynamic_ico' class='icon'></td><td id='main_dynamic_result'>" .
-            $this->globalInfo[$this->globalLevelDynamic] . ' ' . _("See the appropriate tab for details.") . '</td></tr></table>';
+            <td class='icon_td'><img src='" . $this->stateIcons[$this->globalLevelDynamic]."' id='main_dynamic_ico' class='icon'></td><td id='main_dynamic_result'>".
+            $this->globalInfo[$this->globalLevelDynamic].' '._("See the appropriate tab for details.").'</td></tr></table>';
         }
         $out[] = '</fieldset>';
         //print '<pre>'; print_r($out); print '</pre>'; exit;
@@ -320,27 +320,27 @@ 
             $result = $udp->result[0];
             //print '<pre>'; print_r($result); print '</pre>';
             $out[] = '<hr>';
-            $out[] = '<strong>' . sprintf(_("Testing from: %s"), \config\Diagnostics::RADIUSTESTS['UDP-hosts'][$hostindex]['display_name']) . '</strong>';
+            $out[] = '<strong>'.sprintf(_("Testing from: %s"), \config\Diagnostics::RADIUSTESTS['UDP-hosts'][$hostindex]['display_name']).'</strong>';
             $out[] = "<table id='results$hostindex'  style='width:100%' class='udp_results'>
 <tr>
-<td class='icon_td'><img src='" . $this->stateIcons[$result->level] . "' id='src" . $hostindex . "_img'></td>
+<td class='icon_td'><img src='".$this->stateIcons[$result->level]."' id='src".$hostindex."_img'></td>
 <td id='src$hostindex' colspan=2>
 ";
-            $out[] = '<strong>' . ($result->server? $result->server : _("Connected to undetermined server")) . '</strong><br/>' . sprintf (_("elapsed time: %sms."), $result->time_millisec) . '<p>' . $result->message . '</p>';
+            $out[] = '<strong>'.($result->server ? $result->server : _("Connected to undetermined server")).'</strong><br/>'.sprintf(_("elapsed time: %sms."), $result->time_millisec).'<p>'.$result->message.'</p>';
                     
             if ($result->level > \core\common\Entity::L_OK && property_exists($result, 'cert_oddities')) {
                 foreach ($result->cert_oddities as $oddities) {
-                    $out[] = '<tr class="results_tr"><td>&nbsp;</td><td class="icon_td"><img src="' . $icons[$oddities->level] . '"></td><td>' . $oddities->message . '</td></tr>';
+                    $out[] = '<tr class="results_tr"><td>&nbsp;</td><td class="icon_td"><img src="'.$icons[$oddities->level].'"></td><td>'.$oddities->message.'</td></tr>';
                 }
             }
             $cert_data = '';
             foreach ($result->server_cert as $sckey => $sc) {
                 if (array_key_exists($sckey, $this->certFields)) {
-                    $cert_data .= '<dt>' . $this->certFields[$sckey] . '</dt><dd>' . $sc . '</dd>';
+                    $cert_data .= '<dt>'.$this->certFields[$sckey].'</dt><dd>'.$sc.'</dd>';
                 }
             }
             $out[] = "<tr class='server_cert' style='display: ";
-            $out[] = ($result->server_cert? 'table-row' : 'none') . ";'><td>&nbsp;</td><td colspan=2><div><dl class='server_cert_list' style='display: none;'>";
+            $out[] = ($result->server_cert ? 'table-row' : 'none').";'><td>&nbsp;</td><td colspan=2><div><dl class='server_cert_list' style='display: none;'>";
             $out[] = $cert_data;
                         
             $ext = '';
@@ -348,12 +348,12 @@ 
                 if ($ext) {
                     $ext .= '<br>';
                 }
-                $ext .= '<strong>' . $extkey . ': </strong>' . '<i>' . $extval . '</i>';   
+                $ext .= '<strong>'.$extkey.': </strong>'.'<i>'.$extval.'</i>';   
             }
             if ($ext != '') {
-                $out[] = '<dt>' . _('Extensions') . '</dt></dd><dd>' . $ext . '</dd>';
+                $out[] = '<dt>'._('Extensions').'</dt></dd><dd>'.$ext.'</dd>';
             }
-            $out[] = "</dl><a href='' class='morelink'>" . _("show server certificate details") . "&raquo;</a></div></tr>";
+            $out[] = "</dl><a href='' class='morelink'>"._("show server certificate details")."&raquo;</a></div></tr>";
                         
             $out[] = "</td></tr></table>";
         }
@@ -364,7 +364,7 @@ 
     private function collectCAPath()
     {
         $capathtest = [];
-        $capathtest[] = '<p><strong>' . _("Checking server handshake...") . "</strong><p>";
+        $capathtest[] = '<p><strong>'._("Checking server handshake...")."</strong><p>";
         foreach ($this->allReachabilityResults['capath'] as $capath) {
             //print '<pre>'; print_r($capath); print '<pre>';
             $hostindex = $capath->hostindex;
@@ -372,46 +372,46 @@ 
             if ($capath->level == \core\common\Entity::L_OK && $capath->result == \core\diag\RADIUSTests::RETVAL_INVALID) {
                 $level = \core\common\Entity::L_WARN;
             }
-            $capathtest[] = '<p><strong>' . $this->hostMap[$capath->IP] . '</strong>';
+            $capathtest[] = '<p><strong>'.$this->hostMap[$capath->IP].'</strong>';
             $capathtest[] = '<ul style="list-style-type: none;" class="caresult"><li>';
             $capathtest[] = "<table id='caresults$hostindex'  style='width:100%'>
 <tr>
 <td class='icon_td'><img src='";
-            $capathtest[] = $this->stateIcons[$level] . "' id='srcca" . $hostindex . "_img'></td>
+            $capathtest[] = $this->stateIcons[$level]."' id='srcca".$hostindex."_img'></td>
 <td id='srcca$hostindex'>";
             $more = '';
             //print '<pre>'; print_r($server_cert); print '</pre>';print $server_cert['title'].'<br>';
             if ($capath->certdata && $capath->certdata->subject != '') {
                 $more .= '<div class="more">';
-                $certdesc = '<br>' . $this->certFields['title'] . '<ul>';
+                $certdesc = '<br>'.$this->certFields['title'].'<ul>';
                 if ($capath->certdata->subject) {
-                    $certdesc .= '<li>' . $this->certFields['c_subject'] . ': ' . $capath->certdata->subject;
+                    $certdesc .= '<li>'.$this->certFields['c_subject'].': '.$capath->certdata->subject;
                 }
                 if ($capath->certdata->issuer) {
-                    $certdesc .= '<li>' . $this->certFields['c_issuer'] . ': ' . $capath->certdata->issuer;
+                    $certdesc .= '<li>'.$this->certFields['c_issuer'].': '.$capath->certdata->issuer;
                 }
                 if ($capath->certdata->extensions) {
                     if ($capath->certdata->extensions->subjectaltname) {
-                        $certdesc .= '<li>' . $this->certFields['subjectaltname'] . ': ' . $capath->certdata->extensions->subjectaltname;
+                        $certdesc .= '<li>'.$this->certFields['subjectaltname'].': '.$capath->certdata->extensions->subjectaltname;
                     }
                 }
                 if ($capath->certdata->extensions->policies) {
-                    $certdesc .= '<li>' . $this->certFields['policies'] . ': ' . $capath->certdata->extensions->policies;
+                    $certdesc .= '<li>'.$this->certFields['policies'].': '.$capath->certdata->extensions->policies;
                 }
                 if ($capath->certdata->extensions->crldistributionpoints) {
-                    $certdesc .= '<li>' . $this->certFields['crldistributionpoints'] . ': ' . $capath->certdata->extensions->crldistributionpoints;
+                    $certdesc .= '<li>'.$this->certFields['crldistributionpoints'].': '.$capath->certdata->extensions->crldistributionpoints;
                 }
                 if ($capath->certdata->extensions->authorityinfoaccess) {
-                    $certdesc .= '<li>' . $this->certFields['authorityinfoaccess'] . ': ' . $capath->certdata->extensions->authorityinfoaccess;
+                    $certdesc .= '<li>'.$this->certFields['authorityinfoaccess'].': '.$capath->certdata->extensions->authorityinfoaccess;
                 }
                             
                 $certdesc .= '</ul>';
-                $more .= '<span class="morecontent"><span>' . $certdesc .
-                        '</span>&nbsp;&nbsp;<a href="" class="morelink">' . _("more") . '&raquo;</a></span></td></tr>';
+                $more .= '<span class="morecontent"><span>'.$certdesc.
+                        '</span>&nbsp;&nbsp;<a href="" class="morelink">'._("more").'&raquo;</a></span></td></tr>';
             } else {
                 $certdesc = '<br>';
             }
-            $capathtest[] = '<div>' . ($capath->message!=''? $capath->message : _('Test failed')) . '</div>' . $more;
+            $capathtest[] = '<div>'.($capath->message != '' ? $capath->message : _('Test failed')).'</div>'.$more;
             $capathtest[] = '</td>
 </tr>
 </table>';
@@ -426,7 +426,7 @@ 
         foreach ($this->allReachabilityResults['clients'] as $clients) {
             //print '<pre>'; print_r($clients); print '</pre>';
             $hostindex = $clients->hostindex; 
-            $clientstest[] = '<p><strong>' . $this->hostMap[$clients->IP] . '</strong></p>';
+            $clientstest[] = '<p><strong>'.$this->hostMap[$clients->IP].'</strong></p>';
             $clientstest[] = "<span id='clientresults$hostindex'>";
             $clientstest[] = '<p></p>';
             if ($this->globalLevelDynamic != \core\common\Entity::L_ERROR) {
@@ -436,9 +436,9 @@ 
                         //print '<pre>'; print_r($ca); print '</pre>';
                         $srefused = 0;
                         $cliinfo = '';
-                        $cliinfo .= '<li>' . _('Client certificate') . ' <b>' . $ca->clientcertinfo->from .
-                                    '</b>' . ', ' . $ca->clientcertinfo->message .
-                                    '<br> (CA: ' . $ca->clientcertinfo->issuer . ')<ul>';
+                        $cliinfo .= '<li>'._('Client certificate').' <b>'.$ca->clientcertinfo->from.
+                                    '</b>'.', '.$ca->clientcertinfo->message.
+                                    '<br> (CA: '.$ca->clientcertinfo->issuer.')<ul>';
                         foreach ($ca->certificate as $certificate) {
                             if ($certificate->returncode == \core\diag\RADIUSTests::RETVAL_CONNECTION_REFUSED) {
                                 $srefused = 1;
@@ -446,8 +446,8 @@ 
                         }
                         if ($srefused == 0) {
                             foreach ($ca->certificate as $certificate) { 
-                                $cliinfo .= '<li><i>' . $certificate->message .  
-                                            ', ' . _("expected result: ") . $this->states[$certificate->expected] . '</i>';
+                                $cliinfo .= '<li><i>'.$certificate->message.  
+                                            ', '._("expected result: ").$this->states[$certificate->expected].'</i>';
                                 $cliinfo .= '<ul style="list-style-type: none;">';
                                 $level = $certificate->returncode;
                                 if ($level < 0) {
@@ -459,11 +459,11 @@ 
                                         $state = _("Server accepted this client certificate");
                                     } else {
                                         if (property_exists($certificate, 'reason') && $certificate->reason == \core\diag\RADIUSTests::CERTPROB_UNKNOWN_CA) {
-                                            $add = '<br>' . _('You should update your list of accredited CAs') .
-                                                           ' <a href=\"' . \config\Diagnostics::RADIUSTESTS['accreditedCAsURL'] . '\">' .
-                                                            _('Get it from here.') . '</a>';
+                                            $add = '<br>'._('You should update your list of accredited CAs').
+                                                           ' <a href=\"'.\config\Diagnostics::RADIUSTESTS['accreditedCAsURL'].'\">'.
+                                                            _('Get it from here.').'</a>';
                                         }
-                                        $state = _('Server did not accept this client certificate - reason') . ': ' .
+                                        $state = _('Server did not accept this client certificate - reason').': '.
                                                     $certificate->resultcomment;
                                     }
                                 } else {
@@ -472,14 +472,14 @@ 
                                         $state = _('Server accepted this client certificate, but should not have');
                                     } else {
                                        $level = \core\common\Entity::L_OK;
-                                       $state = _('Server did not accept this client certificate') . ': ' . $certificate->resultcomment;
+                                       $state = _('Server did not accept this client certificate').': '.$certificate->resultcomment;
                                     }
                                 }
-                                $cliinfo .= '<li><table><tbody><tr><td class="icon_td"><img class="icon" src="' . $this->stateIcons[$level] . '" style="width: 24px;"></td><td>' . $state;
-                                $cliinfo .= ' (' . sprintf(_('elapsed time: %sms.'), $certificate->time_millisec) . '&nbsp;) ' . $add . '</td></tr>';
+                                $cliinfo .= '<li><table><tbody><tr><td class="icon_td"><img class="icon" src="'.$this->stateIcons[$level].'" style="width: 24px;"></td><td>'.$state;
+                                $cliinfo .= ' ('.sprintf(_('elapsed time: %sms.'), $certificate->time_millisec).'&nbsp;) '.$add.'</td></tr>';
                                 $cliinfo .= '</tbody></table></ul></li>';
                                 if (property_exists($certificate, 'finalerror') && $certificate->finalerror == 1) {
-                                    $cliinfo = '<li>' . _('Rest of tests for this CA skipped') . '</li>';
+                                    $cliinfo = '<li>'._('Rest of tests for this CA skipped').'</li>';
                                 }
                             }
                             $clients_level = max($clients_level, $level);
@@ -488,7 +488,7 @@ 
                                     
                         if ($srefused > 0) {
                             $cliinfo = _('Connection refused');
-                            $clientstest[] = "<table><tr><td class='icon_td' id='srcclient$hostindex_img'><img src='" . $this->stateIcons[\core\common\Entity::L_ERROR] . "'></td>" .
+                            $clientstest[] = "<table><tr><td class='icon_td' id='srcclient$hostindex_img'><img src='".$this->stateIcons[\core\common\Entity::L_ERROR]."'></td>".
                                      "<td id='srcclient$hostname'><p>$cliinfo</p></td></tr></table>";
                         } else {
                             $clientstest[] = "<p>$cliinfo</p>";
@@ -497,9 +497,9 @@ 
                     $cliinfo .= '</ol>';
                 } else {
                     $clients_level = \core\common\Entity::L_WARN;
-                    $cliinfo = _('Test failed') ;
-                    $clientstest[] = "<table><tr><td class='icon_td' id='srcclient$hostindex_img'><img src='" .
-                                    $this->stateIcons[\core\common\Entity::L_WARN] . "'></td>" .
+                    $cliinfo = _('Test failed');
+                    $clientstest[] = "<table><tr><td class='icon_td' id='srcclient$hostindex_img'><img src='".
+                                    $this->stateIcons[\core\common\Entity::L_WARN]."'></td>".
                                     "<td id='srcclient$hostname'>$cliinfo</td></tr></table>";
                 }
             } else {
@@ -507,9 +507,9 @@ 
                 $clientstest[] = "<table id='clientsresults$hostindex'  style='width:100%'>
 <tr>
 <td class='icon_td'><img src='";
-                $clientstest[] = $this->stateIcons[\core\common\Entity::L_ERROR] . "' id='srcclients" . $hostindex . "_img'></td>
+                $clientstest[] = $this->stateIcons[\core\common\Entity::L_ERROR]."' id='srcclients".$hostindex."_img'></td>
 <td id='srcclient$hostindex'>";
-                $clientstest[] =  _("These tests were skipped because of previous errors.") . '</td></tr></table></ul>';
+                $clientstest[] = _("These tests were skipped because of previous errors.").'</td></tr></table></ul>';
             }
             $clientstest[] = '</ol><p></p>';
         }
@@ -520,7 +520,7 @@ 
     {
         $out = [];
         $out[] = "<div id='dynamic_tests'><fieldset class='option_container'>
-            <legend><strong>" . _("DYNAMIC connectivity tests") . "</strong></legend>";
+            <legend><strong>" . _("DYNAMIC connectivity tests")."</strong></legend>";
         
         if (count($this->rfc7585suite->NAPTR_hostname_records) > 0) {    
             $capathtest = $this->collectCAPath();
@@ -531,17 +531,17 @@ 
             if ($this->globalLevelDynamic == \core\common\Entity::L_OK && !$this->areFailed) {
                 $out[] = 'none';
             }
-            $out[] = ';" id="dynamic_result_fail"><b>' . _("Some errors were found during the tests, see below") . '</b></div>';
+            $out[] = ';" id="dynamic_result_fail"><b>'._("Some errors were found during the tests, see below").'</b></div>';
             $out[] = '<div style="align:right; display: ';
             if ($this->globalLevelDynamic != \core\common\Entity::L_OK || $this->areFailed) {
                 $out[] = 'none';
             }
-            $out[] = '" id="dynamic_result_pass"><b>' .
-                                _("All tests passed, congratulations!") . '</b></div>' .
-                                '<div style="align:left;"><a href="" class="moreall"><i>' . _('Show detailed information for all tests') . '&raquo;</i></a></div>';
+            $out[] = '" id="dynamic_result_pass"><b>'.
+                                _("All tests passed, congratulations!").'</b></div>'.
+                                '<div style="align:left;"><a href="" class="moreall"><i>'._('Show detailed information for all tests').'&raquo;</i></a></div>';
             //print '<pre>'; print_r($clientstest); print '</pre>';
             $out[] = join('', $capathtest);
-            $out[] = '<span id="clientstest" style="display: ;"><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>';
+            $out[] = '<span id="clientstest" style="display: ;"><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>';
             $out[] = join('', $clientstest);
             $out[] = '</span>';
             $out[] = '</div>';