Inspection of "Removing the Registered rademark character form ed..." - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — release_2_1 ( 007f3d...3ea6a4 )

by Tomasz

created 2024-07-08 10:28 UTC

Status

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -20,7 +20,7 @@
 block discarded – undo
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $languageInstance = new \core\common\Language();

Please login to merge, or discard this patch.

web/lib/user/Gui.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -61,10 +61,10 @@
 block discarded – undo
         header("Content-Type:text/html;charset=utf-8");
         ?>
         <!DOCTYPE html>
-          <html xmlns='http://www.w3.org/1999/xhtml' lang='<?php echo $ourlocale;?>' <?php echo ($direction ? "dir='rtl'" : "");?>>
-          <head lang='<?php echo $ourlocale;?>'>
+          <html xmlns='http://www.w3.org/1999/xhtml' lang='<?php echo $ourlocale; ?>' <?php echo ($direction ? "dir='rtl'" : ""); ?>>
+          <head lang='<?php echo $ourlocale; ?>'>
           <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
-          <title><?php echo htmlspecialchars($pagetitle);?></title>
+          <title><?php echo htmlspecialchars($pagetitle); ?></title>
           <script type="text/javascript">ie_version = 0;</script>
 <!--[if IE]>
 <script type="text/javascript">ie_version=1;</script>

Please login to merge, or discard this patch.

web/skins/modern/diag/diag.php 1 patch

Spacing +68 added lines, -68 removed lines patch added patch discarded remove patch

@@ -47,9 +47,9 @@  discard block
 block discarded – undo
 $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';
 $cssUrl = $Gui->skinObject->findResourceUrl("CSS", "cat-user.css.php");
 ?>
 </script>
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
 <?php
 echo $divs->divHeading($visibility);
 $Gui->languageInstance->setTextDomain("diagnostics");
-require dirname(__DIR__) . '/diag/js/diag_js.php';
+require dirname(__DIR__).'/diag/js/diag_js.php';
 ?>
 <div id="main_page">
     <div id="loading_ico">
@@ -79,12 +79,12 @@  discard block
 block discarded – undo
     </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>
@@ -94,24 +94,24 @@  discard block
 block discarded – undo
                 ?>
                 </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@<strong>realm.tld</strong>'):");
                 ?>
                 <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>
@@ -144,11 +144,11 @@  discard block
 block discarded – undo
                             echo 'none';
                         }
                         echo ";'>";
-                        echo '<h3>' . _("What is the nature of the problem?") . '</h3>';
-                        echo '<input type="radio" name="problem_type" value="0"' . (($sp==1)? ' checked' : '') . '>';
-                        echo _("I suspect a technical problem at a particular IdP") . '<br>';
+                        echo '<h3>'._("What is the nature of the problem?").'</h3>';
+                        echo '<input type="radio" name="problem_type" value="0"'.(($sp == 1) ? ' checked' : '').'>';
+                        echo _("I suspect a technical problem at a particular IdP").'<br>';
                         echo '<input type="radio" name="problem_type" value="1">';
-                        echo _("I want to report abuse of network resources by a roaming user") . '<br>';
+                        echo _("I want to report abuse of network resources by a roaming user").'<br>';
                         echo '<input type="radio" name="problem_type" value="2">';
                         echo _("I suspect a technical problem for one of my users at a particular SP");
                         echo "<div id='idp_contact_area'></div>";
@@ -157,9 +157,9 @@  discard block
 block discarded – undo
                         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 id="realm_problem">
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
         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);
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
                         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) {
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
                     } 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();
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
                 },
                 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();
@@ -301,9 +301,9 @@  discard block
 block discarded – undo
     });
     $(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('');
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
         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);
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
                         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) {
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
                             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);
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
             $('#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",
@@ -398,7 +398,7 @@  discard block
 block discarded – undo
                     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" ';
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
                         }
                         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] + '">';
@@ -462,7 +462,7 @@  discard block
 block discarded – undo
             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({
@@ -523,7 +523,7 @@  discard block
 block discarded – undo
         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')) {
@@ -571,13 +571,13 @@  discard block
 block discarded – undo
                         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 occurred") . '"'; ?>;
+                        var title = <?php echo '"'._("Diagnostics results for selected realms").'"'; ?>;
+                        result = '<div class="padding"><h3>' + <?php echo '"'._("An unknown problem occurred").'"'; ?>;
                         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++) {
@@ -587,7 +587,7 @@  discard block
 block discarded – undo
                             result = result + r[i];
                         }
                         result = result + '.<br>';
-                        result = result + <?php echo '"' . _("You should report this to") . '"'; ?> + ' <a href="mailto:[email protected]">[email protected]</a>';
+                        result = result + <?php echo '"'._("You should report this to").'"'; ?> + ' <a href="mailto:[email protected]">[email protected]</a>';
                         result = result + '</div>';
                         $('#after_stage_1').hide();
                         $('#before_stage_1').show();
@@ -655,43 +655,43 @@  discard block
 block discarded – undo
             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);
@@ -717,7 +717,7 @@  discard block
 block discarded – undo
                         $(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', '');
@@ -727,7 +727,7 @@  discard block
 block discarded – undo
     $(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', '');
@@ -740,7 +740,7 @@  discard block
 block discarded – undo
         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', '');
@@ -749,7 +749,7 @@  discard block
 block discarded – undo
         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', '');
@@ -758,7 +758,7 @@  discard block
 block discarded – undo
         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', '');
@@ -767,7 +767,7 @@  discard block
 block discarded – undo
         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');

Please login to merge, or discard this patch.

devices/ms/Files/common.inc 1 patch

Spacing +33 added lines, -33 removed lines patch added patch discarded remove patch

@@ -146,10 +146,10 @@  discard block
 block discarded – undo
 !define MUI_HEADERIMAGE_BITMAP "cat_150.bmp"
 !define MUI_COMPONENTSPAGE_SMALLDESC
 
-!define WELCOME_HEADER "<?php printf(WindowsCommon::sprintNsis(_("Welcome to the %s installer")),\config\ConfAssistant::CONSORTIUM['display_name'])?>"
-!define FAREWELL_HEADER "<?php WindowsCommon::echoNsis( _("Installation complete"))?>"
-!define FAREWELL_TEXT	"<?php WindowsCommon::echoNsis( _("Network profiles have been installed."))?>$\r$\n$\n <?php WindowsCommon::echoNsis(  _("Your system is ready."))?>"
-!define FAREWELL_FAIL	"<?php WindowsCommon::echoNsis( _("Network installation had errors."))?>$\r$\n$\n <?php WindowsCommon::echoNsis( _("Please contact \${SUPPORT}."))?>"
+!define WELCOME_HEADER "<?php printf(WindowsCommon::sprintNsis(_("Welcome to the %s installer")), \config\ConfAssistant::CONSORTIUM['display_name'])?>"
+!define FAREWELL_HEADER "<?php WindowsCommon::echoNsis(_("Installation complete"))?>"
+!define FAREWELL_TEXT	"<?php WindowsCommon::echoNsis(_("Network profiles have been installed."))?>$\r$\n$\n <?php WindowsCommon::echoNsis(_("Your system is ready."))?>"
+!define FAREWELL_FAIL	"<?php WindowsCommon::echoNsis(_("Network installation had errors."))?>$\r$\n$\n <?php WindowsCommon::echoNsis(_("Please contact \${SUPPORT}."))?>"
 ;--------------------------------
 ;Languages
 !insertmacro MUI_LANGUAGE "${LANG}"
@@ -157,14 +157,14 @@  discard block
 block discarded – undo
 ;--------------------------------
 ; Licence file
 !ifdef LICENSE_FILE
-LicenseForceSelection checkbox "<?php WindowsCommon::echoNsis( _("Accept"))?>"
+LicenseForceSelection checkbox "<?php WindowsCommon::echoNsis(_("Accept"))?>"
 LicenseText "<?php WindowsCommon::echoNsis(_("If you accept the conditions then select Accept and then click Install to continue."))?>"
 LicenseData ${LICENSE_FILE}
 !endif
 
 ;-----------------------------------
 
-MiscButtonText "" "" "" "<?php WindowsCommon::echoNsis( _("Finish"))?>"
+MiscButtonText "" "" "" "<?php WindowsCommon::echoNsis(_("Finish"))?>"
 ;----------------------------------
 ;  FUNCTIONS
 
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
 
 !macro install_ca_cert ca_file ca_fingerprint level
    !insertmacro debug_cat 2 "locating certificate  SHA=${ca_fingerprint} Level=${level}"
-   DetailPrint "<?php WindowsCommon::echoNsis( _("searching for certificate"))?> ${ca_file}"
+   DetailPrint "<?php WindowsCommon::echoNsis(_("searching for certificate"))?> ${ca_file}"
    File "${ca_file}"
    nsArray::Set Delete_files "${ca_file}"
    !insertmacro debug_cat 2 "Testing machine store root"
@@ -260,13 +260,13 @@  discard block
 block discarded – undo
    ${EndIf}
    !insertmacro debug_cat 2 "installing certificate $TEMP\${ca_file}"
    !insertmacro debug_cat 3 "Execute: certutil -addstore -user ${level} $TEMP\${ca_file}"
-   DetailPrint "<?php WindowsCommon::echoNsis( _("installing certificate"))?> ${ca_file}"
+   DetailPrint "<?php WindowsCommon::echoNsis(_("installing certificate"))?> ${ca_file}"
    nsExec::Exec '"certutil" -addstore -user ${level} "$TEMP"\${ca_file}'
    Pop $0
    !insertmacro debug_cat 3 "certutil returned $0"
    ${If} $0 != 0
      IfSilent +2
-     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis( _("could not install certificate"))?>  ${ca_file}"
+     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis(_("could not install certificate"))?>  ${ca_file}"
      !insertmacro debug_cat 1 "could not install certificate ${ca_file}"
    ${EndIf}
 no_install_${ca_file}:
@@ -473,26 +473,26 @@  discard block
 block discarded – undo
   pop $R0
   ${If} $tkip_count > 0
     ${If} $aes_count > 1
-      StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis( _("The non TKIP profiles are preferred. Always use them if you have a choice."))?>"
+      StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis(_("The non TKIP profiles are preferred. Always use them if you have a choice."))?>"
     ${Else}
-     StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis( _("The non TKIP profile is preferred. Always use it if you have a choice."))?>"
+     StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis(_("The non TKIP profile is preferred. Always use it if you have a choice."))?>"
     ${EndIf}
   ${Else}
     StrCpy $R1 ""
   ${EndIf}
   ${If} $profile_count > 0
-    StrCpy $welcome_message "<?php WindowsCommon::echoNsis( _("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
-<?php WindowsCommon::echoNsis( _("The installer will create the following wireless profiles:"))?>$\r$\n\
+    StrCpy $welcome_message "<?php WindowsCommon::echoNsis(_("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
+<?php WindowsCommon::echoNsis(_("The installer will create the following wireless profiles:"))?>$\r$\n\
 $R0.\
 $R1$\r$\n$\n\
-<?php WindowsCommon::echoNsis( _("More information and comments:"))?>$\r$\n\
+<?php WindowsCommon::echoNsis(_("More information and comments:"))?>$\r$\n\
    EMAIL: ${SUPPORT}$\r$\n\
    WWW: ${URL}"
 ${Else}
-StrCpy $welcome_message "<?php WindowsCommon::echoNsis( _("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
-<?php WindowsCommon::echoNsis( _("The installer will create the wireless profile:"))?> $R0.\
+StrCpy $welcome_message "<?php WindowsCommon::echoNsis(_("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
+<?php WindowsCommon::echoNsis(_("The installer will create the wireless profile:"))?> $R0.\
 $R1$\r$\n$\n\
-<?php WindowsCommon::echoNsis( _("More information and comments:"))?>$\r$\n\
+<?php WindowsCommon::echoNsis(_("More information and comments:"))?>$\r$\n\
    EMAIL: ${SUPPORT}$\r$\n\
    WWW: ${URL}"
 ${EndIf}
@@ -518,7 +518,7 @@  discard block
 block discarded – undo
   SendMessage $HEADLINE ${WM_SETFONT} $HEADLINE_FONT 0
 ;TRANSLATION
   nsDialogs::CreateControl STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 120u 46u -130u -32u "$welcome_message\
-$\r$\n$\r$\n<?php WindowsCommon::echoNsis( _("Installer created with software from the GEANT project."))?>"
+$\r$\n$\r$\n<?php WindowsCommon::echoNsis(_("Installer created with software from the GEANT project."))?>"
   Pop $TEXT
 
   SetCtlColors $DIALOG "" 0xffffff
@@ -651,18 +651,18 @@  discard block
 block discarded – undo
     ${If} $wireless_result == 1
       !insertmacro debug_cat 1 "wlan_test.exe did not find wireless configuration service"
       IfSilent +2
-      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis( _("Windows wireless configuration service is not enabled. The installer cannot continue."))?>"
+      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis(_("Windows wireless configuration service is not enabled. The installer cannot continue."))?>"
       Call Cleanup
     ${EndIf}
     ${If} $wireless_result == 2
       IfSilent +2
-      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis( _("No wireless interfaces found. The installer cannot continue."))?>"
+      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis(_("No wireless interfaces found. The installer cannot continue."))?>"
       Call Cleanup
     ${EndIf}
   ${Else}
     ${If} $wireless_result > 0
        IfSilent +3
-       MessageBox MB_YESNO "<?php WindowsCommon::echoNsis( _("No wireless interfaces found. Wireless access will not be configured. Would you like to continue and configure access on the wired interface?"))?>" IDYES wired_yes
+       MessageBox MB_YESNO "<?php WindowsCommon::echoNsis(_("No wireless interfaces found. Wireless access will not be configured. Would you like to continue and configure access on the wired interface?"))?>" IDYES wired_yes
        Call Cleanup
        wired_yes:
        Push 1
@@ -678,7 +678,7 @@  discard block
 block discarded – undo
     ${If} $wired == 1
       ${If} $force_wired == 0
         IfSilent wired
-        MessageBox MB_YESNO "<?php WindowsCommon::echoNsis( _("Do you want to enable access on wired interfaces?"))?>" IDYES wired
+        MessageBox MB_YESNO "<?php WindowsCommon::echoNsis(_("Do you want to enable access on wired interfaces?"))?>" IDYES wired
         Push 0
         Pop $wired
         wired:
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
 ;================================
 
 Function ShowInstfiles
-  !insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis( _("Profiles installation"))?>" " "
+  !insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis(_("Profiles installation"))?>" " "
 FunctionEnd
 ;================================
 ;  Check if a wireless profile exist and put it on delete list
@@ -738,7 +738,7 @@  discard block
 block discarded – undo
 
 Function FindProfile
   Pop $R8
-  DetailPrint "<?php WindowsCommon::echoNsis( _("Checking for profile \$R8"))?>"
+  DetailPrint "<?php WindowsCommon::echoNsis(_("Checking for profile \$R8"))?>"
   !insertmacro debug_cat 2 "Checking for profile $R8"
   !insertmacro debug_cat 3 "Exec: $Netsh wlan show profiles $R8"
   nsExec::Exec  '"$Netsh" wlan show profiles "$R8"'
@@ -746,7 +746,7 @@  discard block
 block discarded – undo
   !insertmacro debug_cat 4 "netsh returned $0"
   ${If} $0 == 0
     !insertmacro debug_cat 1 "found profile $R8"
-    DetailPrint "<?php WindowsCommon::echoNsis( _("found profile \$R8"))?>"
+    DetailPrint "<?php WindowsCommon::echoNsis(_("found profile \$R8"))?>"
     Push 0
   ${Else}
     !insertmacro debug_cat 1 "profile $R8 not found"
@@ -841,7 +841,7 @@  discard block
 block discarded – undo
     ${If} $Symantec_installed  != 0
      !insertmacro debug_cat 3 "Symantec problem"
      IfSilent +2
-     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php printf(WindowsCommon::sprintNsis(_("Please READ this message it is IMPORTANT.$\\r$\\nInstallation problems may be due to the fact that Symantec Endpoint Protection is installed on your machine.$\\r$\\nWhile this is a well-known bug of the Symantec product, about which the installer can not do anything, there is a workaround.$\\r$\\nWhen you close this window the installer will exit and an explorer window will be started (it could appear underneath already opened windows). In this window you should see a script named inst_cat. Start it by double-clicking, It will install the profiles. You will need to login to %s with your username and password.")),\config\ConfAssistant::CONSORTIUM['display_name']) ?>"
+     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php printf(WindowsCommon::sprintNsis(_("Please READ this message it is IMPORTANT.$\\r$\\nInstallation problems may be due to the fact that Symantec Endpoint Protection is installed on your machine.$\\r$\\nWhile this is a well-known bug of the Symantec product, about which the installer can not do anything, there is a workaround.$\\r$\\nWhen you close this window the installer will exit and an explorer window will be started (it could appear underneath already opened windows). In this window you should see a script named inst_cat. Start it by double-clicking, It will install the profiles. You will need to login to %s with your username and password.")), \config\ConfAssistant::CONSORTIUM['display_name']) ?>"
     Exec '"explorer" /select,"$EXEDIR\inst_cat.cmd"'
     Quit
 
@@ -1174,7 +1174,7 @@  discard block
 block discarded – undo
 Function PFXCertificateSelect
   !ifndef SILVERBULLET
 ;TRANSLATION
-!insertmacro MUI_HEADER_TEXT "<?php printf(WindowsCommon::sprintNsis(_("%s installer for")),\config\ConfAssistant::CONSORTIUM['display_name'])?> " "<?php WindowsCommon::echoNsis(_("Install personal certificate"))?>"
+!insertmacro MUI_HEADER_TEXT "<?php printf(WindowsCommon::sprintNsis(_("%s installer for")), \config\ConfAssistant::CONSORTIUM['display_name'])?> " "<?php WindowsCommon::echoNsis(_("Install personal certificate"))?>"
 ;TRANSLATION
     IfSilent +2
   MessageBox MB_OK "<?php WindowsCommon::echoNsis(_("Preparing to install personal certificate."))?>$\r$\n<?php WindowsCommon::echoNsis(_("Click OK to continue"))?> "
@@ -1190,7 +1190,7 @@  discard block
 block discarded – undo
         $certPasswordLength = strlen($certPasswordLabel);
         $certUsernameLabel = WindowsCommon::sprintNsis(_("Username:"));
         $certUsernameLength = strlen($certUsernameLabel);
-        $labelLength = max($certPasswordLength,$certUsernameLength);
+        $labelLength = max($certPasswordLength, $certUsernameLength);
   ?>
   ${NSD_CreateLabel} 0 0 100% 32u "<?php WindowsCommon::echoNsis(_("Selected file: \$Cert_file"))?>"
   !else
@@ -1207,11 +1207,11 @@  discard block
 block discarded – undo
   !insertmacro debug_cat 3 "Vista level (Vista without Service pack): $VistaNoSP";
   ${If} $VistaNoSP == 0
     !ifdef PFX_USERNAME
-       !define LABEL_LENGTH "<?php echo($labelLength*3.5)?>u"
-       !define TEXT_START "<?php echo($labelLength*3.5 +5)?>u"
+       !define LABEL_LENGTH "<?php echo($labelLength * 3.5)?>u"
+       !define TEXT_START "<?php echo($labelLength * 3.5 + 5)?>u"
     !else
-       !define LABEL_LENGTH "<?php echo($certPasswordLength*3.5)?>u"
-       !define TEXT_START "<?php echo($certPasswordLength*3.5 +5)?>u"
+       !define LABEL_LENGTH "<?php echo($certPasswordLength * 3.5)?>u"
+       !define TEXT_START "<?php echo($certPasswordLength * 3.5 + 5)?>u"
     !endif
     ${NSD_CreateLabel} 0 35u ${LABEL_LENGTH} 12u "<?php echo $certPasswordLabel?>"
     ${NSD_CreatePassword} ${TEXT_START} 34.5u 120u 12u ""
@@ -1583,7 +1583,7 @@  discard block
 block discarded – undo
 Section "-start"
 SectionIn RO
 
-!insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis( _("Installation"))?>" "<?php WindowsCommon::echoNsis( _("Checking for existing wireless profiles"))?>"
+!insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis(_("Installation"))?>" "<?php WindowsCommon::echoNsis(_("Checking for existing wireless profiles"))?>"
 !ifndef PWD
 !include "certs.nsh"
 !endif

Please login to merge, or discard this patch.

web/admin/inc/overview_js.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -69,7 +69,7 @@
 block discarded – undo
     $langInstance = new core\common\Language();
     $end = $langInstance->rtl ? "left" : "right";
     ?>
-    pressedButton.next().append('<span style="padding-<?php echo $end;?>:1em">'+msg+'<\/span>');
+    pressedButton.next().append('<span style="padding-<?php echo $end; ?>:1em">'+msg+'<\/span>');
     }
     );
     }

Please login to merge, or discard this patch.

web/skins/modern/user/cat_info.php 1 patch

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

@@ -31,7 +31,7 @@  discard block
 block discarded – undo
  * the receiving end to strip this marker and not add the title by itself.
  *
  */
-require_once dirname(dirname(dirname((dirname(dirname(__FILE__)))))) . "/config/_config.php";
+require_once dirname(dirname(dirname((dirname(dirname(__FILE__))))))."/config/_config.php";
 
 $Gui = new \web\lib\user\Gui();
 
@@ -41,46 +41,46 @@  discard block
 block discarded – undo
 $subpage = $_REQUEST['subpage'];
 switch ($page) {
     case 'about':
-        include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/about_cat.inc.php";
+        include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/about_cat.inc.php";
         $out = "<div class='padding'>$out</div>";
         break;
     case 'tou':
-        include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/tou.inc.php";
+        include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/tou.inc.php";
         $out = "no_title<div>
            <h1>
-         " . $Tou['title'] . "
+         " . $Tou['title']."
     </h1>
-<div id='tou_1'>" . $Tou['subtitle'] .
-               '<div style="direction:ltr">' . $Tou['short'] . "</div>
+<div id='tou_1'>" . $Tou['subtitle'].
+               '<div style="direction:ltr">'.$Tou['short']."</div>
 </div>
 <div id='all_tou_link'><a href='javascript:showTOU()'>Click here to see the full terms</a></div>
 <div id='tou_2' style='display:none; padding-top:20px; direction:ltr'>" .
-                $Tou['full'] . "
+                $Tou['full']."
 </div>
 </div>
 ";
         break;
     case 'help':
-        include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/faq.inc.php";
+        include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/faq.inc.php";
         switch ($subpage) {
             case 'contact':
             case 'idp_not_listed':
             case 'device_not_listed':
             case 'what_is_eduroam':
-                $out = "no_title<div><h1>" . _("Help") . "</h1>";
+                $out = "no_title<div><h1>"._("Help")."</h1>";
                 foreach ($Faq as $faqItem) {
                     if (!empty($faqItem['id']) && $faqItem['id'] == $subpage) {
-                        $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
-                        $out .= "" . $faqItem['text'] . "</div>\n";
+                        $out .= "<div><h3>".$faqItem['title']."</h3>\n";
+                        $out .= "".$faqItem['text']."</div>\n";
                     }
                 }
                 $out .= "</div>";
                 break;
             case 'faq':
-                $out = "no_title<div><h1>" . _("Frequently Asked Questions") . "</h1>";
+                $out = "no_title<div><h1>"._("Frequently Asked Questions")."</h1>";
                 foreach ($Faq as $faqItem) {
-                    $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
-                    $out .= "" . $faqItem['text'] . "</div>\n";
+                    $out .= "<div><h3>".$faqItem['title']."</h3>\n";
+                    $out .= "".$faqItem['text']."</div>\n";
                 }
                 $out .= "</div>";
                 break;
@@ -104,15 +104,15 @@  discard block
 block discarded – undo
                     $rn = uniqid();
                     $_SESSION['remindIdP'] = $rn;
                     $out .= "<input type='hidden' id='remindIdPs' value='$rn'>";
-                    $out .= "<p><button type='button' onclick='goAdmin(); return(false);'>" . _("Login") . "</button>";
-                    $out .= "<br/><br/><p>" . _("Did you forget with which Identity Provider you logged in to the system? We can try to find out if you specify the email address with which you were invited to the system in the box below. This may not work if you were invited from a third-party website via the AdminAPI.") . "</p>";
-                    $out .= "<input id='remindIdP' type='text'/><button onclick='remindIdPF(); return false;'>" . _("Get IdP Reminder") . "</button>";
+                    $out .= "<p><button type='button' onclick='goAdmin(); return(false);'>"._("Login")."</button>";
+                    $out .= "<br/><br/><p>"._("Did you forget with which Identity Provider you logged in to the system? We can try to find out if you specify the email address with which you were invited to the system in the box below. This may not work if you were invited from a third-party website via the AdminAPI.")."</p>";
+                    $out .= "<input id='remindIdP' type='text'/><button onclick='remindIdPF(); return false;'>"._("Get IdP Reminder")."</button>";
                     $out .= "<div id='remindIdPd'><span id='remindIdPh'></span><ul id='remindIdPl'></ul></div>";
                     $out = "<div  class='padding'>$out</div>";
                 }
                 break;
             case 'develop':
-                include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/devel.inc.php";
+                include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/devel.inc.php";
                 $out = "<div class='padding'>$out</div>";
                 break;
         }

Please login to merge, or discard this patch.

core/SilverbulletCertificate.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -325,7 +325,7 @@  discard block
 block discarded – undo
         $invitationObject = new SilverbulletInvitation($token);
         $profile = new ProfileSilverbullet($invitationObject->profile);
         $inst = new IdP($profile->institution);
-        $loggerInstance->debug(5, "tokenStatus: done, got " . $invitationObject->invitationTokenStatus . ", " . $invitationObject->profile . ", " . $invitationObject->userId . ", " . $invitationObject->expiry . ", " . $invitationObject->invitationTokenString . "\n");
+        $loggerInstance->debug(5, "tokenStatus: done, got ".$invitationObject->invitationTokenStatus.", ".$invitationObject->profile.", ".$invitationObject->userId.", ".$invitationObject->expiry.", ".$invitationObject->invitationTokenString."\n");
         if ($invitationObject->invitationTokenStatus != SilverbulletInvitation::SB_TOKENSTATUS_VALID && $invitationObject->invitationTokenStatus != SilverbulletInvitation::SB_TOKENSTATUS_PARTIALLY_REDEEMED) {
             throw new Exception("Attempt to generate a SilverBullet installer with an invalid/redeemed/expired token. The user should never have got that far!");
         }
@@ -338,12 +338,12 @@  discard block
 block discarded – undo
             throw new Exception("Despite a valid token, the corresponding user was not found in database or database query error!");
         }
         $expiryObject = mysqli_fetch_object(/** @scrutinizer ignore-type */ $userrow);
-        $loggerInstance->debug(5, "EXP: " . $expiryObject->expiry . "\n");
+        $loggerInstance->debug(5, "EXP: ".$expiryObject->expiry."\n");
         $expiryDateObject = date_create_from_format("Y-m-d H:i:s", $expiryObject->expiry);
         if ($expiryDateObject === FALSE) {
             throw new Exception("The expiry date we got from the DB is bogus!");
         }
-        $loggerInstance->debug(5, $expiryDateObject->format("Y-m-d H:i:s") . "\n");
+        $loggerInstance->debug(5, $expiryDateObject->format("Y-m-d H:i:s")."\n");
         // date_create with no parameters can't fail, i.e. is never FALSE
         $validity = date_diff(/** @scrutinizer ignore-type */ date_create(), $expiryDateObject);
         $expiryDays = $validity->days + 1;
@@ -377,14 +377,14 @@  discard block
 block discarded – undo
         $exportedCertClear = "";
         openssl_pkcs12_export($cert, $exportedCertClear, $privateKey, "", ['extracerts' => [$issuingCaPem, $rootCaPem]]);
         $pkey_3des = "";
-        openssl_pkey_export($privateKey, $pkey_3des, $importPassword, [ "encrypt_key_cipher" => OPENSSL_CIPHER_3DES ]);
+        openssl_pkey_export($privateKey, $pkey_3des, $importPassword, ["encrypt_key_cipher" => OPENSSL_CIPHER_3DES]);
         // store resulting cert CN and expiry date in separate columns into DB - do not store the cert data itself as it contains the private key!
         // we need the *real* expiry date, not just the day-approximation
         $x509 = new \core\common\X509();
         $certString = "";
         openssl_x509_export($cert, $certString);
         $parsedCert = $x509->processCertificate($certString);
-        $loggerInstance->debug(5, "CERTINFO: " . /** @scrutinizer ignore-type */ print_r($parsedCert['full_details'], true));
+        $loggerInstance->debug(5, "CERTINFO: "./** @scrutinizer ignore-type */ print_r($parsedCert['full_details'], true));
         $realExpiryDate = date_create_from_format("U", $parsedCert['full_details']['validTo_time_t'])->format("Y-m-d H:i:s");
 
         // store new cert info in DB
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
         // let the RADIUS users know the actual username for CUI generation
         $radiusDbs = DBConnection::handle("RADIUS"); // is an array of server conns
         foreach ($radiusDbs as $oneRadiusDb) {
-            $oneRadiusDb->exec("INSERT IGNORE INTO radcheck (username, attribute, op, value) VALUES (?, 'CUI-Source-Username', ':=', ?)", "ss", ($profile->getUserById($invitationObject->userId))[$invitationObject->userId] , $csr["USERNAME"]);
+            $oneRadiusDb->exec("INSERT IGNORE INTO radcheck (username, attribute, op, value) VALUES (?, 'CUI-Source-Username', ':=', ?)", "ss", ($profile->getUserById($invitationObject->userId))[$invitationObject->userId], $csr["USERNAME"]);
         }
 
 // return PKCS#12 data stream
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
         $username = "";
         while ($usernameIsUnique === FALSE) {
             $usernameLocalPart = common\Entity::randomString(64 - 1 - strlen($realm), "0123456789abcdefghijklmnopqrstuvwxyz");
-            $username = $usernameLocalPart . "@" . $realm;
+            $username = $usernameLocalPart."@".$realm;
             $uniquenessQuery = $databaseHandle->exec("SELECT cn from silverbullet_certificate WHERE cn = ? AND ca_type = ?", "ss", $username, $certtype);
             // SELECT -> resource, not boolean
             if (mysqli_num_rows(/** @scrutinizer ignore-type */ $uniquenessQuery) == 0) {

Please login to merge, or discard this patch.

core/ExternalEduroamDBData.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -126,7 +126,7 @@  discard block
 block discarded – undo
             return $this->counter;
         }
 
-        $cachedNumber = @file_get_contents(ROOT . "/var/tmp/cachedSPNumber.serialised");
+        $cachedNumber = @file_get_contents(ROOT."/var/tmp/cachedSPNumber.serialised");
         if ($cachedNumber !== FALSE) {
             $numberData = unserialize($cachedNumber);
             $now = new \DateTime();
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
         } else { // data in cache is too old or doesn't exist. We really need to ask the database
             $list = $this->listAllServiceProviders();
             $this->counter = count($list);
-            file_put_contents(ROOT . "/var/tmp/cachedSPNumber.serialised", serialize(["number" => $this->counter, "timestamp" => new \DateTime()]));
+            file_put_contents(ROOT."/var/tmp/cachedSPNumber.serialised", serialize(["number" => $this->counter, "timestamp" => new \DateTime()]));
             return $this->counter;
         }
     }
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
         $returnarray = [];
         $query = "SELECT id_institution AS id, country, inst_realm as realmlist, name AS collapsed_name, contact AS collapsed_contact, type FROM view_active_institution WHERE country = ?";
         if ($eduroamDbType !== NULL) {
-            $query .= " AND ( type = '" . ExternalEduroamDBData::TYPE_IDPSP . "' OR type = '" . $eduroamDbType . "')";
+            $query .= " AND ( type = '".ExternalEduroamDBData::TYPE_IDPSP."' OR type = '".$eduroamDbType."')";
         }
         $externals = $this->db->exec($query, "s", $tld);
         // was a SELECT query, so a resource and not a boolean
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
         $instServerTransaction = $this->db->exec($query, "s", $tld);
         while ($instServerResponses = mysqli_fetch_object(/** @scrutinizer ignore-type */ $instServerTransaction)) {
             $contactList = $this->dissectCollapsedContacts($instServerResponses->contacts);
-            $retval[$instServerResponses->ROid . "-". $instServerResponses->instid] = [
+            $retval[$instServerResponses->ROid."-".$instServerResponses->instid] = [
                 "names" => $this->splitNames($instServerResponses->inst_name),
                 "type" => array_search($instServerResponses->type, self::TYPE_MAPPING),
                 "servers" => $instServerResponses->servers,

Please login to merge, or discard this patch.

core/CAT.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -109,7 +109,7 @@  discard block
 block discarded – undo
         parent::__construct();
         common\Entity::intoThePotatoes();
 
-        $this->catVersionString = sprintf("Unreleased %s Git Revision"    , "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>") . "</a>";
+        $this->catVersionString = sprintf("Unreleased %s Git Revision", "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>")."</a>";
 
         if (CAT::RELEASE_VERSION) {
             $major = CAT::VERSION_MAJOR;
@@ -117,14 +117,14 @@  discard block
 block discarded – undo
             $patch = CAT::VERSION_PATCH;
             $extra = CAT::VERSION_EXTRA;
             $temp_version = "CAT-$major.$minor";
-            $branch = "release_$major" . "_$minor";
+            $branch = "release_$major"."_$minor";
             if (CAT::VERSION_PATCH != 0) {
                 $temp_version .= ".$patch";
             }
             if (CAT::VERSION_EXTRA != "") {
                 $temp_version .= "-$extra";
             }
-            $this->catVersionString = sprintf("Release <a href='%s'>%s</a>", "https://github.com/GEANT/CAT/tree/" . $branch . "/Changes.md", $temp_version);
+            $this->catVersionString = sprintf("Release <a href='%s'>%s</a>", "https://github.com/GEANT/CAT/tree/".$branch."/Changes.md", $temp_version);
 
         }
         $product = \config\Master::APPEARANCE['productname'];
@@ -132,9 +132,9 @@  discard block
 block discarded – undo
         $maxYear = self::COPYRIGHT_MAX_YEAR;
         $holder = self::COPYRIGHT_HOLDER;
         $consortia = self::COPYRIGHT_CONSORTIA;
-        $this->catCopyright = "$product - " . $this->catVersionString . " &copy; $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
+        $this->catCopyright = "$product - ".$this->catVersionString." &copy; $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
         $this->catCopyrifhtAndLicense = "&copy; $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
-        $this->catVersion = "$product<br>" . $this->catVersionString;
+        $this->catVersion = "$product<br>".$this->catVersionString;
 
         /* Federations are created in DB with bootstrapFederation, and listed via listFederations
          */

Please login to merge, or discard this patch.

		@@ -20,7 +20,7 @@
		block discarded – undo
20	20	*/
21	21	?>
22	22	<?php
23		-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
	23	+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
24	24
25	25	$auth = new \web\lib\admin\Authentication();
26	26	$languageInstance = new \core\common\Language();

		@@ -61,10 +61,10 @@
		block discarded – undo
61	61	header("Content-Type:text/html;charset=utf-8");
62	62	?>
63	63	<!DOCTYPE html>
64		- <html xmlns='http://www.w3.org/1999/xhtml' lang='<?php echo $ourlocale;?>' <?php echo ($direction ? "dir='rtl'" : "");?>>
65		- <head lang='<?php echo $ourlocale;?>'>
	64	+ <html xmlns='http://www.w3.org/1999/xhtml' lang='<?php echo $ourlocale; ?>' <?php echo ($direction ? "dir='rtl'" : ""); ?>>
	65	+ <head lang='<?php echo $ourlocale; ?>'>
66	66	<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
67		- <title><?php echo htmlspecialchars($pagetitle);?></title>
	67	+ <title><?php echo htmlspecialchars($pagetitle); ?></title>
68	68	<script type="text/javascript">ie_version = 0;</script>
69	69	<!--[if IE]>
70	70	<script type="text/javascript">ie_version=1;</script>

		@@ -146,10 +146,10 @@ discard block
		block discarded – undo
146	146	!define MUI_HEADERIMAGE_BITMAP "cat_150.bmp"
147	147	!define MUI_COMPONENTSPAGE_SMALLDESC
148	148
149		-!define WELCOME_HEADER "<?php printf(WindowsCommon::sprintNsis(_("Welcome to the %s installer")),\config\ConfAssistant::CONSORTIUM['display_name'])?>"
150		-!define FAREWELL_HEADER "<?php WindowsCommon::echoNsis( _("Installation complete"))?>"
151		-!define FAREWELL_TEXT "<?php WindowsCommon::echoNsis( _("Network profiles have been installed."))?>$\r$\n$\n <?php WindowsCommon::echoNsis( _("Your system is ready."))?>"
152		-!define FAREWELL_FAIL "<?php WindowsCommon::echoNsis( _("Network installation had errors."))?>$\r$\n$\n <?php WindowsCommon::echoNsis( _("Please contact \${SUPPORT}."))?>"
	149	+!define WELCOME_HEADER "<?php printf(WindowsCommon::sprintNsis(_("Welcome to the %s installer")), \config\ConfAssistant::CONSORTIUM['display_name'])?>"
	150	+!define FAREWELL_HEADER "<?php WindowsCommon::echoNsis(_("Installation complete"))?>"
	151	+!define FAREWELL_TEXT "<?php WindowsCommon::echoNsis(_("Network profiles have been installed."))?>$\r$\n$\n <?php WindowsCommon::echoNsis(_("Your system is ready."))?>"
	152	+!define FAREWELL_FAIL "<?php WindowsCommon::echoNsis(_("Network installation had errors."))?>$\r$\n$\n <?php WindowsCommon::echoNsis(_("Please contact \${SUPPORT}."))?>"
153	153	;--------------------------------
154	154	;Languages
155	155	!insertmacro MUI_LANGUAGE "${LANG}"
		@@ -157,14 +157,14 @@ discard block
		block discarded – undo
157	157	;--------------------------------
158	158	; Licence file
159	159	!ifdef LICENSE_FILE
160		-LicenseForceSelection checkbox "<?php WindowsCommon::echoNsis( _("Accept"))?>"
	160	+LicenseForceSelection checkbox "<?php WindowsCommon::echoNsis(_("Accept"))?>"
161	161	LicenseText "<?php WindowsCommon::echoNsis(_("If you accept the conditions then select Accept and then click Install to continue."))?>"
162	162	LicenseData ${LICENSE_FILE}
163	163	!endif
164	164
165	165	;-----------------------------------
166	166
167		-MiscButtonText "" "" "" "<?php WindowsCommon::echoNsis( _("Finish"))?>"
	167	+MiscButtonText "" "" "" "<?php WindowsCommon::echoNsis(_("Finish"))?>"
168	168	;----------------------------------
169	169	; FUNCTIONS
170	170
		@@ -198,7 +198,7 @@ discard block
		block discarded – undo
198	198
199	199	!macro install_ca_cert ca_file ca_fingerprint level
200	200	!insertmacro debug_cat 2 "locating certificate SHA=${ca_fingerprint} Level=${level}"
201		- DetailPrint "<?php WindowsCommon::echoNsis( _("searching for certificate"))?> ${ca_file}"
	201	+ DetailPrint "<?php WindowsCommon::echoNsis(_("searching for certificate"))?> ${ca_file}"
202	202	File "${ca_file}"
203	203	nsArray::Set Delete_files "${ca_file}"
204	204	!insertmacro debug_cat 2 "Testing machine store root"
		@@ -260,13 +260,13 @@ discard block
		block discarded – undo
260	260	${EndIf}
261	261	!insertmacro debug_cat 2 "installing certificate $TEMP\${ca_file}"
262	262	!insertmacro debug_cat 3 "Execute: certutil -addstore -user ${level} $TEMP\${ca_file}"
263		- DetailPrint "<?php WindowsCommon::echoNsis( _("installing certificate"))?> ${ca_file}"
	263	+ DetailPrint "<?php WindowsCommon::echoNsis(_("installing certificate"))?> ${ca_file}"
264	264	nsExec::Exec '"certutil" -addstore -user ${level} "$TEMP"\${ca_file}'
265	265	Pop $0
266	266	!insertmacro debug_cat 3 "certutil returned $0"
267	267	${If} $0 != 0
268	268	IfSilent +2
269		- MessageBox MB_OK\|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis( _("could not install certificate"))?> ${ca_file}"
	269	+ MessageBox MB_OK\|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis(_("could not install certificate"))?> ${ca_file}"
270	270	!insertmacro debug_cat 1 "could not install certificate ${ca_file}"
271	271	${EndIf}
272	272	no_install_${ca_file}:
		@@ -473,26 +473,26 @@ discard block
		block discarded – undo
473	473	pop $R0
474	474	${If} $tkip_count > 0
475	475	${If} $aes_count > 1
476		- StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis( _("The non TKIP profiles are preferred. Always use them if you have a choice."))?>"
	476	+ StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis(_("The non TKIP profiles are preferred. Always use them if you have a choice."))?>"
477	477	${Else}
478		- StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis( _("The non TKIP profile is preferred. Always use it if you have a choice."))?>"
	478	+ StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echoNsis(_("The non TKIP profile is preferred. Always use it if you have a choice."))?>"
479	479	${EndIf}
480	480	${Else}
481	481	StrCpy $R1 ""
482	482	${EndIf}
483	483	${If} $profile_count > 0
484		- StrCpy $welcome_message "<?php WindowsCommon::echoNsis( _("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
485		-<?php WindowsCommon::echoNsis( _("The installer will create the following wireless profiles:"))?>$\r$\n\
	484	+ StrCpy $welcome_message "<?php WindowsCommon::echoNsis(_("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
	485	+<?php WindowsCommon::echoNsis(_("The installer will create the following wireless profiles:"))?>$\r$\n\
486	486	$R0.\
487	487	$R1$\r$\n$\n\
488		-<?php WindowsCommon::echoNsis( _("More information and comments:"))?>$\r$\n\
	488	+<?php WindowsCommon::echoNsis(_("More information and comments:"))?>$\r$\n\
489	489	EMAIL: ${SUPPORT}$\r$\n\
490	490	WWW: ${URL}"
491	491	${Else}
492		-StrCpy $welcome_message "<?php WindowsCommon::echoNsis( _("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
493		-<?php WindowsCommon::echoNsis( _("The installer will create the wireless profile:"))?> $R0.\
	492	+StrCpy $welcome_message "<?php WindowsCommon::echoNsis(_("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
	493	+<?php WindowsCommon::echoNsis(_("The installer will create the wireless profile:"))?> $R0.\
494	494	$R1$\r$\n$\n\
495		-<?php WindowsCommon::echoNsis( _("More information and comments:"))?>$\r$\n\
	495	+<?php WindowsCommon::echoNsis(_("More information and comments:"))?>$\r$\n\
496	496	EMAIL: ${SUPPORT}$\r$\n\
497	497	WWW: ${URL}"
498	498	${EndIf}
		@@ -518,7 +518,7 @@ discard block
		block discarded – undo
518	518	SendMessage $HEADLINE ${WM_SETFONT} $HEADLINE_FONT 0
519	519	;TRANSLATION
520	520	nsDialogs::CreateControl STATIC ${WS_VISIBLE}\|${WS_CHILD}\|${WS_CLIPSIBLINGS} 0 120u 46u -130u -32u "$welcome_message\
521		-$\r$\n$\r$\n<?php WindowsCommon::echoNsis( _("Installer created with software from the GEANT project."))?>"
	521	+$\r$\n$\r$\n<?php WindowsCommon::echoNsis(_("Installer created with software from the GEANT project."))?>"
522	522	Pop $TEXT
523	523
524	524	SetCtlColors $DIALOG "" 0xffffff
		@@ -651,18 +651,18 @@ discard block
		block discarded – undo
651	651	${If} $wireless_result == 1
652	652	!insertmacro debug_cat 1 "wlan_test.exe did not find wireless configuration service"
653	653	IfSilent +2
654		- MessageBox MB_OK\|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis( _("Windows wireless configuration service is not enabled. The installer cannot continue."))?>"
	654	+ MessageBox MB_OK\|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis(_("Windows wireless configuration service is not enabled. The installer cannot continue."))?>"
655	655	Call Cleanup
656	656	${EndIf}
657	657	${If} $wireless_result == 2
658	658	IfSilent +2
659		- MessageBox MB_OK\|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis( _("No wireless interfaces found. The installer cannot continue."))?>"
	659	+ MessageBox MB_OK\|MB_ICONEXCLAMATION "<?php WindowsCommon::echoNsis(_("No wireless interfaces found. The installer cannot continue."))?>"
660	660	Call Cleanup
661	661	${EndIf}
662	662	${Else}
663	663	${If} $wireless_result > 0
664	664	IfSilent +3
665		- MessageBox MB_YESNO "<?php WindowsCommon::echoNsis( _("No wireless interfaces found. Wireless access will not be configured. Would you like to continue and configure access on the wired interface?"))?>" IDYES wired_yes
	665	+ MessageBox MB_YESNO "<?php WindowsCommon::echoNsis(_("No wireless interfaces found. Wireless access will not be configured. Would you like to continue and configure access on the wired interface?"))?>" IDYES wired_yes
666	666	Call Cleanup
667	667	wired_yes:
668	668	Push 1
		@@ -678,7 +678,7 @@ discard block
		block discarded – undo
678	678	${If} $wired == 1
679	679	${If} $force_wired == 0
680	680	IfSilent wired
681		- MessageBox MB_YESNO "<?php WindowsCommon::echoNsis( _("Do you want to enable access on wired interfaces?"))?>" IDYES wired
	681	+ MessageBox MB_YESNO "<?php WindowsCommon::echoNsis(_("Do you want to enable access on wired interfaces?"))?>" IDYES wired
682	682	Push 0
683	683	Pop $wired
684	684	wired:
		@@ -719,7 +719,7 @@ discard block
		block discarded – undo
719	719	;================================
720	720
721	721	Function ShowInstfiles
722		- !insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis( _("Profiles installation"))?>" " "
	722	+ !insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis(_("Profiles installation"))?>" " "
723	723	FunctionEnd
724	724	;================================
725	725	; Check if a wireless profile exist and put it on delete list
		@@ -738,7 +738,7 @@ discard block
		block discarded – undo
738	738
739	739	Function FindProfile
740	740	Pop $R8
741		- DetailPrint "<?php WindowsCommon::echoNsis( _("Checking for profile \$R8"))?>"
	741	+ DetailPrint "<?php WindowsCommon::echoNsis(_("Checking for profile \$R8"))?>"
742	742	!insertmacro debug_cat 2 "Checking for profile $R8"
743	743	!insertmacro debug_cat 3 "Exec: $Netsh wlan show profiles $R8"
744	744	nsExec::Exec '"$Netsh" wlan show profiles "$R8"'
		@@ -746,7 +746,7 @@ discard block
		block discarded – undo
746	746	!insertmacro debug_cat 4 "netsh returned $0"
747	747	${If} $0 == 0
748	748	!insertmacro debug_cat 1 "found profile $R8"
749		- DetailPrint "<?php WindowsCommon::echoNsis( _("found profile \$R8"))?>"
	749	+ DetailPrint "<?php WindowsCommon::echoNsis(_("found profile \$R8"))?>"
750	750	Push 0
751	751	${Else}
752	752	!insertmacro debug_cat 1 "profile $R8 not found"
		@@ -841,7 +841,7 @@ discard block
		block discarded – undo
841	841	${If} $Symantec_installed != 0
842	842	!insertmacro debug_cat 3 "Symantec problem"
843	843	IfSilent +2
844		- MessageBox MB_OK\|MB_ICONEXCLAMATION "<?php printf(WindowsCommon::sprintNsis(_("Please READ this message it is IMPORTANT.$\\r$\\nInstallation problems may be due to the fact that Symantec Endpoint Protection is installed on your machine.$\\r$\\nWhile this is a well-known bug of the Symantec product, about which the installer can not do anything, there is a workaround.$\\r$\\nWhen you close this window the installer will exit and an explorer window will be started (it could appear underneath already opened windows). In this window you should see a script named inst_cat. Start it by double-clicking, It will install the profiles. You will need to login to %s with your username and password.")),\config\ConfAssistant::CONSORTIUM['display_name']) ?>"
	844	+ MessageBox MB_OK\|MB_ICONEXCLAMATION "<?php printf(WindowsCommon::sprintNsis(_("Please READ this message it is IMPORTANT.$\\r$\\nInstallation problems may be due to the fact that Symantec Endpoint Protection is installed on your machine.$\\r$\\nWhile this is a well-known bug of the Symantec product, about which the installer can not do anything, there is a workaround.$\\r$\\nWhen you close this window the installer will exit and an explorer window will be started (it could appear underneath already opened windows). In this window you should see a script named inst_cat. Start it by double-clicking, It will install the profiles. You will need to login to %s with your username and password.")), \config\ConfAssistant::CONSORTIUM['display_name']) ?>"
845	845	Exec '"explorer" /select,"$EXEDIR\inst_cat.cmd"'
846	846	Quit
847	847
		@@ -1174,7 +1174,7 @@ discard block
		block discarded – undo
1174	1174	Function PFXCertificateSelect
1175	1175	!ifndef SILVERBULLET
1176	1176	;TRANSLATION
1177		-!insertmacro MUI_HEADER_TEXT "<?php printf(WindowsCommon::sprintNsis(_("%s installer for")),\config\ConfAssistant::CONSORTIUM['display_name'])?> " "<?php WindowsCommon::echoNsis(_("Install personal certificate"))?>"
	1177	+!insertmacro MUI_HEADER_TEXT "<?php printf(WindowsCommon::sprintNsis(_("%s installer for")), \config\ConfAssistant::CONSORTIUM['display_name'])?> " "<?php WindowsCommon::echoNsis(_("Install personal certificate"))?>"
1178	1178	;TRANSLATION
1179	1179	IfSilent +2
1180	1180	MessageBox MB_OK "<?php WindowsCommon::echoNsis(_("Preparing to install personal certificate."))?>$\r$\n<?php WindowsCommon::echoNsis(_("Click OK to continue"))?> "
		@@ -1190,7 +1190,7 @@ discard block
		block discarded – undo
1190	1190	$certPasswordLength = strlen($certPasswordLabel);
1191	1191	$certUsernameLabel = WindowsCommon::sprintNsis(_("Username:"));
1192	1192	$certUsernameLength = strlen($certUsernameLabel);
1193		- $labelLength = max($certPasswordLength,$certUsernameLength);
	1193	+ $labelLength = max($certPasswordLength, $certUsernameLength);
1194	1194	?>
1195	1195	${NSD_CreateLabel} 0 0 100% 32u "<?php WindowsCommon::echoNsis(_("Selected file: \$Cert_file"))?>"
1196	1196	!else
		@@ -1207,11 +1207,11 @@ discard block
		block discarded – undo
1207	1207	!insertmacro debug_cat 3 "Vista level (Vista without Service pack): $VistaNoSP";
1208	1208	${If} $VistaNoSP == 0
1209	1209	!ifdef PFX_USERNAME
1210		- !define LABEL_LENGTH "<?php echo($labelLength*3.5)?>u"
1211		- !define TEXT_START "<?php echo($labelLength*3.5 +5)?>u"
	1210	+ !define LABEL_LENGTH "<?php echo($labelLength * 3.5)?>u"
	1211	+ !define TEXT_START "<?php echo($labelLength * 3.5 + 5)?>u"
1212	1212	!else
1213		- !define LABEL_LENGTH "<?php echo($certPasswordLength*3.5)?>u"
1214		- !define TEXT_START "<?php echo($certPasswordLength*3.5 +5)?>u"
	1213	+ !define LABEL_LENGTH "<?php echo($certPasswordLength * 3.5)?>u"
	1214	+ !define TEXT_START "<?php echo($certPasswordLength * 3.5 + 5)?>u"
1215	1215	!endif
1216	1216	${NSD_CreateLabel} 0 35u ${LABEL_LENGTH} 12u "<?php echo $certPasswordLabel?>"
1217	1217	${NSD_CreatePassword} ${TEXT_START} 34.5u 120u 12u ""
		@@ -1583,7 +1583,7 @@ discard block
		block discarded – undo
1583	1583	Section "-start"
1584	1584	SectionIn RO
1585	1585
1586		-!insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis( _("Installation"))?>" "<?php WindowsCommon::echoNsis( _("Checking for existing wireless profiles"))?>"
	1586	+!insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echoNsis(_("Installation"))?>" "<?php WindowsCommon::echoNsis(_("Checking for existing wireless profiles"))?>"
1587	1587	!ifndef PWD
1588	1588	!include "certs.nsh"
1589	1589	!endif

		@@ -69,7 +69,7 @@
		block discarded – undo
69	69	$langInstance = new core\common\Language();
70	70	$end = $langInstance->rtl ? "left" : "right";
71	71	?>
72		- pressedButton.next().append('<span style="padding-<?php echo $end;?>:1em">'+msg+'<\/span>');
	72	+ pressedButton.next().append('<span style="padding-<?php echo $end; ?>:1em">'+msg+'<\/span>');
73	73	}
74	74	);
75	75	}

		@@ -31,7 +31,7 @@ discard block
		block discarded – undo
31	31	* the receiving end to strip this marker and not add the title by itself.
32	32	*
33	33	*/
34		-require_once dirname(dirname(dirname((dirname(dirname(__FILE__)))))) . "/config/_config.php";
	34	+require_once dirname(dirname(dirname((dirname(dirname(__FILE__))))))."/config/_config.php";
35	35
36	36	$Gui = new \web\lib\user\Gui();
37	37
		@@ -41,46 +41,46 @@ discard block
		block discarded – undo
41	41	$subpage = $_REQUEST['subpage'];
42	42	switch ($page) {
43	43	case 'about':
44		- include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/about_cat.inc.php";
	44	+ include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/about_cat.inc.php";
45	45	$out = "<div class='padding'>$out</div>";
46	46	break;
47	47	case 'tou':
48		- include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/tou.inc.php";
	48	+ include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/tou.inc.php";
49	49	$out = "no_title<div>
50	50	<h1>
51		- " . $Tou['title'] . "
	51	+ " . $Tou['title']."
52	52	</h1>
53		-<div id='tou_1'>" . $Tou['subtitle'] .
54		- '<div style="direction:ltr">' . $Tou['short'] . "</div>
	53	+<div id='tou_1'>" . $Tou['subtitle'].
	54	+ '<div style="direction:ltr">'.$Tou['short']."</div>
55	55	</div>
56	56	<div id='all_tou_link'><a href='javascript:showTOU()'>Click here to see the full terms</a></div>
57	57	<div id='tou_2' style='display:none; padding-top:20px; direction:ltr'>" .
58		- $Tou['full'] . "
	58	+ $Tou['full']."
59	59	</div>
60	60	</div>
61	61	";
62	62	break;
63	63	case 'help':
64		- include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/faq.inc.php";
	64	+ include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/faq.inc.php";
65	65	switch ($subpage) {
66	66	case 'contact':
67	67	case 'idp_not_listed':
68	68	case 'device_not_listed':
69	69	case 'what_is_eduroam':
70		- $out = "no_title<div><h1>" . _("Help") . "</h1>";
	70	+ $out = "no_title<div><h1>"._("Help")."</h1>";
71	71	foreach ($Faq as $faqItem) {
72	72	if (!empty($faqItem['id']) && $faqItem['id'] == $subpage) {
73		- $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
74		- $out .= "" . $faqItem['text'] . "</div>\n";
	73	+ $out .= "<div><h3>".$faqItem['title']."</h3>\n";
	74	+ $out .= "".$faqItem['text']."</div>\n";
75	75	}
76	76	}
77	77	$out .= "</div>";
78	78	break;
79	79	case 'faq':
80		- $out = "no_title<div><h1>" . _("Frequently Asked Questions") . "</h1>";
	80	+ $out = "no_title<div><h1>"._("Frequently Asked Questions")."</h1>";
81	81	foreach ($Faq as $faqItem) {
82		- $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n";
83		- $out .= "" . $faqItem['text'] . "</div>\n";
	82	+ $out .= "<div><h3>".$faqItem['title']."</h3>\n";
	83	+ $out .= "".$faqItem['text']."</div>\n";
84	84	}
85	85	$out .= "</div>";
86	86	break;
		@@ -104,15 +104,15 @@ discard block
		block discarded – undo
104	104	$rn = uniqid();
105	105	$_SESSION['remindIdP'] = $rn;
106	106	$out .= "<input type='hidden' id='remindIdPs' value='$rn'>";
107		- $out .= "<p><button type='button' onclick='goAdmin(); return(false);'>" . _("Login") . "</button>";
108		- $out .= "<br/><br/><p>" . _("Did you forget with which Identity Provider you logged in to the system? We can try to find out if you specify the email address with which you were invited to the system in the box below. This may not work if you were invited from a third-party website via the AdminAPI.") . "</p>";
109		- $out .= "<input id='remindIdP' type='text'/><button onclick='remindIdPF(); return false;'>" . _("Get IdP Reminder") . "</button>";
	107	+ $out .= "<p><button type='button' onclick='goAdmin(); return(false);'>"._("Login")."</button>";
	108	+ $out .= "<br/><br/><p>"._("Did you forget with which Identity Provider you logged in to the system? We can try to find out if you specify the email address with which you were invited to the system in the box below. This may not work if you were invited from a third-party website via the AdminAPI.")."</p>";
	109	+ $out .= "<input id='remindIdP' type='text'/><button onclick='remindIdPF(); return false;'>"._("Get IdP Reminder")."</button>";
110	110	$out .= "<div id='remindIdPd'><span id='remindIdPh'></span><ul id='remindIdPl'></ul></div>";
111	111	$out = "<div class='padding'>$out</div>";
112	112	}
113	113	break;
114	114	case 'develop':
115		- include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/devel.inc.php";
	115	+ include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/devel.inc.php";
116	116	$out = "<div class='padding'>$out</div>";
117	117	break;
118	118	}

		@@ -325,7 +325,7 @@ discard block
		block discarded – undo
325	325	$invitationObject = new SilverbulletInvitation($token);
326	326	$profile = new ProfileSilverbullet($invitationObject->profile);
327	327	$inst = new IdP($profile->institution);
328		- $loggerInstance->debug(5, "tokenStatus: done, got " . $invitationObject->invitationTokenStatus . ", " . $invitationObject->profile . ", " . $invitationObject->userId . ", " . $invitationObject->expiry . ", " . $invitationObject->invitationTokenString . "\n");
	328	+ $loggerInstance->debug(5, "tokenStatus: done, got ".$invitationObject->invitationTokenStatus.", ".$invitationObject->profile.", ".$invitationObject->userId.", ".$invitationObject->expiry.", ".$invitationObject->invitationTokenString."\n");
329	329	if ($invitationObject->invitationTokenStatus != SilverbulletInvitation::SB_TOKENSTATUS_VALID && $invitationObject->invitationTokenStatus != SilverbulletInvitation::SB_TOKENSTATUS_PARTIALLY_REDEEMED) {
330	330	throw new Exception("Attempt to generate a SilverBullet installer with an invalid/redeemed/expired token. The user should never have got that far!");
331	331	}
		@@ -338,12 +338,12 @@ discard block
		block discarded – undo
338	338	throw new Exception("Despite a valid token, the corresponding user was not found in database or database query error!");
339	339	}
340	340	$expiryObject = mysqli_fetch_object(/** @scrutinizer ignore-type */ $userrow);
341		- $loggerInstance->debug(5, "EXP: " . $expiryObject->expiry . "\n");
	341	+ $loggerInstance->debug(5, "EXP: ".$expiryObject->expiry."\n");
342	342	$expiryDateObject = date_create_from_format("Y-m-d H:i:s", $expiryObject->expiry);
343	343	if ($expiryDateObject === FALSE) {
344	344	throw new Exception("The expiry date we got from the DB is bogus!");
345	345	}
346		- $loggerInstance->debug(5, $expiryDateObject->format("Y-m-d H:i:s") . "\n");
	346	+ $loggerInstance->debug(5, $expiryDateObject->format("Y-m-d H:i:s")."\n");
347	347	// date_create with no parameters can't fail, i.e. is never FALSE
348	348	$validity = date_diff(/** @scrutinizer ignore-type */ date_create(), $expiryDateObject);
349	349	$expiryDays = $validity->days + 1;
		@@ -377,14 +377,14 @@ discard block
		block discarded – undo
377	377	$exportedCertClear = "";
378	378	openssl_pkcs12_export($cert, $exportedCertClear, $privateKey, "", ['extracerts' => [$issuingCaPem, $rootCaPem]]);
379	379	$pkey_3des = "";
380		- openssl_pkey_export($privateKey, $pkey_3des, $importPassword, [ "encrypt_key_cipher" => OPENSSL_CIPHER_3DES ]);
	380	+ openssl_pkey_export($privateKey, $pkey_3des, $importPassword, ["encrypt_key_cipher" => OPENSSL_CIPHER_3DES]);
381	381	// store resulting cert CN and expiry date in separate columns into DB - do not store the cert data itself as it contains the private key!
382	382	// we need the real expiry date, not just the day-approximation
383	383	$x509 = new \core\common\X509();
384	384	$certString = "";
385	385	openssl_x509_export($cert, $certString);
386	386	$parsedCert = $x509->processCertificate($certString);
387		- $loggerInstance->debug(5, "CERTINFO: " . /** @scrutinizer ignore-type */ print_r($parsedCert['full_details'], true));
	387	+ $loggerInstance->debug(5, "CERTINFO: "./** @scrutinizer ignore-type */ print_r($parsedCert['full_details'], true));
388	388	$realExpiryDate = date_create_from_format("U", $parsedCert['full_details']['validTo_time_t'])->format("Y-m-d H:i:s");
389	389
390	390	// store new cert info in DB
		@@ -396,7 +396,7 @@ discard block
		block discarded – undo
396	396	// let the RADIUS users know the actual username for CUI generation
397	397	$radiusDbs = DBConnection::handle("RADIUS"); // is an array of server conns
398	398	foreach ($radiusDbs as $oneRadiusDb) {
399		- $oneRadiusDb->exec("INSERT IGNORE INTO radcheck (username, attribute, op, value) VALUES (?, 'CUI-Source-Username', ':=', ?)", "ss", ($profile->getUserById($invitationObject->userId))[$invitationObject->userId] , $csr["USERNAME"]);
	399	+ $oneRadiusDb->exec("INSERT IGNORE INTO radcheck (username, attribute, op, value) VALUES (?, 'CUI-Source-Username', ':=', ?)", "ss", ($profile->getUserById($invitationObject->userId))[$invitationObject->userId], $csr["USERNAME"]);
400	400	}
401	401
402	402	// return PKCS#12 data stream
		@@ -453,7 +453,7 @@ discard block
		block discarded – undo
453	453	$username = "";
454	454	while ($usernameIsUnique === FALSE) {
455	455	$usernameLocalPart = common\Entity::randomString(64 - 1 - strlen($realm), "0123456789abcdefghijklmnopqrstuvwxyz");
456		- $username = $usernameLocalPart . "@" . $realm;
	456	+ $username = $usernameLocalPart."@".$realm;
457	457	$uniquenessQuery = $databaseHandle->exec("SELECT cn from silverbullet_certificate WHERE cn = ? AND ca_type = ?", "ss", $username, $certtype);
458	458	// SELECT -> resource, not boolean
459	459	if (mysqli_num_rows(/** @scrutinizer ignore-type */ $uniquenessQuery) == 0) {

		@@ -126,7 +126,7 @@ discard block
		block discarded – undo
126	126	return $this->counter;
127	127	}
128	128
129		- $cachedNumber = @file_get_contents(ROOT . "/var/tmp/cachedSPNumber.serialised");
	129	+ $cachedNumber = @file_get_contents(ROOT."/var/tmp/cachedSPNumber.serialised");
130	130	if ($cachedNumber !== FALSE) {
131	131	$numberData = unserialize($cachedNumber);
132	132	$now = new \DateTime();
		@@ -139,7 +139,7 @@ discard block
		block discarded – undo
139	139	} else { // data in cache is too old or doesn't exist. We really need to ask the database
140	140	$list = $this->listAllServiceProviders();
141	141	$this->counter = count($list);
142		- file_put_contents(ROOT . "/var/tmp/cachedSPNumber.serialised", serialize(["number" => $this->counter, "timestamp" => new \DateTime()]));
	142	+ file_put_contents(ROOT."/var/tmp/cachedSPNumber.serialised", serialize(["number" => $this->counter, "timestamp" => new \DateTime()]));
143	143	return $this->counter;
144	144	}
145	145	}
		@@ -188,7 +188,7 @@ discard block
		block discarded – undo
188	188	$returnarray = [];
189	189	$query = "SELECT id_institution AS id, country, inst_realm as realmlist, name AS collapsed_name, contact AS collapsed_contact, type FROM view_active_institution WHERE country = ?";
190	190	if ($eduroamDbType !== NULL) {
191		- $query .= " AND ( type = '" . ExternalEduroamDBData::TYPE_IDPSP . "' OR type = '" . $eduroamDbType . "')";
	191	+ $query .= " AND ( type = '".ExternalEduroamDBData::TYPE_IDPSP."' OR type = '".$eduroamDbType."')";
192	192	}
193	193	$externals = $this->db->exec($query, "s", $tld);
194	194	// was a SELECT query, so a resource and not a boolean
		@@ -291,7 +291,7 @@ discard block
		block discarded – undo
291	291	$instServerTransaction = $this->db->exec($query, "s", $tld);
292	292	while ($instServerResponses = mysqli_fetch_object(/** @scrutinizer ignore-type */ $instServerTransaction)) {
293	293	$contactList = $this->dissectCollapsedContacts($instServerResponses->contacts);
294		- $retval[$instServerResponses->ROid . "-". $instServerResponses->instid] = [
	294	+ $retval[$instServerResponses->ROid."-".$instServerResponses->instid] = [
295	295	"names" => $this->splitNames($instServerResponses->inst_name),
296	296	"type" => array_search($instServerResponses->type, self::TYPE_MAPPING),
297	297	"servers" => $instServerResponses->servers,

		@@ -109,7 +109,7 @@ discard block
		block discarded – undo
109	109	parent::__construct();
110	110	common\Entity::intoThePotatoes();
111	111
112		- $this->catVersionString = sprintf("Unreleased %s Git Revision" , "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>") . "</a>";
	112	+ $this->catVersionString = sprintf("Unreleased %s Git Revision", "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>")."</a>";
113	113
114	114	if (CAT::RELEASE_VERSION) {
115	115	$major = CAT::VERSION_MAJOR;
		@@ -117,14 +117,14 @@ discard block
		block discarded – undo
117	117	$patch = CAT::VERSION_PATCH;
118	118	$extra = CAT::VERSION_EXTRA;
119	119	$temp_version = "CAT-$major.$minor";
120		- $branch = "release_$major" . "_$minor";
	120	+ $branch = "release_$major"."_$minor";
121	121	if (CAT::VERSION_PATCH != 0) {
122	122	$temp_version .= ".$patch";
123	123	}
124	124	if (CAT::VERSION_EXTRA != "") {
125	125	$temp_version .= "-$extra";
126	126	}
127		- $this->catVersionString = sprintf("Release <a href='%s'>%s</a>", "https://github.com/GEANT/CAT/tree/" . $branch . "/Changes.md", $temp_version);
	127	+ $this->catVersionString = sprintf("Release <a href='%s'>%s</a>", "https://github.com/GEANT/CAT/tree/".$branch."/Changes.md", $temp_version);
128	128
129	129	}
130	130	$product = \config\Master::APPEARANCE['productname'];
		@@ -132,9 +132,9 @@ discard block
		block discarded – undo
132	132	$maxYear = self::COPYRIGHT_MAX_YEAR;
133	133	$holder = self::COPYRIGHT_HOLDER;
134	134	$consortia = self::COPYRIGHT_CONSORTIA;
135		- $this->catCopyright = "$product - " . $this->catVersionString . " © $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
	135	+ $this->catCopyright = "$product - ".$this->catVersionString." © $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
136	136	$this->catCopyrifhtAndLicense = "© $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>";
137		- $this->catVersion = "$product<br>" . $this->catVersionString;
	137	+ $this->catVersion = "$product<br>".$this->catVersionString;
138	138
139	139	/* Federations are created in DB with bootstrapFederation, and listed via listFederations
140	140	*/

GEANT / CAT

Push — release_2_1 ( 007f3d...3ea6a4 )

Status

Category

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +68 added lines, -68 removed lines patch added patch discarded remove patch

Spacing +33 added lines, -33 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch