Inspection of "better to make this a standard "radcheck" table co..." - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Test Failed

Push — master ( 4e2adf...bef991 )

by Stefan

created 2022-04-13 08:53 UTC

Status

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';
 
 ?>
 </script>
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
 <div id='wrap' style='background-image:url("<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "beta.png"); ?>");'>
 <form id="cat_form" name="cat_form" accept-charset="UTF-8" action="<?php echo $_SERVER['SCRIPT_NAME']; ?>" method="POST">
 <?php
-require dirname(__DIR__) . '/diag/js/diag_js.php';
+require dirname(__DIR__).'/diag/js/diag_js.php';
 echo $divs->divHeading($visibility);
 $Gui->languageInstance->setTextDomain("diagnostics");
 ?>
@@ -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> 
@@ -235,7 +235,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);
@@ -253,7 +253,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) {
@@ -274,7 +274,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();
@@ -283,7 +283,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();
@@ -299,9 +299,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('');
@@ -309,7 +309,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);
@@ -327,7 +327,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) {
@@ -350,7 +350,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);
@@ -384,7 +384,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",
@@ -396,7 +396,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" ';
@@ -408,7 +408,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] + '">';
@@ -460,7 +460,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({
@@ -519,7 +519,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')) {
@@ -567,13 +567,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 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++) {
@@ -583,7 +583,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();
@@ -651,43 +651,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);
@@ -712,7 +712,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', '');
@@ -722,7 +722,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', '');
@@ -735,7 +735,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', '');
@@ -744,7 +744,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', '');
@@ -753,7 +753,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', '');
@@ -762,7 +762,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.

web/admin/overview_installers.php 1 patch

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

@@ -19,7 +19,7 @@  discard block
 block discarded – undo
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
+require_once dirname(dirname(__DIR__))."/config/_config.php";
 
 $deco = new \web\lib\admin\PageDecoration();
 $validator = new \web\lib\common\InputValidation();
@@ -55,10 +55,10 @@  discard block
 block discarded – undo
             <?php
             foreach ($preflist as $method) {
                 $escapedMethod = $method->getIntegerRep();
-                echo "<th  scope='col' style='min-width:200px'>" . $method->getPrintableRep() . "<br/>
+                echo "<th  scope='col' style='min-width:200px'>".$method->getPrintableRep()."<br/>
                         <form method='post' action='inc/toggleRedirect.inc.php?inst_id=$my_inst->identifier&amp;profile_id=$my_profile->identifier' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
                         <input type='hidden' name='eaptype' value='$escapedMethod'>
-                        <button class='redirect' type='submit'>" . _("EAP-Type-specific options...") . "</button>
+                        <button class='redirect' type='submit'>"._("EAP-Type-specific options...")."</button>
                         </form></th>";
             }
             ?>
@@ -74,10 +74,10 @@  discard block
 block discarded – undo
         foreach (\devices\Devices::listDevices() as $index => $description) {
 
             echo "<tr>";
-            echo "<td align='center'><img src='../resources/images/vendorlogo/" . $description['group'] . ".png' alt='logo'></td><td>" . $description['display'] . "<br/>
+            echo "<td align='center'><img src='../resources/images/vendorlogo/".$description['group'].".png' alt='logo'></td><td>".$description['display']."<br/>
                         <form method='post' action='inc/toggleRedirect.inc.php?inst_id=$my_inst->identifier&amp;profile_id=$my_profile->identifier' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
                         <input type='hidden' name='device' value='$index'>
-                        <button class='redirect' type='submit'>" . _("Device-specific options...") . "</button>
+                        <button class='redirect' type='submit'>"._("Device-specific options...")."</button>
                         </form>
                         </td>";
             $factory = new \core\DeviceFactory($index);
@@ -87,13 +87,13 @@  discard block
 block discarded – undo
                 $display_footnote = FALSE;
                 $langObject = new \core\common\Language();
                 $downloadform = "<span style='display:ruby;'>";
-                $formDiffs = ["" => sprintf(_("%s<br/>Installer"), config\ConfAssistant::CONSORTIUM['display_name'])];  /* eduroam */
+                $formDiffs = ["" => sprintf(_("%s<br/>Installer"), config\ConfAssistant::CONSORTIUM['display_name'])]; /* eduroam */
                 if (sizeof($my_profile->getAttributes("media:openroaming")) > 0 && isset($factory->device->options['hs20']) && $factory->device->options['hs20'] == 1) {
                     $formDiffs["<input type='hidden' name='openroaming'  value='1'/>"] = sprintf(_("%s + OpenRoaming<br/>Installer"), config\ConfAssistant::CONSORTIUM['display_name']); /* eduroam + OpenRoaming */
                 }
 
                 foreach ($formDiffs as $inputField => $text) {
-                    $downloadform .= "<form action='" . rtrim(dirname(dirname($_SERVER['SCRIPT_NAME'])), '/') . "/user/API.php?action=downloadInstaller&profile=$my_profile->identifier&lang=" . $langObject->getLang() . "' method='post' accept-charset='UTF-8'>
+                    $downloadform .= "<form action='".rtrim(dirname(dirname($_SERVER['SCRIPT_NAME'])), '/')."/user/API.php?action=downloadInstaller&profile=$my_profile->identifier&lang=".$langObject->getLang()."' method='post' accept-charset='UTF-8'>
                                        <input type='hidden' name='device' value='$index'/>
                                        <input type='hidden' name='generatedfor'  value='admin'/>
                                        $inputField
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
                                     $distinctFootnotes[$num_footnotes] = $oneFootnote;
                                 }
                                 $numberToDisplay = array_keys($distinctFootnotes, $oneFootnote);
-                                echo "(" . $numberToDisplay[0] . ")";
+                                echo "(".$numberToDisplay[0].")";
                             }
                         }
                         echo "</td>";
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
     </table>
     <?php
     if (count($distinctFootnotes)) {
-        echo "<p><strong>" . _("Footnotes:") . "</strong></p><table>";
+        echo "<p><strong>"._("Footnotes:")."</strong></p><table>";
         foreach ($distinctFootnotes as $number => $text) {
             echo "<tr><td>($number) - </td><td>$text</td></tr>";
         }

Please login to merge, or discard this patch.

devices/apple_mobileconfig/MobileconfigSuperclass.php 1 patch

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

@@ -145,7 +145,7 @@  discard block
 block discarded – undo
         \core\common\Entity::intoThePotatoes();
         // that's what all variants support. Sub-classes can change it.
         $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_PEAP_MSCHAP2, \core\common\EAP::EAPTYPE_TTLS_PAP, \core\common\EAP::EAPTYPE_TTLS_MSCHAP2, \core\common\EAP::EAPTYPE_SILVERBULLET]);
-        foreach(\core\common\EAP::listKnownEAPTypes() as $eapType) {
+        foreach (\core\common\EAP::listKnownEAPTypes() as $eapType) {
             if ($eapType->isPasswordRequired() || $eapType->isPasswordOptional()) {
                 $this->specialities['internal:verify_userinput_suffix'][serialize($eapType->getArrayRep())] = _("It is not possible to actively verify the user input for suffix match; but if there is no 'Terms of Use' configured, the installer will display a corresponding hint to the user instead.");
                 $this->specialities['media:consortium_OI'][serialize($eapType->getArrayRep())] = _("Passpoint networks are not provisioned due to severe UI limitations during install time.");
@@ -184,15 +184,15 @@  discard block
 block discarded – undo
       <key>PayloadDescription</key>
          <string>$tagline</string>
       <key>PayloadDisplayName</key>
-         <string>" . \config\ConfAssistant::CONSORTIUM['display_name'] . "</string>
+         <string>".\config\ConfAssistant::CONSORTIUM['display_name']."</string>
       <key>PayloadIdentifier</key>
-         <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string>
+         <string>" . self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string>
       <key>PayloadOrganization</key>
-         <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ( $this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string>
+         <string>".htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8').($this->attributes['internal:profile_count'][0] > 1 ? " (".htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8').")" : "")."</string>
       <key>PayloadType</key>
          <string>Configuration</string>
       <key>PayloadUUID</key>
-         <string>" . \core\common\Entity::uuid('', self::IPHONE_PAYLOAD_PREFIX . $this->massagedConsortium . $this->massagedCountry . $this->massagedInst . $this->massagedProfile) . "</string>
+         <string>" . \core\common\Entity::uuid('', self::IPHONE_PAYLOAD_PREFIX.$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile)."</string>
       <key>PayloadVersion</key>
          <integer>1</integer>";
         \core\common\Entity::outOfThePotatoes();
@@ -224,21 +224,21 @@  discard block
 block discarded – undo
     {
         \core\common\Entity::intoThePotatoes();
         if (isset($this->attributes['support:info_file'])) {
-            return MobileconfigSuperclass::BUFFER_CONSENT_PRE . htmlspecialchars(iconv("UTF-8", "UTF-8//TRANSLIT", $this->attributes['support:info_file'][0]), ENT_XML1, 'UTF-8') . MobileconfigSuperclass::BUFFER_CONSENT_POST;
+            return MobileconfigSuperclass::BUFFER_CONSENT_PRE.htmlspecialchars(iconv("UTF-8", "UTF-8//TRANSLIT", $this->attributes['support:info_file'][0]), ENT_XML1, 'UTF-8').MobileconfigSuperclass::BUFFER_CONSENT_POST;
         }
         if ($this->attributes['internal:verify_userinput_suffix'][0] != 0) {
             if ($this->attributes['internal:hint_userinput_suffix'][0] != 0) {
-                $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE . sprintf(_("Important Notice: your username MUST end exactly with '...@%s' !"), $this->attributes['internal:realm'][0]) . MobileconfigSuperclass::BUFFER_CONSENT_POST;
+                $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE.sprintf(_("Important Notice: your username MUST end exactly with '...@%s' !"), $this->attributes['internal:realm'][0]).MobileconfigSuperclass::BUFFER_CONSENT_POST;
                 \core\common\Entity::outOfThePotatoes();
                 return $retval;
             } else { 
             if (strlen($this->attributes['internal:realm'][0]) > 0) {
                 /// note space between variable and exclamation mark - makes sure users don't mistakenly think the exclamation mark is part of the required username!
-                $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE . sprintf(_("Important Notice: your username MUST contain an '@' and end with ...%s !"), $this->attributes['internal:realm'][0]) . MobileconfigSuperclass::BUFFER_CONSENT_POST;
+                $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE.sprintf(_("Important Notice: your username MUST contain an '@' and end with ...%s !"), $this->attributes['internal:realm'][0]).MobileconfigSuperclass::BUFFER_CONSENT_POST;
                 \core\common\Entity::outOfThePotatoes();
                 return $retval;
             }
-            $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE . _("Important Notice: your username MUST be in the form of xxx@yyy where the yyy is a common suffix identifying your Identity Provider. Please find out what to use there and enter the username in the correct format.") . MobileconfigSuperclass::BUFFER_CONSENT_POST;
+            $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE._("Important Notice: your username MUST be in the form of xxx@yyy where the yyy is a common suffix identifying your Identity Provider. Please find out what to use there and enter the username in the correct format.").MobileconfigSuperclass::BUFFER_CONSENT_POST;
             \core\common\Entity::outOfThePotatoes();
             return $retval;
             }
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
         // also escape htmlspecialchars
         // not all names and profiles have a name, so be prepared
 
-        $this->loggerInstance->debug(5, "List of available attributes: " . var_export($this->attributes, TRUE));
+        $this->loggerInstance->debug(5, "List of available attributes: ".var_export($this->attributes, TRUE));
 
         $this->instName = $this->attributes['general:instname'][0] ?? _("Unnamed Organisation");
         $this->profileName = $this->attributes['profile:name'][0] ?? _("Unnamed Profile");
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
 
         file_put_contents('installer_profile', $outputXml);
 
-        $fileName = $this->installerBasename . '.mobileconfig';
+        $fileName = $this->installerBasename.'.mobileconfig';
 
         if (!$this->sign) {
             rename("installer_profile", $fileName);
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
             return $fileName;
         }
         // still here? Then we are signing.
-        $signing = system($this->sign . " installer_profile '$fileName' > /dev/null");
+        $signing = system($this->sign." installer_profile '$fileName' > /dev/null");
         if ($signing === FALSE) {
             $this->loggerInstance->debug(2, "Signing the mobileconfig installer $fileName FAILED!\n");
         }
@@ -336,19 +336,19 @@  discard block
 block discarded – undo
             $oiCount = $oiCount + count($netDetail['oi']);
         }
         $certCount = count($this->attributes['internal:CAs'][0]);
-        $out = "<p>" . _("For best results, please use the built-in browser (Safari) to open the configuration file.") . "</p>";
+        $out = "<p>"._("For best results, please use the built-in browser (Safari) to open the configuration file.")."</p>";
         $out .= "<p>";
         $out .= _("The profile will install itself after you click (or tap) the button. You will be asked for confirmation/input at several points:");
         $out .= "<ul>";
-        $out .= "<li>" . _("to install the profile") . "</li>";
-        $out .= "<li>" . ngettext("to accept the server certificate authority", "to accept the server certificate authorities", $certCount);
+        $out .= "<li>"._("to install the profile")."</li>";
+        $out .= "<li>".ngettext("to accept the server certificate authority", "to accept the server certificate authorities", $certCount);
         if ($certCount > 1) {
-            $out .= " " . sprintf(_("(%d times)"), $certCount);
+            $out .= " ".sprintf(_("(%d times)"), $certCount);
         }
         $out .= "</li>";
-        $out .= "<li>" . _("to enter the username and password you have been given by your organisation");
+        $out .= "<li>"._("to enter the username and password you have been given by your organisation");
         if ($ssidCount > 1) {
-            $out .= " " . sprintf(_("(%d times each, because %d SSIDs and %d Passpoint networks are installed)"), $ssidCount+$oiCount, $ssidCount, $oiCount);
+            $out .= " ".sprintf(_("(%d times each, because %d SSIDs and %d Passpoint networks are installed)"), $ssidCount + $oiCount, $ssidCount, $oiCount);
         }
         $out .= "</li>";
         $out .= "</ul>";
@@ -388,7 +388,7 @@  discard block
 block discarded – undo
                <key>ServiceProviderRoamingEnabled</key>
                <true/>
                <key>DisplayedOperatorName</key>
-               <string>" . $oiName . "</string>";
+               <string>" . $oiName."</string>";
         // if we don't know the realm, omit the entire DomainName key
         if (isset($this->attributes['internal:realm'])) {
             $retval .= "<key>DomainName</key>
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
                 <array>";
 
         foreach ($consortiumOi as $oneCons) {
-            $retval .= "<string>" . strtoupper($oneCons) . "</string>";
+            $retval .= "<string>".strtoupper($oneCons)."</string>";
         }
 
         $retval .= "</array>";
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
                   <dict>
                       <key>AcceptEAPTypes</key>
                          <array>
-                            <integer>" . $eapType['OUTER'] . "</integer>
+                            <integer>" . $eapType['OUTER']."</integer>
                          </array>
                       <key>EAPFASTProvisionPAC</key>
                             <true />
@@ -452,7 +452,7 @@  discard block
 block discarded – undo
 ";
         if ($realm !== NULL) {
             $retval .= "<key>OuterIdentity</key>
-                                    <string>" . htmlspecialchars($realm, ENT_XML1, 'UTF-8') . "</string>
+                                    <string>" . htmlspecialchars($realm, ENT_XML1, 'UTF-8')."</string>
 ";
         }
         $retval .= "<key>PayloadCertificateAnchorUUID</key>
@@ -476,11 +476,11 @@  discard block
 block discarded – undo
         $retval .= "
                          </array>";
         if ($eapType['INNER'] == \core\common\EAP::NE_SILVERBULLET) {
-            $retval .= "<key>UserName</key><string>" . $this->clientCert["certObject"]->username . "</string>";
+            $retval .= "<key>UserName</key><string>".$this->clientCert["certObject"]->username."</string>";
         }
         $retval .= "
                       <key>TTLSInnerAuthentication</key>
-                         <string>" . ($eapType['INNER'] == \core\common\EAP::NE_PAP ? "PAP" : "MSCHAPv2") . "</string>
+                         <string>" . ($eapType['INNER'] == \core\common\EAP::NE_PAP ? "PAP" : "MSCHAPv2")."</string>
                    </dict>";
         return $retval;
     }
@@ -500,9 +500,9 @@  discard block
 block discarded – undo
             // characters are still reversed, invert on use!
             $buffer .= "<string>Manual</string>
                   <key>ProxyServer</key>
-                  <string>" . strrev($serverAndPort[1]) . "</string>
+                  <string>" . strrev($serverAndPort[1])."</string>
                   <key>ProxyServerPort</key>
-                  <integer>" . strrev($serverAndPort[0]) . "</integer>
+                  <integer>" . strrev($serverAndPort[0])."</integer>
                   <key>ProxyPACFallbackAllowed</key>
                   <false/>";
         } else {
@@ -552,7 +552,7 @@  discard block
 block discarded – undo
                     throw new Exception("SSID must be a string!");
                 }
                 $escapedSSID = htmlspecialchars($toBeConfigured, ENT_XML1, 'UTF-8');
-                $payloadIdentifier = "wifi." . $this->serial;
+                $payloadIdentifier = "wifi.".$this->serial;
                 $payloadShortName = sprintf(_("%s - SSID %s"), $prettyName, $escapedSSID);
                 $payloadName = sprintf(_("%s configuration for network name %s"), $prettyName, $escapedSSID);
                 $encryptionTypeString = $this->encryptionString();
@@ -582,9 +582,9 @@  discard block
 block discarded – undo
                 if (count($toBeConfigured) == 0) {
                     return "";
                 }
-                $payloadIdentifier = "hs20.".implode('-',$toBeConfigured);
+                $payloadIdentifier = "hs20.".implode('-', $toBeConfigured);
                 $payloadShortName = sprintf(_("%s - RCOI"), $prettyName);
-                $payloadName = sprintf(_("%s configuration (Passpoint RCOI)"),$prettyName);
+                $payloadName = sprintf(_("%s configuration (Passpoint RCOI)"), $prettyName);
                 $encryptionTypeString = $this->encryptionString();
                 $setupModesString = "";
                 $wifiNetworkIdentification = $this->passPointBlock($toBeConfigured, $prettyName);
@@ -603,11 +603,11 @@  discard block
 block discarded – undo
                <key>PayloadDisplayName</key>
                   <string>$payloadShortName</string>
                <key>PayloadIdentifier</key>
-                  <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.$payloadIdentifier</string>
+                  <string>".self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.$payloadIdentifier</string>
                <key>PayloadOrganization</key>
-                  <string>" . $this->massagedConsortium . ".1x-config.org</string>
+                  <string>".$this->massagedConsortium.".1x-config.org</string>
                <key>PayloadType</key>
-                  <string>com.apple." . ($blocktype == MobileconfigSuperclass::NETWORK_BLOCK_TYPE_WIRED ? "firstactiveethernet" : "wifi") . ".managed</string>";
+                  <string>com.apple." . ($blocktype == MobileconfigSuperclass::NETWORK_BLOCK_TYPE_WIRED ? "firstactiveethernet" : "wifi").".managed</string>";
         $retval .= $this->proxySettings();
         $retval .= $setupModesString;
         if ($eapType['INNER'] == \core\common\EAP::NE_SILVERBULLET) {
@@ -619,7 +619,7 @@  discard block
 block discarded – undo
         }
         $retval .= "
                <key>PayloadUUID</key>
-                  <string>" . \core\common\Entity::uuid() . "</string>
+                  <string>" . \core\common\Entity::uuid()."</string>
                <key>PayloadVersion</key>
                   <integer>1</integer>
                   $wifiNetworkIdentification</dict>";
@@ -649,15 +649,15 @@  discard block
 block discarded – undo
 	<key>IsHotspot</key>
 	<false/>
 	<key>PayloadDescription</key>
-	<string>" . sprintf(_("This SSID should not be used after bootstrapping %s"), \config\ConfAssistant::CONSORTIUM['display_name']) . "</string>
+	<string>" . sprintf(_("This SSID should not be used after bootstrapping %s"), \config\ConfAssistant::CONSORTIUM['display_name'])."</string>
 	<key>PayloadDisplayName</key>
-	<string>" . _("Disabled WiFi network") . "</string>
+	<string>" . _("Disabled WiFi network")."</string>
 	<key>PayloadIdentifier</key>
-	<string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.wifi.disabled.$this->removeSerial</string>
+	<string>" . self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.wifi.disabled.$this->removeSerial</string>
 	<key>PayloadType</key>
 	<string>com.apple.wifi.managed</string>
 	<key>PayloadUUID</key>
-	<string>" . \core\common\Entity::uuid() . "</string>
+	<string>".\core\common\Entity::uuid()."</string>
 	<key>PayloadVersion</key>
 	<real>1</real>";
         $retval .= $this->proxySettings();
@@ -737,12 +737,12 @@  discard block
 block discarded – undo
         $mimeBlob = base64_encode($binaryBlob);
         $mimeFormatted = chunk_split($mimeBlob, 52, "\r\n");
         $payloadUUID = \core\common\Entity::uuid('', $mimeBlob);
-        $retArray = ["block" => "<dict>" .
+        $retArray = ["block" => "<dict>".
             // we don't include the import password. It's displayed on screen, and should be input by the user.
             // <key>Password</key>
             //   <string>" . $this->clientCert['password'] . "</string>
             "<key>PayloadCertificateFileName</key>
-                     <string>" . $this->massagedConsortium . ".pfx</string>
+                     <string>" . $this->massagedConsortium.".pfx</string>
                   <key>PayloadContent</key>
                      <data>
 $mimeFormatted
@@ -750,7 +750,7 @@  discard block
 block discarded – undo
                   <key>PayloadDescription</key>
                      <string>MIME Base-64 encoded PKCS#12 Client Certificate</string>
                   <key>PayloadDisplayName</key>
-                     <string>" . _("User certificate") . "</string>
+                     <string>"._("User certificate")."</string>
                   <key>PayloadIdentifier</key>
                      <string>com.apple.security.pkcs12.$payloadUUID</string>
                   <key>PayloadType</key>
@@ -760,7 +760,7 @@  discard block
 block discarded – undo
                   <key>PayloadVersion</key>
                      <integer>1</integer>
                 </dict>",
-            "UUID" => $payloadUUID,];
+            "UUID" => $payloadUUID, ];
         \core\common\Entity::outOfThePotatoes();
         return $retArray;
     }
@@ -778,7 +778,7 @@  discard block
 block discarded – undo
         }
         $expiryTime = new \DateTime($this->clientCert['certObject']->expiry);
         return "<key>RemovalDate</key>
-        <date>" . $expiryTime->format("Y-m-d") . "T" . $expiryTime->format("H:i:s") . "Z</date>";
+        <date>" . $expiryTime->format("Y-m-d")."T".$expiryTime->format("H:i:s")."Z</date>";
     }
 
     /**
@@ -800,27 +800,27 @@  discard block
 block discarded – undo
             $stream = "
             <dict>
                <key>PayloadCertificateFileName</key>
-               <string>" . $ca['uuid'] . ".der</string>
+               <string>" . $ca['uuid'].".der</string>
                <key>PayloadContent</key>
                <data>
-" . $trimmedPem . "</data>
+" . $trimmedPem."</data>
                <key>PayloadDescription</key>
-               <string>" . sprintf(_("The %s Certification Authority"), \core\common\Entity::$nomenclature_idp) . "</string>
+               <string>" . sprintf(_("The %s Certification Authority"), \core\common\Entity::$nomenclature_idp)."</string>
                <key>PayloadDisplayName</key>
                <string>" . 
                     /// example: "Identity Provider CA #1 (Root)"
-                    sprintf(_("%s CA #%d (%s)" ), 
+                    sprintf(_("%s CA #%d (%s)"), 
                             \core\common\Entity::$nomenclature_idp, 
-                            count($this->CAsAccountedFor)+1, 
-                            ($ca['root'] ? _("Root") : _("Intermediate"))) . 
+                            count($this->CAsAccountedFor) + 1, 
+                            ($ca['root'] ? _("Root") : _("Intermediate"))). 
               "</string>
                <key>PayloadIdentifier</key>
-               <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.credential.$this->caSerial</string>
+               <string>" . self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.credential.$this->caSerial</string>
                <key>PayloadOrganization</key>
-               <string>" . $this->massagedConsortium . ".1x-config.org</string>
+               <string>".$this->massagedConsortium.".1x-config.org</string>
                <key>PayloadType</key>
                <string>com.apple.security.root</string>
-               <key>PayloadUUID</key><string>" . $ca['uuid'] . "</string>
+               <key>PayloadUUID</key><string>" . $ca['uuid']."</string>
                <key>PayloadVersion</key>
                <integer>1</integer>
             </dict>";

Please login to merge, or discard this patch.

utils/cert_user_correlation.php 1 patch

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

@@ -28,7 +28,7 @@
 block discarded – undo
  * It works on two CAs, the RSA and ECDSA variant. There is a separate temp
  * subdir for both ( temp_ocsp_RSA and temp_ocsp_ECDSA ).
  */
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 
 /* If the RADIUS server is supposed to generate meaningful (temporally stable,
  * per user, per SP identifiers, then it needs to compute them on the username,

Please login to merge, or discard this patch.

		@@ -19,7 +19,7 @@ discard block
		block discarded – undo
19	19	* <base_url>/copyright.php after deploying the software
20	20	*/
21	21
22		-require_once dirname(dirname(__DIR__)) . "/config/_config.php";
	22	+require_once dirname(dirname(__DIR__))."/config/_config.php";
23	23
24	24	$deco = new \web\lib\admin\PageDecoration();
25	25	$validator = new \web\lib\common\InputValidation();
		@@ -55,10 +55,10 @@ discard block
		block discarded – undo
55	55	<?php
56	56	foreach ($preflist as $method) {
57	57	$escapedMethod = $method->getIntegerRep();
58		- echo "<th scope='col' style='min-width:200px'>" . $method->getPrintableRep() . "<br/>
	58	+ echo "<th scope='col' style='min-width:200px'>".$method->getPrintableRep()."<br/>
59	59	<form method='post' action='inc/toggleRedirect.inc.php?inst_id=$my_inst->identifier&profile_id=$my_profile->identifier' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
60	60	<input type='hidden' name='eaptype' value='$escapedMethod'>
61		- <button class='redirect' type='submit'>" . _("EAP-Type-specific options...") . "</button>
	61	+ <button class='redirect' type='submit'>"._("EAP-Type-specific options...")."</button>
62	62	</form></th>";
63	63	}
64	64	?>
		@@ -74,10 +74,10 @@ discard block
		block discarded – undo
74	74	foreach (\devices\Devices::listDevices() as $index => $description) {
75	75
76	76	echo "<tr>";
77		- echo "<td align='center'><img src='../resources/images/vendorlogo/" . $description['group'] . ".png' alt='logo'></td><td>" . $description['display'] . "<br/>
	77	+ echo "<td align='center'><img src='../resources/images/vendorlogo/".$description['group'].".png' alt='logo'></td><td>".$description['display']."<br/>
78	78	<form method='post' action='inc/toggleRedirect.inc.php?inst_id=$my_inst->identifier&profile_id=$my_profile->identifier' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8'>
79	79	<input type='hidden' name='device' value='$index'>
80		- <button class='redirect' type='submit'>" . _("Device-specific options...") . "</button>
	80	+ <button class='redirect' type='submit'>"._("Device-specific options...")."</button>
81	81	</form>
82	82	</td>";
83	83	$factory = new \core\DeviceFactory($index);
		@@ -87,13 +87,13 @@ discard block
		block discarded – undo
87	87	$display_footnote = FALSE;
88	88	$langObject = new \core\common\Language();
89	89	$downloadform = "<span style='display:ruby;'>";
90		- $formDiffs = ["" => sprintf(_("%s<br/>Installer"), config\ConfAssistant::CONSORTIUM['display_name'])]; /* eduroam */
	90	+ $formDiffs = ["" => sprintf(_("%s<br/>Installer"), config\ConfAssistant::CONSORTIUM['display_name'])]; /* eduroam */
91	91	if (sizeof($my_profile->getAttributes("media:openroaming")) > 0 && isset($factory->device->options['hs20']) && $factory->device->options['hs20'] == 1) {
92	92	$formDiffs["<input type='hidden' name='openroaming' value='1'/>"] = sprintf(_("%s + OpenRoaming<br/>Installer"), config\ConfAssistant::CONSORTIUM['display_name']); /* eduroam + OpenRoaming */
93	93	}
94	94
95	95	foreach ($formDiffs as $inputField => $text) {
96		- $downloadform .= "<form action='" . rtrim(dirname(dirname($_SERVER['SCRIPT_NAME'])), '/') . "/user/API.php?action=downloadInstaller&profile=$my_profile->identifier&lang=" . $langObject->getLang() . "' method='post' accept-charset='UTF-8'>
	96	+ $downloadform .= "<form action='".rtrim(dirname(dirname($_SERVER['SCRIPT_NAME'])), '/')."/user/API.php?action=downloadInstaller&profile=$my_profile->identifier&lang=".$langObject->getLang()."' method='post' accept-charset='UTF-8'>
97	97	<input type='hidden' name='device' value='$index'/>
98	98	<input type='hidden' name='generatedfor' value='admin'/>
99	99	$inputField
		@@ -147,7 +147,7 @@ discard block
		block discarded – undo
147	147	$distinctFootnotes[$num_footnotes] = $oneFootnote;
148	148	}
149	149	$numberToDisplay = array_keys($distinctFootnotes, $oneFootnote);
150		- echo "(" . $numberToDisplay[0] . ")";
	150	+ echo "(".$numberToDisplay[0].")";
151	151	}
152	152	}
153	153	echo "</td>";
		@@ -176,7 +176,7 @@ discard block
		block discarded – undo
176	176	</table>
177	177	<?php
178	178	if (count($distinctFootnotes)) {
179		- echo "<p><strong>" . _("Footnotes:") . "</strong></p><table>";
	179	+ echo "<p><strong>"._("Footnotes:")."</strong></p><table>";
180	180	foreach ($distinctFootnotes as $number => $text) {
181	181	echo "<tr><td>($number) - </td><td>$text</td></tr>";
182	182	}

		@@ -145,7 +145,7 @@ discard block
		block discarded – undo
145	145	\core\common\Entity::intoThePotatoes();
146	146	// that's what all variants support. Sub-classes can change it.
147	147	$this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_PEAP_MSCHAP2, \core\common\EAP::EAPTYPE_TTLS_PAP, \core\common\EAP::EAPTYPE_TTLS_MSCHAP2, \core\common\EAP::EAPTYPE_SILVERBULLET]);
148		- foreach(\core\common\EAP::listKnownEAPTypes() as $eapType) {
	148	+ foreach (\core\common\EAP::listKnownEAPTypes() as $eapType) {
149	149	if ($eapType->isPasswordRequired() \|\| $eapType->isPasswordOptional()) {
150	150	$this->specialities['internal:verify_userinput_suffix'][serialize($eapType->getArrayRep())] = _("It is not possible to actively verify the user input for suffix match; but if there is no 'Terms of Use' configured, the installer will display a corresponding hint to the user instead.");
151	151	$this->specialities['media:consortium_OI'][serialize($eapType->getArrayRep())] = _("Passpoint networks are not provisioned due to severe UI limitations during install time.");
		@@ -184,15 +184,15 @@ discard block
		block discarded – undo
184	184	<key>PayloadDescription</key>
185	185	<string>$tagline</string>
186	186	<key>PayloadDisplayName</key>
187		- <string>" . \config\ConfAssistant::CONSORTIUM['display_name'] . "</string>
	187	+ <string>".\config\ConfAssistant::CONSORTIUM['display_name']."</string>
188	188	<key>PayloadIdentifier</key>
189		- <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string>
	189	+ <string>" . self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string>
190	190	<key>PayloadOrganization</key>
191		- <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ( $this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string>
	191	+ <string>".htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8').($this->attributes['internal:profile_count'][0] > 1 ? " (".htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8').")" : "")."</string>
192	192	<key>PayloadType</key>
193	193	<string>Configuration</string>
194	194	<key>PayloadUUID</key>
195		- <string>" . \core\common\Entity::uuid('', self::IPHONE_PAYLOAD_PREFIX . $this->massagedConsortium . $this->massagedCountry . $this->massagedInst . $this->massagedProfile) . "</string>
	195	+ <string>" . \core\common\Entity::uuid('', self::IPHONE_PAYLOAD_PREFIX.$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile)."</string>
196	196	<key>PayloadVersion</key>
197	197	<integer>1</integer>";
198	198	\core\common\Entity::outOfThePotatoes();
		@@ -224,21 +224,21 @@ discard block
		block discarded – undo
224	224	{
225	225	\core\common\Entity::intoThePotatoes();
226	226	if (isset($this->attributes['support:info_file'])) {
227		- return MobileconfigSuperclass::BUFFER_CONSENT_PRE . htmlspecialchars(iconv("UTF-8", "UTF-8//TRANSLIT", $this->attributes['support:info_file'][0]), ENT_XML1, 'UTF-8') . MobileconfigSuperclass::BUFFER_CONSENT_POST;
	227	+ return MobileconfigSuperclass::BUFFER_CONSENT_PRE.htmlspecialchars(iconv("UTF-8", "UTF-8//TRANSLIT", $this->attributes['support:info_file'][0]), ENT_XML1, 'UTF-8').MobileconfigSuperclass::BUFFER_CONSENT_POST;
228	228	}
229	229	if ($this->attributes['internal:verify_userinput_suffix'][0] != 0) {
230	230	if ($this->attributes['internal:hint_userinput_suffix'][0] != 0) {
231		- $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE . sprintf(_("Important Notice: your username MUST end exactly with '...@%s' !"), $this->attributes['internal:realm'][0]) . MobileconfigSuperclass::BUFFER_CONSENT_POST;
	231	+ $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE.sprintf(_("Important Notice: your username MUST end exactly with '...@%s' !"), $this->attributes['internal:realm'][0]).MobileconfigSuperclass::BUFFER_CONSENT_POST;
232	232	\core\common\Entity::outOfThePotatoes();
233	233	return $retval;
234	234	} else {
235	235	if (strlen($this->attributes['internal:realm'][0]) > 0) {
236	236	/// note space between variable and exclamation mark - makes sure users don't mistakenly think the exclamation mark is part of the required username!
237		- $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE . sprintf(_("Important Notice: your username MUST contain an '@' and end with ...%s !"), $this->attributes['internal:realm'][0]) . MobileconfigSuperclass::BUFFER_CONSENT_POST;
	237	+ $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE.sprintf(_("Important Notice: your username MUST contain an '@' and end with ...%s !"), $this->attributes['internal:realm'][0]).MobileconfigSuperclass::BUFFER_CONSENT_POST;
238	238	\core\common\Entity::outOfThePotatoes();
239	239	return $retval;
240	240	}
241		- $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE . _("Important Notice: your username MUST be in the form of xxx@yyy where the yyy is a common suffix identifying your Identity Provider. Please find out what to use there and enter the username in the correct format.") . MobileconfigSuperclass::BUFFER_CONSENT_POST;
	241	+ $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE._("Important Notice: your username MUST be in the form of xxx@yyy where the yyy is a common suffix identifying your Identity Provider. Please find out what to use there and enter the username in the correct format.").MobileconfigSuperclass::BUFFER_CONSENT_POST;
242	242	\core\common\Entity::outOfThePotatoes();
243	243	return $retval;
244	244	}
		@@ -262,7 +262,7 @@ discard block
		block discarded – undo
262	262	// also escape htmlspecialchars
263	263	// not all names and profiles have a name, so be prepared
264	264
265		- $this->loggerInstance->debug(5, "List of available attributes: " . var_export($this->attributes, TRUE));
	265	+ $this->loggerInstance->debug(5, "List of available attributes: ".var_export($this->attributes, TRUE));
266	266
267	267	$this->instName = $this->attributes['general:instname'][0] ?? _("Unnamed Organisation");
268	268	$this->profileName = $this->attributes['profile:name'][0] ?? _("Unnamed Profile");
		@@ -304,7 +304,7 @@ discard block
		block discarded – undo
304	304
305	305	file_put_contents('installer_profile', $outputXml);
306	306
307		- $fileName = $this->installerBasename . '.mobileconfig';
	307	+ $fileName = $this->installerBasename.'.mobileconfig';
308	308
309	309	if (!$this->sign) {
310	310	rename("installer_profile", $fileName);
		@@ -312,7 +312,7 @@ discard block
		block discarded – undo
312	312	return $fileName;
313	313	}
314	314	// still here? Then we are signing.
315		- $signing = system($this->sign . " installer_profile '$fileName' > /dev/null");
	315	+ $signing = system($this->sign." installer_profile '$fileName' > /dev/null");
316	316	if ($signing === FALSE) {
317	317	$this->loggerInstance->debug(2, "Signing the mobileconfig installer $fileName FAILED!\n");
318	318	}
		@@ -336,19 +336,19 @@ discard block
		block discarded – undo
336	336	$oiCount = $oiCount + count($netDetail['oi']);
337	337	}
338	338	$certCount = count($this->attributes['internal:CAs'][0]);
339		- $out = "<p>" . _("For best results, please use the built-in browser (Safari) to open the configuration file.") . "</p>";
	339	+ $out = "<p>"._("For best results, please use the built-in browser (Safari) to open the configuration file.")."</p>";
340	340	$out .= "<p>";
341	341	$out .= _("The profile will install itself after you click (or tap) the button. You will be asked for confirmation/input at several points:");
342	342	$out .= "<ul>";
343		- $out .= "<li>" . _("to install the profile") . "</li>";
344		- $out .= "<li>" . ngettext("to accept the server certificate authority", "to accept the server certificate authorities", $certCount);
	343	+ $out .= "<li>"._("to install the profile")."</li>";
	344	+ $out .= "<li>".ngettext("to accept the server certificate authority", "to accept the server certificate authorities", $certCount);
345	345	if ($certCount > 1) {
346		- $out .= " " . sprintf(_("(%d times)"), $certCount);
	346	+ $out .= " ".sprintf(_("(%d times)"), $certCount);
347	347	}
348	348	$out .= "</li>";
349		- $out .= "<li>" . _("to enter the username and password you have been given by your organisation");
	349	+ $out .= "<li>"._("to enter the username and password you have been given by your organisation");
350	350	if ($ssidCount > 1) {
351		- $out .= " " . sprintf(_("(%d times each, because %d SSIDs and %d Passpoint networks are installed)"), $ssidCount+$oiCount, $ssidCount, $oiCount);
	351	+ $out .= " ".sprintf(_("(%d times each, because %d SSIDs and %d Passpoint networks are installed)"), $ssidCount + $oiCount, $ssidCount, $oiCount);
352	352	}
353	353	$out .= "</li>";
354	354	$out .= "</ul>";
		@@ -388,7 +388,7 @@ discard block
		block discarded – undo
388	388	<key>ServiceProviderRoamingEnabled</key>
389	389	<true/>
390	390	<key>DisplayedOperatorName</key>
391		- <string>" . $oiName . "</string>";
	391	+ <string>" . $oiName."</string>";
392	392	// if we don't know the realm, omit the entire DomainName key
393	393	if (isset($this->attributes['internal:realm'])) {
394	394	$retval .= "<key>DomainName</key>
		@@ -401,7 +401,7 @@ discard block
		block discarded – undo
401	401	<array>";
402	402
403	403	foreach ($consortiumOi as $oneCons) {
404		- $retval .= "<string>" . strtoupper($oneCons) . "</string>";
	404	+ $retval .= "<string>".strtoupper($oneCons)."</string>";
405	405	}
406	406
407	407	$retval .= "</array>";
		@@ -439,7 +439,7 @@ discard block
		block discarded – undo
439	439	<dict>
440	440	<key>AcceptEAPTypes</key>
441	441	<array>
442		- <integer>" . $eapType['OUTER'] . "</integer>
	442	+ <integer>" . $eapType['OUTER']."</integer>
443	443	</array>
444	444	<key>EAPFASTProvisionPAC</key>
445	445	<true />
		@@ -452,7 +452,7 @@ discard block
		block discarded – undo
452	452	";
453	453	if ($realm !== NULL) {
454	454	$retval .= "<key>OuterIdentity</key>
455		- <string>" . htmlspecialchars($realm, ENT_XML1, 'UTF-8') . "</string>
	455	+ <string>" . htmlspecialchars($realm, ENT_XML1, 'UTF-8')."</string>
456	456	";
457	457	}
458	458	$retval .= "<key>PayloadCertificateAnchorUUID</key>
		@@ -476,11 +476,11 @@ discard block
		block discarded – undo
476	476	$retval .= "
477	477	</array>";
478	478	if ($eapType['INNER'] == \core\common\EAP::NE_SILVERBULLET) {
479		- $retval .= "<key>UserName</key><string>" . $this->clientCert["certObject"]->username . "</string>";
	479	+ $retval .= "<key>UserName</key><string>".$this->clientCert["certObject"]->username."</string>";
480	480	}
481	481	$retval .= "
482	482	<key>TTLSInnerAuthentication</key>
483		- <string>" . ($eapType['INNER'] == \core\common\EAP::NE_PAP ? "PAP" : "MSCHAPv2") . "</string>
	483	+ <string>" . ($eapType['INNER'] == \core\common\EAP::NE_PAP ? "PAP" : "MSCHAPv2")."</string>
484	484	</dict>";
485	485	return $retval;
486	486	}
		@@ -500,9 +500,9 @@ discard block
		block discarded – undo
500	500	// characters are still reversed, invert on use!
501	501	$buffer .= "<string>Manual</string>
502	502	<key>ProxyServer</key>
503		- <string>" . strrev($serverAndPort[1]) . "</string>
	503	+ <string>" . strrev($serverAndPort[1])."</string>
504	504	<key>ProxyServerPort</key>
505		- <integer>" . strrev($serverAndPort[0]) . "</integer>
	505	+ <integer>" . strrev($serverAndPort[0])."</integer>
506	506	<key>ProxyPACFallbackAllowed</key>
507	507	<false/>";
508	508	} else {
		@@ -552,7 +552,7 @@ discard block
		block discarded – undo
552	552	throw new Exception("SSID must be a string!");
553	553	}
554	554	$escapedSSID = htmlspecialchars($toBeConfigured, ENT_XML1, 'UTF-8');
555		- $payloadIdentifier = "wifi." . $this->serial;
	555	+ $payloadIdentifier = "wifi.".$this->serial;
556	556	$payloadShortName = sprintf(_("%s - SSID %s"), $prettyName, $escapedSSID);
557	557	$payloadName = sprintf(_("%s configuration for network name %s"), $prettyName, $escapedSSID);
558	558	$encryptionTypeString = $this->encryptionString();
		@@ -582,9 +582,9 @@ discard block
		block discarded – undo
582	582	if (count($toBeConfigured) == 0) {
583	583	return "";
584	584	}
585		- $payloadIdentifier = "hs20.".implode('-',$toBeConfigured);
	585	+ $payloadIdentifier = "hs20.".implode('-', $toBeConfigured);
586	586	$payloadShortName = sprintf(_("%s - RCOI"), $prettyName);
587		- $payloadName = sprintf(_("%s configuration (Passpoint RCOI)"),$prettyName);
	587	+ $payloadName = sprintf(_("%s configuration (Passpoint RCOI)"), $prettyName);
588	588	$encryptionTypeString = $this->encryptionString();
589	589	$setupModesString = "";
590	590	$wifiNetworkIdentification = $this->passPointBlock($toBeConfigured, $prettyName);
		@@ -603,11 +603,11 @@ discard block
		block discarded – undo
603	603	<key>PayloadDisplayName</key>
604	604	<string>$payloadShortName</string>
605	605	<key>PayloadIdentifier</key>
606		- <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.$payloadIdentifier</string>
	606	+ <string>".self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.$payloadIdentifier</string>
607	607	<key>PayloadOrganization</key>
608		- <string>" . $this->massagedConsortium . ".1x-config.org</string>
	608	+ <string>".$this->massagedConsortium.".1x-config.org</string>
609	609	<key>PayloadType</key>
610		- <string>com.apple." . ($blocktype == MobileconfigSuperclass::NETWORK_BLOCK_TYPE_WIRED ? "firstactiveethernet" : "wifi") . ".managed</string>";
	610	+ <string>com.apple." . ($blocktype == MobileconfigSuperclass::NETWORK_BLOCK_TYPE_WIRED ? "firstactiveethernet" : "wifi").".managed</string>";
611	611	$retval .= $this->proxySettings();
612	612	$retval .= $setupModesString;
613	613	if ($eapType['INNER'] == \core\common\EAP::NE_SILVERBULLET) {
		@@ -619,7 +619,7 @@ discard block
		block discarded – undo
619	619	}
620	620	$retval .= "
621	621	<key>PayloadUUID</key>
622		- <string>" . \core\common\Entity::uuid() . "</string>
	622	+ <string>" . \core\common\Entity::uuid()."</string>
623	623	<key>PayloadVersion</key>
624	624	<integer>1</integer>
625	625	$wifiNetworkIdentification</dict>";
		@@ -649,15 +649,15 @@ discard block
		block discarded – undo
649	649	<key>IsHotspot</key>
650	650	<false/>
651	651	<key>PayloadDescription</key>
652		- <string>" . sprintf(_("This SSID should not be used after bootstrapping %s"), \config\ConfAssistant::CONSORTIUM['display_name']) . "</string>
	652	+ <string>" . sprintf(_("This SSID should not be used after bootstrapping %s"), \config\ConfAssistant::CONSORTIUM['display_name'])."</string>
653	653	<key>PayloadDisplayName</key>
654		- <string>" . _("Disabled WiFi network") . "</string>
	654	+ <string>" . _("Disabled WiFi network")."</string>
655	655	<key>PayloadIdentifier</key>
656		- <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.wifi.disabled.$this->removeSerial</string>
	656	+ <string>" . self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.wifi.disabled.$this->removeSerial</string>
657	657	<key>PayloadType</key>
658	658	<string>com.apple.wifi.managed</string>
659	659	<key>PayloadUUID</key>
660		- <string>" . \core\common\Entity::uuid() . "</string>
	660	+ <string>".\core\common\Entity::uuid()."</string>
661	661	<key>PayloadVersion</key>
662	662	<real>1</real>";
663	663	$retval .= $this->proxySettings();
		@@ -737,12 +737,12 @@ discard block
		block discarded – undo
737	737	$mimeBlob = base64_encode($binaryBlob);
738	738	$mimeFormatted = chunk_split($mimeBlob, 52, "\r\n");
739	739	$payloadUUID = \core\common\Entity::uuid('', $mimeBlob);
740		- $retArray = ["block" => "<dict>" .
	740	+ $retArray = ["block" => "<dict>".
741	741	// we don't include the import password. It's displayed on screen, and should be input by the user.
742	742	// <key>Password</key>
743	743	// <string>" . $this->clientCert['password'] . "</string>
744	744	"<key>PayloadCertificateFileName</key>
745		- <string>" . $this->massagedConsortium . ".pfx</string>
	745	+ <string>" . $this->massagedConsortium.".pfx</string>
746	746	<key>PayloadContent</key>
747	747	<data>
748	748	$mimeFormatted
		@@ -750,7 +750,7 @@ discard block
		block discarded – undo
750	750	<key>PayloadDescription</key>
751	751	<string>MIME Base-64 encoded PKCS#12 Client Certificate</string>
752	752	<key>PayloadDisplayName</key>
753		- <string>" . _("User certificate") . "</string>
	753	+ <string>"._("User certificate")."</string>
754	754	<key>PayloadIdentifier</key>
755	755	<string>com.apple.security.pkcs12.$payloadUUID</string>
756	756	<key>PayloadType</key>
		@@ -760,7 +760,7 @@ discard block
		block discarded – undo
760	760	<key>PayloadVersion</key>
761	761	<integer>1</integer>
762	762	</dict>",
763		- "UUID" => $payloadUUID,];
	763	+ "UUID" => $payloadUUID, ];
764	764	\core\common\Entity::outOfThePotatoes();
765	765	return $retArray;
766	766	}
		@@ -778,7 +778,7 @@ discard block
		block discarded – undo
778	778	}
779	779	$expiryTime = new \DateTime($this->clientCert['certObject']->expiry);
780	780	return "<key>RemovalDate</key>
781		- <date>" . $expiryTime->format("Y-m-d") . "T" . $expiryTime->format("H:i:s") . "Z</date>";
	781	+ <date>" . $expiryTime->format("Y-m-d")."T".$expiryTime->format("H:i:s")."Z</date>";
782	782	}
783	783
784	784	/**
		@@ -800,27 +800,27 @@ discard block
		block discarded – undo
800	800	$stream = "
801	801	<dict>
802	802	<key>PayloadCertificateFileName</key>
803		- <string>" . $ca['uuid'] . ".der</string>
	803	+ <string>" . $ca['uuid'].".der</string>
804	804	<key>PayloadContent</key>
805	805	<data>
806		-" . $trimmedPem . "</data>
	806	+" . $trimmedPem."</data>
807	807	<key>PayloadDescription</key>
808		- <string>" . sprintf(_("The %s Certification Authority"), \core\common\Entity::$nomenclature_idp) . "</string>
	808	+ <string>" . sprintf(_("The %s Certification Authority"), \core\common\Entity::$nomenclature_idp)."</string>
809	809	<key>PayloadDisplayName</key>
810	810	<string>" .
811	811	/// example: "Identity Provider CA #1 (Root)"
812		- sprintf(_("%s CA #%d (%s)" ),
	812	+ sprintf(_("%s CA #%d (%s)"),
813	813	\core\common\Entity::$nomenclature_idp,
814		- count($this->CAsAccountedFor)+1,
815		- ($ca['root'] ? _("Root") : _("Intermediate"))) .
	814	+ count($this->CAsAccountedFor) + 1,
	815	+ ($ca['root'] ? _("Root") : _("Intermediate"))).
816	816	"</string>
817	817	<key>PayloadIdentifier</key>
818		- <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.credential.$this->caSerial</string>
	818	+ <string>" . self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.credential.$this->caSerial</string>
819	819	<key>PayloadOrganization</key>
820		- <string>" . $this->massagedConsortium . ".1x-config.org</string>
	820	+ <string>".$this->massagedConsortium.".1x-config.org</string>
821	821	<key>PayloadType</key>
822	822	<string>com.apple.security.root</string>
823		- <key>PayloadUUID</key><string>" . $ca['uuid'] . "</string>
	823	+ <key>PayloadUUID</key><string>" . $ca['uuid']."</string>
824	824	<key>PayloadVersion</key>
825	825	<integer>1</integer>
826	826	</dict>";

		@@ -28,7 +28,7 @@
		block discarded – undo
28	28	* It works on two CAs, the RSA and ECDSA variant. There is a separate temp
29	29	* subdir for both ( temp_ocsp_RSA and temp_ocsp_ECDSA ).
30	30	*/
31		-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
	31	+require_once dirname(dirname(__FILE__))."/config/_config.php";
32	32
33	33	/* If the RADIUS server is supposed to generate meaningful (temporally stable,
34	34	* per user, per SP identifiers, then it needs to compute them on the username,

GEANT / CAT

Push — master ( 4e2adf...bef991 )

Status

Category

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

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

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

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