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 | $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 | co = $("#idp_country option:selected").val(); |
| 392 | 392 | $.ajax({ |
@@ -399,7 +399,7 @@ discard block |
||
| 399 | 399 | var realms = data.realms; |
| 400 | 400 | var realmselect = ''; |
| 401 | 401 | if (realms.length > 1) { |
| 402 | - realmselect = <?php echo '"<td>' . _("Check realm(s):") . '</td>"'; ?>; |
|
| 402 | + realmselect = <?php echo '"<td>'._("Check realm(s):").'</td>"'; ?>; |
|
| 403 | 403 | realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>"; |
| 404 | 404 | for (var i in realms) { |
| 405 | 405 | realmselect = realmselect + '<input type="radio" name="realm" '; |
@@ -411,7 +411,7 @@ discard block |
||
| 411 | 411 | } |
| 412 | 412 | realmselect = realmselect + '</span></td>'; |
| 413 | 413 | } else { |
| 414 | - realmselect = <?php echo '"<td>' . _("Realm:") . '</td>"'; ?>; |
|
| 414 | + realmselect = <?php echo '"<td>'._("Realm:").'</td>"'; ?>; |
|
| 415 | 415 | realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>"; |
| 416 | 416 | realmselect = realmselect + realms[0] + '</span>'; |
| 417 | 417 | realmselect = realmselect + '<input type="hidden" name="realm" value="' + realms[0] + '">'; |
@@ -469,7 +469,7 @@ discard block |
||
| 469 | 469 | clear_sp_question(); |
| 470 | 470 | t = 1; |
| 471 | 471 | } |
| 472 | - var comment = <?php echo '"' . _("Running realm tests") . '..."'; ?>; |
|
| 472 | + var comment = <?php echo '"'._("Running realm tests").'..."'; ?>; |
|
| 473 | 473 | inProgress(1, comment); |
| 474 | 474 | /*waiting(comment);*/ |
| 475 | 475 | $.ajax({ |
@@ -531,7 +531,7 @@ discard block |
||
| 531 | 531 | testSociopath('', answer); |
| 532 | 532 | }); |
| 533 | 533 | $('#realmtest').click(function(event){ |
| 534 | - var comment = <?php echo '"<br><br>' . _("Running realm tests") . '..."'; ?>; |
|
| 534 | + var comment = <?php echo '"<br><br>'._("Running realm tests").'..."'; ?>; |
|
| 535 | 535 | inProgress(1, comment); |
| 536 | 536 | $('#start_test_area').hide(); |
| 537 | 537 | if ($('#select_sp_area').is(':hidden')) { |
@@ -579,13 +579,13 @@ discard block |
||
| 579 | 579 | reset_footer(); |
| 580 | 580 | testSociopath(realm, 0); |
| 581 | 581 | } else { |
| 582 | - var title = <?php echo '"' . _("Diagnostics results for selected realms") . '"'; ?>; |
|
| 583 | - result = '<div class="padding"><h3>' + <?php echo '"' . _("An unknown problem occurred") . '"'; ?>; |
|
| 582 | + var title = <?php echo '"'._("Diagnostics results for selected realms").'"'; ?>; |
|
| 583 | + result = '<div class="padding"><h3>' + <?php echo '"'._("An unknown problem occurred").'"'; ?>; |
|
| 584 | 584 | result = result + '</h3>' |
| 585 | 585 | if (r.length == 1) { |
| 586 | - result = result + <?php echo '"' . _("This test includes checking of the following realm") . '"'; ?>; |
|
| 586 | + result = result + <?php echo '"'._("This test includes checking of the following realm").'"'; ?>; |
|
| 587 | 587 | } else { |
| 588 | - result = result + <?php echo '"' . _("This test includes checking of the following realms") . '"'; ?>; |
|
| 588 | + result = result + <?php echo '"'._("This test includes checking of the following realms").'"'; ?>; |
|
| 589 | 589 | } |
| 590 | 590 | result = result + ': ' |
| 591 | 591 | for (var i=0; i < r.length; i++) { |
@@ -595,7 +595,7 @@ discard block |
||
| 595 | 595 | result = result + r[i]; |
| 596 | 596 | } |
| 597 | 597 | result = result + '.<br>'; |
| 598 | - result = result + <?php echo '"' . _("You should report this to") . '"'; ?> + ' <a href="mailto:[email protected]">[email protected]</a>'; |
|
| 598 | + result = result + <?php echo '"'._("You should report this to").'"'; ?> + ' <a href="mailto:[email protected]">[email protected]</a>'; |
|
| 599 | 599 | result = result + '</div>'; |
| 600 | 600 | $('#after_stage_1').hide(); |
| 601 | 601 | $('#before_stage_1').show(); |
@@ -663,43 +663,43 @@ discard block |
||
| 663 | 663 | success:function(data) { |
| 664 | 664 | if (data.status === 1) { |
| 665 | 665 | var result = ''; |
| 666 | - var title = <?php echo '"' . _("eduroam admin report submission") . '"'; ?>; |
|
| 666 | + var title = <?php echo '"'._("eduroam admin report submission").'"'; ?>; |
|
| 667 | 667 | result = '<div class="padding">'; |
| 668 | 668 | if (type == 'idp_send') { |
| 669 | - result = result + '<h3>'+ <?php echo '"' . _("SP contacting IdP due to technical problems or abuse") . '"'; ?> + '</h3>'; |
|
| 669 | + result = result + '<h3>'+ <?php echo '"'._("SP contacting IdP due to technical problems or abuse").'"'; ?> + '</h3>'; |
|
| 670 | 670 | result = result + '<table>'; |
| 671 | - result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 672 | - result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 673 | - result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 674 | - result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 675 | - result = result + '<tr><td>' + <?php echo '"' . _("An email to contact the reporter") . '"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 676 | - result = result + '<tr><td>' + <?php echo '"' . _("Test result") . '" '; ?> +'</td><td>'; |
|
| 671 | + result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 672 | + result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 673 | + result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 674 | + result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 675 | + result = result + '<tr><td>' + <?php echo '"'._("An email to contact the reporter").'"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 676 | + result = result + '<tr><td>' + <?php echo '"'._("Test result").'" '; ?> +'</td><td>'; |
|
| 677 | 677 | if (data.tests_result == 1) { |
| 678 | - result = result + <?php echo '"' . _("failure") . '"'; ?>; |
|
| 678 | + result = result + <?php echo '"'._("failure").'"'; ?>; |
|
| 679 | 679 | } else { |
| 680 | - result = result + <?php echo '"' . _("success") . '"'; ?>; |
|
| 680 | + result = result + <?php echo '"'._("success").'"'; ?>; |
|
| 681 | 681 | } |
| 682 | 682 | result = result + '</td></tr>'; |
| 683 | - result = result + '<tr><td>' + <?php echo '"' . _("Test URL") . '" '; ?> +'</td><td><a href="' + data.testurl + '">' + data.testurl + '</a></td></tr>'; |
|
| 684 | - result = result + '<tr><td>' + <?php echo '"' . _("Email to IdP administrators ") . '"'; ?> + ' '; |
|
| 683 | + result = result + '<tr><td>' + <?php echo '"'._("Test URL").'" '; ?> +'</td><td><a href="' + data.testurl + '">' + data.testurl + '</a></td></tr>'; |
|
| 684 | + result = result + '<tr><td>' + <?php echo '"'._("Email to IdP administrators ").'"'; ?> + ' '; |
|
| 685 | 685 | if (data.emailsent == 1) { |
| 686 | - result = result + <?php echo '"' . _("send successfully") . '"'; ?>; |
|
| 686 | + result = result + <?php echo '"'._("send successfully").'"'; ?>; |
|
| 687 | 687 | } else { |
| 688 | - result = result + <?php echo '"' . _("not sent - failure while sending") . '"'; ?>; |
|
| 688 | + result = result + <?php echo '"'._("not sent - failure while sending").'"'; ?>; |
|
| 689 | 689 | } |
| 690 | 690 | result = result + '</td><td></td></tr>'; |
| 691 | 691 | } |
| 692 | 692 | if (type == 'sp_send') { |
| 693 | - result = result + '<h3>'+ <?php echo '"' . _("IdP contacting SP due to technical problems or abuse") . '"'; ?> + '</h3>'; |
|
| 693 | + result = result + '<h3>'+ <?php echo '"'._("IdP contacting SP due to technical problems or abuse").'"'; ?> + '</h3>'; |
|
| 694 | 694 | result = result + '<table>'; |
| 695 | - result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 696 | - result = result + '<tr><td>' + <?php echo '"' . _("SP's Operator-Name") . '"'; ?> + '</td><td>' + data.opname + '</td></tr>'; |
|
| 697 | - result = result + '<tr><td>' + <?php echo '"' . _("User's outer ID") . '"'; ?> + '</td><td>' + data.outerid + '</td></tr>'; |
|
| 698 | - result = result + '<tr><td>' + <?php echo '"' . _("IdP email") . '"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 699 | - result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 700 | - result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 701 | - result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 702 | - result = result + '<tr><td>' + <?php echo '"' . _("How to contact the user") . '"'; ?> +'</td><td>' + data.cdetails + '</td></tr>'; |
|
| 695 | + result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>'; |
|
| 696 | + result = result + '<tr><td>' + <?php echo '"'._("SP's Operator-Name").'"'; ?> + '</td><td>' + data.opname + '</td></tr>'; |
|
| 697 | + result = result + '<tr><td>' + <?php echo '"'._("User's outer ID").'"'; ?> + '</td><td>' + data.outerid + '</td></tr>'; |
|
| 698 | + result = result + '<tr><td>' + <?php echo '"'._("IdP email").'"'; ?> + '</td><td>' + data.email + '</td></tr>'; |
|
| 699 | + result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>'; |
|
| 700 | + result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>'; |
|
| 701 | + result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>'; |
|
| 702 | + result = result + '<tr><td>' + <?php echo '"'._("How to contact the user").'"'; ?> +'</td><td>' + data.cdetails + '</td></tr>'; |
|
| 703 | 703 | } |
| 704 | 704 | result = result + '</div>'; |
| 705 | 705 | showInfo(result, title); |
@@ -730,7 +730,7 @@ discard block |
||
| 730 | 730 | $(this).removeClass('visible_row').addClass('hidden_row'); |
| 731 | 731 | } |
| 732 | 732 | }); |
| 733 | - $('#admin_realm').attr('title', <?php echo '"' . _("Wrong format of realm") . '"'; ?>); |
|
| 733 | + $('#admin_realm').attr('title', <?php echo '"'._("Wrong format of realm").'"'; ?>); |
|
| 734 | 734 | } else { |
| 735 | 735 | $('#admin_realm').removeClass('error_input'); |
| 736 | 736 | $('#admin_realm').attr('title', ''); |
@@ -744,7 +744,7 @@ discard block |
||
| 744 | 744 | $(document).on('keyup change', '#email' , function() { |
| 745 | 745 | if ($(this).val().length == 0 || !isEmail($(this).val())) { |
| 746 | 746 | $('#email').addClass('error_input'); |
| 747 | - $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"'; ?>); |
|
| 747 | + $('#email').attr('title', <?php echo '"'._("Wrong format of email").'"'; ?>); |
|
| 748 | 748 | } else { |
| 749 | 749 | $('#email').removeClass('error_input'); |
| 750 | 750 | $('#email').attr('title', ''); |
@@ -757,7 +757,7 @@ discard block |
||
| 757 | 757 | if ($('#mac').val().length > 0) { |
| 758 | 758 | if ($('#mac').val().length != 17) { |
| 759 | 759 | $('#mac').addClass('error_input'); |
| 760 | - $('#mac').attr('title', <?php echo '"' . _("MAC address is incomplete") . '"'; ?>); |
|
| 760 | + $('#mac').attr('title', <?php echo '"'._("MAC address is incomplete").'"'; ?>); |
|
| 761 | 761 | } else { |
| 762 | 762 | $('#mac').removeClass('error_input'); |
| 763 | 763 | $('#mac').attr('title', ''); |
@@ -766,7 +766,7 @@ discard block |
||
| 766 | 766 | if ($(this).attr('id') == 'email' && $(this).val().length > 0) { |
| 767 | 767 | if (!isEmail($(this).val())) { |
| 768 | 768 | $('#email').addClass('error_input'); |
| 769 | - $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"'; ?>); |
|
| 769 | + $('#email').attr('title', <?php echo '"'._("Wrong format of email").'"'; ?>); |
|
| 770 | 770 | } else { |
| 771 | 771 | $('#email').removeClass('error_input'); |
| 772 | 772 | $('#email').attr('title', ''); |
@@ -775,7 +775,7 @@ discard block |
||
| 775 | 775 | if ($(this).attr('id') == 'outer_id' && $(this).val().length > 0) { |
| 776 | 776 | if (!isEmail($(this).val(), true)) { |
| 777 | 777 | $('#outer_id').addClass('error_input'); |
| 778 | - $('#outer_id').attr('title', <?php echo '"' . _("Wrong format of outer ID") . '"'; ?>); |
|
| 778 | + $('#outer_id').attr('title', <?php echo '"'._("Wrong format of outer ID").'"'; ?>); |
|
| 779 | 779 | } else { |
| 780 | 780 | $('#outer_id').removeClass('error_input'); |
| 781 | 781 | $('#outer_id').attr('title', ''); |
@@ -784,7 +784,7 @@ discard block |
||
| 784 | 784 | if ($(this).attr('id') == 'opname' && $('#opname').val().length > 0) { |
| 785 | 785 | if (!isOperatorName($(this).val())) { |
| 786 | 786 | $('#opname').addClass('error_input'); |
| 787 | - $('#opname').attr('title', <?php echo '"' . _("Wrong string given as OperatorName") . '"'; ?>); |
|
| 787 | + $('#opname').attr('title', <?php echo '"'._("Wrong string given as OperatorName").'"'; ?>); |
|
| 788 | 788 | $('#spmanually').show(); |
| 789 | 789 | } else { |
| 790 | 790 | $('#opname').removeClass('error_input'); |
@@ -62,24 +62,24 @@ discard block |
||
| 62 | 62 | case "EXTERNAL": |
| 63 | 63 | case "FRONTEND": |
| 64 | 64 | case "DIAGNOSTICS": |
| 65 | - if (!isset(self::${"instance" . $theDb})) { |
|
| 65 | + if (!isset(self::${"instance".$theDb})) { |
|
| 66 | 66 | $class = __CLASS__; |
| 67 | - self::${"instance" . $theDb} = new $class($database); |
|
| 68 | - DBConnection::${"instance" . $theDb}->databaseInstance = $theDb; |
|
| 67 | + self::${"instance".$theDb} = new $class($database); |
|
| 68 | + DBConnection::${"instance".$theDb}->databaseInstance = $theDb; |
|
| 69 | 69 | } |
| 70 | - return self::${"instance" . $theDb}; |
|
| 70 | + return self::${"instance".$theDb}; |
|
| 71 | 71 | case "RADIUS": |
| 72 | - if (!isset(self::${"instance" . $theDb})) { |
|
| 72 | + if (!isset(self::${"instance".$theDb})) { |
|
| 73 | 73 | $class = __CLASS__; |
| 74 | 74 | foreach (\config\ConfAssistant::DB as $name => $oneRadiusAuthDb) { |
| 75 | 75 | $theInstance = new $class($name); |
| 76 | - self::${"instance" . $theDb}[] = $theInstance; |
|
| 76 | + self::${"instance".$theDb}[] = $theInstance; |
|
| 77 | 77 | $theInstance->databaseInstance = $theDb; |
| 78 | 78 | } |
| 79 | 79 | } |
| 80 | - return self::${"instance" . $theDb}; |
|
| 80 | + return self::${"instance".$theDb}; |
|
| 81 | 81 | default: |
| 82 | - throw new Exception("This type of database (" . strtoupper($database) . ") is not known!"); |
|
| 82 | + throw new Exception("This type of database (".strtoupper($database).") is not known!"); |
|
| 83 | 83 | } |
| 84 | 84 | } |
| 85 | 85 | |
@@ -123,18 +123,18 @@ discard block |
||
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | // log exact query to debug log, if log level is at 5 |
| 126 | - $this->loggerInstance->debug(5, "DB ATTEMPT: ".$this->databaseInstance .": " . $querystring . "\n"); |
|
| 126 | + $this->loggerInstance->debug(5, "DB ATTEMPT: ".$this->databaseInstance.": ".$querystring."\n"); |
|
| 127 | 127 | if ($types !== NULL) { |
| 128 | - $this->loggerInstance->debug(5, "Argument type sequence: $types, parameters are: " . /** @scrutinizer ignore-type */ print_r($arguments, true)); |
|
| 128 | + $this->loggerInstance->debug(5, "Argument type sequence: $types, parameters are: "./** @scrutinizer ignore-type */ print_r($arguments, true)); |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | if ($this->connection->connect_error) { |
| 132 | - throw new Exception("ERROR: Cannot send query to $this->databaseInstance database (no connection, error number" . $this->connection->connect_error . ")!"); |
|
| 132 | + throw new Exception("ERROR: Cannot send query to $this->databaseInstance database (no connection, error number".$this->connection->connect_error.")!"); |
|
| 133 | 133 | } |
| 134 | 134 | if ($types === NULL) { |
| 135 | 135 | $result = $this->connection->query($querystring); |
| 136 | 136 | if ($result === FALSE) { |
| 137 | - throw new Exception("DB: Unable to execute simple statement! Error was --> " . $this->connection->error . " <--"); |
|
| 137 | + throw new Exception("DB: Unable to execute simple statement! Error was --> ".$this->connection->error." <--"); |
|
| 138 | 138 | } |
| 139 | 139 | } else { |
| 140 | 140 | // fancy! prepared statement with dedicated argument list |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | } |
| 151 | 151 | $prepResult = $statementObject->prepare($querystring); |
| 152 | 152 | if ($prepResult === FALSE) { |
| 153 | - throw new Exception("DB: Unable to prepare statement! Statement was --> $querystring <--, error was --> " . $statementObject->error . " <--."); |
|
| 153 | + throw new Exception("DB: Unable to prepare statement! Statement was --> $querystring <--, error was --> ".$statementObject->error." <--."); |
|
| 154 | 154 | } |
| 155 | 155 | $this->preparedStatements[$querystring] = $statementObject; |
| 156 | 156 | } |
@@ -163,11 +163,11 @@ discard block |
||
| 163 | 163 | array_unshift($localArray, $types); |
| 164 | 164 | $retval = call_user_func_array([$statementObject, "bind_param"], $localArray); |
| 165 | 165 | if ($retval === FALSE) { |
| 166 | - throw new Exception("DB: Unable to bind parameters to prepared statement! Argument array was --> " . var_export($localArray, TRUE) . " <--. Error was --> " . $statementObject->error . " <--"); |
|
| 166 | + throw new Exception("DB: Unable to bind parameters to prepared statement! Argument array was --> ".var_export($localArray, TRUE)." <--. Error was --> ".$statementObject->error." <--"); |
|
| 167 | 167 | } |
| 168 | 168 | $result = $statementObject->execute(); |
| 169 | 169 | if ($result === FALSE) { |
| 170 | - throw new Exception("DB: Unable to execute prepared statement! Error was --> " . $statementObject->error . " <--"); |
|
| 170 | + throw new Exception("DB: Unable to execute prepared statement! Error was --> ".$statementObject->error." <--"); |
|
| 171 | 171 | } |
| 172 | 172 | $selectResult = $statementObject->get_result(); |
| 173 | 173 | if ($selectResult !== FALSE) { |
@@ -177,14 +177,14 @@ discard block |
||
| 177 | 177 | |
| 178 | 178 | // all cases where $result could be FALSE have been caught earlier |
| 179 | 179 | if ($this->connection->errno) { |
| 180 | - throw new Exception("ERROR: Cannot execute query in $this->databaseInstance database - (hopefully escaped) query was '$querystring', errno was " . $this->connection->errno . "!"); |
|
| 180 | + throw new Exception("ERROR: Cannot execute query in $this->databaseInstance database - (hopefully escaped) query was '$querystring', errno was ".$this->connection->errno."!"); |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | |
| 184 | 184 | if ($isMoreThanSelect || \config\Master::DEBUG_LEVEL == 5) { |
| 185 | - $this->loggerInstance->writeSQLAudit("[DB: " . strtoupper($this->databaseInstance) . "] " . $querystring); |
|
| 185 | + $this->loggerInstance->writeSQLAudit("[DB: ".strtoupper($this->databaseInstance)."] ".$querystring); |
|
| 186 | 186 | if ($types !== NULL) { |
| 187 | - $this->loggerInstance->writeSQLAudit("Argument type sequence: $types, parameters are: " . /** @scrutinizer ignore-type */ print_r($arguments, true)); |
|
| 187 | + $this->loggerInstance->writeSQLAudit("Argument type sequence: $types, parameters are: "./** @scrutinizer ignore-type */ print_r($arguments, true)); |
|
| 188 | 188 | } |
| 189 | 189 | } |
| 190 | 190 | return $result; |
@@ -282,14 +282,14 @@ discard block |
||
| 282 | 282 | if (isset(\config\Master::DB[$databaseCapitalised])) { |
| 283 | 283 | $this->connection = new \mysqli(\config\Master::DB[$databaseCapitalised]['host'], \config\Master::DB[$databaseCapitalised]['user'], \config\Master::DB[$databaseCapitalised]['pass'], \config\Master::DB[$databaseCapitalised]['db']); |
| 284 | 284 | if ($this->connection->connect_error) { |
| 285 | - throw new Exception("ERROR: Unable to connect to $database database! This is a fatal error, giving up (error number " . $this->connection->connect_errno . ")."); |
|
| 285 | + throw new Exception("ERROR: Unable to connect to $database database! This is a fatal error, giving up (error number ".$this->connection->connect_errno.")."); |
|
| 286 | 286 | } |
| 287 | 287 | $this->readOnly = \config\Master::DB[$databaseCapitalised]['readonly']; |
| 288 | 288 | $this->dbName = \config\Master::DB[$databaseCapitalised]['db']; |
| 289 | 289 | } else { // one of the RADIUS DBs |
| 290 | 290 | $this->connection = new \mysqli(\config\ConfAssistant::DB[$databaseCapitalised]['host'], \config\ConfAssistant::DB[$databaseCapitalised]['user'], \config\ConfAssistant::DB[$databaseCapitalised]['pass'], \config\ConfAssistant::DB[$databaseCapitalised]['db']); |
| 291 | 291 | if ($this->connection->connect_error) { |
| 292 | - throw new Exception("ERROR: Unable to connect to $database database! This is a fatal error, giving up (error number " . $this->connection->connect_errno . ")."); |
|
| 292 | + throw new Exception("ERROR: Unable to connect to $database database! This is a fatal error, giving up (error number ".$this->connection->connect_errno.")."); |
|
| 293 | 293 | } |
| 294 | 294 | $this->readOnly = \config\ConfAssistant::DB[$databaseCapitalised]['readonly']; |
| 295 | 295 | $this->dbName = \config\ConfAssistant::DB[$databaseCapitalised]['db']; |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | private function writeToFile($filename, $message) |
| 51 | 51 | { |
| 52 | - file_put_contents(\config\Master::PATHS['logdir'] . "/$filename", sprintf("%-015s", microtime(TRUE)) . $message, FILE_APPEND); |
|
| 52 | + file_put_contents(\config\Master::PATHS['logdir']."/$filename", sprintf("%-015s", microtime(TRUE)).$message, FILE_APPEND); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | /** |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | */ |
| 62 | 62 | private static function writeToFile_s($filename, $message) |
| 63 | 63 | { |
| 64 | - file_put_contents(\config\Master::PATHS['logdir'] . "/$filename", sprintf("%-015s", microtime(TRUE)) . $message, FILE_APPEND); |
|
| 64 | + file_put_contents(\config\Master::PATHS['logdir']."/$filename", sprintf("%-015s", microtime(TRUE)).$message, FILE_APPEND); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | /** |
@@ -89,9 +89,9 @@ discard block |
||
| 89 | 89 | $output .= " [$file / $function / $line] "; |
| 90 | 90 | } |
| 91 | 91 | if (is_string($stuff)) { |
| 92 | - $output .= $prefix . $stuff . $suffix; |
|
| 92 | + $output .= $prefix.$stuff.$suffix; |
|
| 93 | 93 | } else { |
| 94 | - $output .= $prefix . var_export($stuff, TRUE) . $suffix; |
|
| 94 | + $output .= $prefix.var_export($stuff, TRUE).$suffix; |
|
| 95 | 95 | } |
| 96 | 96 | $this->writeToFile("debug.log", $output); |
| 97 | 97 | |
@@ -123,9 +123,9 @@ discard block |
||
| 123 | 123 | $output .= " [$file / $function / $line] "; |
| 124 | 124 | } |
| 125 | 125 | if (is_string($stuff)) { |
| 126 | - $output .= $prefix . $stuff . $suffix; |
|
| 126 | + $output .= $prefix.$stuff.$suffix; |
|
| 127 | 127 | } else { |
| 128 | - $output .= $prefix . var_export($stuff, TRUE) . $suffix; |
|
| 128 | + $output .= $prefix.var_export($stuff, TRUE).$suffix; |
|
| 129 | 129 | } |
| 130 | 130 | self::writeToFile_s("debug.log", $output); |
| 131 | 131 | return; |
@@ -173,6 +173,6 @@ discard block |
||
| 173 | 173 | $logTextStep1 = preg_replace("/[\n\r]/", "", $query); |
| 174 | 174 | $logTextStep2 = preg_replace("/ +/", " ", $logTextStep1); |
| 175 | 175 | $logTextStep3 = iconv("UTF-8", "UTF-8//IGNORE", $logTextStep2); |
| 176 | - $this->writeToFile("audit-SQL.log", " " . $logTextStep3 . "\n"); |
|
| 176 | + $this->writeToFile("audit-SQL.log", " ".$logTextStep3."\n"); |
|
| 177 | 177 | } |
| 178 | 178 | } |
| 179 | 179 | \ No newline at end of file |
@@ -115,12 +115,12 @@ discard block |
||
| 115 | 115 | $this->name = $this->languageInstance->getLocalisedValue($this->getAttributes('general:instname')); |
| 116 | 116 | $eligibility = $this->eligibility($instQuery->type); |
| 117 | 117 | if (in_array(IdP::ELIGIBILITY_IDP, $eligibility) && in_array(IdP::ELIGIBILITY_SP, $eligibility)) { |
| 118 | - $eligType = IdP::TYPE_IDPSP . ""; |
|
| 118 | + $eligType = IdP::TYPE_IDPSP.""; |
|
| 119 | 119 | $this->type = $eligType; |
| 120 | 120 | } elseif (in_array(IdP::ELIGIBILITY_IDP, $eligibility)) { |
| 121 | - $eligType = IdP::TYPE_IDP . ""; |
|
| 121 | + $eligType = IdP::TYPE_IDP.""; |
|
| 122 | 122 | } else { |
| 123 | - $eligType = IdP::TYPE_SP . ""; |
|
| 123 | + $eligType = IdP::TYPE_SP.""; |
|
| 124 | 124 | } |
| 125 | 125 | $this->type = $eligType; |
| 126 | 126 | $this->loggerInstance->debug(4, "--- END Constructing new IdP object $instId ... ---\n"); |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | */ |
| 135 | 135 | public function listProfiles(bool $activeOnly = FALSE) |
| 136 | 136 | { |
| 137 | - $query = "SELECT profile_id FROM profile WHERE inst_id = $this->identifier" . ($activeOnly ? " AND showtime = 1" : "")." ORDER BY preference"; |
|
| 137 | + $query = "SELECT profile_id FROM profile WHERE inst_id = $this->identifier".($activeOnly ? " AND showtime = 1" : "")." ORDER BY preference"; |
|
| 138 | 138 | $allProfiles = $this->databaseHandle->exec($query); |
| 139 | 139 | $returnarray = []; |
| 140 | 140 | // SELECT -> resource, not boolean |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | $returnarray[] = $oneProfile; |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | - $this->loggerInstance->debug(4, "listProfiles: " . /** @scrutinizer ignore-type */ print_r($returnarray, true)); |
|
| 147 | + $this->loggerInstance->debug(4, "listProfiles: "./** @scrutinizer ignore-type */ print_r($returnarray, true)); |
|
| 148 | 148 | return $returnarray; |
| 149 | 149 | } |
| 150 | 150 | |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | */ |
| 157 | 157 | public function listDeployments(bool $activeOnly = FALSE) |
| 158 | 158 | { |
| 159 | - $query = "SELECT deployment_id FROM deployment WHERE inst_id = $this->identifier" . ($activeOnly ? " AND status = " . AbstractDeployment::ACTIVE : ""); |
|
| 159 | + $query = "SELECT deployment_id FROM deployment WHERE inst_id = $this->identifier".($activeOnly ? " AND status = ".AbstractDeployment::ACTIVE : ""); |
|
| 160 | 160 | $allDeployments = $this->databaseHandle->exec($query); |
| 161 | 161 | $returnarray = []; |
| 162 | 162 | // SELECT -> resource, not boolean |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | $returnarray[] = new DeploymentManaged($this, $deploymentQuery->deployment_id); |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | - $this->loggerInstance->debug(4, "listDeployments: " . /** @scrutinizer ignore-type */ print_r($returnarray, true)); |
|
| 167 | + $this->loggerInstance->debug(4, "listDeployments: "./** @scrutinizer ignore-type */ print_r($returnarray, true)); |
|
| 168 | 168 | return $returnarray; |
| 169 | 169 | } |
| 170 | 170 | |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | $redirectProfileIds = []; |
| 191 | 191 | $allProfileLevels = $this->databaseHandle->exec("SELECT profile_id, sufficient_config + showtime AS maxlevel FROM profile WHERE inst_id = $this->identifier ORDER BY maxlevel DESC"); |
| 192 | 192 | // SELECT yields a resource, not a boolean |
| 193 | - if ($allProfileLevels->num_rows == 0 ) { |
|
| 193 | + if ($allProfileLevels->num_rows == 0) { |
|
| 194 | 194 | return self::PROFILES_INCOMPLETE; |
| 195 | 195 | } |
| 196 | 196 | $allProfilesArray = $allProfileLevels->fetch_all(MYSQLI_ASSOC); |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | $allProfiles = $this->databaseHandle->exec("SELECT MIN(openroaming) AS maxlevel FROM profile WHERE inst_id = $this->identifier"); |
| 219 | 219 | // SELECT yields a resource, not a boolean |
| 220 | 220 | while ($res = mysqli_fetch_object(/** @scrutinizer ignore-type */ $allProfiles)) { |
| 221 | - return (is_numeric($res->maxlevel) ? (int)$res->maxlevel : AbstractProfile::OVERALL_OPENROAMING_LEVEL_NO ); // insts without profiles should get a "NO" |
|
| 221 | + return (is_numeric($res->maxlevel) ? (int) $res->maxlevel : AbstractProfile::OVERALL_OPENROAMING_LEVEL_NO); // insts without profiles should get a "NO" |
|
| 222 | 222 | } |
| 223 | 223 | return AbstractProfile::OVERALL_OPENROAMING_LEVEL_NO; |
| 224 | 224 | } |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | case AbstractProfile::PROFILETYPE_SILVERBULLET: |
| 350 | 350 | $theProfile = new ProfileSilverbullet($identifier, $this); |
| 351 | 351 | $theProfile->addSupportedEapMethod(new \core\common\EAP(\core\common\EAP::EAPTYPE_SILVERBULLET), 1); |
| 352 | - $theProfile->setRealm($this->identifier . "-" . $theProfile->identifier . "." . strtolower($this->federation) . strtolower(\config\ConfAssistant::SILVERBULLET['realm_suffix'])); |
|
| 352 | + $theProfile->setRealm($this->identifier."-".$theProfile->identifier.".".strtolower($this->federation).strtolower(\config\ConfAssistant::SILVERBULLET['realm_suffix'])); |
|
| 353 | 353 | return $theProfile; |
| 354 | 354 | default: |
| 355 | 355 | throw new Exception("This type of profile is unknown and can not be added."); |
@@ -492,7 +492,7 @@ discard block |
||
| 492 | 492 | public function getExternalDBId() |
| 493 | 493 | { |
| 494 | 494 | if (\config\ConfAssistant::CONSORTIUM['name'] == "eduroam" && isset(\config\ConfAssistant::CONSORTIUM['deployment-voodoo']) && \config\ConfAssistant::CONSORTIUM['deployment-voodoo'] == "Operations Team") { // SW: APPROVED |
| 495 | - $idQuery = $this->databaseHandle->exec("SELECT external_db_id, country FROM institution WHERE inst_id = $this->identifier AND external_db_syncstate = " . self::EXTERNAL_DB_SYNCSTATE_SYNCED); |
|
| 495 | + $idQuery = $this->databaseHandle->exec("SELECT external_db_id, country FROM institution WHERE inst_id = $this->identifier AND external_db_syncstate = ".self::EXTERNAL_DB_SYNCSTATE_SYNCED); |
|
| 496 | 496 | // SELECT -> it's a resource, not a boolean |
| 497 | 497 | if (mysqli_num_rows(/** @scrutinizer ignore-type */ $idQuery) == 0) { |
| 498 | 498 | return FALSE; |
@@ -560,16 +560,16 @@ discard block |
||
| 560 | 560 | } |
| 561 | 561 | foreach ($baseline as $lang => $value) { |
| 562 | 562 | if (!key_exists($lang, $newvalues)) { |
| 563 | - $retval[IdP::INSTNAME_CHANGED] .= "#[Language " . strtoupper($lang) . "] DELETED"; |
|
| 563 | + $retval[IdP::INSTNAME_CHANGED] .= "#[Language ".strtoupper($lang)."] DELETED"; |
|
| 564 | 564 | } else { |
| 565 | 565 | if ($value != $newvalues[$lang]) { |
| 566 | - $retval[IdP::INSTNAME_CHANGED] .= "#[Language " . strtoupper($lang) . "] CHANGED from '" . $baseline[$lang] . "' to '" . $newvalues[$lang] . "'"; |
|
| 566 | + $retval[IdP::INSTNAME_CHANGED] .= "#[Language ".strtoupper($lang)."] CHANGED from '".$baseline[$lang]."' to '".$newvalues[$lang]."'"; |
|
| 567 | 567 | } |
| 568 | 568 | } |
| 569 | 569 | } |
| 570 | 570 | foreach ($newvalues as $lang => $value) { |
| 571 | 571 | if (!key_exists($lang, $baseline)) { |
| 572 | - $retval[IdP::INSTNAME_CHANGED] .= "#[Language " . strtoupper($lang) . "] ADDED as '" . $value . "'"; |
|
| 572 | + $retval[IdP::INSTNAME_CHANGED] .= "#[Language ".strtoupper($lang)."] ADDED as '".$value."'"; |
|
| 573 | 573 | } |
| 574 | 574 | } |
| 575 | 575 | return $retval; |
@@ -169,8 +169,8 @@ discard block |
||
| 169 | 169 | public function isFromEduGAIN() |
| 170 | 170 | { |
| 171 | 171 | $loggerInstance = new common\Logging(); |
| 172 | - $entityId = preg_replace('/^.*=!/','', $_SESSION['user']); |
|
| 173 | - $url = \config\Diagnostics::EDUGAINRESOLVER['url'] . "?action=get_entity_name&type=idp&e_id=$entityId"; |
|
| 172 | + $entityId = preg_replace('/^.*=!/', '', $_SESSION['user']); |
|
| 173 | + $url = \config\Diagnostics::EDUGAINRESOLVER['url']."?action=get_entity_name&type=idp&e_id=$entityId"; |
|
| 174 | 174 | $ch = curl_init($url); |
| 175 | 175 | if ($ch === FALSE) { |
| 176 | 176 | $loggerInstance->debug(2, "Unable ask eduGAIN about IdP - CURL init failed!"); |
@@ -214,8 +214,8 @@ discard block |
||
| 214 | 214 | common\Entity::intoThePotatoes(); |
| 215 | 215 | $mail = \core\common\OutsideComm::mailHandle(); |
| 216 | 216 | // who to whom? |
| 217 | - $mail->FromName = \config\Master::APPEARANCE['productname'] . " Notification System"; |
|
| 218 | - $mail->addReplyTo(\config\Master::APPEARANCE['support-contact']['developer-mail'], \config\Master::APPEARANCE['productname'] . " " . _("Feedback")); |
|
| 217 | + $mail->FromName = \config\Master::APPEARANCE['productname']." Notification System"; |
|
| 218 | + $mail->addReplyTo(\config\Master::APPEARANCE['support-contact']['developer-mail'], \config\Master::APPEARANCE['productname']." "._("Feedback")); |
|
| 219 | 219 | $mail->addAddress($mailaddr[0]["value"]); |
| 220 | 220 | // what do we want to say? |
| 221 | 221 | $mail->Subject = $subject; |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | } |
| 281 | 281 | $lookFor .= "$name"; |
| 282 | 282 | } |
| 283 | - $finding = preg_match("/^(" . $lookFor . "):(.*)/", $oneRow->user_id, $matches); |
|
| 283 | + $finding = preg_match("/^(".$lookFor."):(.*)/", $oneRow->user_id, $matches); |
|
| 284 | 284 | if ($finding === 0 || $finding === FALSE) { |
| 285 | 285 | return FALSE; |
| 286 | 286 | } |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | $matchedProviders[] = $idp; |
| 299 | 299 | $name = $idp; |
| 300 | 300 | if ($skipCurl == 0) { |
| 301 | - $url = \config\Diagnostics::EDUGAINRESOLVER['url'] . "?action=get_entity_name&type=idp&e_id=$idp&lang=$lang"; |
|
| 301 | + $url = \config\Diagnostics::EDUGAINRESOLVER['url']."?action=get_entity_name&type=idp&e_id=$idp&lang=$lang"; |
|
| 302 | 302 | $ch = curl_init($url); |
| 303 | 303 | if ($ch === FALSE) { |
| 304 | 304 | $loggerInstance->debug(2, "Unable ask eduGAIN about IdP - CURL init failed!"); |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | } |
| 315 | 315 | curl_close($ch); |
| 316 | 316 | } |
| 317 | - $listOfProviders[] = User::PROVIDER_STRINGS[$providerStrings[0]] . " - IdP: " . $name; |
|
| 317 | + $listOfProviders[] = User::PROVIDER_STRINGS[$providerStrings[0]]." - IdP: ".$name; |
|
| 318 | 318 | } |
| 319 | 319 | break; |
| 320 | 320 | case $providerStrings[1]: |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | return $this->counter; |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - $cachedNumber = @file_get_contents(ROOT . "/var/tmp/cachedSPNumber.serialised"); |
|
| 145 | + $cachedNumber = @file_get_contents(ROOT."/var/tmp/cachedSPNumber.serialised"); |
|
| 146 | 146 | if ($cachedNumber !== FALSE) { |
| 147 | 147 | $numberData = unserialize($cachedNumber); |
| 148 | 148 | $now = new \DateTime(); |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | } else { // data in cache is too old or doesn't exist. We really need to ask the database |
| 156 | 156 | $list = $this->listAllServiceProviders(); |
| 157 | 157 | $this->counter = count($list); |
| 158 | - file_put_contents(ROOT . "/var/tmp/cachedSPNumber.serialised", serialize(["number" => $this->counter, "timestamp" => new \DateTime()])); |
|
| 158 | + file_put_contents(ROOT."/var/tmp/cachedSPNumber.serialised", serialize(["number" => $this->counter, "timestamp" => new \DateTime()])); |
|
| 159 | 159 | return $this->counter; |
| 160 | 160 | } |
| 161 | 161 | } |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | $returnarray = []; |
| 247 | 247 | $query = "SELECT instid AS id, country, inst_realm as realmlist, name AS collapsed_name, contact AS collapsed_contact, type FROM view_active_institution WHERE country = ?"; |
| 248 | 248 | if ($eduroamDbType !== NULL) { |
| 249 | - $query .= " AND ( type = '" . ExternalEduroamDBData::TYPE_IDPSP . "' OR type = '" . $eduroamDbType . "')"; |
|
| 249 | + $query .= " AND ( type = '".ExternalEduroamDBData::TYPE_IDPSP."' OR type = '".$eduroamDbType."')"; |
|
| 250 | 250 | } |
| 251 | 251 | $externals = $this->db->exec($query, "s", $tld); |
| 252 | 252 | // was a SELECT query, so a resource and not a boolean |
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | * @return array |
| 308 | 308 | */ |
| 309 | 309 | |
| 310 | - public function listExternalEntitiesByUserEmail($userEmail){ |
|
| 310 | + public function listExternalEntitiesByUserEmail($userEmail) { |
|
| 311 | 311 | $out = []; |
| 312 | 312 | $cat = $this->localDb->dbName; |
| 313 | 313 | $query = "SELECT DISTINCT view_institution_admins.instid, $cat.institution.inst_id, |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | |
| 323 | 323 | $externals = $this->db->exec($query, 's', $userEmail); |
| 324 | 324 | while ($row = $externals->fetch_array()) { |
| 325 | - $external_db_id = $row[0]; |
|
| 325 | + $external_db_id = $row[0]; |
|
| 326 | 326 | $inst_id = $row[1]; |
| 327 | 327 | $country = $row[2]; |
| 328 | 328 | $name = $row[3]; |
@@ -406,19 +406,19 @@ discard block |
||
| 406 | 406 | * |
| 407 | 407 | * @return array |
| 408 | 408 | */ |
| 409 | - public function listExternalTlsServersInstitution($tld, $include_not_ready=FALSE) { |
|
| 409 | + public function listExternalTlsServersInstitution($tld, $include_not_ready = FALSE) { |
|
| 410 | 410 | $retval = []; |
| 411 | 411 | // this includes servers of type "staging", which is fine |
| 412 | 412 | $query = "SELECT ROid, instid, type, inst_name, servers, contacts, ts FROM view_tls_inst WHERE country = ?"; |
| 413 | 413 | if (!$include_not_ready) { |
| 414 | - $query = $query . " AND servers IS NOT NULL AND contacts IS NOT NULL"; |
|
| 414 | + $query = $query." AND servers IS NOT NULL AND contacts IS NOT NULL"; |
|
| 415 | 415 | } |
| 416 | 416 | $instServerTransaction = $this->db->exec($query, "s", $tld); |
| 417 | 417 | while ($instServerResponses = mysqli_fetch_object(/** @scrutinizer ignore-type */ $instServerTransaction)) { |
| 418 | 418 | $contactList = $this::dissectCollapsedContacts($instServerResponses->contacts); |
| 419 | 419 | $names = $this->splitNames($instServerResponses->inst_name); |
| 420 | 420 | $thelanguage = $names[$this->languageInstance->getLang()] ?? $names["en"] ?? array_shift($names); |
| 421 | - $retval[$instServerResponses->ROid . "-". $instServerResponses->instid] = [ |
|
| 421 | + $retval[$instServerResponses->ROid."-".$instServerResponses->instid] = [ |
|
| 422 | 422 | "names" => $names, |
| 423 | 423 | "name" => $thelanguage, |
| 424 | 424 | "type" => array_search($instServerResponses->type, self::TYPE_MAPPING), |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | } else { |
| 161 | 161 | $this->databaseHandle->exec("INSERT INTO ownership (user_id, institution_id, blesslevel, orig_mail) VALUES(?, ?, ?, ?)", "siss", $owner, $catId, $level, $destMail); |
| 162 | 162 | } |
| 163 | - $this->loggerInstance->writeAudit((string) $owner, "OWN", "IdP " . $invitationDetails['cat_institution_id'] . " - added user as owner"); |
|
| 163 | + $this->loggerInstance->writeAudit((string) $owner, "OWN", "IdP ".$invitationDetails['cat_institution_id']." - added user as owner"); |
|
| 164 | 164 | common\Entity::outOfThePotatoes(); |
| 165 | 165 | return new IdP($invitationDetails['cat_institution_id']); |
| 166 | 166 | } |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | $idp = new IdP($fed->newIdP($invitationDetails['invite_fortype'], $owner, $invitationDetails['invite_issuer_level'], $invitationDetails['invite_dest_mail'], $bestnameguess)); |
| 175 | 175 | $idp->addAttribute("general:instname", 'C', $bestnameguess); |
| 176 | 176 | } |
| 177 | - $this->loggerInstance->writeAudit($owner, "NEW", "IdP " . $idp->identifier . " - created from invitation"); |
|
| 177 | + $this->loggerInstance->writeAudit($owner, "NEW", "IdP ".$idp->identifier." - created from invitation"); |
|
| 178 | 178 | |
| 179 | 179 | // in case we have more admins in the queue which were invited to |
| 180 | 180 | // administer the same inst but haven't redeemed their invitations |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | WHERE invite_created >= TIMESTAMPADD(DAY, -1, NOW()) AND used = 0 AND name = ? AND country = ? AND ( cat_institution_id IS NULL OR external_db_uniquehandle IS NULL ) ", "ss", $invitationDetails['name'], $invitationDetails['country']); |
| 189 | 189 | // SELECT -> resource, no boolean |
| 190 | 190 | while ($pendingDetail = mysqli_fetch_object(/** @scrutinizer ignore-type */ $otherPending)) { |
| 191 | - $this->databaseHandle->exec("UPDATE invitations SET cat_institution_id = " . $idp->identifier . " WHERE id = " . $pendingDetail->id); |
|
| 191 | + $this->databaseHandle->exec("UPDATE invitations SET cat_institution_id = ".$idp->identifier." WHERE id = ".$pendingDetail->id); |
|
| 192 | 192 | } |
| 193 | 193 | common\Entity::outOfThePotatoes(); |
| 194 | 194 | return $idp; |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | 'invite_dest_mail' => $_SESSION['auth_email'] |
| 214 | 214 | ]; |
| 215 | 215 | $idp = $this->newIdPFromExternal($extId, $fed, $invitationDetails, $owner, $externalinfo); |
| 216 | - $this->loggerInstance->writeAudit($owner, "NEW", "IdP " . $idp->identifier . " - created from auto-registration of $extId"); |
|
| 216 | + $this->loggerInstance->writeAudit($owner, "NEW", "IdP ".$idp->identifier." - created from auto-registration of $extId"); |
|
| 217 | 217 | return $idp; |
| 218 | 218 | } |
| 219 | 219 | |
@@ -339,9 +339,9 @@ discard block |
||
| 339 | 339 | $retval = []; |
| 340 | 340 | $invitations = $this->databaseHandle->exec("SELECT cat_institution_id, country, name, invite_issuer_level, invite_dest_mail, invite_token , TIMESTAMPADD(DAY, 1, invite_created) as expiry |
| 341 | 341 | FROM invitations |
| 342 | - WHERE cat_institution_id " . ( $idpIdentifier != 0 ? "= $idpIdentifier" : "IS NULL") . " AND invite_created >= TIMESTAMPADD(DAY, -1, NOW()) AND used = 0"); |
|
| 342 | + WHERE cat_institution_id " . ($idpIdentifier != 0 ? "= $idpIdentifier" : "IS NULL")." AND invite_created >= TIMESTAMPADD(DAY, -1, NOW()) AND used = 0"); |
|
| 343 | 343 | // SELECT -> resource, not boolean |
| 344 | - $this->loggerInstance->debug(4, "Retrieving pending invitations for " . ($idpIdentifier != 0 ? "IdP $idpIdentifier" : "IdPs awaiting initial creation" ) . ".\n"); |
|
| 344 | + $this->loggerInstance->debug(4, "Retrieving pending invitations for ".($idpIdentifier != 0 ? "IdP $idpIdentifier" : "IdPs awaiting initial creation").".\n"); |
|
| 345 | 345 | while ($invitationQuery = mysqli_fetch_object(/** @scrutinizer ignore-type */ $invitations)) { |
| 346 | 346 | $retval[] = ["country" => $invitationQuery->country, "name" => $invitationQuery->name, "mail" => $invitationQuery->invite_dest_mail, "token" => $invitationQuery->invite_token, "expiry" => $invitationQuery->expiry]; |
| 347 | 347 | } |
@@ -414,7 +414,7 @@ discard block |
||
| 414 | 414 | // these require not further checking |
| 415 | 415 | foreach ($extInstListTmp as $country => $extInstCountryList) { |
| 416 | 416 | $len = count($extInstCountryList); |
| 417 | - for($i = 0; $i < $len; ++$i) { |
|
| 417 | + for ($i = 0; $i < $len; ++$i) { |
|
| 418 | 418 | $extInst = $extInstCountryList[$i]; |
| 419 | 419 | if ($extInst['inst_id'] != NULL && in_array($extInst['inst_id'], $this->currentInstitutions['existing'])) { |
| 420 | 420 | unset($extInstList[$country][$i]); |
@@ -454,7 +454,7 @@ discard block |
||
| 454 | 454 | $names = $disectedNames['joint']; |
| 455 | 455 | $realms = \core\ExternalEduroamDBData::dissectCollapsedInstitutionRealms($extInst['realm']); |
| 456 | 456 | $foundMatch = $this->checkForSimilarInstitutions($names, $realms); |
| 457 | - $this->loggerInstance->debug(4, $foundMatch, "checkForSimilarInstitutions returned: ","\n"); |
|
| 457 | + $this->loggerInstance->debug(4, $foundMatch, "checkForSimilarInstitutions returned: ", "\n"); |
|
| 458 | 458 | if ($foundMatch == 0) { |
| 459 | 459 | $this->currentInstitutions['new'][] = [$extInst['external_db_id'], $disectedNames['perlang'], $country]; |
| 460 | 460 | } |
@@ -462,7 +462,7 @@ discard block |
||
| 462 | 462 | |
| 463 | 463 | } |
| 464 | 464 | } |
| 465 | - $this->loggerInstance->debug(4,$this->currentInstitutions['new'],"\n","\n"); |
|
| 465 | + $this->loggerInstance->debug(4, $this->currentInstitutions['new'], "\n", "\n"); |
|
| 466 | 466 | return $this->currentInstitutions; |
| 467 | 467 | } |
| 468 | 468 | |
@@ -133,7 +133,7 @@ |
||
| 133 | 133 | * @return array |
| 134 | 134 | */ |
| 135 | 135 | |
| 136 | - public function listExternalEntitiesByUserEmail($userEmail){ |
|
| 136 | + public function listExternalEntitiesByUserEmail($userEmail) { |
|
| 137 | 137 | return []; |
| 138 | 138 | } |
| 139 | 139 | } |
| 140 | 140 | \ No newline at end of file |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | * <base_url>/copyright.php after deploying the software |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | -require dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php"; |
|
| 22 | +require dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php"; |
|
| 23 | 23 | $colour1 = \config\Master::APPEARANCE['colour1']; |
| 24 | 24 | $colour2 = \config\Master::APPEARANCE['colour2']; |
| 25 | 25 | // we need to know if we are serving a RTL language so we can flip some heading |
@@ -34,14 +34,14 @@ discard block |
||
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | body { |
| 37 | - background: <?php echo $colour1;?>; |
|
| 37 | + background: <?php echo $colour1; ?>; |
|
| 38 | 38 | color: #000000; |
| 39 | 39 | font-family:Verdana, Arial, Helvetica, sans-serif; |
| 40 | 40 | font-size:11px; |
| 41 | 41 | height: 100%; |
| 42 | 42 | margin: 0px; |
| 43 | 43 | padding: 0px; |
| 44 | - padding-<?php echo $start;?>: 0px; |
|
| 44 | + padding-<?php echo $start; ?>: 0px; |
|
| 45 | 45 | min-width: 700px; |
| 46 | 46 | font-size: 11px; |
| 47 | 47 | font-weight: normal; |
@@ -57,18 +57,18 @@ discard block |
||
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | button { |
| 60 | - background: <?php echo $colour2;?>; |
|
| 60 | + background: <?php echo $colour2; ?>; |
|
| 61 | 61 | color: #FFFFFF; |
| 62 | 62 | min-height: 23px; |
| 63 | - border-<?php echo $start;?>-style: outset; |
|
| 64 | - border-<?php echo $start;?>-width: 1px; |
|
| 65 | - border-<?php echo $start;?>-color: #8bbacb; |
|
| 63 | + border-<?php echo $start; ?>-style: outset; |
|
| 64 | + border-<?php echo $start; ?>-width: 1px; |
|
| 65 | + border-<?php echo $start; ?>-color: #8bbacb; |
|
| 66 | 66 | border-top-style: outset; |
| 67 | 67 | border-top-width: 1px; |
| 68 | 68 | border-top-color: #8bbacb; |
| 69 | - border-<?php echo $end;?>-style: outset; |
|
| 70 | - border-<?php echo $end;?>-width: 2px; |
|
| 71 | - border-<?php echo $end;?>-color: #043d52; |
|
| 69 | + border-<?php echo $end; ?>-style: outset; |
|
| 70 | + border-<?php echo $end; ?>-width: 2px; |
|
| 71 | + border-<?php echo $end; ?>-color: #043d52; |
|
| 72 | 72 | border-bottom-style: outset; |
| 73 | 73 | border-bottom-width: 2px; |
| 74 | 74 | border-bottom-color: #043d52; |
@@ -83,14 +83,14 @@ discard block |
||
| 83 | 83 | background:#095e80; |
| 84 | 84 | border-style:inset; |
| 85 | 85 | position: relative; |
| 86 | - <?php echo $start;?>: 3px; |
|
| 86 | + <?php echo $start; ?>: 3px; |
|
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | button.pressedDisabled { |
| 90 | 90 | background:#999; |
| 91 | 91 | border-style:inset; |
| 92 | 92 | position: relative; |
| 93 | - <?php echo $start;?>: 3px; |
|
| 93 | + <?php echo $start; ?>: 3px; |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | button.delete { |
@@ -102,14 +102,14 @@ discard block |
||
| 102 | 102 | color:#FFF; |
| 103 | 103 | } |
| 104 | 104 | .problemdescription { |
| 105 | - padding-<?php echo $start;?>:40px; |
|
| 105 | + padding-<?php echo $start; ?>:40px; |
|
| 106 | 106 | padding-top: 10px; |
| 107 | 107 | padding-bottom: 10px; |
| 108 | 108 | background-color: lightyellow; |
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | .problemsolution { |
| 112 | - padding-<?php echo $start;?>:40px; |
|
| 112 | + padding-<?php echo $start; ?>:40px; |
|
| 113 | 113 | padding-top: 10px; |
| 114 | 114 | padding-bottom: 10px; |
| 115 | 115 | background-color: lightgreen; |
@@ -118,15 +118,15 @@ discard block |
||
| 118 | 118 | .use_borders button.alertButton { |
| 119 | 119 | color: maroon; |
| 120 | 120 | background: #bbb; |
| 121 | - border-<?php echo $start;?>-style: outset; |
|
| 122 | - border-<?php echo $start;?>-width: 1px; |
|
| 123 | - border-<?php echo $start;?>-color: #eee; |
|
| 121 | + border-<?php echo $start; ?>-style: outset; |
|
| 122 | + border-<?php echo $start; ?>-width: 1px; |
|
| 123 | + border-<?php echo $start; ?>-color: #eee; |
|
| 124 | 124 | border-top-style: outset; |
| 125 | 125 | border-top-width: 1px; |
| 126 | 126 | border-top-color: #eee; |
| 127 | - border-<?php echo $end;?>-style: outset; |
|
| 128 | - border-<?php echo $end;?>-width: 2px; |
|
| 129 | - border-<?php echo $end;?>-color: #444; |
|
| 127 | + border-<?php echo $end; ?>-style: outset; |
|
| 128 | + border-<?php echo $end; ?>-width: 2px; |
|
| 129 | + border-<?php echo $end; ?>-color: #444; |
|
| 130 | 130 | border-bottom-style: outset; |
| 131 | 131 | border-bottom-width: 2px; |
| 132 | 132 | border-bottom-color: #444; |
@@ -136,15 +136,15 @@ discard block |
||
| 136 | 136 | button[disabled] { |
| 137 | 137 | background: #bababa; |
| 138 | 138 | color: #6a6a6a; |
| 139 | - border-<?php echo $start;?>-style: inset; |
|
| 140 | - border-<?php echo $start;?>-width: 1px; |
|
| 141 | - border-<?php echo $start;?>-color: #dadada; |
|
| 139 | + border-<?php echo $start; ?>-style: inset; |
|
| 140 | + border-<?php echo $start; ?>-width: 1px; |
|
| 141 | + border-<?php echo $start; ?>-color: #dadada; |
|
| 142 | 142 | border-top-style: inset; |
| 143 | 143 | border-top-width: 1px; |
| 144 | 144 | border-top-color: #dadada; |
| 145 | - border-<?php echo $end;?>-style: outset; |
|
| 146 | - border-<?php echo $end;?>-width: 2px; |
|
| 147 | - border-<?php echo $end;?>-color: #dadada; |
|
| 145 | + border-<?php echo $end; ?>-style: outset; |
|
| 146 | + border-<?php echo $end; ?>-width: 2px; |
|
| 147 | + border-<?php echo $end; ?>-color: #dadada; |
|
| 148 | 148 | border-bottom-style: outset; |
| 149 | 149 | border-bottom-width: 2px; |
| 150 | 150 | border-bottom-color: #dadada; |
@@ -176,8 +176,8 @@ discard block |
||
| 176 | 176 | div.profilemodulebuttons { |
| 177 | 177 | position: inherit; |
| 178 | 178 | bottom: 5px; |
| 179 | - <?php echo $end;?>: 5px; |
|
| 180 | - text-align: <?php echo $end;?>; |
|
| 179 | + <?php echo $end; ?>: 5px; |
|
| 180 | + text-align: <?php echo $end; ?>; |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | div.profilebox { |
@@ -198,15 +198,15 @@ discard block |
||
| 198 | 198 | display: block; |
| 199 | 199 | position: absolute; |
| 200 | 200 | top:0; |
| 201 | - <?php echo $end;?>:0; |
|
| 202 | - padding-<?php echo $end;?>:20px; |
|
| 201 | + <?php echo $end; ?>:0; |
|
| 202 | + padding-<?php echo $end; ?>:20px; |
|
| 203 | 203 | padding-top:7px; |
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | div.sidebar { |
| 207 | 207 | display: inline; |
| 208 | - float: <?php echo $end;?>; |
|
| 209 | - padding-<?php echo $end;?>: 20px; |
|
| 208 | + float: <?php echo $end; ?>; |
|
| 209 | + padding-<?php echo $end; ?>: 20px; |
|
| 210 | 210 | } |
| 211 | 211 | div.sidebar a { |
| 212 | 212 | color: white; |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | div.header { |
| 216 | 216 | height: 54px; |
| 217 | 217 | background: #FFFFFF; |
| 218 | - padding-<?php echo $start;?>:30px; |
|
| 218 | + padding-<?php echo $start; ?>:30px; |
|
| 219 | 219 | padding-bottom: 10px; |
| 220 | 220 | color: <?php echo $colour2?>; |
| 221 | 221 | } |
@@ -225,8 +225,8 @@ discard block |
||
| 225 | 225 | top: 54px; |
| 226 | 226 | bottom: 50px; |
| 227 | 227 | padding-top: 10px; |
| 228 | - padding-<?php echo $start;?>: 0px; |
|
| 229 | - padding-<?php echo $end;?>: 0px; |
|
| 228 | + padding-<?php echo $start; ?>: 0px; |
|
| 229 | + padding-<?php echo $end; ?>: 0px; |
|
| 230 | 230 | width:100%; |
| 231 | 231 | } |
| 232 | 232 | |
@@ -240,18 +240,18 @@ discard block |
||
| 240 | 240 | color: #FFFFFF; |
| 241 | 241 | min-height:100px; |
| 242 | 242 | overflow: auto; |
| 243 | - padding-<?php echo $start;?>:20px |
|
| 243 | + padding-<?php echo $start; ?>:20px |
|
| 244 | 244 | } |
| 245 | 245 | |
| 246 | 246 | #thirdrow { |
| 247 | - padding-<?php echo $start;?>: 10px; |
|
| 248 | - padding-<?php echo $end;?>: 10px; |
|
| 247 | + padding-<?php echo $start; ?>: 10px; |
|
| 248 | + padding-<?php echo $end; ?>: 10px; |
|
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | #footer { |
| 252 | 252 | width: 100%; |
| 253 | - <?php echo $start;?>: 0; |
|
| 254 | - <?php echo $end;?>: 0; |
|
| 253 | + <?php echo $start; ?>: 0; |
|
| 254 | + <?php echo $end; ?>: 0; |
|
| 255 | 255 | bottom: 0; |
| 256 | 256 | position: absolute; |
| 257 | 257 | background: white; |
@@ -277,8 +277,8 @@ discard block |
||
| 277 | 277 | height: 100% !important; |
| 278 | 278 | position: relative; |
| 279 | 279 | min-width: 1000px; |
| 280 | - margin-<?php echo $start;?>: auto; |
|
| 281 | - margin-<?php echo $end;?>: auto; |
|
| 280 | + margin-<?php echo $start; ?>: auto; |
|
| 281 | + margin-<?php echo $end; ?>: auto; |
|
| 282 | 282 | } |
| 283 | 283 | |
| 284 | 284 | div.device_info { |
@@ -298,8 +298,8 @@ discard block |
||
| 298 | 298 | position: fixed; |
| 299 | 299 | top: 0; |
| 300 | 300 | bottom: 0; |
| 301 | - <?php echo $start;?>: 0; |
|
| 302 | - <?php echo $end;?>: 0; |
|
| 301 | + <?php echo $start; ?>: 0; |
|
| 302 | + <?php echo $end; ?>: 0; |
|
| 303 | 303 | background-color: #000000; |
| 304 | 304 | opacity: 0.5; |
| 305 | 305 | z-index: 90; |
@@ -326,7 +326,7 @@ discard block |
||
| 326 | 326 | padding: 15px; |
| 327 | 327 | text-align: start; |
| 328 | 328 | width: 850px; |
| 329 | - <?php echo $start;?>: 100px; |
|
| 329 | + <?php echo $start; ?>: 100px; |
|
| 330 | 330 | top: 50px; |
| 331 | 331 | z-index: 100; |
| 332 | 332 | } |
@@ -335,15 +335,15 @@ discard block |
||
| 335 | 335 | position: absolute; |
| 336 | 336 | top: 0; |
| 337 | 337 | bottom: 0; |
| 338 | - <?php echo $start;?>: 0; |
|
| 339 | - <?php echo $end;?>: 0; |
|
| 338 | + <?php echo $start; ?>: 0; |
|
| 339 | + <?php echo $end; ?>: 0; |
|
| 340 | 340 | z-index: 100; |
| 341 | 341 | } |
| 342 | 342 | |
| 343 | 343 | div#msgbox div { |
| 344 | 344 | position: fixed; |
| 345 | - <?php echo $start;?>: 0; |
|
| 346 | - <?php echo $end;?>: 0; |
|
| 345 | + <?php echo $start; ?>: 0; |
|
| 346 | + <?php echo $end; ?>: 0; |
|
| 347 | 347 | } |
| 348 | 348 | |
| 349 | 349 | div#msgbox div div.graybox { |
@@ -358,13 +358,13 @@ discard block |
||
| 358 | 358 | div.graybox img { |
| 359 | 359 | display: block; |
| 360 | 360 | cursor: pointer; |
| 361 | - float: <?php echo $end;?>; |
|
| 361 | + float: <?php echo $end; ?>; |
|
| 362 | 362 | margin: 0px 0px 10px 10px; |
| 363 | 363 | } |
| 364 | 364 | |
| 365 | 365 | img.icon { |
| 366 | - float: <?php echo $start;?>; |
|
| 367 | - margin-<?php echo $end;?>: 5px; |
|
| 366 | + float: <?php echo $start; ?>; |
|
| 367 | + margin-<?php echo $end; ?>: 5px; |
|
| 368 | 368 | margin-top: 3px; |
| 369 | 369 | } |
| 370 | 370 | |
@@ -428,15 +428,15 @@ discard block |
||
| 428 | 428 | div.ca-summary { |
| 429 | 429 | border: 1px dotted; |
| 430 | 430 | background-color: #ccccff; |
| 431 | - border-<?php echo $start;?>: 10px solid; |
|
| 432 | - border-<?php echo $start;?>-color: green; |
|
| 431 | + border-<?php echo $start; ?>: 10px solid; |
|
| 432 | + border-<?php echo $start; ?>-color: green; |
|
| 433 | 433 | padding: 2px; |
| 434 | - padding-<?php echo $start;?>: 8px; |
|
| 434 | + padding-<?php echo $start; ?>: 8px; |
|
| 435 | 435 | } |
| 436 | 436 | |
| 437 | 437 | span.edu_cat { |
| 438 | 438 | font-weight: bold; |
| 439 | - color: <?php echo $colour2;?>; |
|
| 439 | + color: <?php echo $colour2; ?>; |
|
| 440 | 440 | } |
| 441 | 441 | |
| 442 | 442 | span.tooltip { |
@@ -495,7 +495,7 @@ discard block |
||
| 495 | 495 | } |
| 496 | 496 | |
| 497 | 497 | table.authrecord td { |
| 498 | - padding-<?php echo $end;?>: 10px; |
|
| 498 | + padding-<?php echo $end; ?>: 10px; |
|
| 499 | 499 | } |
| 500 | 500 | |
| 501 | 501 | p.MOTD { |
@@ -513,15 +513,15 @@ discard block |
||
| 513 | 513 | } |
| 514 | 514 | |
| 515 | 515 | .use_borders button { |
| 516 | - border-<?php echo $start;?>-style: outset; |
|
| 517 | - border-<?php echo $start;?>-width: 1px; |
|
| 518 | - border-<?php echo $start;?>-color: #8bbacb; |
|
| 516 | + border-<?php echo $start; ?>-style: outset; |
|
| 517 | + border-<?php echo $start; ?>-width: 1px; |
|
| 518 | + border-<?php echo $start; ?>-color: #8bbacb; |
|
| 519 | 519 | border-top-style: outset; |
| 520 | 520 | border-top-width: 1px; |
| 521 | 521 | border-top-color: #8bbacb; |
| 522 | - border-<?php echo $end;?>-style: outset; |
|
| 523 | - border-<?php echo $end;?>-width: 2px; |
|
| 524 | - border-<?php echo $end;?>-color: #043d52; |
|
| 522 | + border-<?php echo $end; ?>-style: outset; |
|
| 523 | + border-<?php echo $end; ?>-width: 2px; |
|
| 524 | + border-<?php echo $end; ?>-color: #043d52; |
|
| 525 | 525 | border-bottom-style: outset; |
| 526 | 526 | border-bottom-width: 2px; |
| 527 | 527 | border-bottom-color: #043d52; |
@@ -544,8 +544,8 @@ discard block |
||
| 544 | 544 | border-bottom-style:solid; |
| 545 | 545 | border-top-width:5px; |
| 546 | 546 | border-bottom-width:5px; |
| 547 | - border-color: <?php echo $colour1;?>; |
|
| 548 | - padding-<?php echo $start;?>:30px; |
|
| 547 | + border-color: <?php echo $colour1; ?>; |
|
| 548 | + padding-<?php echo $start; ?>:30px; |
|
| 549 | 549 | } |
| 550 | 550 | |
| 551 | 551 | .no_borders button.disabledDevice { |
@@ -561,13 +561,13 @@ discard block |
||
| 561 | 561 | } |
| 562 | 562 | |
| 563 | 563 | input { |
| 564 | - margin-<?php echo $end;?>: 5px; |
|
| 564 | + margin-<?php echo $end; ?>: 5px; |
|
| 565 | 565 | |
| 566 | 566 | } |
| 567 | 567 | |
| 568 | 568 | select { |
| 569 | 569 | vertical-align: middle; |
| 570 | - margin-<?php echo $start;?>: 10px; |
|
| 570 | + margin-<?php echo $start; ?>: 10px; |
|
| 571 | 571 | } |
| 572 | 572 | |
| 573 | 573 | td.notapplicable { |
@@ -600,8 +600,8 @@ discard block |
||
| 600 | 600 | |
| 601 | 601 | .signin_large { |
| 602 | 602 | vertical-align: top; |
| 603 | - padding-<?php echo $start;?>:20px; |
|
| 604 | - padding-<?php echo $end;?>:20px; |
|
| 603 | + padding-<?php echo $start; ?>:20px; |
|
| 604 | + padding-<?php echo $end; ?>:20px; |
|
| 605 | 605 | color: #bfd5dc; |
| 606 | 606 | font-size: 20px; |
| 607 | 607 | } |
@@ -614,34 +614,34 @@ discard block |
||
| 614 | 614 | } |
| 615 | 615 | |
| 616 | 616 | #close_button { |
| 617 | - background: <?php echo $colour2;?>; |
|
| 617 | + background: <?php echo $colour2; ?>; |
|
| 618 | 618 | color: #FFFFFF; |
| 619 | 619 | height: 23px; |
| 620 | - border-<?php echo $start;?>-style: inset; |
|
| 621 | - border-<?php echo $start;?>-width: 1px; |
|
| 622 | - border-<?php echo $start;?>-color: #8bbacb; |
|
| 620 | + border-<?php echo $start; ?>-style: inset; |
|
| 621 | + border-<?php echo $start; ?>-width: 1px; |
|
| 622 | + border-<?php echo $start; ?>-color: #8bbacb; |
|
| 623 | 623 | border-top-style: inset; |
| 624 | 624 | border-top-width: 1px; |
| 625 | 625 | border-top-color: #8bbacb; |
| 626 | - border-<?php echo $end;?>-style: outset; |
|
| 627 | - border-<?php echo $end;?>-width: 2px; |
|
| 628 | - border-<?php echo $end;?>-color: #043d52; |
|
| 626 | + border-<?php echo $end; ?>-style: outset; |
|
| 627 | + border-<?php echo $end; ?>-width: 2px; |
|
| 628 | + border-<?php echo $end; ?>-color: #043d52; |
|
| 629 | 629 | border-bottom-style: outset; |
| 630 | 630 | border-bottom-width: 2px; |
| 631 | 631 | border-bottom-color: #043d52; |
| 632 | - padding-<?php echo $start;?>: 5px; |
|
| 633 | - padding-<?php echo $end;?>: 5px; |
|
| 632 | + padding-<?php echo $start; ?>: 5px; |
|
| 633 | + padding-<?php echo $end; ?>: 5px; |
|
| 634 | 634 | padding-top: 1px; |
| 635 | 635 | padding-bottom: 1px; |
| 636 | 636 | position: relative; |
| 637 | - <?php echo $start;?>: 640px; |
|
| 637 | + <?php echo $start; ?>: 640px; |
|
| 638 | 638 | cursor:pointer; |
| 639 | 639 | } |
| 640 | 640 | |
| 641 | 641 | #loading_ico { |
| 642 | 642 | display: none; |
| 643 | 643 | position: absolute; |
| 644 | - <?php echo $start;?>: 200px; |
|
| 644 | + <?php echo $start; ?>: 200px; |
|
| 645 | 645 | top: 220px; |
| 646 | 646 | z-index: 200; |
| 647 | 647 | text-align: center; |
@@ -655,7 +655,7 @@ discard block |
||
| 655 | 655 | z-index: 100; |
| 656 | 656 | position: absolute; |
| 657 | 657 | width: 700px; |
| 658 | - <?php echo $start;?>: 200px; |
|
| 658 | + <?php echo $start; ?>: 200px; |
|
| 659 | 659 | text-align: justify; |
| 660 | 660 | top: 200px; |
| 661 | 661 | box-shadow: 5px 5px 5px #666666; |
@@ -663,23 +663,23 @@ discard block |
||
| 663 | 663 | } |
| 664 | 664 | |
| 665 | 665 | #user_info { |
| 666 | - padding-<?php echo $start;?>: 30px; |
|
| 666 | + padding-<?php echo $start; ?>: 30px; |
|
| 667 | 667 | font-size: 11px; |
| 668 | 668 | font-weight: normal; |
| 669 | 669 | } |
| 670 | 670 | |
| 671 | 671 | #user_welcome { |
| 672 | 672 | background: #ffffff; |
| 673 | - padding-<?php echo $start;?>: 30px; |
|
| 673 | + padding-<?php echo $start; ?>: 30px; |
|
| 674 | 674 | padding-top: 20px; |
| 675 | - padding-<?php echo $end;?>: 180px; |
|
| 675 | + padding-<?php echo $end; ?>: 180px; |
|
| 676 | 676 | font-size: 12px; |
| 677 | 677 | font-weight: normal; |
| 678 | 678 | } |
| 679 | 679 | |
| 680 | 680 | #devices { |
| 681 | 681 | z-index:90; |
| 682 | - padding-<?php echo $start;?>: 30px; |
|
| 682 | + padding-<?php echo $start; ?>: 30px; |
|
| 683 | 683 | font-size: 11px; |
| 684 | 684 | font-weight: normal; |
| 685 | 685 | position: relative; |
@@ -687,15 +687,15 @@ discard block |
||
| 687 | 687 | |
| 688 | 688 | #profile_list { |
| 689 | 689 | width: 30em; |
| 690 | - padding-<?php echo $start;?>: 10px; |
|
| 691 | - padding-<?php echo $end;?>: 0px; |
|
| 692 | - background: <?php echo $colour2;?>; |
|
| 690 | + padding-<?php echo $start; ?>: 10px; |
|
| 691 | + padding-<?php echo $end; ?>: 0px; |
|
| 692 | + background: <?php echo $colour2; ?>; |
|
| 693 | 693 | color: white; |
| 694 | 694 | box-shadow: 10px 10px 5px #888888; |
| 695 | 695 | } |
| 696 | 696 | |
| 697 | 697 | #profile_redirect { |
| 698 | - padding-<?php echo $start;?>: 30px; |
|
| 698 | + padding-<?php echo $start; ?>: 30px; |
|
| 699 | 699 | padding-top: 20px; |
| 700 | 700 | font-size: 11px; |
| 701 | 701 | font-weight: normal; |
@@ -705,13 +705,13 @@ discard block |
||
| 705 | 705 | } |
| 706 | 706 | |
| 707 | 707 | #profiles { |
| 708 | - padding-<?php echo $start;?>: 30px; |
|
| 708 | + padding-<?php echo $start; ?>: 30px; |
|
| 709 | 709 | font-size: 11px; |
| 710 | 710 | padding-bottom: 10px |
| 711 | 711 | } |
| 712 | 712 | |
| 713 | 713 | #signin { |
| 714 | - padding-<?php echo $start;?>: 30px; |
|
| 714 | + padding-<?php echo $start; ?>: 30px; |
|
| 715 | 715 | padding-top: 10px; |
| 716 | 716 | } |
| 717 | 717 | |
@@ -735,8 +735,8 @@ discard block |
||
| 735 | 735 | font-size: 14px; |
| 736 | 736 | padding-top: 4px; |
| 737 | 737 | padding-bottom: 12px; |
| 738 | - padding-<?php echo $start;?>: 30px; |
|
| 739 | - background: <?php echo $colour1;?>; |
|
| 738 | + padding-<?php echo $start; ?>: 30px; |
|
| 739 | + background: <?php echo $colour1; ?>; |
|
| 740 | 740 | text-align: start; |
| 741 | 741 | text-shadow: 10px 10px 5px #888888; |
| 742 | 742 | } |
@@ -746,9 +746,9 @@ discard block |
||
| 746 | 746 | border-bottom-style:solid; |
| 747 | 747 | border-top-width:5px; |
| 748 | 748 | border-bottom-width:5px; |
| 749 | - border-color: <?php echo $colour1;?>; |
|
| 750 | - padding-<?php echo $start;?>:30px; |
|
| 751 | - color: <?php echo $colour2;?>; |
|
| 749 | + border-color: <?php echo $colour1; ?>; |
|
| 750 | + padding-<?php echo $start; ?>:30px; |
|
| 751 | + color: <?php echo $colour2; ?>; |
|
| 752 | 752 | } |
| 753 | 753 | |
| 754 | 754 | #heading h1 { |
@@ -763,11 +763,11 @@ discard block |
||
| 763 | 763 | |
| 764 | 764 | #welcome { |
| 765 | 765 | padding: 20px; |
| 766 | - padding-<?php echo $start;?>: 30px; |
|
| 766 | + padding-<?php echo $start; ?>: 30px; |
|
| 767 | 767 | text-align: justify; |
| 768 | 768 | border-bottom-style:solid; |
| 769 | 769 | border-bottom-width:5px; |
| 770 | - border-color: <?php echo $colour1;?>; |
|
| 770 | + border-color: <?php echo $colour1; ?>; |
|
| 771 | 771 | font-size: 11px; |
| 772 | 772 | font-weight: normal; |
| 773 | 773 | } |
@@ -776,14 +776,14 @@ discard block |
||
| 776 | 776 | #main_menu_info { |
| 777 | 777 | position: relative; |
| 778 | 778 | top: 15px; |
| 779 | - <?php echo $start;?>: 0px; |
|
| 780 | - padding:10px; padding-<?php echo $start;?>:20px; padding-<?php echo $end;?>:20px; |
|
| 779 | + <?php echo $start; ?>: 0px; |
|
| 780 | + padding:10px; padding-<?php echo $start; ?>:20px; padding-<?php echo $end; ?>:20px; |
|
| 781 | 781 | background: #f0f0f0; |
| 782 | 782 | border: 1px solid #dddddd; |
| 783 | - margin-<?php echo $start;?>: 25px; |
|
| 784 | - padding-<?php echo $start;?>: 25px; |
|
| 785 | - margin-<?php echo $end;?>: 25px; |
|
| 786 | - padding-<?php echo $end;?>: 25px; |
|
| 783 | + margin-<?php echo $start; ?>: 25px; |
|
| 784 | + padding-<?php echo $start; ?>: 25px; |
|
| 785 | + margin-<?php echo $end; ?>: 25px; |
|
| 786 | + padding-<?php echo $end; ?>: 25px; |
|
| 787 | 787 | padding-bottom: 10px; |
| 788 | 788 | vertical-align: top; |
| 789 | 789 | box-shadow: 5px 5px 5px #666666; |
@@ -814,7 +814,7 @@ discard block |
||
| 814 | 814 | |
| 815 | 815 | #faq { |
| 816 | 816 | padding: 20px; |
| 817 | - color: <?php echo $colour2;?>; |
|
| 817 | + color: <?php echo $colour2; ?>; |
|
| 818 | 818 | background: #ffffff; |
| 819 | 819 | } |
| 820 | 820 | |
@@ -832,7 +832,7 @@ discard block |
||
| 832 | 832 | #idp_logo { |
| 833 | 833 | display:none; |
| 834 | 834 | position:absolute; |
| 835 | - <?php echo $end;?>:30px; |
|
| 835 | + <?php echo $end; ?>:30px; |
|
| 836 | 836 | max-height:150px; |
| 837 | 837 | max-width:150px; |
| 838 | 838 | padding-top:10px; |
@@ -855,18 +855,18 @@ discard block |
||
| 855 | 855 | #slides img { |
| 856 | 856 | position: absolute; |
| 857 | 857 | top: 145px; |
| 858 | - <?php echo $end;?>: 60px; |
|
| 858 | + <?php echo $end; ?>: 60px; |
|
| 859 | 859 | } |
| 860 | 860 | |
| 861 | 861 | #slides span { |
| 862 | 862 | position: absolute; |
| 863 | - <?php echo $start;?>: 180px; |
|
| 863 | + <?php echo $start; ?>: 180px; |
|
| 864 | 864 | z-index: 20; |
| 865 | 865 | } |
| 866 | 866 | |
| 867 | 867 | #line1 { |
| 868 | 868 | top:145px; |
| 869 | - color: <?php echo $colour2;?>; |
|
| 869 | + color: <?php echo $colour2; ?>; |
|
| 870 | 870 | font-size:20px; |
| 871 | 871 | } |
| 872 | 872 | |
@@ -878,7 +878,7 @@ discard block |
||
| 878 | 878 | |
| 879 | 879 | #line3 { |
| 880 | 880 | top:245px; |
| 881 | - <?php echo $start;?>: 200px; |
|
| 881 | + <?php echo $start; ?>: 200px; |
|
| 882 | 882 | color: maroon; |
| 883 | 883 | font-size:25px; |
| 884 | 884 | } |
@@ -907,16 +907,16 @@ discard block |
||
| 907 | 907 | height:100%; |
| 908 | 908 | border-spacing:0; |
| 909 | 909 | border-collapse:collapse; |
| 910 | - padding-<?php echo $start;?>:200px; |
|
| 910 | + padding-<?php echo $start; ?>:200px; |
|
| 911 | 911 | padding-top:10px; |
| 912 | 912 | } |
| 913 | 913 | |
| 914 | 914 | #front_page_leftmenu { |
| 915 | - border-<?php echo $end;?>:solid; |
|
| 916 | - border-color: <?php echo $colour1;?>; |
|
| 915 | + border-<?php echo $end; ?>:solid; |
|
| 916 | + border-color: <?php echo $colour1; ?>; |
|
| 917 | 917 | border-width:5px; |
| 918 | 918 | min-height:400px; |
| 919 | - padding-<?php echo $start;?>: 10px; |
|
| 919 | + padding-<?php echo $start; ?>: 10px; |
|
| 920 | 920 | vertical-align:top; |
| 921 | 921 | width:110px; |
| 922 | 922 | padding-top:30px; |
@@ -926,8 +926,8 @@ discard block |
||
| 926 | 926 | vertical-align: top; |
| 927 | 927 | height:280px; |
| 928 | 928 | background: #fff; |
| 929 | - padding-<?php echo $start;?>: 20px; |
|
| 930 | - padding-<?php echo $end;?>: 20px; |
|
| 929 | + padding-<?php echo $start; ?>: 20px; |
|
| 930 | + padding-<?php echo $end; ?>: 20px; |
|
| 931 | 931 | } |
| 932 | 932 | |
| 933 | 933 | #user_button_td { |
@@ -938,11 +938,11 @@ discard block |
||
| 938 | 938 | } |
| 939 | 939 | |
| 940 | 940 | a:link { |
| 941 | - color:<?php echo $colour2;?>; |
|
| 941 | + color:<?php echo $colour2; ?>; |
|
| 942 | 942 | } |
| 943 | 943 | |
| 944 | 944 | a:visited { |
| 945 | - color:<?php echo $colour2;?>; |
|
| 945 | + color:<?php echo $colour2; ?>; |
|
| 946 | 946 | } |
| 947 | 947 | |
| 948 | 948 | a:hover { |
@@ -950,7 +950,7 @@ discard block |
||
| 950 | 950 | } |
| 951 | 951 | |
| 952 | 952 | a:active { |
| 953 | - color:<?php echo $colour2;?>; |
|
| 953 | + color:<?php echo $colour2; ?>; |
|
| 954 | 954 | } |
| 955 | 955 | |
| 956 | 956 | .comment { |
@@ -981,14 +981,14 @@ discard block |
||
| 981 | 981 | table.user_overview th { |
| 982 | 982 | text-align: start; |
| 983 | 983 | background: #f0f0f0; |
| 984 | - padding-<?php echo $start;?>: 4px; |
|
| 985 | - padding-<?php echo $end;?>: 4px; |
|
| 984 | + padding-<?php echo $start; ?>: 4px; |
|
| 985 | + padding-<?php echo $end; ?>: 4px; |
|
| 986 | 986 | } |
| 987 | 987 | |
| 988 | 988 | table.user_overview td { |
| 989 | 989 | border-top-style: none; |
| 990 | - padding-<?php echo $start;?>: 4px; |
|
| 991 | - padding-<?php echo $end;?>: 4px; |
|
| 990 | + padding-<?php echo $start; ?>: 4px; |
|
| 991 | + padding-<?php echo $end; ?>: 4px; |
|
| 992 | 992 | vertical-align: middle; |
| 993 | 993 | height: 28px; |
| 994 | 994 | } |
@@ -1005,14 +1005,14 @@ discard block |
||
| 1005 | 1005 | .download_button_text { |
| 1006 | 1006 | width: 380px; |
| 1007 | 1007 | position:absolute; |
| 1008 | - <?php echo $end;?>: 5px; |
|
| 1008 | + <?php echo $end; ?>: 5px; |
|
| 1009 | 1009 | padding-top:0px; |
| 1010 | 1010 | } |
| 1011 | 1011 | |
| 1012 | 1012 | #download_info { |
| 1013 | 1013 | background: #f0f0f0; |
| 1014 | - padding-<?php echo $start;?>: 20px; |
|
| 1015 | - padding-<?php echo $end;?>: 20px; |
|
| 1014 | + padding-<?php echo $start; ?>: 20px; |
|
| 1015 | + padding-<?php echo $end; ?>: 20px; |
|
| 1016 | 1016 | padding-top:3px; |
| 1017 | 1017 | padding-bottom:3px; |
| 1018 | 1018 | } |
@@ -1056,7 +1056,7 @@ discard block |
||
| 1056 | 1056 | } |
| 1057 | 1057 | |
| 1058 | 1058 | .downloads tr td { |
| 1059 | - text-align: <?php echo $end;?>; |
|
| 1059 | + text-align: <?php echo $end; ?>; |
|
| 1060 | 1060 | padding-left: 5px; |
| 1061 | 1061 | padding-right: 5px; |
| 1062 | 1062 | border-bottom-style: solid; |
@@ -1064,5 +1064,5 @@ discard block |
||
| 1064 | 1064 | } |
| 1065 | 1065 | |
| 1066 | 1066 | .downloads tr td:first-child { |
| 1067 | - text-align: <?php echo $start;?>; |
|
| 1067 | + text-align: <?php echo $start; ?>; |
|
| 1068 | 1068 | } |
| 1069 | 1069 | \ No newline at end of file |
