@@ -129,7 +129,7 @@ |
||
129 | 129 | foreach ($D as $id=>$priority) { |
130 | 130 | echo "<input type='hidden' class='profiles' id='profile-$id' name='profile-$id' value='$priority'>"; |
131 | 131 | } |
132 | - ?> |
|
132 | + ?> |
|
133 | 133 | </form> |
134 | 134 | <?php echo $deco->footer(); |
135 | 135 |
@@ -181,9 +181,9 @@ discard block |
||
181 | 181 | </legend> |
182 | 182 | <?php |
183 | 183 | if ($wizardStyle) { |
184 | - echo "<p>" . _("We will now define a profile for your user group(s). You can add as many profiles as you like by choosing the appropriate button on the end of the page. After we are done, the wizard is finished and you will be taken to the main IdP administration page.") . "</p>"; |
|
184 | + echo "<p>" . _("We will now define a profile for your user group(s). You can add as many profiles as you like by choosing the appropriate button on the end of the page. After we are done, the wizard is finished and you will be taken to the main IdP administration page.") . "</p>"; |
|
185 | 185 | } |
186 | - ?> |
|
186 | + ?> |
|
187 | 187 | <h3><?php echo _("Profile Name and RADIUS realm"); ?> |
188 | 188 | </h3> |
189 | 189 | <?php |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | |
331 | 331 | <?php |
332 | 332 | echo $wizard->displayHelp("redirect"); |
333 | - ?> |
|
333 | + ?> |
|
334 | 334 | <p> |
335 | 335 | |
336 | 336 | <?php |
@@ -89,13 +89,13 @@ discard block |
||
89 | 89 | $ssidlist .= ", '<strong>" . $ssid . "</strong>'"; |
90 | 90 | } |
91 | 91 | $ssidlist = substr($ssidlist, 2); |
92 | - $h .= sprintf(ngettext("We will always configure this SSID for WPA2/AES: %s.", "We will always configure these SSIDs for WPA2/AES: %s.", count(\config\ConfAssistant::CONSORTIUM['ssid'])), $ssidlist); |
|
93 | - $h .= "<br/>" . sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $this->displayName("media:SSID")); |
|
92 | + $h .= sprintf(ngettext("We will always configure this SSID for WPA2/AES: %s.", "We will always configure these SSIDs for WPA2/AES: %s.", count(\config\ConfAssistant::CONSORTIUM['ssid'])), $ssidlist); |
|
93 | + $h .= "<br/>" . sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $this->displayName("media:SSID")); |
|
94 | 94 | } else { |
95 | - $h .= _("Please configure which SSIDs should be configured in the installers."); |
|
95 | + $h .= _("Please configure which SSIDs should be configured in the installers."); |
|
96 | 96 | } |
97 | - $h .= " " . _("By default, we will only configure the SSIDs with WPA2/AES encryption. By using the '(with WPA/TKIP)' option you can specify that we should include legacy support for WPA/TKIP where possible."); |
|
98 | - $h .= "</li>"; |
|
97 | + $h .= " " . _("By default, we will only configure the SSIDs with WPA2/AES encryption. By using the '(with WPA/TKIP)' option you can specify that we should include legacy support for WPA/TKIP where possible."); |
|
98 | + $h .= "</li>"; |
|
99 | 99 | |
100 | 100 | $h .= "<li>"; |
101 | 101 | $h .= "<strong>" . ( count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>"; |
@@ -135,19 +135,19 @@ discard block |
||
135 | 135 | "<p>" . _("Optionally, you can provide a longer descriptive text about who this profile is for. If you specify it, it will be displayed on the download page after the user has selected the profile name in the list.") . "</p>". |
136 | 136 | "<p>" . _("You can also tell us your RADIUS realm. "); |
137 | 137 | if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] !== NULL) { |
138 | - $h .= sprintf(_("This is useful if you want to use the sanity check module later, which tests reachability of your realm in the %s infrastructure. "), \config\ConfAssistant::CONSORTIUM['display_name']); |
|
138 | + $h .= sprintf(_("This is useful if you want to use the sanity check module later, which tests reachability of your realm in the %s infrastructure. "), \config\ConfAssistant::CONSORTIUM['display_name']); |
|
139 | 139 | } |
140 | 140 | $h .= _("It is required to enter the realm name if you want to support anonymous outer identities (see below).") . "</p>"; |
141 | 141 | $this->helpMessage['profile'] = $h; |
142 | 142 | |
143 | 143 | // REALM |
144 | 144 | $h = "<p>".sprintf(_("Some installers support a feature called 'Anonymous outer identity'. If you don't know what this is, please read <a href='%s'>this article</a>."), "https://confluence.terena.org/display/H2eduroam/eap-types")."</p>". |
145 | - "<p>"._("On some platforms, the installers can suggest username endings and/or verify the user input to contain the realm suffix.")."</p>". |
|
146 | - "<p>"._("The realm check feature needs to know an outer ID which actually gets a chance to authenticate. If your RADIUS server lets only select usernames pass, it is useful to supply the information which of those (outer ID) username we can use for testing.")."</p>"; |
|
145 | + "<p>"._("On some platforms, the installers can suggest username endings and/or verify the user input to contain the realm suffix.")."</p>". |
|
146 | + "<p>"._("The realm check feature needs to know an outer ID which actually gets a chance to authenticate. If your RADIUS server lets only select usernames pass, it is useful to supply the information which of those (outer ID) username we can use for testing.")."</p>"; |
|
147 | 147 | $this->helpMessage['realm'] = $h; |
148 | 148 | |
149 | 149 | // REDIRECT |
150 | - $h ="<p>"._("The CAT has a download area for end users. There, they will, for example, learn about the support pointers you entered earlier. The CAT can also immediately offer the installers for the profile for download. If you don't want that, you can instead enter a web site location where you want your users to be redirected to. You, as the administrator, can still download the profiles to place them on that page (see the 'Compatibility Matrix' button on the dashboard).") . "</p>"; |
|
150 | + $h ="<p>"._("The CAT has a download area for end users. There, they will, for example, learn about the support pointers you entered earlier. The CAT can also immediately offer the installers for the profile for download. If you don't want that, you can instead enter a web site location where you want your users to be redirected to. You, as the administrator, can still download the profiles to place them on that page (see the 'Compatibility Matrix' button on the dashboard).") . "</p>"; |
|
151 | 151 | $this->helpMessage['redirect'] = $h; |
152 | 152 | |
153 | 153 | // EAP |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | /* Messages */ |
92 | 92 | $messages = [ |
93 | 93 | 'WRONG_SUBJECT' => _('Submitted Certificate Signing Request contains subject field that does not start with ') . |
94 | - $subject_prefix . '<br>' . _("See CSR generation rules below."), |
|
94 | + $subject_prefix . '<br>' . _("See CSR generation rules below."), |
|
95 | 95 | 'WRONG_CRL' => _('Submitted Certificate Signing Request is broken - unable to extract the public key from CSR') |
96 | 96 | ]; |
97 | 97 | $settings = array(); |
@@ -171,16 +171,16 @@ discard block |
||
171 | 171 | $ou = $serverInfo["names"][$langInstance->getLang()]; |
172 | 172 | } |
173 | 173 | print($ou); |
174 | - $modou = 0; |
|
175 | - if (str_contains($ou, ',')) { |
|
176 | - $modou = 1; |
|
177 | - $ou = str_replace(",", "/,", $ou); |
|
178 | - } |
|
179 | - $ou = preg_replace('/\s+/', ' ', $ou); |
|
180 | - if (strlen($ou) >= 64) { |
|
181 | - $ou = substr($ou, 0, 64); |
|
182 | - $modou += 2; |
|
183 | - } |
|
174 | + $modou = 0; |
|
175 | + if (str_contains($ou, ',')) { |
|
176 | + $modou = 1; |
|
177 | + $ou = str_replace(",", "/,", $ou); |
|
178 | + } |
|
179 | + $ou = preg_replace('/\s+/', ' ', $ou); |
|
180 | + if (strlen($ou) >= 64) { |
|
181 | + $ou = substr($ou, 0, 64); |
|
182 | + $modou += 2; |
|
183 | + } |
|
184 | 184 | $DN[] = "O=".iconv('UTF-8', 'ASCII//TRANSLIT', $ou); |
185 | 185 | $serverList = explode(",", $serverInfo["servers"]); |
186 | 186 | $DN[] = "CN=" . $serverList[0]; |
@@ -205,20 +205,20 @@ discard block |
||
205 | 205 | echo "<p style='font-size: large'>" . _("Requesting a certificate with the following properties"); |
206 | 206 | echo "<ul>"; |
207 | 207 | echo "<li>" . _("Policy OIDs: ") . implode(", ", $policies) . "</li>"; |
208 | - echo "<li>" . _("Distinguished Name: ") . implode(", ", $DN); |
|
209 | - if ($modou > 0) { |
|
210 | - echo " ("; |
|
208 | + echo "<li>" . _("Distinguished Name: ") . implode(", ", $DN); |
|
209 | + if ($modou > 0) { |
|
210 | + echo " ("; |
|
211 | 211 | echo _("Organization field adjusted"). ': '; |
212 | - $desc = array(); |
|
213 | - if ($modou >= 2) { |
|
214 | - $desc[] = _("truncated to 64 chars"); |
|
215 | - } |
|
216 | - if ($modou == 1 || $modou == 3) { |
|
217 | - $desc[] = _("commas escaped"); |
|
212 | + $desc = array(); |
|
213 | + if ($modou >= 2) { |
|
214 | + $desc[] = _("truncated to 64 chars"); |
|
215 | + } |
|
216 | + if ($modou == 1 || $modou == 3) { |
|
217 | + $desc[] = _("commas escaped"); |
|
218 | 218 | } |
219 | - echo implode(', ', $desc); |
|
220 | - echo ")"; |
|
221 | - } |
|
219 | + echo implode(', ', $desc); |
|
220 | + echo ")"; |
|
221 | + } |
|
222 | 222 | echo "</li>"; |
223 | 223 | echo "<li>" . _("subjectAltName:DNS : ") . implode(", ", $serverList) . "</li>"; |
224 | 224 | echo "<li>" . _("Requester Contact Details: ") . $firstName . " <" . $firstMail . ">" . "</li>"; |
@@ -360,7 +360,7 @@ discard block |
||
360 | 360 | <?php if (empty($policies)) {?> |
361 | 361 | eduroam IdP/SP |
362 | 362 | <?php } else { |
363 | - echo implode(', ', $policies); |
|
363 | + echo implode(', ', $policies); |
|
364 | 364 | }?> |
365 | 365 | </span> |
366 | 366 | </h3> |