@@ -89,12 +89,12 @@ |
||
89 | 89 | $this->templates[WELCOME_ABOARD_TERMS] = ""; |
90 | 90 | foreach ([ |
91 | 91 | "eduroam" => [ |
92 | - "TOU" => "https://wiki.geant.org/display/H2eduroam/Terms+and+Conditions", |
|
93 | - "PRIV" => "https://www.eduroam.org/privacy/", |
|
92 | + "TOU" => "https://wiki.geant.org/display/H2eduroam/Terms+and+Conditions", |
|
93 | + "PRIV" => "https://www.eduroam.org/privacy/", |
|
94 | 94 | ], |
95 | 95 | "OpenRoaming" => [ |
96 | - "TOU" => "https://wballiance.com/openroaming/toc-2020/", |
|
97 | - "PRIV" => "https://wballiance.com/openroaming/privacy-policy-2020/", |
|
96 | + "TOU" => "https://wballiance.com/openroaming/toc-2020/", |
|
97 | + "PRIV" => "https://wballiance.com/openroaming/privacy-policy-2020/", |
|
98 | 98 | ] |
99 | 99 | ] as $consortium => $terms) { |
100 | 100 | $this->templates[WELCOME_ABOARD_TERMS] .= sprintf("<p>" . _("When connecting to %s hotspots, the following <a href='%s'>Terms and Conditions</a> and <a href='%s'>Privacy Notice</a> apply.") . "</p>", $consortium, $terms['TOU'], $terms['PRIV']); |
@@ -34,13 +34,13 @@ |
||
34 | 34 | */ |
35 | 35 | class Diagnostics |
36 | 36 | { |
37 | - /** |
|
38 | - * Various paths. |
|
39 | - * eapol_test: absolute path to the eapol_test executable. If you just fill in "eapol_test" the one from the system $PATH will be taken. |
|
40 | - * c_rehash: absolute path to the c_rehash executable. If you just fill in "c_rehash" the one from the system $PATH will be taken. |
|
41 | - * See also NSIS_VERSION further down |
|
42 | - * @var array |
|
43 | - */ |
|
37 | + /** |
|
38 | + * Various paths. |
|
39 | + * eapol_test: absolute path to the eapol_test executable. If you just fill in "eapol_test" the one from the system $PATH will be taken. |
|
40 | + * c_rehash: absolute path to the c_rehash executable. If you just fill in "c_rehash" the one from the system $PATH will be taken. |
|
41 | + * See also NSIS_VERSION further down |
|
42 | + * @var array |
|
43 | + */ |
|
44 | 44 | const PATHS = [ |
45 | 45 | 'c_rehash' => 'c_rehash', |
46 | 46 | 'eapol_test' => 'eapol_test', |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | public function divSilverbullet() { |
125 | 125 | $retval = " |
126 | 126 | <div id='silverbullet'>" |
127 | - .$this->Gui->textTemplates->templates[user\SB_GO_AWAY] . |
|
127 | + .$this->Gui->textTemplates->templates[user\SB_GO_AWAY] . |
|
128 | 128 | "</div> |
129 | 129 | "; |
130 | 130 | return $retval; |
@@ -292,9 +292,9 @@ discard block |
||
292 | 292 | $retval .= '<tr>'; |
293 | 293 | } |
294 | 294 | $retval .= "<td><button id='".$d."'>".$D['display']."</button>" |
295 | - ."<div class='openroaming_selection' id='openroaming_".$d."'><button>eduroam</button> <button>eduroam + OpenRoaming</button></div>" |
|
296 | - ."<div class='device_info' id='info_".$d."'></div></td>" |
|
297 | - ."<td><button class='more_info_b' id='info_b_".$d."'>i</button></td></tr>\n"; |
|
295 | + ."<div class='openroaming_selection' id='openroaming_".$d."'><button>eduroam</button> <button>eduroam + OpenRoaming</button></div>" |
|
296 | + ."<div class='device_info' id='info_".$d."'></div></td>" |
|
297 | + ."<td><button class='more_info_b' id='info_b_".$d."'>i</button></td></tr>\n"; |
|
298 | 298 | $deviceIndex++; |
299 | 299 | } |
300 | 300 | $retval .= "</tbody>"; |
@@ -362,7 +362,7 @@ discard block |
||
362 | 362 | <tr> |
363 | 363 | <td>" . |
364 | 364 | $this->Gui->catCopyright |
365 | - ." |
|
365 | + ." |
|
366 | 366 | </td>"; |
367 | 367 | |
368 | 368 | if (!empty(\config\Master::APPEARANCE['privacy_notice_url'])) { |
@@ -222,7 +222,6 @@ |
||
222 | 222 | * - RETVAL_NOTCONFIGURED; needs \config\Diagnostics::RADIUSTESTS['TLS-discoverytag'] |
223 | 223 | * - RETVAL_INVALID (at least one format error) |
224 | 224 | * - RETVAL_OK (all fine) |
225 | - |
|
226 | 225 | * @return int one of two RETVALs above |
227 | 226 | */ |
228 | 227 | public function relevantNAPTRcompliance($discoverytag = \config\Diagnostics::RADIUSTESTS['TLS-discoverytag']) { |