@@ -71,5 +71,5 @@ |
||
71 | 71 | throw new Exception("Unable to find our accountstatus.php page."); |
72 | 72 | } |
73 | 73 | // print $accountPageUrl; |
74 | - header("Location: ../accountstatus/accountstatus.php?token=" . $cleanToken . "&errorcode=GENERATOR_CONSUMED"); |
|
74 | + header("Location: ../accountstatus/accountstatus.php?token=" . $cleanToken . "&errorcode=GENERATOR_CONSUMED"); |
|
75 | 75 | } |
@@ -32,8 +32,8 @@ discard block |
||
32 | 32 | switch ($page) { |
33 | 33 | case 'about' : |
34 | 34 | require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/user/about_cat.inc.php"); |
35 | - $out = "<div>$out</div>"; |
|
36 | - break; |
|
35 | + $out = "<div>$out</div>"; |
|
36 | + break; |
|
37 | 37 | case 'tou': |
38 | 38 | require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/user/tou.inc.php"); |
39 | 39 | $out = "no_title<div> |
@@ -59,18 +59,18 @@ discard block |
||
59 | 59 | case 'what_is_eduroam' : |
60 | 60 | $out = "no_title<div><h1>" . _("Help") . "</h1>"; |
61 | 61 | foreach ($Faq as $faqItem) { |
62 | - if (!empty($faqItem['id']) && $faqItem['id'] == $subpage) { |
|
63 | - $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n"; |
|
64 | - $out .= "" . $faqItem['text'] . "</div>\n"; |
|
65 | - } |
|
62 | + if (!empty($faqItem['id']) && $faqItem['id'] == $subpage) { |
|
63 | + $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n"; |
|
64 | + $out .= "" . $faqItem['text'] . "</div>\n"; |
|
65 | + } |
|
66 | 66 | } |
67 | 67 | $out .= "</div>"; |
68 | 68 | break; |
69 | 69 | case 'faq': |
70 | 70 | $out = "no_title<div><h1>" . _("Frequently Asked Questions") . "</h1>"; |
71 | 71 | foreach ($Faq as $faqItem) { |
72 | - $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n"; |
|
73 | - $out .= "" . $faqItem['text'] . "</div>\n"; |
|
72 | + $out .= "<div><h3>" . $faqItem['title'] . "</h3>\n"; |
|
73 | + $out .= "" . $faqItem['text'] . "</div>\n"; |
|
74 | 74 | } |
75 | 75 | $out .= "</div>"; |
76 | 76 | break; |
@@ -98,8 +98,8 @@ discard block |
||
98 | 98 | $out .= "<input id='mail' name='mail' type='text'/><button onclick='window.location.replace(\"[email protected]\"; return false;'>" . _("Get IdP Reminder") . "</button>"; |
99 | 99 | } |
100 | 100 | break; |
101 | - } |
|
102 | - break; |
|
101 | + } |
|
102 | + break; |
|
103 | 103 | default: |
104 | 104 | break; |
105 | 105 | } |
@@ -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(); |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | $idpId = filter_input(INPUT_GET, 'idp', FILTER_VALIDATE_INT) ?? filter_input(INPUT_POST, 'idp', FILTER_VALIDATE_INT); |
20 | 20 | $profileId = filter_input(INPUT_GET, 'profile', FILTER_VALIDATE_INT) ?? filter_input(INPUT_POST, 'profile', FILTER_VALIDATE_INT); |
21 | 21 | $skinObject = $Gui->skinObject; |
22 | - ?> |
|
22 | + ?> |
|
23 | 23 | var n; |
24 | 24 | var profile; |
25 | 25 | // var device_button_bg ="#0a698e"; |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | } |
353 | 353 | |
354 | 354 | <?php if($idpId) { |
355 | - print "front_page = 0;\n"; |
|
355 | + print "front_page = 0;\n"; |
|
356 | 356 | } ?> |
357 | 357 | |
358 | 358 | function showTOU(){ |
@@ -434,7 +434,7 @@ discard block |
||
434 | 434 | if ($profileId) { |
435 | 435 | print "listProfiles($idpId,$profileId);"; |
436 | 436 | } |
437 | - ?> |
|
437 | + ?> |
|
438 | 438 | |
439 | 439 | $(".signin").click(function(event){ |
440 | 440 | event.preventDefault(); |
@@ -517,12 +517,12 @@ discard block |
||
517 | 517 | }); |
518 | 518 | DiscoJuice.Constants.Countries = { |
519 | 519 | <?php |
520 | - $C = $Gui->printCountryList(1); |
|
521 | - $ret = ''; |
|
522 | - foreach ($C as $key => $val) { |
|
520 | + $C = $Gui->printCountryList(1); |
|
521 | + $ret = ''; |
|
522 | + foreach ($C as $key => $val) { |
|
523 | 523 | $ret .= "'$key': \"$val\","; |
524 | - } |
|
525 | - echo substr($ret, 0, -1); |
|
524 | + } |
|
525 | + echo substr($ret, 0, -1); |
|
526 | 526 | ?> |
527 | 527 | }; |
528 | 528 | } |
@@ -24,19 +24,19 @@ discard block |
||
24 | 24 | } |
25 | 25 | } |
26 | 26 | $this->menu = [['id'=>'start', |
27 | - 'text'=>_("Start page"), |
|
28 | - 'visibility' => 'index'], |
|
27 | + 'text'=>_("Start page"), |
|
28 | + 'visibility' => 'index'], |
|
29 | 29 | ['id'=>'about', |
30 | - 'text'=>_("About"),'link'=>'','submenu'=>[ |
|
30 | + 'text'=>_("About"),'link'=>'','submenu'=>[ |
|
31 | 31 | ['text'=>sprintf(_("About %s"), CONFIG['APPEARANCE']['productname']), |
32 | - 'catInfo'=>['about_cat',sprintf(_("About %s"), CONFIG['APPEARANCE']['productname'])]], |
|
32 | + 'catInfo'=>['about_cat',sprintf(_("About %s"), CONFIG['APPEARANCE']['productname'])]], |
|
33 | 33 | ['text'=>sprintf(_("About %s"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']), |
34 | - 'link'=>CONFIG_CONFASSISTANT['CONSORTIUM']['homepage']], |
|
34 | + 'link'=>CONFIG_CONFASSISTANT['CONSORTIUM']['homepage']], |
|
35 | 35 | ]], |
36 | 36 | ['id'=>'lang', |
37 | - 'text'=>_("Language"), 'submenu'=>$langsArray,], |
|
37 | + 'text'=>_("Language"), 'submenu'=>$langsArray,], |
|
38 | 38 | ['id'=>'help', |
39 | - 'text'=>_("Help"), 'submenu'=>[ |
|
39 | + 'text'=>_("Help"), 'submenu'=>[ |
|
40 | 40 | ['text'=>_("My institution is not listed"), 'catInfo'=>['idp_not_listed',_("FAQ")], 'visibility'=>'index'], |
41 | 41 | ['text'=>_("My device is not listed"), 'catInfo'=>['device_not_listed',_("FAQ")], 'visibility'=>'index'], |
42 | 42 | ['text'=>_("SB help item"),'visibility'=>'sb'], |
@@ -45,24 +45,24 @@ discard block |
||
45 | 45 | ['text'=>_("Contact"), 'catInfo'=>['contact',_("FAQ")]], |
46 | 46 | ]], |
47 | 47 | ['id'=>'manage', |
48 | - 'text'=>_("Manage"),'submenu'=>[ |
|
48 | + 'text'=>_("Manage"),'submenu'=>[ |
|
49 | 49 | ['text'=>sprintf(_("%s admin access"),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']), |
50 | - 'catInfo'=>['admin',sprintf(_("%s admin:<br>manage your IdP"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])]], |
|
50 | + 'catInfo'=>['admin',sprintf(_("%s admin:<br>manage your IdP"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])]], |
|
51 | 51 | ['text'=>_("Become a CAT developer"), |
52 | - 'catInfo'=>['develop',_("Become a CAT developer")]], |
|
52 | + 'catInfo'=>['develop',_("Become a CAT developer")]], |
|
53 | 53 | ['text'=>_("Documentation")], |
54 | 54 | ], |
55 | - 'visibility' => 'index'], |
|
55 | + 'visibility' => 'index'], |
|
56 | 56 | ['id'=>'tou', |
57 | - 'text'=>_("Terms of use"), 'catInfo'=>['tou','TOU']], |
|
57 | + 'text'=>_("Terms of use"), 'catInfo'=>['tou','TOU']], |
|
58 | 58 | ]; |
59 | 59 | $this->visibility = $visibility; |
60 | 60 | } |
61 | 61 | public function printMenu($menu = NULL, $id=NULL) { |
62 | 62 | $menu = $menu ?? $this->menu; |
63 | - if(count($menu) == 0) { |
|
64 | - return; |
|
65 | - } |
|
63 | + if(count($menu) == 0) { |
|
64 | + return; |
|
65 | + } |
|
66 | 66 | $out = "\n<ul>\n"; |
67 | 67 | foreach ($menu as $menuItem) { |
68 | 68 | $itemVisibility = $menuItem['visibility'] ?? 'all'; |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | $out .= $this->printMenuItem($menuItem['text'], $link, $class); |
79 | 79 | $out .= $this->printMenu($submenu,$iD); |
80 | 80 | $out .= "</li>\n"; |
81 | - } |
|
81 | + } |
|
82 | 82 | } |
83 | 83 | $out .= '</ul>'; |
84 | 84 | return($out); |
@@ -11,14 +11,14 @@ 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(); |
18 | 18 | $langObject->setTextDomain('web_user'); |
19 | 19 | $idpId = filter_input(INPUT_GET, 'idp', FILTER_VALIDATE_INT) ?? filter_input(INPUT_POST, 'idp', FILTER_VALIDATE_INT); |
20 | 20 | $profileId = filter_input(INPUT_GET, 'profile', FILTER_VALIDATE_INT) ?? filter_input(INPUT_POST, 'profile', FILTER_VALIDATE_INT); |
21 | - ?> |
|
21 | + ?> |
|
22 | 22 | var n; |
23 | 23 | var profile; |
24 | 24 | var generateTimer; |
@@ -353,7 +353,7 @@ discard block |
||
353 | 353 | } |
354 | 354 | |
355 | 355 | <?php if($idpId) { |
356 | - print "front_page = 0;\n"; |
|
356 | + print "front_page = 0;\n"; |
|
357 | 357 | } ?> |
358 | 358 | |
359 | 359 | function showTOU(){ |
@@ -487,7 +487,7 @@ discard block |
||
487 | 487 | if ($profileId) { |
488 | 488 | print "listProfiles($idpId,$profileId);"; |
489 | 489 | } |
490 | - ?> |
|
490 | + ?> |
|
491 | 491 | |
492 | 492 | $(".signin").click(function(event){ |
493 | 493 | pressedButton = $(this); |
@@ -548,12 +548,12 @@ discard block |
||
548 | 548 | }); |
549 | 549 | DiscoJuice.Constants.Countries = { |
550 | 550 | <?php |
551 | - $C = $Gui->printCountryList(1); |
|
552 | - $ret = ''; |
|
553 | - foreach ($C as $key => $val) { |
|
551 | + $C = $Gui->printCountryList(1); |
|
552 | + $ret = ''; |
|
553 | + foreach ($C as $key => $val) { |
|
554 | 554 | $ret .= "'$key': \"$val\","; |
555 | - } |
|
556 | - echo substr($ret, 0, -1); |
|
555 | + } |
|
556 | + echo substr($ret, 0, -1); |
|
557 | 557 | ?> |
558 | 558 | }; |
559 | 559 |