GEANT / CAT

web/diag/diag.php

Indentation +2 added lines, -2 removed lines

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

Spacing +4 added lines, -4 removed lines

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

web/skins/modern/diag/diag.php

Indentation +1 added lines, -1 removed lines

@@ -156,7 +156,7 @@
                         echo "0\">";
                         echo _("This service is for authenticated admins only.") . '<br>';
                         echo "<a href=\"diag.php?admin=1\">" .
-                             _("eduroam® admin access is needed") . "</a>";
+                                _("eduroam® admin access is needed") . "</a>";
                     }
                 ?>
             </div> 

Spacing +82 added lines, -82 removed lines

@@ -40,16 +40,16 @@ 
 
 <?php
 $profile_list_size = 1;
-require_once dirname(__DIR__) . '/Divs.php';
+require_once dirname(__DIR__).'/Divs.php';
 $divs = new Divs($Gui);
 $visibility = 'index';
 $operatingSystem = $Gui->detectOS();
 $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>
@@ -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 '<h3>'._("Which problem are you reporting?").'</h3>';
                         echo '<input type="radio" name="problem_type" value="1">';
-                        echo _("SP contacting IdP due to technical problems or abuse") . '<br>';
+                        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> 
@@ -180,7 +180,7 @@ 
         if (type === 'idp' || type === 'sp') {
             shtml = '<table><tbody><tr id="row_'+type+'_country"></tr>';
             shtml = shtml + '<tr id="row_'+type+'_institution" style="visibility: collapse;">';
-            shtml = shtml + '<td>' + <?php echo '"' . _("Select institiution:") . '"'; ?> + '</td><td></td></tr>';
+            shtml = shtml + '<td>' + <?php echo '"'._("Select institiution:").'"'; ?> + '</td><td></td></tr>';
             if (type === 'idp') {
                 shtml = shtml + '<tr id="row_idp_realm"></tr>';
             }
@@ -206,7 +206,7 @@ 
         var options = '';
         var selecthead = '';
         if (type1 === 'sp' || type1 === 'idp') {
-            selecthead = <?php echo '"<td>' . _("Select country or region:") . ' </td>"'; ?>;
+            selecthead = <?php echo '"<td>'._("Select country or region:").' </td>"'; ?>;
             selecthead = selecthead + '<td>\n';
         }
         var select = '<select id="' + type1 + '_country" name="' + type1 + '_country" style="margin-left:0px; width:400px;">';
@@ -214,7 +214,7 @@ 
             options = ($('#'+type2+'_country').html());
             countryAddSelect(selecthead, select + options + '</select>', type1);
         } else {
-            var comment = <?php echo '"<br><br>' . _("Fetching country/region list") . '..."'; ?>;
+            var comment = <?php echo '"<br><br>'._("Fetching country/region list").'..."'; ?>;
             inProgress(1, comment);
             $.ajax({
                 url: "findRealm.php",
@@ -251,7 +251,7 @@ 
         return false;
     }
     function testSociopath(realm, answer) {
-        var comment = <?php echo '"' . _("Testing realm") . '..."'; ?>; 
+        var comment = <?php echo '"'._("Testing realm").'..."'; ?>; 
         inProgress(1, comment);
         if ($('#tested_realm').length == 0) {
             $('<input>').attr({
@@ -275,9 +275,9 @@ 
                                 query = '<input type="hidden" id="tested_realm" value="' + realm + '">';
                             }    
                             query = query + '<div id="current_query">'+data['TEXT']+'</div>';
-                            query = query + '<div><button id="answer_yes">' + <?php echo '"' . _("Yes") . '"'; ?> + '</button>';
-                            query = query + '<button style="margin-left:20px;" id="answer_no">' + <?php echo '"' . _("No") . '"'; ?> + '</button>';
-                            query = query + '<button style="margin-left:20px;" id="answer_noidea">' + <?php echo '"' . _("I don't know") . '"'; ?> + '</button></div>';
+                            query = query + '<div><button id="answer_yes">' + <?php echo '"'._("Yes").'"'; ?> + '</button>';
+                            query = query + '<button style="margin-left:20px;" id="answer_no">' + <?php echo '"'._("No").'"'; ?> + '</button>';
+                            query = query + '<button style="margin-left:20px;" id="answer_noidea">' + <?php echo '"'._("I don't know").'"'; ?> + '</button></div>';
                             $('#sociopath_queries').html(query);
                             $('#sociopath_query_area').show();
                         }
@@ -308,55 +308,55 @@ 
        }); 
     }
     function finalVerdict(realm, verdict) {
-        var title = <?php echo '"' . _("Diagnostic tests results for selected realm") . '"'; ?>;
+        var title = <?php echo '"'._("Diagnostic tests results for selected realm").'"'; ?>;
         result = '<div class="padding">';
         result = result + '<div><h3>';
-        result = result + <?php echo '"' . _("The result for tested realm:") . ' "'; ?> + realm;
+        result = result + <?php echo '"'._("The result for tested realm:").' "'; ?> + realm;
         result = result + '</h3></p><div style="padding: 5px;"><div style="padding: 0px;">';
-        result = result + <?php echo '"' . _("The system identified") . '" '; ?>  + ' ';
+        result = result + <?php echo '"'._("The system identified").'" '; ?>  + ' ';
         result = result + Object.keys(verdict).length + ' ';
-        result = result + <?php echo '"' . _("suspected areas which potentially can cause a problem.") . '"'; ?> + '<br>';
-        result = result + <?php echo '"' . _("Next to the problem description we show a speculated probability of this event.") . '"'; ?>;
+        result = result + <?php echo '"'._("suspected areas which potentially can cause a problem.").'"'; ?> + '<br>';
+        result = result + <?php echo '"'._("Next to the problem description we show a speculated probability of this event.").'"'; ?>;
         result = result + '</div><div style="padding: 5px;"><table>';
         k = 1;
         for (key in verdict) {
             result = result + '<tr><td>' + k + '.</td>';
             k = k + 1;
             if (key === 'INFRA_DEVICE') {
-                result = result + '<td>' + <?php echo '"' . _("Your device configuration is broken") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("Your device configuration is broken").'"'; ?> + '</td>';
             }
             if (key === 'INFRA_SP_80211') {
-                result = result + '<td>' + <?php echo '"' . _("The Wi-Fi network in your vicinity has quality issues") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("The Wi-Fi network in your vicinity has quality issues").'"'; ?> + '</td>';
             }
             if (key === 'INFRA_SP_LAN') {
-                result = result + '<td>' + <?php echo '"' . _("The network environment around you is broken") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("The network environment around you is broken").'"'; ?> + '</td>';
             }
             if (key === 'INFRA_SP_RADIUS') {
-                result = result + '<td>' + <?php echo '"' . _("The RADIUS server of your service provider is the source of the problem") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("The RADIUS server of your service provider is the source of the problem").'"'; ?> + '</td>';
             }
             if (key === 'INFRA_IDP_AUTHBACKEND') {
-                result = result + '<td>' + <?php echo '"' . _("The RADIUS server in your home institution is currently unable to authenticate you") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("The RADIUS server in your home institution is currently unable to authenticate you").'"'; ?> + '</td>';
             }
             if (key === 'INFRA_NRO_SP') {
-                result = result + '<td>' + <?php echo '"' . _("The national server in the country/region you are visiting is not functioning correctly") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("The national server in the country/region you are visiting is not functioning correctly").'"'; ?> + '</td>';
             }
             if (key === 'INFRA_LINK_ETLR_NRO_SP') {
-                result = result + '<td>' + <?php echo '"' . _("The link between the national server of the country/region you are visiting and the top-level server is broken") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("The link between the national server of the country/region you are visiting and the top-level server is broken").'"'; ?> + '</td>';
             }
             if (key === 'INFRA_LINK_ETLR_NRO_IdP') {
-                result = result + '<td>' + <?php echo '"' . _("The link between the national server of your home country/region and the top-level server is broken") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("The link between the national server of your home country/region and the top-level server is broken").'"'; ?> + '</td>';
             }
             if (key === 'INFRA_ETLR') {
-                result = result + '<td>' + <?php echo '"' . _("The communication to the top-level server is down") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("The communication to the top-level server is down").'"'; ?> + '</td>';
             }
             if (key === 'INFRA_NRO_IdP') {
-                result = result + '<td>' + <?php echo '"' . _("The national server in your home country/region is not functioning properly.") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("The national server in your home country/region is not functioning properly.").'"'; ?> + '</td>';
             }
             if (key === 'INFRA_IdP_RADIUS') {
-                result = result + '<td>' + <?php echo '"' . _("The RADIUS server of your home institution is the source of the problem") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("The RADIUS server of your home institution is the source of the problem").'"'; ?> + '</td>';
             }
             if (key === 'INFRA_NONEXISTENTREALM') {
-                result = result + '<td>' + <?php echo '"' . _("This realm does not exist") . '"'; ?> + '</td>';
+                result = result + '<td>' + <?php echo '"'._("This realm does not exist").'"'; ?> + '</td>';
             }
             result = result + '<td style="padding-left: 5px;">' + (verdict[key] * 100).toFixed(2) + "%</td></tr>";
         }
@@ -468,7 +468,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);
@@ -486,7 +486,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) {
@@ -507,7 +507,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();
@@ -516,7 +516,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();
@@ -531,7 +531,7 @@ 
         return false;
     });
     $(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);
@@ -549,7 +549,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) {
@@ -572,7 +572,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);
@@ -606,7 +606,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",
@@ -618,7 +618,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" ';
@@ -630,7 +630,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] + '">';
@@ -685,7 +685,7 @@ 
             });
             t = 1;
         }
-        var comment = <?php echo '"' . _("Running realm tests") . '..."'; ?>;
+        var comment = <?php echo '"'._("Running realm tests").'..."'; ?>;
         inProgress(1, comment);
         /*waiting(comment);*/
         $.ajax({
@@ -729,7 +729,7 @@ 
                             }
                         });
                         $('#sp_questions > tbody').append('<tr class="error_row"><td>' +
-                                <?php echo '"' . _("Realm is not registered with the eduroam database:") . '"'; ?> +
+                                <?php echo '"'._("Realm is not registered with the eduroam database:").'"'; ?> +
                                 '</td><td>' + realm + '</td></tr>');
                         $('#admin_realm').val('');
                     }    
@@ -753,7 +753,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')) {
@@ -801,13 +801,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++) {
@@ -817,7 +817,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();
@@ -877,7 +877,7 @@ 
                 });
             });
         });
-        var comment = <?php echo '"' . _("Running realm tests") . '..."'; ?>;
+        var comment = <?php echo '"'._("Running realm tests").'..."'; ?>;
         inProgress(1, comment);
         $.ajax({
             url: "findRealm.php",
@@ -948,29 +948,29 @@ 
             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 '"' . _("SP email") . '"'; ?> + '</td><td>' + data.email + '</td></tr>';
-                        result = result + '<tr><td>' + <?php echo '"' . _("IdP email(s)") . '"'; ?> + '</td><td>' + data.idpcontact + '</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 '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("SP email").'"'; ?> + '</td><td>' + data.email + '</td></tr>';
+                        result = result + '<tr><td>' + <?php echo '"'._("IdP email(s)").'"'; ?> + '</td><td>' + data.idpcontact + '</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>';
                     }
                     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);
@@ -987,7 +987,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', '');
@@ -996,7 +996,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', '');
@@ -1005,7 +1005,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', '');
@@ -1014,7 +1014,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/lib/user/TextTemplates.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
 const DOWNLOAD_REDIRECT_CONTINUE = 1054;
 const SB_GO_AWAY = 1060;
 const SB_FRONTPAGE_BIGDOWNLOADBUTTON = 1061;
-const SB_FRONTPAGE_ROLLER_CUSTOMBUILT= 1062;
+const SB_FRONTPAGE_ROLLER_CUSTOMBUILT = 1062;
 
 
 /**
@@ -88,7 +88,7 @@ 
         $this->templates[WELCOME_ABOARD_BACKTODOWNLOADS] = _("Back to downloads");
         $this->templates[EDUROAM_WELCOME_ADVERTISING] = sprintf(_("we would like to warmly welcome you among the several million users of %s! From now on, you will be able to use internet access resources on thousands of universities, research centres and other places all over the globe. All of this completely free of charge!"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
         $this->templates[HEADING_TOPLEVEL_GREET] = sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']);
-        $this->templates[HEADING_TOPLEVEL_PURPOSE] = sprintf(_("Connect your device to %s"),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
+        $this->templates[HEADING_TOPLEVEL_PURPOSE] = sprintf(_("Connect your device to %s"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
         $this->templates[FRONTPAGE_ROLLER_EASY] = sprintf(_("%s installation made easy:"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
         $this->templates[FRONTPAGE_ROLLER_CUSTOMBUILT] = _("Custom built for your organisation");
         $this->templates[FRONTPAGE_BIGDOWNLOADBUTTON] = sprintf(_("Click here to download your %s installer"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);

core/EntityWithDBProperties.php

Spacing +4 added lines, -4 removed lines

@@ -126,7 +126,7 @@ 
             case "core\User":
                 return $this->userName;
             default:
-                throw new Exception("Operating on a class where we don't know the relevant identifier in the DB - " . get_class($this) . "!");
+                throw new Exception("Operating on a class where we don't know the relevant identifier in the DB - ".get_class($this)."!");
         }
     }
 
@@ -162,7 +162,7 @@ 
      * @return array list of row id's of file-based attributes which weren't deleted
      */
     public function beginFlushAttributes($extracondition = "") {
-        $quotedIdentifier = (!is_int($this->getRelevantIdentifier()) ? "\"" : "") . $this->getRelevantIdentifier() . (!is_int($this->getRelevantIdentifier()) ? "\"" : "");
+        $quotedIdentifier = (!is_int($this->getRelevantIdentifier()) ? "\"" : "").$this->getRelevantIdentifier().(!is_int($this->getRelevantIdentifier()) ? "\"" : "");
         $this->databaseHandle->exec("DELETE FROM $this->entityOptionTable WHERE $this->entityIdColumn = $quotedIdentifier AND option_name NOT LIKE '%_file' $extracondition");
         $this->updateFreshness();
         $execFlush = $this->databaseHandle->exec("SELECT row FROM $this->entityOptionTable WHERE $this->entityIdColumn = $quotedIdentifier $extracondition");
@@ -181,7 +181,7 @@ 
      * @return void
      */
     public function commitFlushAttributes(array $tobedeleted) {
-        $quotedIdentifier = (!is_int($this->getRelevantIdentifier()) ? "\"" : "") . $this->getRelevantIdentifier() . (!is_int($this->getRelevantIdentifier()) ? "\"" : "");
+        $quotedIdentifier = (!is_int($this->getRelevantIdentifier()) ? "\"" : "").$this->getRelevantIdentifier().(!is_int($this->getRelevantIdentifier()) ? "\"" : "");
         foreach (array_keys($tobedeleted) as $row) {
             $this->databaseHandle->exec("DELETE FROM $this->entityOptionTable WHERE $this->entityIdColumn = $quotedIdentifier AND row = $row");
             $this->updateFreshness();
@@ -208,7 +208,7 @@ 
     public function addAttribute($attrName, $attrLang, $attrValue) {
         $relevantId = $this->getRelevantIdentifier();
         $identifierType = (is_int($relevantId) ? "i" : "s");
-        $this->databaseHandle->exec("INSERT INTO $this->entityOptionTable ($this->entityIdColumn, option_name, option_lang, option_value) VALUES(?,?,?,?)", $identifierType . "sss", $relevantId, $attrName, $attrLang, $attrValue);
+        $this->databaseHandle->exec("INSERT INTO $this->entityOptionTable ($this->entityIdColumn, option_name, option_lang, option_value) VALUES(?,?,?,?)", $identifierType."sss", $relevantId, $attrName, $attrLang, $attrValue);
         $this->updateFreshness();
     }
 

core/CAT.php

Spacing +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
 
 namespace core;
 
-require_once dirname(__DIR__) . "/config/_config.php";
+require_once dirname(__DIR__)."/config/_config.php";
 
 CAT_session_start();
 
@@ -105,19 +105,19 @@ 
         parent::__construct();
         common\Entity::intoThePotatoes();
         
-        $this->CAT_VERSION_STRING = sprintf(_("Unreleased %s Git Revision"),"<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>")."</a>";
+        $this->CAT_VERSION_STRING = sprintf(_("Unreleased %s Git Revision"), "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>")."</a>";
         if (CAT::RELEASE_VERSION) {
-            $temp_version = "CAT-" . CAT::VERSION_MAJOR . "." . CAT::VERSION_MINOR;
-            $branch = "release_" . CAT::VERSION_MAJOR . "_" . CAT::VERSION_MINOR;
+            $temp_version = "CAT-".CAT::VERSION_MAJOR.".".CAT::VERSION_MINOR;
+            $branch = "release_".CAT::VERSION_MAJOR."_".CAT::VERSION_MINOR;
             if (CAT::VERSION_PATCH != 0) {
-                $temp_version .= "." . CAT::VERSION_PATCH;
+                $temp_version .= ".".CAT::VERSION_PATCH;
             }
             if (CAT::VERSION_EXTRA != "") {
-                $temp_version .= "-" . CAT::VERSION_EXTRA;
+                $temp_version .= "-".CAT::VERSION_EXTRA;
             }
-            $this->CAT_VERSION_STRING = sprintf(_("Release <a href='%s'>%s</a>"), "https://github.com/GEANT/CAT/tree/" . $branch . "/Changes.md", $temp_version);
+            $this->CAT_VERSION_STRING = sprintf(_("Release <a href='%s'>%s</a>"), "https://github.com/GEANT/CAT/tree/".$branch."/Changes.md", $temp_version);
         }
-        $this->CAT_COPYRIGHT = CONFIG['APPEARANCE']['productname'] . " - " . $this->CAT_VERSION_STRING . " &copy; " . CAT::COPYRIGHT_MIN_YEAR . "-" . CAT::COPYRIGHT_MAX_YEAR . " " . CAT::COPYRIGHT_HOLDER . "<br/>on behalf of " . CAT::COPYRIGHT_CONSORTIA . "; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
+        $this->CAT_COPYRIGHT = CONFIG['APPEARANCE']['productname']." - ".$this->CAT_VERSION_STRING." &copy; ".CAT::COPYRIGHT_MIN_YEAR."-".CAT::COPYRIGHT_MAX_YEAR." ".CAT::COPYRIGHT_HOLDER."<br/>on behalf of ".CAT::COPYRIGHT_CONSORTIA."; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
         
 
         /* Federations are created in DB with bootstrapFederation, and listed via listFederations

web/skins/modern/Divs.php

Spacing +32 added lines, -32 removed lines

@@ -49,11 +49,11 @@ 
         $location = $this->Gui->skinObject->findResourceUrl("IMAGES", "consortium_logo.png");
         if ($location !== FALSE) {
             $retval .= "<div id='cat_logo'>
-            <a href='" . CONFIG_CONFASSISTANT['CONSORTIUM']['homepage'] . "'><img id='logo_img' src='$location' alt='Consortium Logo'/></a>
+            <a href='" . CONFIG_CONFASSISTANT['CONSORTIUM']['homepage']."'><img id='logo_img' src='$location' alt='Consortium Logo'/></a>
             <span>Configuration Assistant Tool</span>
             </div>";
         }
-        $retval .= "<div id='motd'>" . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . "</div>";
+        $retval .= "<div id='motd'>".(isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp')."</div>";
         $loc2 = $this->Gui->skinObject->findResourceUrl("IMAGES", "icons/menu.png");
         if ($loc2 !== FALSE) {
             $retval .= "<img id='hamburger' src='$loc2' alt='Menu'/>";
@@ -71,13 +71,13 @@ 
     public function divUserWelcome() {
         $retval = "
 <div id='user_welcome'> <!-- this information is shown just before the download -->
-    <strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PAGEHEADING] . "</strong>
+    <strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PAGEHEADING]."</strong>
     <p>
     <span id='download_info'>
     <!-- the empty href is dynamically exchanged with the actual path by jQuery at runtime -->
-        " . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_DOWNLOAD] . "
+        " . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_DOWNLOAD]."
     </span>
-    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_HEADING] . "
+    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_HEADING]."
     <br/>
     <br/>";
         switch (CONFIG_CONFASSISTANT['CONSORTIUM']['name']) {
@@ -87,11 +87,11 @@ 
         }
         $retval .= "
     </p>
-    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_USAGE] . "
-    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PROBLEMS] . "
+    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_USAGE]."
+    <p>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_PROBLEMS]."
     </p>
     <p>
-    <a href='javascript:back_to_downloads()'><strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_BACKTODOWNLOADS] . "</strong></a>
+    <a href='javascript:back_to_downloads()'><strong>" . $this->Gui->textTemplates->templates[user\WELCOME_ABOARD_BACKTODOWNLOADS]."</strong></a>
     </p>
 </div> <!-- id='user_welcomer_page' -->
 ";
@@ -101,7 +101,7 @@ 
     public function divSilverbullet() {
         $retval = "
 <div id='silverbullet'>"
-                . $this->Gui->textTemplates->templates[user\SB_GO_AWAY] .
+                . $this->Gui->textTemplates->templates[user\SB_GO_AWAY].
                 "</div>
     ";
         return $retval;
@@ -114,10 +114,10 @@ 
         }
         return "
 <div id='welcome_top1'>
-    " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_GREET] . "
+    " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_GREET]."
 </div>
 <div id='top_invite'>
-    " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_PURPOSE] . $retval . "
+    " . $this->Gui->textTemplates->templates[user\HEADING_TOPLEVEL_PURPOSE].$retval."
 </div>";
     }
 
@@ -125,7 +125,7 @@ 
         $retval = "
 <div id='roller'>
     <div id='slides'>
-        <span id='line1'>" . $this->Gui->textTemplates->templates[user\FRONTPAGE_ROLLER_EASY] . "</span>
+        <span id='line1'>" . $this->Gui->textTemplates->templates[user\FRONTPAGE_ROLLER_EASY]."</span>
         <span id='line2'></span>
         <span id='line3'></span>
         <span id='line4'>";
@@ -177,9 +177,9 @@ 
     public function divProfiles() {
         return "
 <div id='profiles'> <!-- this is the profile selection filled during run time -->
-    <div id='profiles_h' class='sub_h'>" . $this->Gui->textTemplates->templates[user\PROFILE_SELECTION] . "
+    <div id='profiles_h' class='sub_h'>" . $this->Gui->textTemplates->templates[user\PROFILE_SELECTION]."
     </div>" .
-                "<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>" .
+                "<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>".
                 "</div>";
     }
 
@@ -193,7 +193,7 @@ 
     public function divInstitution($selectButton = TRUE) {
         $retval = "<div id='institution_name'>
     <span id='inst_name_span'></span> <div id='inst_extra_text'></div><!-- this will be filled with the IdP name -->" .
-                ($selectButton ? "<a  id='select_another' class='signin' href=\"\">" . $this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION] . "</a>" : "") .
+                ($selectButton ? "<a  id='select_another' class='signin' href=\"\">".$this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION]."</a>" : "").
                 "</div>";
         $retval .= $this->emptyImage('idp_logo', 'IdP Logo');
         return $retval;
@@ -207,7 +207,7 @@ 
     public function divOtherinstallers() {
         $retval = "
 <div class='sub_h'>
-    <div id='other_installers'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE] . "
+    <div id='other_installers'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE]."
          <table id='device_list' style='padding:0px;'>";
 
         foreach ($this->Gui->listDevices(isset($_REQUEST['hidden']) ? $_REQUEST['hidden'] : 0) as $group => $deviceGroup) {
@@ -215,18 +215,18 @@ 
             $deviceIndex = 0;
 
             $imgTag = "";
-            $imgLocation = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/" . $group . ".png");
+            $imgLocation = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/".$group.".png");
             if ($imgLocation !== FALSE) {
-                $imgTag = '<img src="' . $imgLocation . '" alt="' . $group . ' Device" title="' . $group . ' Device">';
+                $imgTag = '<img src="'.$imgLocation.'" alt="'.$group.' Device" title="'.$group.' Device">';
             }
-            $retval .= '<tbody><tr><td class="vendor" rowspan="' . $groupIndex . '">' . $imgTag . '</td>';
+            $retval .= '<tbody><tr><td class="vendor" rowspan="'.$groupIndex.'">'.$imgTag.'</td>';
             foreach ($deviceGroup as $d => $D) {
                 if ($deviceIndex) {
                     $retval .= '<tr>';
                 }
-                $retval .= "<td><button id='" . $d . "'>" . $D['display'] . "</button>"
-                        . "<div class='device_info' id='info_" . $d . "'></div></td>"
-                        . "<td><button class='more_info_b' id='info_b_" . $d . "'>i</button></td></tr>\n";
+                $retval .= "<td><button id='".$d."'>".$D['display']."</button>"
+                        . "<div class='device_info' id='info_".$d."'></div></td>"
+                        . "<td><button class='more_info_b' id='info_b_".$d."'>i</button></td></tr>\n";
                 $deviceIndex++;
             }
             $retval .= "</tbody>";
@@ -240,15 +240,15 @@ 
     }
 
     public function divGuessOs($operatingSystem) {
-        $vendorlogo = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/" . $operatingSystem['group'] . ".png");
+        $vendorlogo = $this->Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/".$operatingSystem['group'].".png");
         $vendorstyle = "";
         if ($vendorlogo !== FALSE) {
-            $vendorstyle = "style='background-image:url(\"" . $vendorlogo . "\")'";
+            $vendorstyle = "style='background-image:url(\"".$vendorlogo."\")'";
         }
         $deleteIcon = $this->Gui->skinObject->findResourceUrl("IMAGES", "icons/delete_32.png");
         $deleteImg = "";
         if ($deleteIcon !== FALSE) {
-            $deleteImg = "<img id='cross_icon_" . $operatingSystem['device'] . "' src='$deleteIcon' >";
+            $deleteImg = "<img id='cross_icon_".$operatingSystem['device']."' src='$deleteIcon' >";
         }
         return "
 <div class='sub_h' id='guess_os'>
@@ -256,23 +256,23 @@ 
     <table id='browser'>
         <tr>
             <td>
-                <button class='large_button guess_os' $vendorstyle id='g_" . $operatingSystem['device'] . "'>
+                <button class='large_button guess_os' $vendorstyle id='g_".$operatingSystem['device']."'>
                     $deleteImg
-                    <div class='download_button_text_1' id='download_button_header_" . $operatingSystem['device'] . "'> " . $this->Gui->textTemplates->templates[user\DOWNLOAD_MESSAGE] . "
+                    <div class='download_button_text_1' id='download_button_header_".$operatingSystem['device']."'> ".$this->Gui->textTemplates->templates[user\DOWNLOAD_MESSAGE]."
                     </div>
                     <div class='download_button_text'>" .
-                $operatingSystem['display'] . "
+                $operatingSystem['display']."
                     </div>
                 </button>
-                <div class='device_info' id='info_g_" . $operatingSystem['device'] . "'></div>
+                <div class='device_info' id='info_g_" . $operatingSystem['device']."'></div>
           </td>
           <td style='vertical-align:top'>
-               <button class='more_info_b large_button' id='g_info_b_" . $operatingSystem['device'] . "'>i</button>
+               <button class='more_info_b large_button' id='g_info_b_" . $operatingSystem['device']."'>i</button>
           </td>
       </tr>
     </table> <!-- id='browser' -->
     <div class='sub_h'>
-       <a href='javascript:other_installers()'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE] . "</a>
+       <a href='javascript:other_installers()'>" . $this->Gui->textTemplates->templates[user\DOWNLOAD_CHOOSE]."</a>
     </div>
 </div> <!-- id='guess_os' -->";
     }
@@ -288,7 +288,7 @@ 
             </td>";
 
         if (!empty(CONFIG['APPEARANCE']['privacy_notice_url'])) {
-            $retval .= "<td><a href='" . CONFIG['APPEARANCE']['privacy_notice_url'] . "'>" . sprintf(_("%s Privacy Notice"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) . "</a></td>";
+            $retval .= "<td><a href='".CONFIG['APPEARANCE']['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])."</a></td>";
         }
         $retval .= "<td>";
         if (CONFIG_CONFASSISTANT['CONSORTIUM']['name'] == "eduroam" && isset(CONFIG_CONFASSISTANT['CONSORTIUM']['deployment-voodoo']) && CONFIG_CONFASSISTANT['CONSORTIUM']['deployment-voodoo'] == "Operations Team") {

web/skins/modern/copyright.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
             <div id="user_page" style="display:block">
                 <?php echo $divs->divPagetitle("eduroam CAT Copyright and Licensing", ""); ?>
                 <div style="padding:20px">
-            <?php require dirname(dirname(__DIR__)) . "/copyright.inc.php"; ?>
+            <?php require dirname(dirname(__DIR__))."/copyright.inc.php"; ?>
                 </div>
             </div>
         </div>

web/skins/modern/index.php

Spacing +3 added lines, -3 removed lines

@@ -43,10 +43,10 @@ 
 $operatingSystem = $Gui->detectOS();
 $Gui->loggerInstance->debug(4, $operatingSystem);
 if ($operatingSystem) {
-    print "recognisedOS = '" . $operatingSystem['device'] . "';\n";
+    print "recognisedOS = '".$operatingSystem['device']."';\n";
 }
 
-print 'downloadMessage = "' . $Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE] . '";';
+print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE].'";';
 //TODO modify this based on OS detection
 $userAgent = $_SERVER['HTTP_USER_AGENT'] ?? "";
 if (preg_match('/Android/', $userAgent)) {
@@ -75,7 +75,7 @@ 
     <?php echo $divs->divHeading($visibility); ?>
     <div id="main_page">
         <div id="loading_ico">
-          <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif"); ?>" alt="Authenticating ..."/>
+          <?php echo _("Authenticating")."..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif"); ?>" alt="Authenticating ..."/>
         </div>
         <div id="info_overlay"> <!-- device info -->
             <div id="info_window"></div>

web/skins/modern/test.php

Indentation +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
          <?php if (empty($_REQUEST['idp'])) { ?>
               <div id="front_page">
                   <?php
-                         echo $divs->divTopWelcome();
+                            echo $divs->divTopWelcome();
 //                         echo $divs->div_roller();
 //                         echo $divs->div_main_button(); ?>
               </div> <!-- id="front_page" -->

Spacing +11 added lines, -11 removed lines

@@ -28,9 +28,9 @@ 
 ?>
 
 <!-- JQuery -->
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate-1.2.1.js") ?>"></script>
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate-1.2.1.js") ?>"></script>
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js") ?>"></script>
 <!-- JQuery -->
 
 <script type="text/javascript">
@@ -44,10 +44,10 @@ 
 $operatingSystem = $Gui->detectOS();
 $Gui->loggerInstance->debug(4, $operatingSystem);
 if ($operatingSystem) {
-    print "recognisedOS = '" . $operatingSystem['device'] . "';\n";
+    print "recognisedOS = '".$operatingSystem['device']."';\n";
 }
 
-print 'downloadMessage = "' . $Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE] . '";';
+print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE].'";';
 //TODO modify this based on OS detection
 if (preg_match('/Android/', $_SERVER['HTTP_USER_AGENT'])) {
     $profile_list_size = 1;
@@ -58,7 +58,7 @@ 
 include("user/js/cat_js.php");
 ?>
     var loading_ico = new Image();
-    loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>";
+    loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>";
 </script>
 <?php $Gui->langObject->setTextDomain("web_user"); ?>
 <!-- DiscoJuice -->
@@ -67,9 +67,9 @@ 
     front_page = 0;
     var lang = "<?php echo($Gui->langObject->getLang()) ?>";
 </script>
-<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","discojuice/css/discojuice.css")?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "discojuice/css/discojuice.css")?>" />
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
-<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" />
+<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
 </head>
 <body>
 <div id="wrap">
@@ -77,14 +77,14 @@ 
     <?php echo $divs->divHeading($visibility); ?>
     <div id="main_page">
         <div id="loading_ico">
-          <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>" alt="Authenticating ..."/>
+          <?php echo _("Authenticating")."..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>" alt="Authenticating ..."/>
         </div>
         <div id="info_overlay"> <!-- device info -->
             <div id="info_window"></div>
-            <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
+            <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
         </div>
         <div id="main_menu_info" style="display:none"> <!-- stuff triggered form main menu -->
-          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
+          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
           <div id="main_menu_content"></div>
         </div>
         <div id="main_body">