GEANT / CAT

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/diag.php

Spacing +4 added lines, -4 removed lines

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

web/diag/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);
 

web/skins/modern/diag/diag.php

Spacing +67 added lines, -67 removed lines

@@ -46,9 +46,9 @@ 
 $Gui->loggerInstance->debug(4, $operatingSystem);
 $uiElements = new web\lib\admin\UIElements();
 if ($operatingSystem) {
-    print "recognisedOS = '" . $operatingSystem['device'] . "';\n";
+    print "recognisedOS = '".$operatingSystem['device']."';\n";
 }
-require dirname(__DIR__) . '/user/js/cat_js.php';
+require dirname(__DIR__).'/user/js/cat_js.php';
 
 ?>
 </script>
@@ -60,7 +60,7 @@ 
 <div id='wrap' style='background-image:url("<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "beta.png"); ?>");'>
 <form id="cat_form" name="cat_form" accept-charset="UTF-8" action="<?php echo $_SERVER['SCRIPT_NAME']; ?>" method="POST">
 <?php
-require dirname(__DIR__) . '/diag/js/diag_js.php';
+require dirname(__DIR__).'/diag/js/diag_js.php';
 echo $divs->divHeading($visibility);
 $Gui->languageInstance->setTextDomain("diagnostics");
 ?>
@@ -78,12 +78,12 @@ 
     </div>
     <div id="main_body">
         <div id="user_page">
-            <?php echo $divs->divPagetitle(_("Diagnostics site") . " (<span style='color:red'>beta</span>)", ""); ?>
+            <?php echo $divs->divPagetitle(_("Diagnostics site")." (<span style='color:red'>beta</span>)", ""); ?>
             <div id="user_info" style='padding-top: 10px;'>
             <div id='diagnostic_choice'>
-                <?php echo _("The diagnostics system will do its best to identify and resolve your problems!") . ' ' . _("Please help the system by answering the questions as precisely as possible.") . "<br/>" . _("Are you a") . ' '; ?>
-                <input type='radio' name='diagnostic_usertype' value='0'><?php echo _("end-user") . ' ' . _("or"); ?>   
-                <input type='radio' name='diagnostic_usertype' value='1' <?php if ($admin == 1) { echo " checked"; } ?> > <?php echo _("eduroam administrator") .'?'; ?>
+                <?php echo _("The diagnostics system will do its best to identify and resolve your problems!").' '._("Please help the system by answering the questions as precisely as possible.")."<br/>"._("Are you a").' '; ?>
+                <input type='radio' name='diagnostic_usertype' value='0'><?php echo _("end-user").' '._("or"); ?>   
+                <input type='radio' name='diagnostic_usertype' value='1' <?php if ($admin == 1) { echo " checked"; } ?> > <?php echo _("eduroam administrator").'?'; ?>
             </div>
             <div id='diagnostic_enduser' style='display: none;'>
                 <h2><?php echo _("Tools for End Users"); ?></h2>
@@ -93,24 +93,24 @@ 
                 ?>
                 </p>
                 <?php
-                    echo '<div id="before_stage_1"><h3>' . _("The system needs some information on your home institution - issuer of your account") . '</h3>';
+                    echo '<div id="before_stage_1"><h3>'._("The system needs some information on your home institution - issuer of your account").'</h3>';
                     echo _("What is the realm part of your user account (the part behind the @ of 'your.username@<b>realm.tld</b>):");
                 ?>
                 <input type='text' name='user_realm' id='user_realm' value=''>
                 <?php
-                    echo '<div id="realm_by_select"><br/>' . _("alternatively") . '<br/>';
-                    echo _("You can select your home institution from the following list") . '<br/>';
+                    echo '<div id="realm_by_select"><br/>'._("alternatively").'<br/>';
+                    echo _("You can select your home institution from the following list").'<br/>';
                     echo '<div id="select_idp_country"><a href="" id="idp_countries_list">';    
-                    echo '<span id="realmselect">' . _("Click to select your country/region and organisation") . '</span></a></div>';
+                    echo '<span id="realmselect">'._("Click to select your country/region and organisation").'</span></a></div>';
                 ?>
                 <div id="select_idp_area" style="display:none;">
                 </div>
                 </div>
                 <div id="position_info">
                     <?php
-                        echo '<h3>' . _("Optionally, to improve tests, you can provide information on your current location") . '</h3>';
+                        echo '<h3>'._("Optionally, to improve tests, you can provide information on your current location").'</h3>';
                         echo '<div id="select_sp_country"><a href="" id="sp_countries_list">';    
-                        echo '<span id="spselect">' . _("Click to select a location in which you have an eduroam problem") . '</span></a></div>';
+                        echo '<span id="spselect">'._("Click to select a location in which you have an eduroam problem").'</span></a></div>';
                     ?>
                     <div id="select_sp_area" style="display:none;">
                     </div>
@@ -143,9 +143,9 @@ 
                             echo 'none';
                         }
                         echo ";'>";
-                        echo '<h3>' . _("Which problem are you reporting?") . '</h3>';
-                        echo '<input type="radio" name="problem_type" value="1"' . (($sp==1)? ' checked' : '') . '>';
-                        echo _("SP contacting IdP due to technical problems or abuse") . '<br>';
+                        echo '<h3>'._("Which problem are you reporting?").'</h3>';
+                        echo '<input type="radio" name="problem_type" value="1"'.(($sp == 1) ? ' checked' : '').'>';
+                        echo _("SP contacting IdP due to technical problems or abuse").'<br>';
                         echo '<input type="radio" name="problem_type" value="2">';
                         echo _("IdP contacting SP due to technical problems");
                         echo "<div id='idp_contact_area'></div>";
@@ -154,9 +154,9 @@ 
                         echo "</div>"; 
                     } else {
                         echo "0\">";
-                        echo _("This service is for authenticated admins only.") . '<br>';
-                        echo "<a href=\"diag.php?admin=1\">" .
-                             _("eduroam® admin access is needed") . "</a>";
+                        echo _("This service is for authenticated admins only.").'<br>';
+                        echo "<a href=\"diag.php?admin=1\">".
+                             _("eduroam® admin access is needed")."</a>";
                     }
                 ?>
             </div> 
@@ -232,7 +232,7 @@ 
         return false;
     });
     $(document).on('change', '#idp_country' , function() {
-        var comment = <?php echo '"' . _("Fetching institutions list") . '..."'; ?>;  
+        var comment = <?php echo '"'._("Fetching institutions list").'..."'; ?>;  
         var id = $(this).attr('id');
         var k = id.indexOf('_');
         var type = id.substr(0,k);
@@ -250,7 +250,7 @@ 
                         var shtml = '';
                         var select = '';
                         if (type !== 'asp') {
-                            shtml = <?php echo '"<td>' . _("Select institution:") . '</td><td>"'; ?>;
+                            shtml = <?php echo '"<td>'._("Select institution:").'</td><td>"'; ?>;
                         }
                         select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value=""></option>';
                         for (var i in institutions) {
@@ -271,7 +271,7 @@ 
                     } else {
                         if (data.status === 0) {
                             inProgress(0);
-                            var msg = <?php echo '"' . _("The database does not contain the information needed to help you in realm selection for this country. You have to provide the realm you are interested in.") . '"'; ?>;
+                            var msg = <?php echo '"'._("The database does not contain the information needed to help you in realm selection for this country. You have to provide the realm you are interested in.").'"'; ?>;
                             alert(msg);
                             $('#select_idp_country').show();
                             $('#select_idp_area').hide();
@@ -280,7 +280,7 @@ 
                 },
                 error:function() {
                     inProgress(0);
-                    var msg = <?php echo '"' . _("Can not search in database. You have to provide the realm you are interested in.") . '"'; ?>;
+                    var msg = <?php echo '"'._("Can not search in database. You have to provide the realm you are interested in.").'"'; ?>;
                     alert(msg);
                     $('#select_idp_country').show();
                     $('#select_idp_area').hide();
@@ -296,9 +296,9 @@ 
     });
     $(document).on('change', '#select_sp_problem' , function() {
         if ($('#select_sp_problem').val().substr(0,6) == 'abuse-') {
-            $('#realm_in_db_admin').text(<?php echo '"' . _("Check if this realm is registered") . '"'; ?>);
+            $('#realm_in_db_admin').text(<?php echo '"'._("Check if this realm is registered").'"'; ?>);
         } else {
-            $('#realm_in_db_admin').text(<?php echo '"' . _("Check this realm") . '"'; ?>);
+            $('#realm_in_db_admin').text(<?php echo '"'._("Check this realm").'"'; ?>);
         }
         $('#realm_in_db_admin').hide();
         $('#admin_realm').val('');
@@ -306,7 +306,7 @@ 
         clear_sp_question();
     });
     $(document).on('change', '#sp_country, #asp_country' , function() {
-        var comment = <?php echo '"' . _("Fetching institutions list") . '..."'; ?>;  
+        var comment = <?php echo '"'._("Fetching institutions list").'..."'; ?>;  
         var id = $(this).attr('id');
         var k = id.indexOf('_');
         var type = id.substr(0,k);
@@ -324,7 +324,7 @@ 
                         var shtml = '';
                         var select = '';
                         if (type !== 'asp') {
-                            shtml = <?php echo '"<td>' . _("Select institution:") . '</td><td>"'; ?>;
+                            shtml = <?php echo '"<td>'._("Select institution:").'</td><td>"'; ?>;
                         }
                         select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value=""></option>';
                         for (var i in hotspots) {
@@ -347,7 +347,7 @@ 
                             inProgress(0);
                             var select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value="">';
                             var shtml = '<td></td><td>';
-                            select = select + <?php echo '"' . _("Other location") . '"'; ?> + '</option></select></td>';
+                            select = select + <?php echo '"'._("Other location").'"'; ?> + '</option></select></td>';
                             if (type !== 'asp') {
                                 $('#row_' + type + '_institution').html('');
                                 $('#row_' + type + '_institution').append(shtml + select);
@@ -381,7 +381,7 @@ 
             $('#start_test_area').hide();
             return false;
         }
-        var comment = <?php echo '"' . _("Fetching realms list") . '..."'; ?>;
+        var comment = <?php echo '"'._("Fetching realms list").'..."'; ?>;
         inProgress(1, comment);
         $.ajax({
             url: "findRealm.php",
@@ -393,7 +393,7 @@ 
                     var realms = data.realms;
                     var realmselect = '';
                     if (realms.length > 1) {
-                        realmselect = <?php echo '"<td>' . _("Check realm(s):") . '</td>"'; ?>;
+                        realmselect = <?php echo '"<td>'._("Check realm(s):").'</td>"'; ?>;
                         realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>";
                         for (var i in realms) {
                             realmselect = realmselect + '<input type="radio" name="realm" ';
@@ -405,7 +405,7 @@ 
                         }
                         realmselect = realmselect + '</span></td>';
                     } else {
-                        realmselect = <?php echo '"<td>' . _("Realm:") . '</td>"'; ?>;
+                        realmselect = <?php echo '"<td>'._("Realm:").'</td>"'; ?>;
                         realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>";
                         realmselect = realmselect + realms[0] + '</span>';
                         realmselect = realmselect + '<input type="hidden" name="realm" value="' + realms[0] + '">';
@@ -457,7 +457,7 @@ 
             clear_sp_question();
             t = 1;
         }
-        var comment = <?php echo '"' . _("Running realm tests") . '..."'; ?>;
+        var comment = <?php echo '"'._("Running realm tests").'..."'; ?>;
         inProgress(1, comment);
         /*waiting(comment);*/
         $.ajax({
@@ -516,7 +516,7 @@ 
         testSociopath('', answer);
     });
     $('#realmtest').click(function(event){
-        var comment = <?php echo '"<br><br>' . _("Running realm tests") . '..."'; ?>;
+        var comment = <?php echo '"<br><br>'._("Running realm tests").'..."'; ?>;
         inProgress(1, comment);
         $('#start_test_area').hide();
         if ($('#select_sp_area').is(':hidden')) {
@@ -564,13 +564,13 @@ 
                         reset_footer();
                         testSociopath(realm, 0);
                     } else {
-                        var title = <?php echo '"' . _("Diagnostics results for selected realms") . '"'; ?>;
-                        result = '<div class="padding"><h3>' + <?php echo '"' . _("An unknown problem occured") . '"'; ?>;
+                        var title = <?php echo '"'._("Diagnostics results for selected realms").'"'; ?>;
+                        result = '<div class="padding"><h3>' + <?php echo '"'._("An unknown problem occured").'"'; ?>;
                         result = result + '</h3>'
                         if (r.length == 1) {
-                            result = result + <?php echo '"' . _("This test includes checking of the following realm") . '"'; ?>;
+                            result = result + <?php echo '"'._("This test includes checking of the following realm").'"'; ?>;
                         } else {    
-                            result = result + <?php echo '"' . _("This test includes checking of the following realms") . '"'; ?>;
+                            result = result + <?php echo '"'._("This test includes checking of the following realms").'"'; ?>;
                         }
                         result = result + ': '
                         for (var i=0; i < r.length; i++) {
@@ -580,7 +580,7 @@ 
                             result = result + r[i];
                         }
                         result = result + '.<br>';
-                        result = result + <?php echo '"' . _("You should report this to") . '"'; ?> + ' <a href="mailto:admin@eduroam.pl">admin@eduroam.pl</a>';
+                        result = result + <?php echo '"'._("You should report this to").'"'; ?> + ' <a href="mailto:admin@eduroam.pl">admin@eduroam.pl</a>';
                         result = result + '</div>';
                         $('#after_stage_1').hide();
                         $('#before_stage_1').show();
@@ -648,43 +648,43 @@ 
             success:function(data) {
                 if (data.status === 1) {
                     var result = '';
-                    var title = <?php echo '"' . _("eduroam admin report submission") . '"'; ?>;
+                    var title = <?php echo '"'._("eduroam admin report submission").'"'; ?>;
                     result = '<div class="padding">';
                     if (type == 'idp_send') {
-                        result = result + '<h3>'+ <?php echo '"' . _("SP contacting IdP due to technical problems or abuse") . '"'; ?> + '</h3>';
+                        result = result + '<h3>'+ <?php echo '"'._("SP contacting IdP due to technical problems or abuse").'"'; ?> + '</h3>';
                         result = result + '<table>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("An email to contact the reporter") . '"'; ?> + '</td><td>' + data.email + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Test result") . '" '; ?> +'</td><td>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("An email to contact the reporter").'"'; ?> + '</td><td>' + data.email + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Test result").'" '; ?> +'</td><td>';
                         if (data.tests_result == 1) {
-                            result = result + <?php echo '"' . _("failure") . '"'; ?>;
+                            result = result + <?php echo '"'._("failure").'"'; ?>;
                         } else {
-                            result = result + <?php echo '"' . _("success") . '"'; ?>;
+                            result = result + <?php echo '"'._("success").'"'; ?>;
                         }
                         result = result + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Test URL") . '" '; ?> +'</td><td><a href="' + data.testurl + '">' + data.testurl + '</a></td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Email to IdP administrators ") . '"'; ?> + ' ';
+                        result = result + '<tr><td>' + <?php echo '"'._("Test URL").'" '; ?> +'</td><td><a href="' + data.testurl + '">' + data.testurl + '</a></td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Email to IdP administrators ").'"'; ?> + ' ';
                         if (data.emailsent == 1) {
-                            result = result + <?php echo '"' . _("send successfully") . '"'; ?>;
+                            result = result + <?php echo '"'._("send successfully").'"'; ?>;
                         } else {
-                            result = result + <?php echo '"' . _("not sent - failure while sending") . '"'; ?>;
+                            result = result + <?php echo '"'._("not sent - failure while sending").'"'; ?>;
                         }
                         result = result + '</td><td></td></tr>';
                     }
                     if (type == 'sp_send') {
-                        result = result + '<h3>'+ <?php echo '"' . _("IdP contacting SP due to technical problems or abuse") . '"'; ?> + '</h3>';
+                        result = result + '<h3>'+ <?php echo '"'._("IdP contacting SP due to technical problems or abuse").'"'; ?> + '</h3>';
                         result = result + '<table>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("SP's Operator-Name") . '"'; ?> + '</td><td>' + data.opname + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("User's outer ID") . '"'; ?> + '</td><td>' + data.outerid + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("IdP email") . '"'; ?> + '</td><td>' + data.email + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("How to contact the user") . '"'; ?> +'</td><td>' + data.cdetails + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("SP's Operator-Name").'"'; ?> + '</td><td>' + data.opname + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("User's outer ID").'"'; ?> + '</td><td>' + data.outerid + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("IdP email").'"'; ?> + '</td><td>' + data.email + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("How to contact the user").'"'; ?> +'</td><td>' + data.cdetails + '</td></tr>';
                     }
                     result = result + '</div>';
                     showInfo(result, title);
@@ -709,7 +709,7 @@ 
                         $(this).removeClass('visible_row').addClass('hidden_row');
                     }
                 });
-                $('#admin_realm').attr('title', <?php echo '"' . _("Wrong format of realm") . '"'; ?>);
+                $('#admin_realm').attr('title', <?php echo '"'._("Wrong format of realm").'"'; ?>);
             } else {
                 $('#admin_realm').removeClass('error_input');
                 $('#admin_realm').attr('title', '');
@@ -719,7 +719,7 @@ 
     $(document).on('keyup change', '#email' , function() {
         if ($(this).val().length == 0 || !isEmail($(this).val())) {
             $('#email').addClass('error_input');
-            $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"'; ?>);
+            $('#email').attr('title', <?php echo '"'._("Wrong format of email").'"'; ?>);
         } else {
             $('#email').removeClass('error_input');
             $('#email').attr('title', '');
@@ -732,7 +732,7 @@ 
         if ($('#mac').val().length > 0) {
             if ($('#mac').val().length != 17) {
                 $('#mac').addClass('error_input');
-                $('#mac').attr('title', <?php echo '"' . _("MAC address is incomplete") . '"'; ?>);
+                $('#mac').attr('title', <?php echo '"'._("MAC address is incomplete").'"'; ?>);
             } else {
                 $('#mac').removeClass('error_input'); 
                 $('#mac').attr('title', '');
@@ -741,7 +741,7 @@ 
         if ($(this).attr('id') == 'email' &&  $(this).val().length > 0) {
             if (!isEmail($(this).val())) {
                 $('#email').addClass('error_input');
-                $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"'; ?>);
+                $('#email').attr('title', <?php echo '"'._("Wrong format of email").'"'; ?>);
             } else {
                 $('#email').removeClass('error_input');
                 $('#email').attr('title', '');
@@ -750,7 +750,7 @@ 
         if ($(this).attr('id') == 'outer_id' &&  $(this).val().length > 0) {
             if (!isEmail($(this).val(), true)) {
                 $('#outer_id').addClass('error_input');
-                $('#outer_id').attr('title', <?php echo '"' . _("Wrong format of outer ID") . '"'; ?>);
+                $('#outer_id').attr('title', <?php echo '"'._("Wrong format of outer ID").'"'; ?>);
             } else {
                 $('#outer_id').removeClass('error_input');
                 $('#outer_id').attr('title', '');
@@ -759,7 +759,7 @@ 
         if ($(this).attr('id') == 'opname' && $('#opname').val().length > 0) {
             if (!isOperatorName($(this).val())) {
                 $('#opname').addClass('error_input');
-                $('#opname').attr('title', <?php echo '"' . _("Wrong string given as OperatorName") . '"'; ?>);
+                $('#opname').attr('title', <?php echo '"'._("Wrong string given as OperatorName").'"'; ?>);
                 $('#spmanually').show();
             } else {
                 $('#opname').removeClass('error_input');

web/admin/edit_participant_result.php

Spacing +21 added lines, -21 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();
@@ -33,15 +33,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:
@@ -51,9 +51,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) {
@@ -72,19 +72,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']);
@@ -93,10 +93,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)
@@ -112,12 +112,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>";
@@ -125,7 +125,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"));
         }
@@ -153,7 +153,7 @@ 
                 // did we get an email address? then, show the silverbullet jumpstart button
                 // otherwise, issue a smartass comment
                 if (count($myInstReinstantiated->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!"));
@@ -161,10 +161,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_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,17 +186,17 @@ 
                 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");
                 }
             }
             // re-instantiate $profile, we need to do completion checks and need fresh data for isEapTypeDefinitionComplete()
@@ -205,23 +205,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) {
@@ -233,7 +233,7 @@ 
                 // see if we can enable the EAP type, or if info is missing
                     $eapcompleteness = $reloadedProfile->isEapTypeDefinitionComplete($oneEap);
                     if ($eapcompleteness === true) {
-                        echo $uiElements->boxOkay(_("Supported EAP Type: ") . "<strong>" . $oneEap->getPrintableRep() . "</strong>");
+                        echo $uiElements->boxOkay(_("Supported EAP Type: ")."<strong>".$oneEap->getPrintableRep()."</strong>");
                     } else {
                         
                         if (is_array($eapcompleteness)) {
@@ -242,11 +242,11 @@ 
                             $warntext = "<strong>";
                             foreach ($eapcompleteness as $item) {
                                 $iterator = $iterator + 1;
-                                $warntext .= $uiElements->displayName($item) . "</strong>".($iterator < $number ? ", " : "")."<strong>";
+                                $warntext .= $uiElements->displayName($item)."</strong>".($iterator < $number ? ", " : "")."<strong>";
                             }
                             $warntext .= "</strong>";
                         }
-                        echo $uiElements->boxWarning(sprintf(_("Supported EAP Type <strong>%s</strong> is missing required information: %s !"), $oneEap->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 !"), $oneEap->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."));
                     }
             }
             $reloadedProfile->prepShowtime();
@@ -259,7 +259,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/overview_sp.php

Spacing +25 added lines, -25 removed lines

@@ -26,7 +26,7 @@ 
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $deco = new \web\lib\admin\PageDecoration();
 $validator = new \web\lib\common\InputValidation();
@@ -38,7 +38,7 @@ 
 } else {
     $link = 'http://';
 }
-$link .= $_SERVER['SERVER_NAME'] . $_SERVER['SCRIPT_NAME'];
+$link .= $_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME'];
 $link = htmlspecialchars($link);
 
 echo $deco->defaultPagePrelude(sprintf(_("%s: %s Dashboard"), \config\Master::APPEARANCE['productname'], $uiElements->nomenclatureHotspot));
@@ -99,21 +99,21 @@ 
         <?php
         if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] !== NULL) {
             echo "<tr>
-                        <td>" . _("Check another realm's reachability") . "</td>
+                        <td>" . _("Check another realm's reachability")."</td>
                         <td><form method='post' action='../diag/action_realmcheck.php?inst_id=$my_inst->identifier' accept-charset='UTF-8'>
                               <!--<input type='text' name='realm' id='realm'>-->
                               <input type='hidden' name='comefrom' id='comefrom' value='$link'/>
-                              <button id='realmcheck' style='cursor:pointer;' type='submit'>" . _("Go!") . "</button>
+                              <button id='realmcheck' style='cursor:pointer;' type='submit'>"._("Go!")."</button>
                             </form>
                         </td>
                     </tr>";
         }
         if (\config\ConfAssistant::CONSORTIUM['name'] == "eduroam") { // SW: APPROVED
             echo "<tr>
-                        <td>" . sprintf(_("Check %s server status"), $uiElements->nomenclatureFed) . "</td>
+                        <td>" . sprintf(_("Check %s server status"), $uiElements->nomenclatureFed)."</td>
                         <td>
                            <form action='https://monitor.eduroam.org/mon_direct.php' accept-charset='UTF-8'>
-                              <button style='cursor:pointer;' type='submit'>" . _("Go!") . "</button>
+                              <button style='cursor:pointer;' type='submit'>" . _("Go!")."</button>
                            </form>
                         </td>
                     </tr>";
@@ -124,10 +124,10 @@ 
     <?php
     $hotspotProfiles = $my_inst->listDeployments();
     if (count($hotspotProfiles) == 0) { // no profiles yet.
-        echo "<h2>" . sprintf(_("There are not yet any known deployments for your %s."), $uiElements->nomenclatureHotspot) . "</h2>";
+        echo "<h2>".sprintf(_("There are not yet any known deployments for your %s."), $uiElements->nomenclatureHotspot)."</h2>";
     }
     if (count($hotspotProfiles) > 0) { // no profiles yet.
-        echo "<h2>" . sprintf(_("Deployments for this %s"), $uiElements->nomenclatureHotspot) . "</h2>";
+        echo "<h2>".sprintf(_("Deployments for this %s"), $uiElements->nomenclatureHotspot)."</h2>";
         // display an info box with the connection data
     }
    
@@ -146,19 +146,19 @@ 
         ?>
         <div style='display: table-row; margin-bottom: 20px;'>
             <div class='profilebox' style='display: table-cell;'>
-                <h2><?php echo core\DeploymentManaged::PRODUCTNAME . " (<span style='color:" . ( $deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>" . _("inactive") : "green;'>" . _("active") ) . "</span>)"; ?></h2>
+                <h2><?php echo core\DeploymentManaged::PRODUCTNAME." (<span style='color:".($deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>"._("inactive") : "green;'>"._("active"))."</span>)"; ?></h2>
                 <table>
                     <tr>
                         <td><strong><?php echo _("Your primary RADIUS server") ?></strong><br/>
                         <?php
                             if ($deploymentObject->host1_v4 !== NULL) {
-                                echo _("IPv4") . ": " . $deploymentObject->host1_v4;
+                                echo _("IPv4").": ".$deploymentObject->host1_v4;
                             }
                             if ($deploymentObject->host1_v4 !== NULL && $deploymentObject->host1_v6 !== NULL) {
                                 echo "<br/>";
                             }
                             if ($deploymentObject->host1_v6 !== NULL) {
-                                echo _("IPv6") . ": " . $deploymentObject->host1_v6;
+                                echo _("IPv6").": ".$deploymentObject->host1_v6;
                             }
                             ?>
                         </td>
@@ -166,9 +166,9 @@ 
                         <td><?php echo $deploymentObject->port1; ?></td>
                         <td>
                             <?php
-                                echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] . 
-                                     "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . 
-                                     "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "'>";
+                                echo "<img src='".$radiusMessages[$deploymentObject->radius_status_1]['icon']. 
+                                     "' alt='".$radiusMessages[$deploymentObject->radius_status_1]['text']. 
+                                     "' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."'>";
                             ?>
                         </td>
                     </tr>
@@ -176,22 +176,22 @@ 
                         <td><strong><?php echo _("Your backup RADIUS server") ?><br/></strong>
                             <?php
                             if ($deploymentObject->host2_v4 !== NULL) {
-                                echo _("IPv4") . ": " . $deploymentObject->host2_v4;
+                                echo _("IPv4").": ".$deploymentObject->host2_v4;
                             }
                             if ($deploymentObject->host2_v4 !== NULL && $deploymentObject->host2_v6 !== NULL) {
                                 echo "<br/>";
                             }
                             if ($deploymentObject->host2_v6 !== NULL) {
-                                echo _("IPv6") . ": " . $deploymentObject->host2_v6;
+                                echo _("IPv6").": ".$deploymentObject->host2_v6;
                             }
                             ?></td>
                         <td><?php echo _("RADIUS port number: ") ?></td>
                         <td><?php echo $deploymentObject->port2; ?></td>
                         <td>
                             <?php
-                                echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] .
-                                     "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . 
-                                     "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "'>";
+                                echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon'].
+                                     "' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text']. 
+                                     "' title='".$radiusMessages[$deploymentObject->radius_status_2]['text']."'>";
                             ?>
                         </td>
                     </tr>
@@ -242,12 +242,12 @@ 
                                     if (isset($res['FAILURE']) && $res['FAILURE'] > 0) {
                                         echo '<br>';
                                         if ($res['FAILURE'] == 2) {
-                                            echo ' <span style="color: red;">' . _("Activation failure.") . '</span>';
+                                            echo ' <span style="color: red;">'._("Activation failure.").'</span>';
                                         } else {
                                             if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') {
-                                                echo ' <span style="color: red;">' . _("Activation failure for your primary RADIUS server.") . '</span>';
+                                                echo ' <span style="color: red;">'._("Activation failure for your primary RADIUS server.").'</span>';
                                             } else {
-                                                echo ' <span style="color: red;">' . _("Activation failure for your backup RADIUS server.") . '</span>';
+                                                echo ' <span style="color: red;">'._("Activation failure for your backup RADIUS server.").'</span>';
                                             }
                                         }
                                     }
@@ -267,12 +267,12 @@ 
                                     if ($res['FAILURE'] > 0) {
                                         echo '<br>';
                                         if ($res['FAILURE'] == 2) {
-                                            echo ' <span style="color: red;">' . _("Failure during deactivation, your request is queued for handling") . '</span>';
+                                            echo ' <span style="color: red;">'._("Failure during deactivation, your request is queued for handling").'</span>';
                                         } else {
                                             if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') {
-                                                echo ' <span style="color: red;">' . _("Deactivation failure for your primary RADIUS server, your request is queued.") . '</span>';
+                                                echo ' <span style="color: red;">'._("Deactivation failure for your primary RADIUS server, your request is queued.").'</span>';
                                             } else {
-                                                echo ' <span style="color: red;">' . _("Deactivation failure for your backup RADIUS server, your request is queued.") . '</span>';
+                                                echo ' <span style="color: red;">'._("Deactivation failure for your backup RADIUS server, your request is queued.").'</span>';
                                             }
                                         }
                                     }

core/diag/RADIUSTestsUI.php

Spacing +69 added lines, -69 removed lines

@@ -112,8 +112,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");
@@ -131,7 +131,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);
             }
@@ -191,9 +191,9 @@ 
         }
     }           
 
-    public function isDynamic ()
+    public function isDynamic()
     {
-        if ($this->naptr> 0) {
+        if ($this->naptr > 0) {
             return TRUE;
         }
         return FALSE;
@@ -203,17 +203,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.");
@@ -228,7 +228,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.";
@@ -241,7 +241,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.");
@@ -256,7 +256,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.");
@@ -275,28 +275,28 @@ 
             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>';
         } 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;
@@ -317,27 +317,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="' . $this->stateIcons[$oddities->level] . '"></td><td>' . $oddities->message . '</td></tr>';
+                    $out[] = '<tr class="results_tr"><td>&nbsp;</td><td class="icon_td"><img src="'.$this->stateIcons[$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 = '';
@@ -345,12 +345,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>";
         }
@@ -361,7 +361,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;
@@ -369,46 +369,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>';
@@ -423,7 +423,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) {
@@ -433,9 +433,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;
@@ -443,8 +443,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) {
@@ -456,11 +456,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 {
@@ -469,14 +469,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>';
                                 }
                             }
                             $cliinfo .= '</ul>';
@@ -484,7 +484,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$hostindex'><p>$cliinfo</p></td></tr></table>";
                         } else {
                             $clientstest[] = "<p>$cliinfo</p>";
@@ -492,9 +492,9 @@ 
                     }
                     
                 } else {
-                    $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$hostindex'>$cliinfo</td></tr></table>";
                 }
             } else {
@@ -502,9 +502,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>';
         }
@@ -515,7 +515,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();
@@ -526,17 +526,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>';