@@ -14,11 +14,11 @@ |
||
| 14 | 14 | */ |
| 15 | 15 | class InstitutionPageBuilder { |
| 16 | 16 | |
| 17 | - /** |
|
| 18 | - * Particular IdP instance. If set to null means that page is entered by a mistake. |
|
| 19 | - * |
|
| 20 | - * @var \core\IdP |
|
| 21 | - */ |
|
| 17 | + /** |
|
| 18 | + * Particular IdP instance. If set to null means that page is entered by a mistake. |
|
| 19 | + * |
|
| 20 | + * @var \core\IdP |
|
| 21 | + */ |
|
| 22 | 22 | protected $institution = null; |
| 23 | 23 | |
| 24 | 24 | /** |
@@ -3,24 +3,24 @@ |
||
| 3 | 3 | <?php echo _("Choose an installer to download"); ?> |
| 4 | 4 | <table id="device_list" style="padding:0px;"> |
| 5 | 5 | <?php |
| 6 | - $langObject->setTextDomain("devices"); |
|
| 7 | - foreach ($Gui->listDevices(isset($_REQUEST['hidden']) ? $_REQUEST['hidden'] : 0) as $group => $deviceGroup) { |
|
| 8 | - $groupIndex = count($deviceGroup); |
|
| 9 | - $deviceIndex = 0; |
|
| 10 | - print '<tbody><tr><td class="vendor" rowspan="' . $groupIndex . '"><img src="'. $Gui->skinObject->findResourceUrl("IMAGES","vendorlogo/".$group.".png").'" alt="' . $group . ' Device" title="' . $group . ' Device"></td>'; |
|
| 11 | - foreach ($deviceGroup as $d => $D) { |
|
| 12 | - if ($deviceIndex) { |
|
| 13 | - print '<tr>'; |
|
| 14 | - } |
|
| 15 | - $j = ($deviceIndex + 1) * 20; |
|
| 16 | - print "<td><button id='" . $d . "'>" . $D['display'] . "</button>"; |
|
| 17 | - print "<div class='device_info' id='info_" . $d . "'></div></td>"; |
|
| 18 | - print "<td><button class='more_info_b' id='info_b_" . $d . "'>i</button></td></tr>\n"; |
|
| 19 | - $deviceIndex++; |
|
| 20 | - } |
|
| 21 | - print "</tbody>"; |
|
| 22 | - } |
|
| 23 | - $langObject->setTextDomain("web_user"); |
|
| 6 | + $langObject->setTextDomain("devices"); |
|
| 7 | + foreach ($Gui->listDevices(isset($_REQUEST['hidden']) ? $_REQUEST['hidden'] : 0) as $group => $deviceGroup) { |
|
| 8 | + $groupIndex = count($deviceGroup); |
|
| 9 | + $deviceIndex = 0; |
|
| 10 | + print '<tbody><tr><td class="vendor" rowspan="' . $groupIndex . '"><img src="'. $Gui->skinObject->findResourceUrl("IMAGES","vendorlogo/".$group.".png").'" alt="' . $group . ' Device" title="' . $group . ' Device"></td>'; |
|
| 11 | + foreach ($deviceGroup as $d => $D) { |
|
| 12 | + if ($deviceIndex) { |
|
| 13 | + print '<tr>'; |
|
| 14 | + } |
|
| 15 | + $j = ($deviceIndex + 1) * 20; |
|
| 16 | + print "<td><button id='" . $d . "'>" . $D['display'] . "</button>"; |
|
| 17 | + print "<div class='device_info' id='info_" . $d . "'></div></td>"; |
|
| 18 | + print "<td><button class='more_info_b' id='info_b_" . $d . "'>i</button></td></tr>\n"; |
|
| 19 | + $deviceIndex++; |
|
| 20 | + } |
|
| 21 | + print "</tbody>"; |
|
| 22 | + } |
|
| 23 | + $langObject->setTextDomain("web_user"); |
|
| 24 | 24 | ?> |
| 25 | 25 | </table> |
| 26 | 26 | </div> |
@@ -35,8 +35,8 @@ discard block |
||
| 35 | 35 | switch ($page) { |
| 36 | 36 | case 'about' : |
| 37 | 37 | require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/user/about_cat.inc.php"); |
| 38 | - $out = "<div>$out</div>"; |
|
| 39 | - break; |
|
| 38 | + $out = "<div>$out</div>"; |
|
| 39 | + break; |
|
| 40 | 40 | case 'tou': |
| 41 | 41 | require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/user/tou.inc.php"); |
| 42 | 42 | $out = "no_title<div> |
@@ -62,18 +62,18 @@ discard block |
||
| 62 | 62 | case 'what_is_eduroam' : |
| 63 | 63 | $out = "no_title<div><h1>" . _("Help") . "</h1>"; |
| 64 | 64 | foreach ($Faq as $faqItem) { |
| 65 | - if (!empty($faqItem['id']) && $faqItem['id'] == $subpage) { |
|
| 66 | - $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n"; |
|
| 67 | - $out .= "" . $faqItem['text'] . "</div>\n"; |
|
| 68 | - } |
|
| 65 | + if (!empty($faqItem['id']) && $faqItem['id'] == $subpage) { |
|
| 66 | + $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n"; |
|
| 67 | + $out .= "" . $faqItem['text'] . "</div>\n"; |
|
| 68 | + } |
|
| 69 | 69 | } |
| 70 | 70 | $out .= "</div>"; |
| 71 | 71 | break; |
| 72 | 72 | case 'faq': |
| 73 | 73 | $out = "no_title<div><h1>" . _("Frequently Asked Questions") . "</h1>"; |
| 74 | 74 | foreach ($Faq as $faqItem) { |
| 75 | - $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n"; |
|
| 76 | - $out .= "" . $faqItem['text'] . "</div>\n"; |
|
| 75 | + $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n"; |
|
| 76 | + $out .= "" . $faqItem['text'] . "</div>\n"; |
|
| 77 | 77 | } |
| 78 | 78 | $out .= "</div>"; |
| 79 | 79 | break; |
@@ -97,10 +97,10 @@ discard block |
||
| 97 | 97 | $out .= _("Please authenticate yourself and login"); |
| 98 | 98 | } |
| 99 | 99 | $out .= "<p><button onclick='goAdmin(); return(false);'>" . _("Login") . "</button>"; |
| 100 | - } |
|
| 101 | - break; |
|
| 102 | - } |
|
| 103 | - break; |
|
| 100 | + } |
|
| 101 | + break; |
|
| 102 | + } |
|
| 103 | + break; |
|
| 104 | 104 | default: |
| 105 | 105 | break; |
| 106 | 106 | } |
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | |
| 20 | 20 | // extract request parameters; action is mandatory |
| 21 | 21 | if(!isset($_REQUEST['action'])) { |
| 22 | - exit; |
|
| 22 | + exit; |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | $action = $_REQUEST['action']; |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | ?> |
| 11 | 11 | <?php |
| 12 | 12 | function escaped_echo($s) { |
| 13 | - echo preg_replace('/"/','"',$s); |
|
| 13 | + echo preg_replace('/"/','"',$s); |
|
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | $langObject = new \core\common\Language(); |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | if (! is_numeric($profileId)) { |
| 24 | 24 | exit; |
| 25 | 25 | } |
| 26 | - ?> |
|
| 26 | + ?> |
|
| 27 | 27 | var n; |
| 28 | 28 | var profile; |
| 29 | 29 | // var device_button_bg ="#0a698e"; |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | } |
| 346 | 346 | |
| 347 | 347 | <?php if($idpId) { |
| 348 | - print "front_page = 0;\n"; |
|
| 348 | + print "front_page = 0;\n"; |
|
| 349 | 349 | } ?> |
| 350 | 350 | |
| 351 | 351 | function showTOU(){ |
@@ -421,7 +421,7 @@ discard block |
||
| 421 | 421 | if ($profileId) { |
| 422 | 422 | print "listProfiles($idpId,$profileId);"; |
| 423 | 423 | } |
| 424 | - ?> |
|
| 424 | + ?> |
|
| 425 | 425 | |
| 426 | 426 | $(".signin").click(function(event){ |
| 427 | 427 | event.preventDefault(); |
@@ -500,12 +500,12 @@ discard block |
||
| 500 | 500 | }); |
| 501 | 501 | DiscoJuice.Constants.Countries = { |
| 502 | 502 | <?php |
| 503 | - $C = $Gui->printCountryList(1); |
|
| 504 | - $ret = ''; |
|
| 505 | - foreach ($C as $key => $val) { |
|
| 503 | + $C = $Gui->printCountryList(1); |
|
| 504 | + $ret = ''; |
|
| 505 | + foreach ($C as $key => $val) { |
|
| 506 | 506 | $ret .= "'$key': \"$val\","; |
| 507 | - } |
|
| 508 | - echo substr($ret, 0, -1); |
|
| 507 | + } |
|
| 508 | + echo substr($ret, 0, -1); |
|
| 509 | 509 | ?> |
| 510 | 510 | }; |
| 511 | 511 | |
@@ -68,13 +68,12 @@ |
||
| 68 | 68 | |
| 69 | 69 | <?php |
| 70 | 70 | /** |
| 71 | - * The OS object holds operating system descriptions |
|
| 72 | - * @param name is the main title |
|
| 73 | - * @param subtitle - the subtitle |
|
| 74 | - * @param path - the path to the scriin-dump image |
|
| 75 | - * @param signed - if true show information that the module is signed |
|
| 76 | - |
|
| 77 | -*/ |
|
| 71 | + * The OS object holds operating system descriptions |
|
| 72 | + * @param name is the main title |
|
| 73 | + * @param subtitle - the subtitle |
|
| 74 | + * @param path - the path to the scriin-dump image |
|
| 75 | + * @param signed - if true show information that the module is signed |
|
| 76 | + */ |
|
| 78 | 77 | ?> |
| 79 | 78 | |
| 80 | 79 | function OS(name, subtitle, path, signed) { |
@@ -76,9 +76,9 @@ |
||
| 76 | 76 | public $CAT_COPYRIGHT; |
| 77 | 77 | |
| 78 | 78 | /** |
| 79 | - * the custom displayable variant of the term 'federation' |
|
| 80 | - * @var string |
|
| 81 | - */ |
|
| 79 | + * the custom displayable variant of the term 'federation' |
|
| 80 | + * @var string |
|
| 81 | + */ |
|
| 82 | 82 | public $nomenclature_fed; |
| 83 | 83 | |
| 84 | 84 | /** |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | <?php |
| 12 | 12 | $cat = new core\CAT(); |
| 13 | 13 | function escaped_echo($s) { |
| 14 | - echo preg_replace('/"/','"',$s); |
|
| 14 | + echo preg_replace('/"/','"',$s); |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | $langObject = new \core\common\Language(); |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | if (! is_numeric($profileId)) { |
| 25 | 25 | exit; |
| 26 | 26 | } |
| 27 | - ?> |
|
| 27 | + ?> |
|
| 28 | 28 | var n; |
| 29 | 29 | var profile; |
| 30 | 30 | var generateTimer; |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | } |
| 360 | 360 | |
| 361 | 361 | <?php if($idpId) { |
| 362 | - print "front_page = 0;\n"; |
|
| 362 | + print "front_page = 0;\n"; |
|
| 363 | 363 | } ?> |
| 364 | 364 | |
| 365 | 365 | function showTOU(){ |
@@ -493,7 +493,7 @@ discard block |
||
| 493 | 493 | if ($profileId) { |
| 494 | 494 | print "listProfiles($idpId,$profileId);"; |
| 495 | 495 | } |
| 496 | - ?> |
|
| 496 | + ?> |
|
| 497 | 497 | |
| 498 | 498 | $(".signin").click(function(event){ |
| 499 | 499 | pressedButton = $(this); |
@@ -554,12 +554,12 @@ discard block |
||
| 554 | 554 | }); |
| 555 | 555 | DiscoJuice.Constants.Countries = { |
| 556 | 556 | <?php |
| 557 | - $C = $Gui->printCountryList(1); |
|
| 558 | - $ret = ''; |
|
| 559 | - foreach ($C as $key => $val) { |
|
| 557 | + $C = $Gui->printCountryList(1); |
|
| 558 | + $ret = ''; |
|
| 559 | + foreach ($C as $key => $val) { |
|
| 560 | 560 | $ret .= "'$key': \"$val\","; |
| 561 | - } |
|
| 562 | - echo substr($ret, 0, -1); |
|
| 561 | + } |
|
| 562 | + echo substr($ret, 0, -1); |
|
| 563 | 563 | ?> |
| 564 | 564 | }; |
| 565 | 565 | |
@@ -128,7 +128,6 @@ |
||
| 128 | 128 | * - RETVAL_NOTCONFIGURED; needs CONFIG_DIAGNOSTICS['RADIUSTESTS']['TLS-discoverytag'] |
| 129 | 129 | * - RETVAL_INVALID (at least one format error) |
| 130 | 130 | * - RETVAL_OK (all fine) |
| 131 | - |
|
| 132 | 131 | * @return int one of two RETVALs above |
| 133 | 132 | */ |
| 134 | 133 | public function NAPTR_compliance() { |