GEANT /
CAT
@@ -61,10 +61,10 @@ |
||
| 61 | 61 | header("Content-Type:text/html;charset=utf-8"); |
| 62 | 62 | ?> |
| 63 | 63 | <!DOCTYPE html> |
| 64 | - <html xmlns='http://www.w3.org/1999/xhtml' lang='<?php echo $ourlocale;?>' <?php echo ($direction ? "dir='rtl'" : "");?>> |
|
| 65 | - <head lang='<?php echo $ourlocale;?>'> |
|
| 64 | + <html xmlns='http://www.w3.org/1999/xhtml' lang='<?php echo $ourlocale; ?>' <?php echo ($direction ? "dir='rtl'" : ""); ?>> |
|
| 65 | + <head lang='<?php echo $ourlocale; ?>'> |
|
| 66 | 66 | <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'> |
| 67 | - <title><?php echo htmlspecialchars($pagetitle);?></title> |
|
| 67 | + <title><?php echo htmlspecialchars($pagetitle); ?></title> |
|
| 68 | 68 | <script type="text/javascript">ie_version = 0;</script> |
| 69 | 69 | <!--[if IE]> |
| 70 | 70 | <script type="text/javascript">ie_version=1;</script> |
@@ -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 | $cssUrl = $Gui->skinObject->findResourceUrl("CSS", "cat-user.css.php"); |
| 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 occurred") . '"'; ?>; |
|
| 574 | + var title = <?php echo '"'._("Diagnostics results for selected realms").'"'; ?>; |
|
| 575 | + result = '<div class="padding"><h3>' + <?php echo '"'._("An unknown problem occurred").'"'; ?>; |
|
| 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'); |
@@ -69,7 +69,7 @@ |
||
| 69 | 69 | $langInstance = new core\common\Language(); |
| 70 | 70 | $end = $langInstance->rtl ? "left" : "right"; |
| 71 | 71 | ?> |
| 72 | - pressedButton.next().append('<span style="padding-<?php echo $end;?>:1em">'+msg+'<\/span>'); |
|
| 72 | + pressedButton.next().append('<span style="padding-<?php echo $end; ?>:1em">'+msg+'<\/span>'); |
|
| 73 | 73 | } |
| 74 | 74 | ); |
| 75 | 75 | } |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | * the receiving end to strip this marker and not add the title by itself. |
| 32 | 32 | * |
| 33 | 33 | */ |
| 34 | -require_once dirname(dirname(dirname((dirname(dirname(__FILE__)))))) . "/config/_config.php"; |
|
| 34 | +require_once dirname(dirname(dirname((dirname(dirname(__FILE__))))))."/config/_config.php"; |
|
| 35 | 35 | |
| 36 | 36 | $Gui = new \web\lib\user\Gui(); |
| 37 | 37 | |
@@ -41,46 +41,46 @@ discard block |
||
| 41 | 41 | $subpage = $_REQUEST['subpage']; |
| 42 | 42 | switch ($page) { |
| 43 | 43 | case 'about': |
| 44 | - include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/about_cat.inc.php"; |
|
| 44 | + include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/about_cat.inc.php"; |
|
| 45 | 45 | $out = "<div class='padding'>$out</div>"; |
| 46 | 46 | break; |
| 47 | 47 | case 'tou': |
| 48 | - include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/tou.inc.php"; |
|
| 48 | + include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/tou.inc.php"; |
|
| 49 | 49 | $out = "no_title<div> |
| 50 | 50 | <h1> |
| 51 | - " . $Tou['title'] . " |
|
| 51 | + " . $Tou['title']." |
|
| 52 | 52 | </h1> |
| 53 | -<div id='tou_1'>" . $Tou['subtitle'] . |
|
| 54 | - '<div style="direction:ltr">' . $Tou['short'] . "</div> |
|
| 53 | +<div id='tou_1'>" . $Tou['subtitle']. |
|
| 54 | + '<div style="direction:ltr">'.$Tou['short']."</div> |
|
| 55 | 55 | </div> |
| 56 | 56 | <div id='all_tou_link'><a href='javascript:showTOU()'>Click here to see the full terms</a></div> |
| 57 | 57 | <div id='tou_2' style='display:none; padding-top:20px; direction:ltr'>" . |
| 58 | - $Tou['full'] . " |
|
| 58 | + $Tou['full']." |
|
| 59 | 59 | </div> |
| 60 | 60 | </div> |
| 61 | 61 | "; |
| 62 | 62 | break; |
| 63 | 63 | case 'help': |
| 64 | - include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/faq.inc.php"; |
|
| 64 | + include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/faq.inc.php"; |
|
| 65 | 65 | switch ($subpage) { |
| 66 | 66 | case 'contact': |
| 67 | 67 | case 'idp_not_listed': |
| 68 | 68 | case 'device_not_listed': |
| 69 | 69 | case 'what_is_eduroam': |
| 70 | - $out = "no_title<div><h1>" . _("Help") . "</h1>"; |
|
| 70 | + $out = "no_title<div><h1>"._("Help")."</h1>"; |
|
| 71 | 71 | foreach ($Faq as $faqItem) { |
| 72 | 72 | if (!empty($faqItem['id']) && $faqItem['id'] == $subpage) { |
| 73 | - $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n"; |
|
| 74 | - $out .= "" . $faqItem['text'] . "</div>\n"; |
|
| 73 | + $out .= "<div><h3>".$faqItem['title']."</h3>\n"; |
|
| 74 | + $out .= "".$faqItem['text']."</div>\n"; |
|
| 75 | 75 | } |
| 76 | 76 | } |
| 77 | 77 | $out .= "</div>"; |
| 78 | 78 | break; |
| 79 | 79 | case 'faq': |
| 80 | - $out = "no_title<div><h1>" . _("Frequently Asked Questions") . "</h1>"; |
|
| 80 | + $out = "no_title<div><h1>"._("Frequently Asked Questions")."</h1>"; |
|
| 81 | 81 | foreach ($Faq as $faqItem) { |
| 82 | - $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n"; |
|
| 83 | - $out .= "" . $faqItem['text'] . "</div>\n"; |
|
| 82 | + $out .= "<div><h3>".$faqItem['title']."</h3>\n"; |
|
| 83 | + $out .= "".$faqItem['text']."</div>\n"; |
|
| 84 | 84 | } |
| 85 | 85 | $out .= "</div>"; |
| 86 | 86 | break; |
@@ -104,15 +104,15 @@ discard block |
||
| 104 | 104 | $rn = uniqid(); |
| 105 | 105 | $_SESSION['remindIdP'] = $rn; |
| 106 | 106 | $out .= "<input type='hidden' id='remindIdPs' value='$rn'>"; |
| 107 | - $out .= "<p><button type='button' onclick='goAdmin(); return(false);'>" . _("Login") . "</button>"; |
|
| 108 | - $out .= "<br/><br/><p>" . _("Did you forget with which Identity Provider you logged in to the system? We can try to find out if you specify the email address with which you were invited to the system in the box below. This may not work if you were invited from a third-party website via the AdminAPI.") . "</p>"; |
|
| 109 | - $out .= "<input id='remindIdP' type='text'/><button onclick='remindIdPF(); return false;'>" . _("Get IdP Reminder") . "</button>"; |
|
| 107 | + $out .= "<p><button type='button' onclick='goAdmin(); return(false);'>"._("Login")."</button>"; |
|
| 108 | + $out .= "<br/><br/><p>"._("Did you forget with which Identity Provider you logged in to the system? We can try to find out if you specify the email address with which you were invited to the system in the box below. This may not work if you were invited from a third-party website via the AdminAPI.")."</p>"; |
|
| 109 | + $out .= "<input id='remindIdP' type='text'/><button onclick='remindIdPF(); return false;'>"._("Get IdP Reminder")."</button>"; |
|
| 110 | 110 | $out .= "<div id='remindIdPd'><span id='remindIdPh'></span><ul id='remindIdPl'></ul></div>"; |
| 111 | 111 | $out = "<div class='padding'>$out</div>"; |
| 112 | 112 | } |
| 113 | 113 | break; |
| 114 | 114 | case 'develop': |
| 115 | - include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/user/devel.inc.php"; |
|
| 115 | + include_once dirname(dirname(dirname(dirname(__FILE__))))."/user/devel.inc.php"; |
|
| 116 | 116 | $out = "<div class='padding'>$out</div>"; |
| 117 | 117 | break; |
| 118 | 118 | } |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | $invitationObject = new SilverbulletInvitation($token); |
| 326 | 326 | $profile = new ProfileSilverbullet($invitationObject->profile); |
| 327 | 327 | $inst = new IdP($profile->institution); |
| 328 | - $loggerInstance->debug(5, "tokenStatus: done, got " . $invitationObject->invitationTokenStatus . ", " . $invitationObject->profile . ", " . $invitationObject->userId . ", " . $invitationObject->expiry . ", " . $invitationObject->invitationTokenString . "\n"); |
|
| 328 | + $loggerInstance->debug(5, "tokenStatus: done, got ".$invitationObject->invitationTokenStatus.", ".$invitationObject->profile.", ".$invitationObject->userId.", ".$invitationObject->expiry.", ".$invitationObject->invitationTokenString."\n"); |
|
| 329 | 329 | if ($invitationObject->invitationTokenStatus != SilverbulletInvitation::SB_TOKENSTATUS_VALID && $invitationObject->invitationTokenStatus != SilverbulletInvitation::SB_TOKENSTATUS_PARTIALLY_REDEEMED) { |
| 330 | 330 | throw new Exception("Attempt to generate a SilverBullet installer with an invalid/redeemed/expired token. The user should never have got that far!"); |
| 331 | 331 | } |
@@ -338,12 +338,12 @@ discard block |
||
| 338 | 338 | throw new Exception("Despite a valid token, the corresponding user was not found in database or database query error!"); |
| 339 | 339 | } |
| 340 | 340 | $expiryObject = mysqli_fetch_object(/** @scrutinizer ignore-type */ $userrow); |
| 341 | - $loggerInstance->debug(5, "EXP: " . $expiryObject->expiry . "\n"); |
|
| 341 | + $loggerInstance->debug(5, "EXP: ".$expiryObject->expiry."\n"); |
|
| 342 | 342 | $expiryDateObject = date_create_from_format("Y-m-d H:i:s", $expiryObject->expiry); |
| 343 | 343 | if ($expiryDateObject === FALSE) { |
| 344 | 344 | throw new Exception("The expiry date we got from the DB is bogus!"); |
| 345 | 345 | } |
| 346 | - $loggerInstance->debug(5, $expiryDateObject->format("Y-m-d H:i:s") . "\n"); |
|
| 346 | + $loggerInstance->debug(5, $expiryDateObject->format("Y-m-d H:i:s")."\n"); |
|
| 347 | 347 | // date_create with no parameters can't fail, i.e. is never FALSE |
| 348 | 348 | $validity = date_diff(/** @scrutinizer ignore-type */ date_create(), $expiryDateObject); |
| 349 | 349 | $expiryDays = $validity->days + 1; |
@@ -377,14 +377,14 @@ discard block |
||
| 377 | 377 | $exportedCertClear = ""; |
| 378 | 378 | openssl_pkcs12_export($cert, $exportedCertClear, $privateKey, "", ['extracerts' => [$issuingCaPem, $rootCaPem]]); |
| 379 | 379 | $pkey_3des = ""; |
| 380 | - openssl_pkey_export($privateKey, $pkey_3des, $importPassword, [ "encrypt_key_cipher" => OPENSSL_CIPHER_3DES ]); |
|
| 380 | + openssl_pkey_export($privateKey, $pkey_3des, $importPassword, ["encrypt_key_cipher" => OPENSSL_CIPHER_3DES]); |
|
| 381 | 381 | // store resulting cert CN and expiry date in separate columns into DB - do not store the cert data itself as it contains the private key! |
| 382 | 382 | // we need the *real* expiry date, not just the day-approximation |
| 383 | 383 | $x509 = new \core\common\X509(); |
| 384 | 384 | $certString = ""; |
| 385 | 385 | openssl_x509_export($cert, $certString); |
| 386 | 386 | $parsedCert = $x509->processCertificate($certString); |
| 387 | - $loggerInstance->debug(5, "CERTINFO: " . /** @scrutinizer ignore-type */ print_r($parsedCert['full_details'], true)); |
|
| 387 | + $loggerInstance->debug(5, "CERTINFO: "./** @scrutinizer ignore-type */ print_r($parsedCert['full_details'], true)); |
|
| 388 | 388 | $realExpiryDate = date_create_from_format("U", $parsedCert['full_details']['validTo_time_t'])->format("Y-m-d H:i:s"); |
| 389 | 389 | |
| 390 | 390 | // store new cert info in DB |
@@ -396,7 +396,7 @@ discard block |
||
| 396 | 396 | // let the RADIUS users know the actual username for CUI generation |
| 397 | 397 | $radiusDbs = DBConnection::handle("RADIUS"); // is an array of server conns |
| 398 | 398 | foreach ($radiusDbs as $oneRadiusDb) { |
| 399 | - $oneRadiusDb->exec("INSERT IGNORE INTO radcheck (username, attribute, op, value) VALUES (?, 'CUI-Source-Username', ':=', ?)", "ss", ($profile->getUserById($invitationObject->userId))[$invitationObject->userId] , $csr["USERNAME"]); |
|
| 399 | + $oneRadiusDb->exec("INSERT IGNORE INTO radcheck (username, attribute, op, value) VALUES (?, 'CUI-Source-Username', ':=', ?)", "ss", ($profile->getUserById($invitationObject->userId))[$invitationObject->userId], $csr["USERNAME"]); |
|
| 400 | 400 | } |
| 401 | 401 | |
| 402 | 402 | // return PKCS#12 data stream |
@@ -453,7 +453,7 @@ discard block |
||
| 453 | 453 | $username = ""; |
| 454 | 454 | while ($usernameIsUnique === FALSE) { |
| 455 | 455 | $usernameLocalPart = common\Entity::randomString(64 - 1 - strlen($realm), "0123456789abcdefghijklmnopqrstuvwxyz"); |
| 456 | - $username = $usernameLocalPart . "@" . $realm; |
|
| 456 | + $username = $usernameLocalPart."@".$realm; |
|
| 457 | 457 | $uniquenessQuery = $databaseHandle->exec("SELECT cn from silverbullet_certificate WHERE cn = ? AND ca_type = ?", "ss", $username, $certtype); |
| 458 | 458 | // SELECT -> resource, not boolean |
| 459 | 459 | if (mysqli_num_rows(/** @scrutinizer ignore-type */ $uniquenessQuery) == 0) { |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | parent::__construct(); |
| 110 | 110 | common\Entity::intoThePotatoes(); |
| 111 | 111 | |
| 112 | - $this->catVersionString = sprintf("Unreleased %s Git Revision" , "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>") . "</a>"; |
|
| 112 | + $this->catVersionString = sprintf("Unreleased %s Git Revision", "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>")."</a>"; |
|
| 113 | 113 | |
| 114 | 114 | if (CAT::RELEASE_VERSION) { |
| 115 | 115 | $major = CAT::VERSION_MAJOR; |
@@ -117,14 +117,14 @@ discard block |
||
| 117 | 117 | $patch = CAT::VERSION_PATCH; |
| 118 | 118 | $extra = CAT::VERSION_EXTRA; |
| 119 | 119 | $temp_version = "CAT-$major.$minor"; |
| 120 | - $branch = "release_$major" . "_$minor"; |
|
| 120 | + $branch = "release_$major"."_$minor"; |
|
| 121 | 121 | if (CAT::VERSION_PATCH != 0) { |
| 122 | 122 | $temp_version .= ".$patch"; |
| 123 | 123 | } |
| 124 | 124 | if (CAT::VERSION_EXTRA != "") { |
| 125 | 125 | $temp_version .= "-$extra"; |
| 126 | 126 | } |
| 127 | - $this->catVersionString = sprintf("Release <a href='%s'>%s</a>", "https://github.com/GEANT/CAT/tree/" . $branch . "/Changes.md", $temp_version); |
|
| 127 | + $this->catVersionString = sprintf("Release <a href='%s'>%s</a>", "https://github.com/GEANT/CAT/tree/".$branch."/Changes.md", $temp_version); |
|
| 128 | 128 | |
| 129 | 129 | } |
| 130 | 130 | $product = \config\Master::APPEARANCE['productname']; |
@@ -132,9 +132,9 @@ discard block |
||
| 132 | 132 | $maxYear = self::COPYRIGHT_MAX_YEAR; |
| 133 | 133 | $holder = self::COPYRIGHT_HOLDER; |
| 134 | 134 | $consortia = self::COPYRIGHT_CONSORTIA; |
| 135 | - $this->catCopyright = "$product - " . $this->catVersionString . " © $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>"; |
|
| 135 | + $this->catCopyright = "$product - ".$this->catVersionString." © $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>"; |
|
| 136 | 136 | $this->catCopyrifhtAndLicense = "© $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>"; |
| 137 | - $this->catVersion = "$product<br>" . $this->catVersionString; |
|
| 137 | + $this->catVersion = "$product<br>".$this->catVersionString; |
|
| 138 | 138 | |
| 139 | 139 | /* Federations are created in DB with bootstrapFederation, and listed via listFederations |
| 140 | 140 | */ |
@@ -17,12 +17,12 @@ |
||
| 17 | 17 | * <base_url>/copyright.php after deploying the software |
| 18 | 18 | */ |
| 19 | 19 | header("Content-Type:text/css"); |
| 20 | -require_once dirname(dirname(dirname(dirname(dirname(dirname(__DIR__)))))) . "/config/_config.php"; |
|
| 20 | +require_once dirname(dirname(dirname(dirname(dirname(dirname(__DIR__))))))."/config/_config.php"; |
|
| 21 | 21 | $langInstance = new core\common\Language(); |
| 22 | 22 | $start = $langInstance->rtl ? "right" : "left"; |
| 23 | 23 | ?> |
| 24 | 24 | #sb_info { |
| 25 | - padding-<?php echo $start;?>: 30px; |
|
| 25 | + padding-<?php echo $start; ?>: 30px; |
|
| 26 | 26 | font-size: 12px; |
| 27 | 27 | font-weight: normal; |
| 28 | 28 | } |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | // we need to know if we are serving a RTL language so we can flip some heading |
| 22 | 22 | // items |
| 23 | 23 | header("Content-Type:text/css"); |
| 24 | -require_once dirname(dirname(dirname(__DIR__))) . "/config/_config.php"; |
|
| 24 | +require_once dirname(dirname(dirname(__DIR__)))."/config/_config.php"; |
|
| 25 | 25 | $langInstance = new core\common\Language(); |
| 26 | 26 | $start = $langInstance->rtl ? "right" : "left"; |
| 27 | 27 | $end = $langInstance->rtl ? "left" : "right"; |
@@ -82,16 +82,16 @@ discard block |
||
| 82 | 82 | margin-bottom:3px; |
| 83 | 83 | } |
| 84 | 84 | .sb-date-picker{ |
| 85 | - padding-<?php echo $end;?>:25px; |
|
| 85 | + padding-<?php echo $end; ?>:25px; |
|
| 86 | 86 | width: 140px; |
| 87 | 87 | } |
| 88 | 88 | .sb-date-button{ |
| 89 | - margin-<?php echo $start;?>:-30px; |
|
| 89 | + margin-<?php echo $start; ?>:-30px; |
|
| 90 | 90 | min-height: 22px; |
| 91 | - border-<?php echo $start;?>-style: solid; |
|
| 91 | + border-<?php echo $start; ?>-style: solid; |
|
| 92 | 92 | border-top-style: solid; |
| 93 | - border-<?php echo $end;?>-style: solid; |
|
| 94 | - border-<?php echo $end;?>-width: 1px; |
|
| 93 | + border-<?php echo $end; ?>-style: solid; |
|
| 94 | + border-<?php echo $end; ?>-width: 1px; |
|
| 95 | 95 | border-bottom-width: 1px; |
| 96 | 96 | border-radius: 1px; |
| 97 | 97 | box-shadow: 0px 0px 0px #666666; |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | // we need to know if we are serving a RTL language so we can flip some heading |
| 23 | 23 | // items |
| 24 | 24 | header("Content-Type:text/css"); |
| 25 | -require_once dirname(dirname(dirname(__DIR__))) . "/config/_config.php"; |
|
| 25 | +require_once dirname(dirname(dirname(__DIR__)))."/config/_config.php"; |
|
| 26 | 26 | |
| 27 | 27 | $langInstance = new core\common\Language(); |
| 28 | 28 | $start = $langInstance->rtl ? "right" : "left"; |
@@ -32,15 +32,15 @@ discard block |
||
| 32 | 32 | ol.eapmethods { list-style-position: inside; margin: 0; padding: 0px; padding-top: 20px; padding-bottom: 0px; width: 20em; } |
| 33 | 33 | ol.eapmethods li{ |
| 34 | 34 | background: #CCF; |
| 35 | - border-<?php echo $start;?>-style: inset; |
|
| 36 | - border-<?php echo $start;?>-width: 1px; |
|
| 37 | - border-<?php echo $start;?>-color: #8BBACB; |
|
| 35 | + border-<?php echo $start; ?>-style: inset; |
|
| 36 | + border-<?php echo $start; ?>-width: 1px; |
|
| 37 | + border-<?php echo $start; ?>-color: #8BBACB; |
|
| 38 | 38 | border-top-style: inset; |
| 39 | 39 | border-top-width: 1px; |
| 40 | 40 | border-top-color: #8BBACB; |
| 41 | - border-<?php echo $end;?>-style: outset; |
|
| 42 | - border-<?php echo $end;?>-width: 2px; |
|
| 43 | - border-<?php echo $end;?>-color: #043D52; |
|
| 41 | + border-<?php echo $end; ?>-style: outset; |
|
| 42 | + border-<?php echo $end; ?>-width: 2px; |
|
| 43 | + border-<?php echo $end; ?>-color: #043D52; |
|
| 44 | 44 | border-bottom-style: outset; |
| 45 | 45 | border-bottom-width: 2px; |
| 46 | 46 | border-bottom-color: #043D52; |
@@ -51,8 +51,8 @@ discard block |
||
| 51 | 51 | background-position:95% 50%; |
| 52 | 52 | margin: 2px 0px 2px 0px; |
| 53 | 53 | padding: 3px; |
| 54 | - padding-<?php echo $start;?>: 1em; |
|
| 55 | - padding-<?php echo $end;?>: 0px; |
|
| 54 | + padding-<?php echo $start; ?>: 1em; |
|
| 55 | + padding-<?php echo $end; ?>: 0px; |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | table.eaptable td { |
