GEANT /
CAT
@@ -47,9 +47,9 @@ discard block |
||
| 47 | 47 | $Gui->loggerInstance->debug(4, $operatingSystem); |
| 48 | 48 | $uiElements = new web\lib\admin\UIElements(); |
| 49 | 49 | if ($operatingSystem) { |
| 50 | - print "recognisedOS = '" . $operatingSystem['device'] . "';\n"; |
|
| 50 | + print "recognisedOS = '".$operatingSystem['device']."';\n"; |
|
| 51 | 51 | } |
| 52 | -require dirname(__DIR__) . '/user/js/cat_js.php'; |
|
| 52 | +require dirname(__DIR__).'/user/js/cat_js.php'; |
|
| 53 | 53 | |
| 54 | 54 | ?> |
| 55 | 55 | </script> |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | <?php |
| 64 | 64 | echo $divs->divHeading($visibility); |
| 65 | 65 | $Gui->languageInstance->setTextDomain("diagnostics"); |
| 66 | -require dirname(__DIR__) . '/diag/js/diag_js.php'; |
|
| 66 | +require dirname(__DIR__).'/diag/js/diag_js.php'; |
|
| 67 | 67 | ?> |
| 68 | 68 | <div id="main_page"> |
| 69 | 69 | <div id="loading_ico"> |
@@ -79,12 +79,12 @@ discard block |
||
| 79 | 79 | </div> |
| 80 | 80 | <div id="main_body"> |
| 81 | 81 | <div id="user_page"> |
| 82 | - <?php echo $divs->divPagetitle(_("Diagnostics site") . " (<span style='color:red'>beta</span>)", ""); ?> |
|
| 82 | + <?php echo $divs->divPagetitle(_("Diagnostics site")." (<span style='color:red'>beta</span>)", ""); ?> |
|
| 83 | 83 | <div id="user_info" style='padding-top: 10px;'> |
| 84 | 84 | <div id='diagnostic_choice'> |
| 85 | - <?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") . ' '; ?> |
|
| 86 | - <input type='radio' name='diagnostic_usertype' value='0'><?php echo _("end-user") . ' ' . _("or"); ?> |
|
| 87 | - <input type='radio' name='diagnostic_usertype' value='1' <?php if ($admin == 1) { echo " checked"; } ?> > <?php echo _("eduroam administrator") .'?'; ?> |
|
| 85 | + <?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").' '; ?> |
|
| 86 | + <input type='radio' name='diagnostic_usertype' value='0'><?php echo _("end-user").' '._("or"); ?> |
|
| 87 | + <input type='radio' name='diagnostic_usertype' value='1' <?php if ($admin == 1) { echo " checked"; } ?> > <?php echo _("eduroam administrator").'?'; ?> |
|
| 88 | 88 | </div> |
| 89 | 89 | <div id='diagnostic_enduser' style='display: none;'> |
| 90 | 90 | <h2><?php echo _("Tools for End Users"); ?></h2> |
@@ -94,24 +94,24 @@ discard block |
||
| 94 | 94 | ?> |
| 95 | 95 | </p> |
| 96 | 96 | <?php |
| 97 | - echo '<div id="before_stage_1"><h3>' . _("The system needs some information on your home institution - issuer of your account") . '</h3>'; |
|
| 97 | + echo '<div id="before_stage_1"><h3>'._("The system needs some information on your home institution - issuer of your account").'</h3>'; |
|
| 98 | 98 | echo _("What is the realm part of your user account (the part behind the @ of 'your.username@<strong>realm.tld</strong>'):"); |
| 99 | 99 | ?> |
| 100 | 100 | <input type='text' name='user_realm' id='user_realm' value=''> |
| 101 | 101 | <?php |
| 102 | - echo '<div id="realm_by_select"><br/>' . _("alternatively") . '<br/>'; |
|
| 103 | - echo _("You can select your home institution from the following list") . '<br/>'; |
|
| 102 | + echo '<div id="realm_by_select"><br/>'._("alternatively").'<br/>'; |
|
| 103 | + echo _("You can select your home institution from the following list").'<br/>'; |
|
| 104 | 104 | echo '<div id="select_idp_country"><a href="" id="idp_countries_list">'; |
| 105 | - echo '<span id="realmselect">' . _("Click to select your country/region and organisation") . '</span></a></div>'; |
|
| 105 | + echo '<span id="realmselect">'._("Click to select your country/region and organisation").'</span></a></div>'; |
|
| 106 | 106 | ?> |
| 107 | 107 | <div id="select_idp_area" style="display:none;"> |
| 108 | 108 | </div> |
| 109 | 109 | </div> |
| 110 | 110 | <div id="position_info"> |
| 111 | 111 | <?php |
| 112 | - echo '<h3>' . _("Optionally, to improve tests, you can provide information on your current location") . '</h3>'; |
|
| 112 | + echo '<h3>'._("Optionally, to improve tests, you can provide information on your current location").'</h3>'; |
|
| 113 | 113 | echo '<div id="select_sp_country"><a href="" id="sp_countries_list">'; |
| 114 | - echo '<span id="spselect">' . _("Click to select a location in which you have an eduroam problem") . '</span></a></div>'; |
|
| 114 | + echo '<span id="spselect">'._("Click to select a location in which you have an eduroam problem").'</span></a></div>'; |
|
| 115 | 115 | ?> |
| 116 | 116 | <div id="select_sp_area" style="display:none;"> |
| 117 | 117 | </div> |
@@ -144,11 +144,11 @@ discard block |
||
| 144 | 144 | echo 'none'; |
| 145 | 145 | } |
| 146 | 146 | echo ";'>"; |
| 147 | - echo '<h3>' . _("What is the nature of the problem?") . '</h3>'; |
|
| 148 | - echo '<input type="radio" name="problem_type" value="0"' . (($sp==1)? ' checked' : '') . '>'; |
|
| 149 | - echo _("I suspect a technical problem at a particular IdP") . '<br>'; |
|
| 147 | + echo '<h3>'._("What is the nature of the problem?").'</h3>'; |
|
| 148 | + echo '<input type="radio" name="problem_type" value="0"'.(($sp == 1) ? ' checked' : '').'>'; |
|
| 149 | + echo _("I suspect a technical problem at a particular IdP").'<br>'; |
|
| 150 | 150 | echo '<input type="radio" name="problem_type" value="1">'; |
| 151 | - echo _("I want to report abuse of network resources by a roaming user") . '<br>'; |
|
| 151 | + echo _("I want to report abuse of network resources by a roaming user").'<br>'; |
|
| 152 | 152 | echo '<input type="radio" name="problem_type" value="2">'; |
| 153 | 153 | echo _("I suspect a technical problem for one of my users at a particular SP"); |
| 154 | 154 | echo "<div id='idp_contact_area'></div>"; |
@@ -157,9 +157,9 @@ discard block |
||
| 157 | 157 | echo "</div>"; |
| 158 | 158 | } else { |
| 159 | 159 | echo "0\">"; |
| 160 | - echo _("This service is for authenticated admins only.") . '<br>'; |
|
| 161 | - echo "<a href=\"diag.php?admin=1\">" . |
|
| 162 | - _("eduroam® admin access is needed") . "</a>"; |
|
| 160 | + echo _("This service is for authenticated admins only.").'<br>'; |
|
| 161 | + echo "<a href=\"diag.php?admin=1\">". |
|
| 162 | + _("eduroam® admin access is needed")."</a>"; |
|
| 163 | 163 | } |
| 164 | 164 | ?> |
| 165 | 165 | <div id="realm_problem"> |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | return false; |
| 238 | 238 | }); |
| 239 | 239 | $(document).on('change', '#idp_country' , function() { |
| 240 | - var comment = <?php echo '"' . _("Fetching institutions list") . '..."'; ?>; |
|
| 240 | + var comment = <?php echo '"'._("Fetching institutions list").'..."'; ?>; |
|
| 241 | 241 | var id = $(this).attr('id'); |
| 242 | 242 | var k = id.indexOf('_'); |
| 243 | 243 | var type = id.substr(0,k); |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | var shtml = ''; |
| 256 | 256 | var select = ''; |
| 257 | 257 | if (type !== 'asp') { |
| 258 | - shtml = <?php echo '"<td>' . _("Select institution:") . '</td><td>"'; ?>; |
|
| 258 | + shtml = <?php echo '"<td>'._("Select institution:").'</td><td>"'; ?>; |
|
| 259 | 259 | } |
| 260 | 260 | select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value=""></option>'; |
| 261 | 261 | for (var i in institutions) { |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | } else { |
| 277 | 277 | if (data.status === 0) { |
| 278 | 278 | inProgress(0); |
| 279 | - 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.") . '"'; ?>; |
|
| 279 | + 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.").'"'; ?>; |
|
| 280 | 280 | alert(msg); |
| 281 | 281 | $('#select_idp_country').show(); |
| 282 | 282 | $('#select_idp_area').hide(); |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | }, |
| 286 | 286 | error:function() { |
| 287 | 287 | inProgress(0); |
| 288 | - var msg = <?php echo '"' . _("Can not search in database. You have to provide the realm you are interested in.") . '"'; ?>; |
|
| 288 | + var msg = <?php echo '"'._("Can not search in database. You have to provide the realm you are interested in.").'"'; ?>; |
|
| 289 | 289 | alert(msg); |
| 290 | 290 | $('#select_idp_country').show(); |
| 291 | 291 | $('#select_idp_area').hide(); |
@@ -301,9 +301,9 @@ discard block |
||
| 301 | 301 | }); |
| 302 | 302 | $(document).on('change', '#select_sp_problem' , function() { |
| 303 | 303 | if ($('#select_sp_problem').val().substr(0,6) == 'abuse-') { |
| 304 | - $('#realm_in_db_admin').text(<?php echo '"' . _("Check if this realm is registered") . '"'; ?>); |
|
| 304 | + $('#realm_in_db_admin').text(<?php echo '"'._("Check if this realm is registered").'"'; ?>); |
|
| 305 | 305 | } else { |
| 306 | - $('#realm_in_db_admin').text(<?php echo '"' . _("Check this realm") . '"'; ?>); |
|
| 306 | + $('#realm_in_db_admin').text(<?php echo '"'._("Check this realm").'"'; ?>); |
|
| 307 | 307 | } |
| 308 | 308 | $('#realm_in_db_admin').hide(); |
| 309 | 309 | $('#admin_realm').val(''); |
@@ -311,7 +311,7 @@ discard block |
||
| 311 | 311 | clear_sp_question(); |
| 312 | 312 | }); |
| 313 | 313 | $(document).on('change', '#sp_country, #asp_country' , function() { |
| 314 | - var comment = <?php echo '"' . _("Fetching institutions list") . '..."'; ?>; |
|
| 314 | + var comment = <?php echo '"'._("Fetching institutions list").'..."'; ?>; |
|
| 315 | 315 | var id = $(this).attr('id'); |
| 316 | 316 | var k = id.indexOf('_'); |
| 317 | 317 | var type = id.substr(0,k); |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | var shtml = ''; |
| 330 | 330 | var select = ''; |
| 331 | 331 | if (type !== 'asp') { |
| 332 | - shtml = <?php echo '"<td>' . _("Select institution:") . '</td><td>"'; ?>; |
|
| 332 | + shtml = <?php echo '"<td>'._("Select institution:").'</td><td>"'; ?>; |
|
| 333 | 333 | } |
| 334 | 334 | select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value=""></option>'; |
| 335 | 335 | for (var i in hotspots) { |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | inProgress(0); |
| 353 | 353 | var select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value="">'; |
| 354 | 354 | var shtml = '<td></td><td>'; |
| 355 | - select = select + <?php echo '"' . _("Other location") . '"'; ?> + '</option></select></td>'; |
|
| 355 | + select = select + <?php echo '"'._("Other location").'"'; ?> + '</option></select></td>'; |
|
| 356 | 356 | if (type !== 'asp') { |
| 357 | 357 | $('#row_' + type + '_institution').html(''); |
| 358 | 358 | $('#row_' + type + '_institution').append(shtml + select); |
@@ -386,7 +386,7 @@ discard block |
||
| 386 | 386 | $('#start_test_area').hide(); |
| 387 | 387 | return false; |
| 388 | 388 | } |
| 389 | - var comment = <?php echo '"' . _("Fetching realms list") . '..."'; ?>; |
|
| 389 | + var comment = <?php echo '"'._("Fetching realms list").'..."'; ?>; |
|
| 390 | 390 | inProgress(1, comment); |
| 391 | 391 | $.ajax({ |
| 392 | 392 | url: "findRealm.php", |
@@ -398,7 +398,7 @@ discard block |
||
| 398 | 398 | var realms = data.realms; |
| 399 | 399 | var realmselect = ''; |
| 400 | 400 | if (realms.length > 1) { |
| 401 | - realmselect = <?php echo '"<td>' . _("Check realm(s):") . '</td>"'; ?>; |
|
| 401 | + realmselect = <?php echo '"<td>'._("Check realm(s):").'</td>"'; ?>; |
|
| 402 | 402 | realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>"; |
| 403 | 403 | for (var i in realms) { |
| 404 | 404 | realmselect = realmselect + '<input type="radio" name="realm" '; |
@@ -410,7 +410,7 @@ discard block |
||
| 410 | 410 | } |
| 411 | 411 | realmselect = realmselect + '</span></td>'; |
| 412 | 412 | } else { |
| 413 | - realmselect = <?php echo '"<td>' . _("Realm:") . '</td>"'; ?>; |
|
| 413 | + realmselect = <?php echo '"<td>'._("Realm:").'</td>"'; ?>; |
|
| 414 | 414 | realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>"; |
| 415 | 415 | realmselect = realmselect + realms[0] + '</span>'; |
| 416 | 416 | realmselect = realmselect + '<input type="hidden" name="realm" value="' + realms[0] + '">'; |
@@ -462,7 +462,7 @@ discard block |
||
| 462 | 462 | clear_sp_question(); |
| 463 | 463 | t = 1; |
| 464 | 464 | } |
| 465 | - var comment = <?php echo '"' . _("Running realm tests") . '..."'; ?>; |
|
| 465 | + var comment = <?php echo '"'._("Running realm tests").'..."'; ?>; |
|
| 466 | 466 | inProgress(1, comment); |
| 467 | 467 | /*waiting(comment);*/ |
| 468 | 468 | $.ajax({ |
@@ -523,7 +523,7 @@ discard block |
||
| 523 | 523 | testSociopath('', answer); |
| 524 | 524 | }); |
| 525 | 525 | $('#realmtest').click(function(event){ |
| 526 | - var comment = <?php echo '"<br><br>' . _("Running realm tests") . '..."'; ?>; |
|
| 526 | + var comment = <?php echo '"<br><br>'._("Running realm tests").'..."'; ?>; |
|
| 527 | 527 | inProgress(1, comment); |
| 528 | 528 | $('#start_test_area').hide(); |
| 529 | 529 | if ($('#select_sp_area').is(':hidden')) { |
@@ -571,13 +571,13 @@ discard block |
||
| 571 | 571 | reset_footer(); |
| 572 | 572 | testSociopath(realm, 0); |
| 573 | 573 | } else { |
| 574 | - var title = <?php echo '"' . _("Diagnostics results for selected realms") . '"'; ?>; |
|
| 575 | - result = '<div class="padding"><h3>' + <?php echo '"' . _("An unknown problem occured") . '"'; ?>; |
|
| 574 | + var title = <?php echo '"'._("Diagnostics results for selected realms").'"'; ?>; |
|
| 575 | + result = '<div class="padding"><h3>' + <?php echo '"'._("An unknown problem occured").'"'; ?>; |
|
| 576 | 576 | result = result + '</h3>' |
| 577 | 577 | if (r.length == 1) { |
| 578 | - result = result + <?php echo '"' . _("This test includes checking of the following realm") . '"'; ?>; |
|
| 578 | + result = result + <?php echo '"'._("This test includes checking of the following realm").'"'; ?>; |
|
| 579 | 579 | } else { |
| 580 | - result = result + <?php echo '"' . _("This test includes checking of the following realms") . '"'; ?>; |
|
| 580 | + result = result + <?php echo '"'._("This test includes checking of the following realms").'"'; ?>; |
|
| 581 | 581 | } |
| 582 | 582 | result = result + ': ' |
| 583 | 583 | for (var i=0; i < r.length; i++) { |
@@ -587,7 +587,7 @@ discard block |
||
| 587 | 587 | result = result + r[i]; |
| 588 | 588 | } |
| 589 | 589 | result = result + '.<br>'; |
| 590 | - result = result + <?php echo '"' . _("You should report this to") . '"'; ?> + ' <a href="mailto:[email protected]">[email protected]</a>'; |
|
| 590 | + result = result + <?php echo '"'._("You should report this to").'"'; ?> + ' <a href="mailto:[email protected]">[email protected]</a>'; |
|
| 591 | 591 | result = result + '</div>'; |
| 592 | 592 | $('#after_stage_1').hide(); |
| 593 | 593 | $('#before_stage_1').show(); |
@@ -655,43 +655,43 @@ discard block |
||
| 655 | 655 | success:function(data) { |
| 656 | 656 | if (data.status === 1) { |
| 657 | 657 | var result = ''; |
| 658 | - var title = <?php echo '"' . _("eduroam admin report submission") . '"'; ?>; |
|
| 658 | + var title = <?php echo '"'._("eduroam admin report submission").'"'; ?>; |
|
| 659 | 659 | result = '<div class="padding">'; |
| 660 | 660 | if (type == 'idp_send') { |
| 661 | - result = result + '<h3>'+ <?php echo '"' . _("SP contacting IdP due to technical problems or abuse") . '"'; ?> + '</h3>'; |
|
| 661 | + result = result + '<h3>'+ <?php echo '"'._("SP contacting IdP due to technical problems or abuse").'"'; ?> + '</h3>'; |
|
| 662 | 662 | result = result + '<table>'; |
| 663 | - result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 664 | - result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 665 | - result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 666 | - result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 667 | - result = result + '<tr><td>' + <?php echo '"' . _("An email to contact the reporter") . '"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 668 | - result = result + '<tr><td>' + <?php echo '"' . _("Test result") . '" '; ?> +'</td><td>'; |
|
| 663 | + result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 664 | + result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 665 | + result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 666 | + result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 667 | + result = result + '<tr><td>' + <?php echo '"'._("An email to contact the reporter").'"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 668 | + result = result + '<tr><td>' + <?php echo '"'._("Test result").'" '; ?> +'</td><td>'; |
|
| 669 | 669 | if (data.tests_result == 1) { |
| 670 | - result = result + <?php echo '"' . _("failure") . '"'; ?>; |
|
| 670 | + result = result + <?php echo '"'._("failure").'"'; ?>; |
|
| 671 | 671 | } else { |
| 672 | - result = result + <?php echo '"' . _("success") . '"'; ?>; |
|
| 672 | + result = result + <?php echo '"'._("success").'"'; ?>; |
|
| 673 | 673 | } |
| 674 | 674 | result = result + '</td></tr>'; |
| 675 | - result = result + '<tr><td>' + <?php echo '"' . _("Test URL") . '" '; ?> +'</td><td><a href="' + data.testurl + '">' + data.testurl + '</a></td></tr>'; |
|
| 676 | - result = result + '<tr><td>' + <?php echo '"' . _("Email to IdP administrators ") . '"'; ?> + ' '; |
|
| 675 | + result = result + '<tr><td>' + <?php echo '"'._("Test URL").'" '; ?> +'</td><td><a href="' + data.testurl + '">' + data.testurl + '</a></td></tr>'; |
|
| 676 | + result = result + '<tr><td>' + <?php echo '"'._("Email to IdP administrators ").'"'; ?> + ' '; |
|
| 677 | 677 | if (data.emailsent == 1) { |
| 678 | - result = result + <?php echo '"' . _("send successfully") . '"'; ?>; |
|
| 678 | + result = result + <?php echo '"'._("send successfully").'"'; ?>; |
|
| 679 | 679 | } else { |
| 680 | - result = result + <?php echo '"' . _("not sent - failure while sending") . '"'; ?>; |
|
| 680 | + result = result + <?php echo '"'._("not sent - failure while sending").'"'; ?>; |
|
| 681 | 681 | } |
| 682 | 682 | result = result + '</td><td></td></tr>'; |
| 683 | 683 | } |
| 684 | 684 | if (type == 'sp_send') { |
| 685 | - result = result + '<h3>'+ <?php echo '"' . _("IdP contacting SP due to technical problems or abuse") . '"'; ?> + '</h3>'; |
|
| 685 | + result = result + '<h3>'+ <?php echo '"'._("IdP contacting SP due to technical problems or abuse").'"'; ?> + '</h3>'; |
|
| 686 | 686 | result = result + '<table>'; |
| 687 | - result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 688 | - result = result + '<tr><td>' + <?php echo '"' . _("SP's Operator-Name") . '"'; ?> + '</td><td>' + data.opname + '</td></tr>'; |
|
| 689 | - result = result + '<tr><td>' + <?php echo '"' . _("User's outer ID") . '"'; ?> + '</td><td>' + data.outerid + '</td></tr>'; |
|
| 690 | - result = result + '<tr><td>' + <?php echo '"' . _("IdP email") . '"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 691 | - result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 692 | - result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 693 | - result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 694 | - result = result + '<tr><td>' + <?php echo '"' . _("How to contact the user") . '"'; ?> +'</td><td>' + data.cdetails + '</td></tr>'; |
|
| 687 | + result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 688 | + result = result + '<tr><td>' + <?php echo '"'._("SP's Operator-Name").'"'; ?> + '</td><td>' + data.opname + '</td></tr>'; |
|
| 689 | + result = result + '<tr><td>' + <?php echo '"'._("User's outer ID").'"'; ?> + '</td><td>' + data.outerid + '</td></tr>'; |
|
| 690 | + result = result + '<tr><td>' + <?php echo '"'._("IdP email").'"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 691 | + result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 692 | + result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 693 | + result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 694 | + result = result + '<tr><td>' + <?php echo '"'._("How to contact the user").'"'; ?> +'</td><td>' + data.cdetails + '</td></tr>'; |
|
| 695 | 695 | } |
| 696 | 696 | result = result + '</div>'; |
| 697 | 697 | showInfo(result, title); |
@@ -717,7 +717,7 @@ discard block |
||
| 717 | 717 | $(this).removeClass('visible_row').addClass('hidden_row'); |
| 718 | 718 | } |
| 719 | 719 | }); |
| 720 | - $('#admin_realm').attr('title', <?php echo '"' . _("Wrong format of realm") . '"'; ?>); |
|
| 720 | + $('#admin_realm').attr('title', <?php echo '"'._("Wrong format of realm").'"'; ?>); |
|
| 721 | 721 | } else { |
| 722 | 722 | $('#admin_realm').removeClass('error_input'); |
| 723 | 723 | $('#admin_realm').attr('title', ''); |
@@ -727,7 +727,7 @@ discard block |
||
| 727 | 727 | $(document).on('keyup change', '#email' , function() { |
| 728 | 728 | if ($(this).val().length == 0 || !isEmail($(this).val())) { |
| 729 | 729 | $('#email').addClass('error_input'); |
| 730 | - $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"'; ?>); |
|
| 730 | + $('#email').attr('title', <?php echo '"'._("Wrong format of email").'"'; ?>); |
|
| 731 | 731 | } else { |
| 732 | 732 | $('#email').removeClass('error_input'); |
| 733 | 733 | $('#email').attr('title', ''); |
@@ -740,7 +740,7 @@ discard block |
||
| 740 | 740 | if ($('#mac').val().length > 0) { |
| 741 | 741 | if ($('#mac').val().length != 17) { |
| 742 | 742 | $('#mac').addClass('error_input'); |
| 743 | - $('#mac').attr('title', <?php echo '"' . _("MAC address is incomplete") . '"'; ?>); |
|
| 743 | + $('#mac').attr('title', <?php echo '"'._("MAC address is incomplete").'"'; ?>); |
|
| 744 | 744 | } else { |
| 745 | 745 | $('#mac').removeClass('error_input'); |
| 746 | 746 | $('#mac').attr('title', ''); |
@@ -749,7 +749,7 @@ discard block |
||
| 749 | 749 | if ($(this).attr('id') == 'email' && $(this).val().length > 0) { |
| 750 | 750 | if (!isEmail($(this).val())) { |
| 751 | 751 | $('#email').addClass('error_input'); |
| 752 | - $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"'; ?>); |
|
| 752 | + $('#email').attr('title', <?php echo '"'._("Wrong format of email").'"'; ?>); |
|
| 753 | 753 | } else { |
| 754 | 754 | $('#email').removeClass('error_input'); |
| 755 | 755 | $('#email').attr('title', ''); |
@@ -758,7 +758,7 @@ discard block |
||
| 758 | 758 | if ($(this).attr('id') == 'outer_id' && $(this).val().length > 0) { |
| 759 | 759 | if (!isEmail($(this).val(), true)) { |
| 760 | 760 | $('#outer_id').addClass('error_input'); |
| 761 | - $('#outer_id').attr('title', <?php echo '"' . _("Wrong format of outer ID") . '"'; ?>); |
|
| 761 | + $('#outer_id').attr('title', <?php echo '"'._("Wrong format of outer ID").'"'; ?>); |
|
| 762 | 762 | } else { |
| 763 | 763 | $('#outer_id').removeClass('error_input'); |
| 764 | 764 | $('#outer_id').attr('title', ''); |
@@ -767,7 +767,7 @@ discard block |
||
| 767 | 767 | if ($(this).attr('id') == 'opname' && $('#opname').val().length > 0) { |
| 768 | 768 | if (!isOperatorName($(this).val())) { |
| 769 | 769 | $('#opname').addClass('error_input'); |
| 770 | - $('#opname').attr('title', <?php echo '"' . _("Wrong string given as OperatorName") . '"'; ?>); |
|
| 770 | + $('#opname').attr('title', <?php echo '"'._("Wrong string given as OperatorName").'"'; ?>); |
|
| 771 | 771 | $('#spmanually').show(); |
| 772 | 772 | } else { |
| 773 | 773 | $('#opname').removeClass('error_input'); |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | $loggerInstance->debug(4, "OutsideComm::mailAddressValidSecure: no MX."); |
| 124 | 124 | return OutsideComm::MAILDOMAIN_NO_MX; |
| 125 | 125 | } |
| 126 | - $loggerInstance->debug(5, "Domain: $domain MX: " . /** @scrutinizer ignore-type */ print_r($mx, TRUE)); |
|
| 126 | + $loggerInstance->debug(5, "Domain: $domain MX: "./** @scrutinizer ignore-type */ print_r($mx, TRUE)); |
|
| 127 | 127 | // create a pool of A and AAAA records for all the MXes |
| 128 | 128 | $ipAddrs = []; |
| 129 | 129 | foreach ($mx as $onemx) { |
@@ -133,14 +133,14 @@ discard block |
||
| 133 | 133 | $ipAddrs[] = $oneipv4['ip']; |
| 134 | 134 | } |
| 135 | 135 | foreach ($v6list as $oneipv6) { |
| 136 | - $ipAddrs[] = "[" . $oneipv6['ipv6'] . "]"; |
|
| 136 | + $ipAddrs[] = "[".$oneipv6['ipv6']."]"; |
|
| 137 | 137 | } |
| 138 | 138 | } |
| 139 | 139 | if (count($ipAddrs) == 0) { |
| 140 | 140 | $loggerInstance->debug(4, "OutsideComm::mailAddressValidSecure: no mailserver hosts."); |
| 141 | 141 | return OutsideComm::MAILDOMAIN_NO_HOST; |
| 142 | 142 | } |
| 143 | - $loggerInstance->debug(5, "Domain: $domain Addrs: " . /** @scrutinizer ignore-type */ print_r($ipAddrs, TRUE)); |
|
| 143 | + $loggerInstance->debug(5, "Domain: $domain Addrs: "./** @scrutinizer ignore-type */ print_r($ipAddrs, TRUE)); |
|
| 144 | 144 | // connect to all hosts. If all can't connect, return MAILDOMAIN_NO_CONNECT. |
| 145 | 145 | // If at least one does not support STARTTLS or one of the hosts doesn't connect |
| 146 | 146 | // , return MAILDOMAIN_NO_STARTTLS (one which we can't connect to we also |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | switch (\config\ConfAssistant::SMSSETTINGS['provider']) { |
| 194 | 194 | case 'Nexmo': |
| 195 | 195 | // taken from https://docs.nexmo.com/messaging/sms-api |
| 196 | - $url = 'https://rest.nexmo.com/sms/json?' . http_build_query( |
|
| 196 | + $url = 'https://rest.nexmo.com/sms/json?'.http_build_query( |
|
| 197 | 197 | [ |
| 198 | 198 | 'api_key' => \config\ConfAssistant::SMSSETTINGS['username'], |
| 199 | 199 | 'api_secret' => \config\ConfAssistant::SMSSETTINGS['password'], |
@@ -224,14 +224,14 @@ discard block |
||
| 224 | 224 | $loggerInstance->debug(2, 'Problem with SMS invitation: no message was sent!'); |
| 225 | 225 | return OutsideComm::SMS_NOTSENT; |
| 226 | 226 | } |
| 227 | - $loggerInstance->debug(2, 'Total of ' . $messageCount . ' messages were attempted to send.'); |
|
| 227 | + $loggerInstance->debug(2, 'Total of '.$messageCount.' messages were attempted to send.'); |
|
| 228 | 228 | |
| 229 | 229 | $totalFailures = 0; |
| 230 | 230 | foreach ($decoded_response['messages'] as $message) { |
| 231 | 231 | if ($message['status'] == 0) { |
| 232 | - $loggerInstance->debug(2, $message['message-id'] . ": Success"); |
|
| 232 | + $loggerInstance->debug(2, $message['message-id'].": Success"); |
|
| 233 | 233 | } else { |
| 234 | - $loggerInstance->debug(2, $message['message-id'] . ": Failed (failure code = " . $message['status'] . ")"); |
|
| 234 | + $loggerInstance->debug(2, $message['message-id'].": Failed (failure code = ".$message['status'].")"); |
|
| 235 | 235 | $totalFailures++; |
| 236 | 236 | } |
| 237 | 237 | } |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | $proto = "https://"; |
| 301 | 301 | } |
| 302 | 302 | // then, send out the mail |
| 303 | - $message = _("Hello,") . "\n\n" . wordwrap($introTexts[$introtext] . " " . $validity, 72) . "\n\n"; |
|
| 303 | + $message = _("Hello,")."\n\n".wordwrap($introTexts[$introtext]." ".$validity, 72)."\n\n"; |
|
| 304 | 304 | // default means we don't have a Reply-To. |
| 305 | 305 | $replyToMessage = wordwrap(_("manually. Please do not reply to this mail; this is a send-only address.")); |
| 306 | 306 | |
@@ -308,8 +308,8 @@ discard block |
||
| 308 | 308 | // see if we are supposed to add a custom message |
| 309 | 309 | $customtext = $federation->getAttributes('fed:custominvite'); |
| 310 | 310 | if (count($customtext) > 0) { |
| 311 | - $message .= wordwrap(sprintf(_("Additional message from your %s administrator:"), Entity::$nomenclature_fed), 72) . "\n---------------------------------" . |
|
| 312 | - wordwrap($customtext[0]['value'], 72) . "\n---------------------------------\n\n"; |
|
| 311 | + $message .= wordwrap(sprintf(_("Additional message from your %s administrator:"), Entity::$nomenclature_fed), 72)."\n---------------------------------". |
|
| 312 | + wordwrap($customtext[0]['value'], 72)."\n---------------------------------\n\n"; |
|
| 313 | 313 | } |
| 314 | 314 | // and add Reply-To already now |
| 315 | 315 | foreach ($federation->listFederationAdmins() as $fedadmin_id) { |
@@ -325,19 +325,19 @@ discard block |
||
| 325 | 325 | } |
| 326 | 326 | $productname = \config\Master::APPEARANCE['productname']; |
| 327 | 327 | $consortium = \config\ConfAssistant::CONSORTIUM['display_name']; |
| 328 | - $message .= wordwrap(sprintf(_("To enlist as an administrator for that %s, please click on the following link:"), Entity::$nomenclature_participant), 72) . "\n\n" . |
|
| 329 | - $proto . $_SERVER['SERVER_NAME'] . \config\Master::PATHS['cat_base_url'] . "admin/action_enrollment.php?token=$newtoken\n\n" . |
|
| 330 | - wordwrap(sprintf(_("If clicking the link doesn't work, you can also go to the %s Administrator Interface at"), $productname), 72) . "\n\n" . |
|
| 331 | - $proto . $_SERVER['SERVER_NAME'] . \config\Master::PATHS['cat_base_url'] . "admin/\n\n" . |
|
| 332 | - _("and enter the invitation token") . "\n\n" . |
|
| 333 | - $newtoken . "\n\n$replyToMessage\n\n" . |
|
| 334 | - wordwrap(_("Do NOT forward the mail before the token has expired - or the recipients may be able to consume the token on your behalf!"), 72) . "\n\n" . |
|
| 335 | - wordwrap(sprintf(_("We wish you a lot of fun with the %s."), $productname), 72) . "\n\n" . |
|
| 328 | + $message .= wordwrap(sprintf(_("To enlist as an administrator for that %s, please click on the following link:"), Entity::$nomenclature_participant), 72)."\n\n". |
|
| 329 | + $proto.$_SERVER['SERVER_NAME'].\config\Master::PATHS['cat_base_url']."admin/action_enrollment.php?token=$newtoken\n\n". |
|
| 330 | + wordwrap(sprintf(_("If clicking the link doesn't work, you can also go to the %s Administrator Interface at"), $productname), 72)."\n\n". |
|
| 331 | + $proto.$_SERVER['SERVER_NAME'].\config\Master::PATHS['cat_base_url']."admin/\n\n". |
|
| 332 | + _("and enter the invitation token")."\n\n". |
|
| 333 | + $newtoken."\n\n$replyToMessage\n\n". |
|
| 334 | + wordwrap(_("Do NOT forward the mail before the token has expired - or the recipients may be able to consume the token on your behalf!"), 72)."\n\n". |
|
| 335 | + wordwrap(sprintf(_("We wish you a lot of fun with the %s."), $productname), 72)."\n\n". |
|
| 336 | 336 | sprintf(_("Sincerely,\n\nYour friendly folks from %s Operations"), $consortium); |
| 337 | 337 | |
| 338 | 338 | |
| 339 | 339 | // who to whom? |
| 340 | - $mail->FromName = \config\Master::APPEARANCE['productname'] . " Invitation System"; |
|
| 340 | + $mail->FromName = \config\Master::APPEARANCE['productname']." Invitation System"; |
|
| 341 | 341 | |
| 342 | 342 | if (isset(\config\Master::APPEARANCE['invitation-bcc-mail']) && \config\Master::APPEARANCE['invitation-bcc-mail'] !== NULL) { |
| 343 | 343 | $mail->addBCC(\config\Master::APPEARANCE['invitation-bcc-mail']); |
@@ -30,7 +30,7 @@ |
||
| 30 | 30 | $dom = new \DOMDocument('1.0', 'utf-8'); |
| 31 | 31 | $root = $dom->createElement($rootname); |
| 32 | 32 | $dom->appendChild($root); |
| 33 | - $ns = $dom->createAttributeNS( null, 'xmlns' ); |
|
| 33 | + $ns = $dom->createAttributeNS(null, 'xmlns'); |
|
| 34 | 34 | $ns->value = "http://www.microsoft.com/networking/LAN/profile/v1"; |
| 35 | 35 | $root->appendChild($ns); |
| 36 | 36 | \core\DeviceXMLmain::marshalObject($dom, $root, 'WLANprofile', $this->getLANprofile(), '', true); |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | |
| 103 | 103 | $this->loggerInstance->debug(5, "translateFile($source_name, $output_name)\n"); |
| 104 | 104 | ob_start(); |
| 105 | - $this->loggerInstance->debug(5, $this->module_path . '/Files/' . $this->device_id . '/' . $source_name . "\n"); |
|
| 105 | + $this->loggerInstance->debug(5, $this->module_path.'/Files/'.$this->device_id.'/'.$source_name."\n"); |
|
| 106 | 106 | $source = $this->findSourceFile($source_name); |
| 107 | 107 | |
| 108 | 108 | if ($source !== false) { // if there is no file found, don't attempt to include an uninitialised variable |
@@ -229,8 +229,8 @@ discard block |
||
| 229 | 229 | $out .= sprintf(_("%s installer will be in the form of an EXE file. It will configure %s on your device, by creating wireless network profiles.<p>When you click the download button, the installer will be saved by your browser. Copy it to the machine you want to configure and execute."), \config\ConfAssistant::CONSORTIUM['display_name'], \config\ConfAssistant::CONSORTIUM['display_name']); |
| 230 | 230 | $out .= "<p>"; |
| 231 | 231 | if ($networksCount > $configCount) { |
| 232 | - $out .= sprintf(ngettext("In addition to <strong>%s</strong> the installer will also configure access to:", "In addition to <strong>%s</strong> the installer will also configure access to the following networks:", $networksCount - $configCount), implode(', ', $configNetworkList)) . " "; |
|
| 233 | - $out .= '<strong>' . join('</strong>, <strong>', array_diff($networkList, $configNetworkList)) . '</strong>'; |
|
| 232 | + $out .= sprintf(ngettext("In addition to <strong>%s</strong> the installer will also configure access to:", "In addition to <strong>%s</strong> the installer will also configure access to the following networks:", $networksCount - $configCount), implode(', ', $configNetworkList))." "; |
|
| 233 | + $out .= '<strong>'.join('</strong>, <strong>', array_diff($networkList, $configNetworkList)).'</strong>'; |
|
| 234 | 234 | $out .= "<p>"; |
| 235 | 235 | } |
| 236 | 236 | // TODO - change this below |
@@ -339,14 +339,14 @@ discard block |
||
| 339 | 339 | */ |
| 340 | 340 | protected function signInstaller() |
| 341 | 341 | { |
| 342 | - $fileName = $this->installerBasename . '.exe'; |
|
| 342 | + $fileName = $this->installerBasename.'.exe'; |
|
| 343 | 343 | if (!$this->sign) { |
| 344 | 344 | rename("installer.exe", $fileName); |
| 345 | 345 | return $fileName; |
| 346 | 346 | } |
| 347 | 347 | $retval = 0; |
| 348 | 348 | // are actually signing |
| 349 | - $outputFromSigning = system($this->sign . " installer.exe '$fileName' > /dev/null", $retval); |
|
| 349 | + $outputFromSigning = system($this->sign." installer.exe '$fileName' > /dev/null", $retval); |
|
| 350 | 350 | $this->loggerInstance->debug(4, $retval, "Output from Windows signing:", "==\n"); |
| 351 | 351 | if ($retval !== 0 || $outputFromSigning === false) { |
| 352 | 352 | $this->loggerInstance->debug(2, "Signing the WindowsCommon installer $fileName FAILED!\n"); |
@@ -364,12 +364,12 @@ discard block |
||
| 364 | 364 | */ |
| 365 | 365 | protected function compileNSIS() |
| 366 | 366 | { |
| 367 | - $makensis = \config\ConfAssistant::PATHS['makensis'] . " -INPUTCHARSET UTF8"; |
|
| 367 | + $makensis = \config\ConfAssistant::PATHS['makensis']." -INPUTCHARSET UTF8"; |
|
| 368 | 368 | $lcAll = getenv("LC_ALL"); |
| 369 | 369 | putenv("LC_ALL=en_US.UTF-8"); |
| 370 | - $command = $makensis . ' -V4 cat.NSI > nsis.log 2>&1'; |
|
| 370 | + $command = $makensis.' -V4 cat.NSI > nsis.log 2>&1'; |
|
| 371 | 371 | system($command); |
| 372 | - putenv("LC_ALL=" . $lcAll); |
|
| 372 | + putenv("LC_ALL=".$lcAll); |
|
| 373 | 373 | $this->loggerInstance->debug(4, "compileNSIS:$command\n"); |
| 374 | 374 | } |
| 375 | 375 | |
@@ -386,10 +386,10 @@ discard block |
||
| 386 | 386 | 'email' => 'SUPPORT', |
| 387 | 387 | 'url' => 'URL', |
| 388 | 388 | ]; |
| 389 | - $s = "support_" . $type . "_substitute"; |
|
| 389 | + $s = "support_".$type."_substitute"; |
|
| 390 | 390 | $substitute = $this->translateString($this->$s); |
| 391 | - $returnValue = !empty($attr['support:' . $type][0]) ? $attr['support:' . $type][0] : $substitute; |
|
| 392 | - return '!define ' . $supportString[$type] . ' "' . $returnValue . '"' . "\n"; |
|
| 391 | + $returnValue = !empty($attr['support:'.$type][0]) ? $attr['support:'.$type][0] : $substitute; |
|
| 392 | + return '!define '.$supportString[$type].' "'.$returnValue.'"'."\n"; |
|
| 393 | 393 | } |
| 394 | 394 | |
| 395 | 395 | /** |
@@ -402,18 +402,18 @@ discard block |
||
| 402 | 402 | { |
| 403 | 403 | $fcontents = ''; |
| 404 | 404 | if ($attr['internal:profile_count'][0] > 1) { |
| 405 | - $fcontents .= "\n" . '!define USER_GROUP "' . $this->translateString(str_replace('"', '$\\"', $attr['profile:name'][0])) . '" |
|
| 405 | + $fcontents .= "\n".'!define USER_GROUP "'.$this->translateString(str_replace('"', '$\\"', $attr['profile:name'][0])).'" |
|
| 406 | 406 | '; |
| 407 | 407 | } |
| 408 | 408 | $fcontents .= ' |
| 409 | -Caption "' . $this->translateString(sprintf(WindowsCommon::sprintNsis(_("%s installer for %s")), \config\ConfAssistant::CONSORTIUM['display_name'], $attr['general:instname'][0])) . '" |
|
| 410 | -!define APPLICATION "' . $this->translateString(sprintf(WindowsCommon::sprintNsis(_("%s installer for %s")), \config\ConfAssistant::CONSORTIUM['display_name'], $attr['general:instname'][0])) . '" |
|
| 411 | -!define VERSION "' . \core\CAT::VERSION_MAJOR . '.' . \core\CAT::VERSION_MINOR . '" |
|
| 409 | +Caption "' . $this->translateString(sprintf(WindowsCommon::sprintNsis(_("%s installer for %s")), \config\ConfAssistant::CONSORTIUM['display_name'], $attr['general:instname'][0])).'" |
|
| 410 | +!define APPLICATION "' . $this->translateString(sprintf(WindowsCommon::sprintNsis(_("%s installer for %s")), \config\ConfAssistant::CONSORTIUM['display_name'], $attr['general:instname'][0])).'" |
|
| 411 | +!define VERSION "' . \core\CAT::VERSION_MAJOR.'.'.\core\CAT::VERSION_MINOR.'" |
|
| 412 | 412 | !define INSTALLER_NAME "installer.exe" |
| 413 | -!define LANG "' . $this->lang . '" |
|
| 414 | -!define LOCALE "' . preg_replace('/\..*$/', '', \config\Master::LANGUAGES[$this->languageInstance->getLang()]['locale']) . '" |
|
| 413 | +!define LANG "' . $this->lang.'" |
|
| 414 | +!define LOCALE "' . preg_replace('/\..*$/', '', \config\Master::LANGUAGES[$this->languageInstance->getLang()]['locale']).'" |
|
| 415 | 415 | ;-------------------------------- |
| 416 | -!define ORGANISATION "' . $this->translateString($attr['general:instname'][0]) . '" |
|
| 416 | +!define ORGANISATION "' . $this->translateString($attr['general:instname'][0]).'" |
|
| 417 | 417 | '; |
| 418 | 418 | $fcontents .= $this->getSupport($attr, 'email'); |
| 419 | 419 | $fcontents .= $this->getSupport($attr, 'url'); |
@@ -421,18 +421,18 @@ discard block |
||
| 421 | 421 | $fcontents .= '!define WIRED |
| 422 | 422 | '; |
| 423 | 423 | } |
| 424 | - $fcontents .= '!define PROVIDERID "urn:UUID:' . $this->deviceUUID . '" |
|
| 424 | + $fcontents .= '!define PROVIDERID "urn:UUID:'.$this->deviceUUID.'" |
|
| 425 | 425 | '; |
| 426 | 426 | if (!empty($attr['internal:realm'][0])) { |
| 427 | - $fcontents .= '!define REALM "' . $attr['internal:realm'][0] . '" |
|
| 427 | + $fcontents .= '!define REALM "'.$attr['internal:realm'][0].'" |
|
| 428 | 428 | '; |
| 429 | 429 | } |
| 430 | 430 | if (!empty($attr['internal:hint_userinput_suffix'][0]) && $attr['internal:hint_userinput_suffix'][0] == 1) { |
| 431 | - $fcontents .= '!define HINT_USER_INPUT "' . $attr['internal:hint_userinput_suffix'][0] . '" |
|
| 431 | + $fcontents .= '!define HINT_USER_INPUT "'.$attr['internal:hint_userinput_suffix'][0].'" |
|
| 432 | 432 | '; |
| 433 | 433 | } |
| 434 | 434 | if (!empty($attr['internal:verify_userinput_suffix'][0]) && $attr['internal:verify_userinput_suffix'][0] == 1) { |
| 435 | - $fcontents .= '!define VERIFY_USER_REALM_INPUT "' . $attr['internal:verify_userinput_suffix'][0] . '" |
|
| 435 | + $fcontents .= '!define VERIFY_USER_REALM_INPUT "'.$attr['internal:verify_userinput_suffix'][0].'" |
|
| 436 | 436 | '; |
| 437 | 437 | } |
| 438 | 438 | $fcontents .= $this->msInfoFile($attr); |
@@ -453,7 +453,7 @@ discard block |
||
| 453 | 453 | $out .= '!define EXTERNAL_INFO "'; |
| 454 | 454 | // $this->loggerInstance->debug(4,"Info file type ".$attr['support:info_file'][0]['mime']."\n"); |
| 455 | 455 | if ($attr['internal:info_file'][0]['mime'] == 'rtf') { |
| 456 | - $out = '!define LICENSE_FILE "' . $attr['internal:info_file'][0]['name']; |
|
| 456 | + $out = '!define LICENSE_FILE "'.$attr['internal:info_file'][0]['name']; |
|
| 457 | 457 | } elseif ($attr['internal:info_file'][0]['mime'] == 'txt') { |
| 458 | 458 | $infoFile = file_get_contents($attr['internal:info_file'][0]['name']); |
| 459 | 459 | if ($infoFile === false) { |
@@ -466,7 +466,7 @@ discard block |
||
| 466 | 466 | $out = '!define LICENSE_FILE " info_f.txt'; |
| 467 | 467 | } |
| 468 | 468 | } else { |
| 469 | - $out = '!define EXTERNAL_INFO "' . $attr['internal:info_file'][0]['name']; |
|
| 469 | + $out = '!define EXTERNAL_INFO "'.$attr['internal:info_file'][0]['name']; |
|
| 470 | 470 | } |
| 471 | 471 | |
| 472 | 472 | $out .= "\"\n"; |
@@ -145,7 +145,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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); |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | } |
| 314 | 314 | // still here? Then we are signing. |
| 315 | 315 | $retval = 0; |
| 316 | - $signing = system($this->sign . " installer_profile '$fileName' > /dev/null", $retval); |
|
| 316 | + $signing = system($this->sign." installer_profile '$fileName' > /dev/null", $retval); |
|
| 317 | 317 | if ($retval !== 0 || $signing === FALSE) { |
| 318 | 318 | $this->loggerInstance->debug(2, "Signing the mobileconfig installer $fileName FAILED!\n"); |
| 319 | 319 | // we are passing a name that will be then used as a path - this will not exist, hence an error will |
@@ -340,19 +340,19 @@ discard block |
||
| 340 | 340 | $oiCount = $oiCount + count($netDetail['oi']); |
| 341 | 341 | } |
| 342 | 342 | $certCount = count($this->attributes['internal:CAs'][0]); |
| 343 | - $out = "<p>" . _("For best results, please use the built-in browser (Safari) to open the configuration file.") . "</p>"; |
|
| 343 | + $out = "<p>"._("For best results, please use the built-in browser (Safari) to open the configuration file.")."</p>"; |
|
| 344 | 344 | $out .= "<p>"; |
| 345 | 345 | $out .= _("The profile will install itself after you click (or tap) the button. You will be asked for confirmation/input at several points:"); |
| 346 | 346 | $out .= "<ul>"; |
| 347 | - $out .= "<li>" . _("to install the profile") . "</li>"; |
|
| 348 | - $out .= "<li>" . ngettext("to accept the server certificate authority", "to accept the server certificate authorities", $certCount); |
|
| 347 | + $out .= "<li>"._("to install the profile")."</li>"; |
|
| 348 | + $out .= "<li>".ngettext("to accept the server certificate authority", "to accept the server certificate authorities", $certCount); |
|
| 349 | 349 | if ($certCount > 1) { |
| 350 | - $out .= " " . sprintf(_("(%d times)"), $certCount); |
|
| 350 | + $out .= " ".sprintf(_("(%d times)"), $certCount); |
|
| 351 | 351 | } |
| 352 | 352 | $out .= "</li>"; |
| 353 | - $out .= "<li>" . _("to enter the username and password you have been given by your organisation"); |
|
| 353 | + $out .= "<li>"._("to enter the username and password you have been given by your organisation"); |
|
| 354 | 354 | if ($ssidCount > 1) { |
| 355 | - $out .= " " . sprintf(_("(%d times each, because %d SSIDs and %d Passpoint networks are installed)"), $ssidCount+$oiCount, $ssidCount, $oiCount); |
|
| 355 | + $out .= " ".sprintf(_("(%d times each, because %d SSIDs and %d Passpoint networks are installed)"), $ssidCount + $oiCount, $ssidCount, $oiCount); |
|
| 356 | 356 | } |
| 357 | 357 | $out .= "</li>"; |
| 358 | 358 | $out .= "</ul>"; |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | <key>ServiceProviderRoamingEnabled</key> |
| 393 | 393 | <true/> |
| 394 | 394 | <key>DisplayedOperatorName</key> |
| 395 | - <string>" . $oiName . "</string>"; |
|
| 395 | + <string>" . $oiName."</string>"; |
|
| 396 | 396 | // if we don't know the realm, omit the entire DomainName key |
| 397 | 397 | if (isset($this->attributes['internal:realm'])) { |
| 398 | 398 | $retval .= "<key>DomainName</key> |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | <array>"; |
| 406 | 406 | |
| 407 | 407 | foreach ($consortiumOi as $oneCons) { |
| 408 | - $retval .= "<string>" . strtoupper($oneCons) . "</string>"; |
|
| 408 | + $retval .= "<string>".strtoupper($oneCons)."</string>"; |
|
| 409 | 409 | } |
| 410 | 410 | |
| 411 | 411 | $retval .= "</array>"; |
@@ -443,7 +443,7 @@ discard block |
||
| 443 | 443 | <dict> |
| 444 | 444 | <key>AcceptEAPTypes</key> |
| 445 | 445 | <array> |
| 446 | - <integer>" . $eapType['OUTER'] . "</integer> |
|
| 446 | + <integer>" . $eapType['OUTER']."</integer> |
|
| 447 | 447 | </array> |
| 448 | 448 | <key>EAPFASTProvisionPAC</key> |
| 449 | 449 | <true /> |
@@ -456,7 +456,7 @@ discard block |
||
| 456 | 456 | "; |
| 457 | 457 | if ($realm !== NULL) { |
| 458 | 458 | $retval .= "<key>OuterIdentity</key> |
| 459 | - <string>" . htmlspecialchars($realm, ENT_XML1, 'UTF-8') . "</string> |
|
| 459 | + <string>" . htmlspecialchars($realm, ENT_XML1, 'UTF-8')."</string> |
|
| 460 | 460 | "; |
| 461 | 461 | } |
| 462 | 462 | $retval .= "<key>PayloadCertificateAnchorUUID</key> |
@@ -480,11 +480,11 @@ discard block |
||
| 480 | 480 | $retval .= " |
| 481 | 481 | </array>"; |
| 482 | 482 | if ($eapType['INNER'] == \core\common\EAP::NE_SILVERBULLET) { |
| 483 | - $retval .= "<key>UserName</key><string>" . $this->clientCert["certObject"]->username . "</string>"; |
|
| 483 | + $retval .= "<key>UserName</key><string>".$this->clientCert["certObject"]->username."</string>"; |
|
| 484 | 484 | } |
| 485 | 485 | $retval .= " |
| 486 | 486 | <key>TTLSInnerAuthentication</key> |
| 487 | - <string>" . ($eapType['INNER'] == \core\common\EAP::NE_PAP ? "PAP" : "MSCHAPv2") . "</string> |
|
| 487 | + <string>" . ($eapType['INNER'] == \core\common\EAP::NE_PAP ? "PAP" : "MSCHAPv2")."</string> |
|
| 488 | 488 | </dict>"; |
| 489 | 489 | return $retval; |
| 490 | 490 | } |
@@ -504,9 +504,9 @@ discard block |
||
| 504 | 504 | // characters are still reversed, invert on use! |
| 505 | 505 | $buffer .= "<string>Manual</string> |
| 506 | 506 | <key>ProxyServer</key> |
| 507 | - <string>" . strrev($serverAndPort[1]) . "</string> |
|
| 507 | + <string>" . strrev($serverAndPort[1])."</string> |
|
| 508 | 508 | <key>ProxyServerPort</key> |
| 509 | - <integer>" . strrev($serverAndPort[0]) . "</integer> |
|
| 509 | + <integer>" . strrev($serverAndPort[0])."</integer> |
|
| 510 | 510 | <key>ProxyPACFallbackAllowed</key> |
| 511 | 511 | <false/>"; |
| 512 | 512 | } else { |
@@ -556,7 +556,7 @@ discard block |
||
| 556 | 556 | throw new Exception("SSID must be a string!"); |
| 557 | 557 | } |
| 558 | 558 | $escapedSSID = htmlspecialchars($toBeConfigured, ENT_XML1, 'UTF-8'); |
| 559 | - $payloadIdentifier = "wifi." . $this->serial; |
|
| 559 | + $payloadIdentifier = "wifi.".$this->serial; |
|
| 560 | 560 | $payloadShortName = sprintf(_("%s - SSID %s"), $prettyName, $escapedSSID); |
| 561 | 561 | $payloadName = sprintf(_("%s configuration for network name %s"), $prettyName, $escapedSSID); |
| 562 | 562 | $encryptionTypeString = $this->encryptionString(); |
@@ -586,9 +586,9 @@ discard block |
||
| 586 | 586 | if (count($toBeConfigured) == 0) { |
| 587 | 587 | return ""; |
| 588 | 588 | } |
| 589 | - $payloadIdentifier = "hs20.".implode('-',$toBeConfigured); |
|
| 589 | + $payloadIdentifier = "hs20.".implode('-', $toBeConfigured); |
|
| 590 | 590 | $payloadShortName = sprintf(_("%s - RCOI"), $prettyName); |
| 591 | - $payloadName = sprintf(_("%s configuration (Passpoint RCOI)"),$prettyName); |
|
| 591 | + $payloadName = sprintf(_("%s configuration (Passpoint RCOI)"), $prettyName); |
|
| 592 | 592 | $encryptionTypeString = $this->encryptionString(); |
| 593 | 593 | $setupModesString = ""; |
| 594 | 594 | $wifiNetworkIdentification = $this->passPointBlock($toBeConfigured, $prettyName); |
@@ -607,11 +607,11 @@ discard block |
||
| 607 | 607 | <key>PayloadDisplayName</key> |
| 608 | 608 | <string>$payloadShortName</string> |
| 609 | 609 | <key>PayloadIdentifier</key> |
| 610 | - <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.$payloadIdentifier</string> |
|
| 610 | + <string>".self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.$payloadIdentifier</string> |
|
| 611 | 611 | <key>PayloadOrganization</key> |
| 612 | - <string>" . $this->massagedConsortium . ".1x-config.org</string> |
|
| 612 | + <string>".$this->massagedConsortium.".1x-config.org</string> |
|
| 613 | 613 | <key>PayloadType</key> |
| 614 | - <string>com.apple." . ($blocktype == MobileconfigSuperclass::NETWORK_BLOCK_TYPE_WIRED ? "firstactiveethernet" : "wifi") . ".managed</string>"; |
|
| 614 | + <string>com.apple." . ($blocktype == MobileconfigSuperclass::NETWORK_BLOCK_TYPE_WIRED ? "firstactiveethernet" : "wifi").".managed</string>"; |
|
| 615 | 615 | $retval .= $this->proxySettings(); |
| 616 | 616 | $retval .= $setupModesString; |
| 617 | 617 | if ($eapType['INNER'] == \core\common\EAP::NE_SILVERBULLET) { |
@@ -623,7 +623,7 @@ discard block |
||
| 623 | 623 | } |
| 624 | 624 | $retval .= " |
| 625 | 625 | <key>PayloadUUID</key> |
| 626 | - <string>" . \core\common\Entity::uuid() . "</string> |
|
| 626 | + <string>" . \core\common\Entity::uuid()."</string> |
|
| 627 | 627 | <key>PayloadVersion</key> |
| 628 | 628 | <integer>1</integer> |
| 629 | 629 | $wifiNetworkIdentification</dict>"; |
@@ -653,15 +653,15 @@ discard block |
||
| 653 | 653 | <key>IsHotspot</key> |
| 654 | 654 | <false/> |
| 655 | 655 | <key>PayloadDescription</key> |
| 656 | - <string>" . sprintf(_("This SSID should not be used after bootstrapping %s"), \config\ConfAssistant::CONSORTIUM['display_name']) . "</string> |
|
| 656 | + <string>" . sprintf(_("This SSID should not be used after bootstrapping %s"), \config\ConfAssistant::CONSORTIUM['display_name'])."</string> |
|
| 657 | 657 | <key>PayloadDisplayName</key> |
| 658 | - <string>" . _("Disabled WiFi network") . "</string> |
|
| 658 | + <string>" . _("Disabled WiFi network")."</string> |
|
| 659 | 659 | <key>PayloadIdentifier</key> |
| 660 | - <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.wifi.disabled.$this->removeSerial</string> |
|
| 660 | + <string>" . self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.wifi.disabled.$this->removeSerial</string> |
|
| 661 | 661 | <key>PayloadType</key> |
| 662 | 662 | <string>com.apple.wifi.managed</string> |
| 663 | 663 | <key>PayloadUUID</key> |
| 664 | - <string>" . \core\common\Entity::uuid() . "</string> |
|
| 664 | + <string>".\core\common\Entity::uuid()."</string> |
|
| 665 | 665 | <key>PayloadVersion</key> |
| 666 | 666 | <real>1</real>"; |
| 667 | 667 | $retval .= $this->proxySettings(); |
@@ -741,12 +741,12 @@ discard block |
||
| 741 | 741 | $mimeBlob = base64_encode($binaryBlob); |
| 742 | 742 | $mimeFormatted = chunk_split($mimeBlob, 52, "\r\n"); |
| 743 | 743 | $payloadUUID = \core\common\Entity::uuid('', $mimeBlob); |
| 744 | - $retArray = ["block" => "<dict>" . |
|
| 744 | + $retArray = ["block" => "<dict>". |
|
| 745 | 745 | // we don't include the import password. It's displayed on screen, and should be input by the user. |
| 746 | 746 | // <key>Password</key> |
| 747 | 747 | // <string>" . $this->clientCert['password'] . "</string> |
| 748 | 748 | "<key>PayloadCertificateFileName</key> |
| 749 | - <string>" . $this->massagedConsortium . ".pfx</string> |
|
| 749 | + <string>" . $this->massagedConsortium.".pfx</string> |
|
| 750 | 750 | <key>PayloadContent</key> |
| 751 | 751 | <data> |
| 752 | 752 | $mimeFormatted |
@@ -754,7 +754,7 @@ discard block |
||
| 754 | 754 | <key>PayloadDescription</key> |
| 755 | 755 | <string>MIME Base-64 encoded PKCS#12 Client Certificate</string> |
| 756 | 756 | <key>PayloadDisplayName</key> |
| 757 | - <string>" . _("User certificate") . "</string> |
|
| 757 | + <string>"._("User certificate")."</string> |
|
| 758 | 758 | <key>PayloadIdentifier</key> |
| 759 | 759 | <string>com.apple.security.pkcs12.$payloadUUID</string> |
| 760 | 760 | <key>PayloadType</key> |
@@ -764,7 +764,7 @@ discard block |
||
| 764 | 764 | <key>PayloadVersion</key> |
| 765 | 765 | <integer>1</integer> |
| 766 | 766 | </dict>", |
| 767 | - "UUID" => $payloadUUID,]; |
|
| 767 | + "UUID" => $payloadUUID, ]; |
|
| 768 | 768 | \core\common\Entity::outOfThePotatoes(); |
| 769 | 769 | return $retArray; |
| 770 | 770 | } |
@@ -782,7 +782,7 @@ discard block |
||
| 782 | 782 | } |
| 783 | 783 | $expiryTime = new \DateTime($this->clientCert['certObject']->expiry); |
| 784 | 784 | return "<key>RemovalDate</key> |
| 785 | - <date>" . $expiryTime->format("Y-m-d") . "T" . $expiryTime->format("H:i:s") . "Z</date>"; |
|
| 785 | + <date>" . $expiryTime->format("Y-m-d")."T".$expiryTime->format("H:i:s")."Z</date>"; |
|
| 786 | 786 | } |
| 787 | 787 | |
| 788 | 788 | /** |
@@ -804,27 +804,27 @@ discard block |
||
| 804 | 804 | $stream = " |
| 805 | 805 | <dict> |
| 806 | 806 | <key>PayloadCertificateFileName</key> |
| 807 | - <string>" . $ca['uuid'] . ".der</string> |
|
| 807 | + <string>" . $ca['uuid'].".der</string> |
|
| 808 | 808 | <key>PayloadContent</key> |
| 809 | 809 | <data> |
| 810 | -" . $trimmedPem . "</data> |
|
| 810 | +" . $trimmedPem."</data> |
|
| 811 | 811 | <key>PayloadDescription</key> |
| 812 | - <string>" . sprintf(_("The %s Certification Authority"), \core\common\Entity::$nomenclature_idp) . "</string> |
|
| 812 | + <string>" . sprintf(_("The %s Certification Authority"), \core\common\Entity::$nomenclature_idp)."</string> |
|
| 813 | 813 | <key>PayloadDisplayName</key> |
| 814 | 814 | <string>" . |
| 815 | 815 | /// example: "Identity Provider CA #1 (Root)" |
| 816 | - sprintf(_("%s CA #%d (%s)" ), |
|
| 816 | + sprintf(_("%s CA #%d (%s)"), |
|
| 817 | 817 | \core\common\Entity::$nomenclature_idp, |
| 818 | - count($this->CAsAccountedFor)+1, |
|
| 819 | - ($ca['root'] ? _("Root") : _("Intermediate"))) . |
|
| 818 | + count($this->CAsAccountedFor) + 1, |
|
| 819 | + ($ca['root'] ? _("Root") : _("Intermediate"))). |
|
| 820 | 820 | "</string> |
| 821 | 821 | <key>PayloadIdentifier</key> |
| 822 | - <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.credential.$this->caSerial</string> |
|
| 822 | + <string>" . self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.credential.$this->caSerial</string> |
|
| 823 | 823 | <key>PayloadOrganization</key> |
| 824 | - <string>" . $this->massagedConsortium . ".1x-config.org</string> |
|
| 824 | + <string>".$this->massagedConsortium.".1x-config.org</string> |
|
| 825 | 825 | <key>PayloadType</key> |
| 826 | 826 | <string>com.apple.security.root</string> |
| 827 | - <key>PayloadUUID</key><string>" . $ca['uuid'] . "</string> |
|
| 827 | + <key>PayloadUUID</key><string>" . $ca['uuid']."</string> |
|
| 828 | 828 | <key>PayloadVersion</key> |
| 829 | 829 | <integer>1</integer> |
| 830 | 830 | </dict>"; |
@@ -50,11 +50,11 @@ discard block |
||
| 50 | 50 | print "vendorlogo ='';\n"; |
| 51 | 51 | } |
| 52 | 52 | if ($operatingSystem) { |
| 53 | - print "recognisedOS = '".$operatingSystem['device'] . "';\n"; |
|
| 54 | - print "recognisedOShs20 = '".$operatingSystem['hs20'] . "';\n"; |
|
| 53 | + print "recognisedOS = '".$operatingSystem['device']."';\n"; |
|
| 54 | + print "recognisedOShs20 = '".$operatingSystem['hs20']."';\n"; |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | -print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE] . '";'; |
|
| 57 | +print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE].'";'; |
|
| 58 | 58 | //TODO modify this based on OS detection |
| 59 | 59 | $userAgent = $_SERVER['HTTP_USER_AGENT'] ?? ""; |
| 60 | 60 | if (preg_match('/Android/', $userAgent)) { |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | <?php echo $divs->divHeading($visibility); ?> |
| 84 | 84 | <div id="main_page"> |
| 85 | 85 | <div id="loading_ico"> |
| 86 | - <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif"); ?>" alt="Authenticating ..."/> |
|
| 86 | + <?php echo _("Authenticating")."..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif"); ?>" alt="Authenticating ..."/> |
|
| 87 | 87 | </div> |
| 88 | 88 | <div id="info_overlay"> <!-- device info --> |
| 89 | 89 | <div id="info_window"></div> |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | ?> |
| 28 | 28 | <?php |
| 29 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 29 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 30 | 30 | |
| 31 | 31 | $deco = new \web\lib\admin\PageDecoration(); |
| 32 | 32 | $validator = new \web\lib\common\InputValidation(); |
@@ -40,10 +40,10 @@ discard block |
||
| 40 | 40 | ( $_POST['consortium'] == "OpenRoaming" && count($myfed->getAttributes("fed:openroaming")) > 0 ) |
| 41 | 41 | ) |
| 42 | 42 | ) {*/ |
| 43 | - if (isset($_POST['consortium']) && $_POST['consortium'] == "eduroam") |
|
| 43 | + if (isset($_POST['consortium']) && $_POST['consortium'] == "eduroam") |
|
| 44 | 44 | { |
| 45 | 45 | $my_inst->newDeployment(\core\AbstractDeployment::DEPLOYMENTTYPE_MANAGED, $_POST['consortium']); |
| 46 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
| 46 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier); |
|
| 47 | 47 | exit(0); |
| 48 | 48 | } else { |
| 49 | 49 | throw new Exception("Desired consortium for Managed SP needs to be specified, and allowed!"); |
@@ -100,18 +100,18 @@ discard block |
||
| 100 | 100 | if (isset($_POST['agreement']) && $_POST['agreement'] == "true") { |
| 101 | 101 | $deployment->addAttribute("hiddenmanagedsp:tou_accepted", NULL, 1); |
| 102 | 102 | } |
| 103 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
| 103 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier); |
|
| 104 | 104 | exit(0); |
| 105 | 105 | case web\lib\common\FormElements::BUTTON_DELETE: |
| 106 | 106 | $response = $deployment->setRADIUSconfig(); |
| 107 | 107 | if (in_array('OK', $response)) { |
| 108 | 108 | $deployment->deactivate(); |
| 109 | 109 | } |
| 110 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response))); |
|
| 110 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response))); |
|
| 111 | 111 | exit(0); |
| 112 | 112 | case web\lib\common\FormElements::BUTTON_REMOVESP: |
| 113 | 113 | $deployment->remove(); |
| 114 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
| 114 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier); |
|
| 115 | 115 | exit(0); |
| 116 | 116 | case web\lib\common\FormElements::BUTTON_ACTIVATE: |
| 117 | 117 | if (count($deployment->getAttributes("hiddenmanagedsp:tou_accepted")) > 0) { |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | if (in_array('OK', $response)) { |
| 120 | 120 | $deployment->activate(); |
| 121 | 121 | } |
| 122 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response))); |
|
| 122 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response))); |
|
| 123 | 123 | exit(0); |
| 124 | 124 | } else { |
| 125 | 125 | throw new Exception("Activate button pushed without acknowledged ToUs!"); |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | } else { |
| 149 | 149 | $response = ['NOOP', 'NOOP']; |
| 150 | 150 | } |
| 151 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response))); |
|
| 151 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response))); |
|
| 152 | 152 | exit(0); |
| 153 | 153 | default: |
| 154 | 154 | throw new Exception("Unknown button action requested!"); |
@@ -157,10 +157,10 @@ discard block |
||
| 157 | 157 | if (isset($_POST['command'])) { |
| 158 | 158 | switch ($_POST['command']) { |
| 159 | 159 | case web\lib\common\FormElements::BUTTON_CLOSE: |
| 160 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
| 160 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier); |
|
| 161 | 161 | exit(0); |
| 162 | 162 | default: |
| 163 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
| 163 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier); |
|
| 164 | 164 | exit(0); |
| 165 | 165 | } |
| 166 | 166 | } |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | echo $uiElements->instLevelInfoBoxes($my_inst); |
| 188 | 188 | $deploymentOptions = $deployment->getAttributes(); |
| 189 | 189 | echo "<form enctype='multipart/form-data' action='edit_hotspot.php?inst_id=$my_inst->identifier&deployment_id=$deployment->identifier' method='post' accept-charset='UTF-8'> |
| 190 | - <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>"; |
|
| 190 | + <input type='hidden' name='MAX_FILE_SIZE' value='".\config\Master::MAX_UPLOAD_SIZE."'>"; |
|
| 191 | 191 | $optionDisplay = new \web\lib\admin\OptionDisplay($deploymentOptions, \core\Options::LEVEL_PROFILE); |
| 192 | 192 | ?> |
| 193 | 193 | <fieldset class='option_container' id='managedsp_override'> |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | <!-- input for VLAN identifier for home users--> |
| 222 | 222 | <td> |
| 223 | 223 | <span id='vlan_label'> |
| 224 | - <?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " " . _("(unset with '0')"))); ?> |
|
| 224 | + <?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " "._("(unset with '0')"))); ?> |
|
| 225 | 225 | </span> |
| 226 | 226 | </td> |
| 227 | 227 | <td> |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | </fieldset> |
| 242 | 242 | |
| 243 | 243 | <?php |
| 244 | - echo "<p><button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>" . _("Discard changes") . "</button></p></form>"; |
|
| 244 | + echo "<p><button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>"._("Discard changes")."</button></p></form>"; |
|
| 245 | 245 | echo $deco->footer(); |
| 246 | 246 | |
| 247 | 247 | |
| 248 | 248 | \ No newline at end of file |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | ?> |
| 28 | 28 | <?php |
| 29 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 29 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 30 | 30 | |
| 31 | 31 | $auth = new \web\lib\admin\Authentication(); |
| 32 | 32 | $deco = new \web\lib\admin\PageDecoration(); |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | // also send user back to the overview page |
| 73 | 73 | if (isset($_POST['requestcert']) && $_POST['requestcert'] == \web\lib\common\FormElements::BUTTON_SAVE) { |
| 74 | 74 | // basic sanity checks before we hand this over to openssl |
| 75 | - $sanitisedCsr = $validator->string($_POST['CSR'] ?? "" , TRUE); |
|
| 75 | + $sanitisedCsr = $validator->string($_POST['CSR'] ?? "", TRUE); |
|
| 76 | 76 | if (openssl_csr_get_public_key($sanitisedCsr) === FALSE) { |
| 77 | 77 | throw new Exception("Sorry: Unable to parse the submitted public key - no public key inside?"); |
| 78 | 78 | } |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | $fed = $validator->existingFederation($_POST['NRO-list']); |
| 87 | 87 | $country = strtoupper($fed->tld); |
| 88 | 88 | $DN[] = "C=$country"; |
| 89 | - $DN[] = "O=NRO of " . $cat->knownFederations[strtoupper($fed->tld)]; |
|
| 89 | + $DN[] = "O=NRO of ".$cat->knownFederations[strtoupper($fed->tld)]; |
|
| 90 | 90 | $externalDb = new \core\ExternalEduroamDBData(); |
| 91 | 91 | $serverInfo = $externalDb->listExternalTlsServersFederation($fed->tld); |
| 92 | 92 | $serverList = explode(",", array_key_first($serverInfo)); |
@@ -109,14 +109,14 @@ discard block |
||
| 109 | 109 | default: |
| 110 | 110 | throw new Exception("Sorry: Unknown level of issuance requested."); |
| 111 | 111 | } |
| 112 | - echo "<p style='font-size: large'>" . _("Requesting a certificate with the following properties"); |
|
| 112 | + echo "<p style='font-size: large'>"._("Requesting a certificate with the following properties"); |
|
| 113 | 113 | echo "<ul>"; |
| 114 | - echo "<li>" . _("Policy OIDs: ") . implode(", ", $policies) . "</li>"; |
|
| 115 | - echo "<li>" . _("Distinguished Name: ") . implode(", ", $DN) . "</li>"; |
|
| 116 | - echo "<li>" . _("subjectAltName:DNS : ") . implode(", ", $serverList) . "</li>"; |
|
| 114 | + echo "<li>"._("Policy OIDs: ").implode(", ", $policies)."</li>"; |
|
| 115 | + echo "<li>"._("Distinguished Name: ").implode(", ", $DN)."</li>"; |
|
| 116 | + echo "<li>"._("subjectAltName:DNS : ").implode(", ", $serverList)."</li>"; |
|
| 117 | 117 | $firstName = $serverInfo[array_key_first($serverInfo)][0]["name"]; |
| 118 | 118 | $firstMail = $serverInfo[array_key_first($serverInfo)][0]["mail"]; |
| 119 | - echo "<li>" . _("Requester Contact Details: ") . $firstName . " <" . $firstMail . ">" . "</li>"; |
|
| 119 | + echo "<li>"._("Requester Contact Details: ").$firstName." <".$firstMail.">"."</li>"; |
|
| 120 | 120 | echo "</ul></p>"; |
| 121 | 121 | /* $ossl = proc_open("openssl req -subj '/".implode("/", $DN)."'", [ 0 => ["pipe", "r"], 1 => ["pipe", "w"], 2 => [ "file", "/tmp/voodoo-error", "a"] ], $pipes); |
| 122 | 122 | if (is_resource($ossl)) { |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | "CSR_STRING" => /* $newCsr */ $vettedCsr, |
| 135 | 135 | "USERNAME" => $firstName, |
| 136 | 136 | "USERMAIL" => $firstMail, |
| 137 | - "SUBJECT" => implode(",", $DN) , |
|
| 137 | + "SUBJECT" => implode(",", $DN), |
|
| 138 | 138 | "ALTNAMES" => $serverList, |
| 139 | 139 | "FED" => $country]; |
| 140 | 140 | // our certs can be good for max 5 years |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | echo "<p>"._("The certificate was requested.")."</p>"; |
| 143 | 143 | ?> |
| 144 | 144 | <form action="overview_certificates.php" method="GET"> |
| 145 | - <button type="submit"><?php echo _("Back to Certificate Overview");?></button> |
|
| 145 | + <button type="submit"><?php echo _("Back to Certificate Overview"); ?></button> |
|
| 146 | 146 | </form> |
| 147 | 147 | <?php |
| 148 | 148 | echo $deco->footer(); |
@@ -151,14 +151,14 @@ discard block |
||
| 151 | 151 | |
| 152 | 152 | // if we did not get a SAVE button, display UI for a fresh request instead |
| 153 | 153 | ?> |
| 154 | - <h2><?php echo _("1. Certificate Holder Details");?></h2> |
|
| 154 | + <h2><?php echo _("1. Certificate Holder Details"); ?></h2> |
|
| 155 | 155 | <form action="action_req_certificate.php" method="POST"> |
| 156 | 156 | <input type="radio" name="LEVEL" id="NRO" value="NRO" checked><?php printf(_("Certificate for %s role"), $uiElements->nomenclatureFed); ?></input> |
| 157 | 157 | <?php |
| 158 | 158 | if (count($feds) == 1) { |
| 159 | 159 | $fedObject = new \core\Federation($feds[0]['value']); |
| 160 | - echo " <strong>" . $cat->knownFederations[$fedObject->tld] . "</strong>"; |
|
| 161 | - echo '<input type="hidden" name="NRO-list" id="NRO-list" value="' . $fedObject->tld . '"/>'; |
|
| 160 | + echo " <strong>".$cat->knownFederations[$fedObject->tld]."</strong>"; |
|
| 161 | + echo '<input type="hidden" name="NRO-list" id="NRO-list" value="'.$fedObject->tld.'"/>'; |
|
| 162 | 162 | } else { |
| 163 | 163 | ?> |
| 164 | 164 | <select name="NRO-list" id="NRO-list"> |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | <?php |
| 167 | 167 | foreach ($feds as $oneFed) { |
| 168 | 168 | $fedObject = new \core\Federation($oneFed['value']); |
| 169 | - echo '<option value="' . strtoupper($fedObject->tld) . '">' . $cat->knownFederations[$fedObject->tld] . "</option>"; |
|
| 169 | + echo '<option value="'.strtoupper($fedObject->tld).'">'.$cat->knownFederations[$fedObject->tld]."</option>"; |
|
| 170 | 170 | } |
| 171 | 171 | ?> |
| 172 | 172 | </select> |
@@ -194,10 +194,10 @@ discard block |
||
| 194 | 194 | ?> |
| 195 | 195 | </select> |
| 196 | 196 | <br/> |
| 197 | - <h2><?php echo _("2. CSR generation");?></h2> |
|
| 198 | - <p><?php echo _("One way to generate an acceptable certificate request is via this openssl one-liner:");?></p> |
|
| 197 | + <h2><?php echo _("2. CSR generation"); ?></h2> |
|
| 198 | + <p><?php echo _("One way to generate an acceptable certificate request is via this openssl one-liner:"); ?></p> |
|
| 199 | 199 | <p>openssl req -new -newkey rsa:4096 -out test.csr -keyout test.key -subj /DC=test/DC=test/DC=eduroam/C=XY/O=WillBeReplaced/CN=will.be.replaced</p> |
| 200 | - <h2><?php echo _("3. Submission");?></h2> |
|
| 200 | + <h2><?php echo _("3. Submission"); ?></h2> |
|
| 201 | 201 | <?php echo _("Please paste your CSR here:"); ?><br/><textarea name="CSR" id="CSR" rows="20" cols="85"/></textarea><br/> |
| 202 | 202 | <button type="submit" name="requestcert" id="requestcert" value="<?php echo \web\lib\common\FormElements::BUTTON_SAVE ?>"><?php echo _("Send request"); ?></button> |
| 203 | 203 | </form> |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | ?> |
| 28 | 28 | <?php |
| 29 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 29 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 30 | 30 | |
| 31 | 31 | $auth = new \web\lib\admin\Authentication(); |
| 32 | 32 | $deco = new \web\lib\admin\PageDecoration(); |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | $feds = $user->getAttributes("user:fedadmin"); |
| 71 | 71 | foreach ($feds as $oneFed) { |
| 72 | 72 | $theFed = new \core\Federation($oneFed['value']); |
| 73 | - printf("<p>" . _("Certificate Information for %s %s"), $uiElements->nomenclatureFed, $theFed->name) . "</p>"; |
|
| 73 | + printf("<p>"._("Certificate Information for %s %s"), $uiElements->nomenclatureFed, $theFed->name)."</p>"; |
|
| 74 | 74 | foreach ($theFed->listTlsCertificates() as $oneCert) { |
| 75 | 75 | if ($oneCert['STATUS'] == "REQUESTED") { |
| 76 | 76 | $theFed->updateCertificateStatus($oneCert['REQSERIAL']); |
@@ -81,12 +81,12 @@ discard block |
||
| 81 | 81 | foreach ($theFed->listTlsCertificates() as $oneCert) { // fetch list a second time, in case we got a cert |
| 82 | 82 | $status = $oneCert['STATUS']; |
| 83 | 83 | echo "<tr>"; |
| 84 | - echo "<td>" . $oneCert['REQSERIAL'] . "</td><td>" . $oneCert['DN'] . "</td><td>" . $status . "</td><td>" . $oneCert['EXPIRY'] . "</td>"; |
|
| 84 | + echo "<td>".$oneCert['REQSERIAL']."</td><td>".$oneCert['DN']."</td><td>".$status."</td><td>".$oneCert['EXPIRY']."</td>"; |
|
| 85 | 85 | if ($status == "ISSUED") { |
| 86 | 86 | ?> |
| 87 | 87 | <td> |
| 88 | 88 | <form action='inc/showCert.inc.php' onsubmit='popupRedirectWindow(this); return false;' accept-charset='UTF-8' method="POST"> |
| 89 | - <input type="hidden" name="certdata" value="<?php echo $oneCert['CERT'];?>"/> |
|
| 89 | + <input type="hidden" name="certdata" value="<?php echo $oneCert['CERT']; ?>"/> |
|
| 90 | 90 | <button type="submit">Display</button> |
| 91 | 91 | </form> |
| 92 | 92 | <td> |
