@@ -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 extracts the public key from CSR') |
| 96 | 96 | ]; |
| 97 | 97 | $settings = array(); |
@@ -168,16 +168,16 @@ discard block |
||
| 168 | 168 | $ou = $serverInfo["names"][$langInstance->getLang()]; |
| 169 | 169 | } |
| 170 | 170 | print($ou); |
| 171 | - $modou = 0; |
|
| 172 | - if (str_contains($ou, ',')) { |
|
| 173 | - $modou = 1; |
|
| 174 | - $ou = str_replace(",", "/,", $ou); |
|
| 175 | - } |
|
| 176 | - $ou = preg_replace('/\s+/', ' ', $ou); |
|
| 177 | - if (strlen($ou) >= 64) { |
|
| 178 | - $ou = substr($ou, 0, 64); |
|
| 179 | - $modou += 2; |
|
| 180 | - } |
|
| 171 | + $modou = 0; |
|
| 172 | + if (str_contains($ou, ',')) { |
|
| 173 | + $modou = 1; |
|
| 174 | + $ou = str_replace(",", "/,", $ou); |
|
| 175 | + } |
|
| 176 | + $ou = preg_replace('/\s+/', ' ', $ou); |
|
| 177 | + if (strlen($ou) >= 64) { |
|
| 178 | + $ou = substr($ou, 0, 64); |
|
| 179 | + $modou += 2; |
|
| 180 | + } |
|
| 181 | 181 | $DN[] = "O=".iconv('UTF-8', 'ASCII//TRANSLIT', $ou); |
| 182 | 182 | $serverList = explode(",", $serverInfo["servers"]); |
| 183 | 183 | $DN[] = "CN=" . $serverList[0]; |
@@ -202,20 +202,20 @@ discard block |
||
| 202 | 202 | echo "<p style='font-size: large'>" . _("Requesting a certificate with the following properties"); |
| 203 | 203 | echo "<ul>"; |
| 204 | 204 | echo "<li>" . _("Policy OIDs: ") . implode(", ", $policies) . "</li>"; |
| 205 | - echo "<li>" . _("Distinguished Name: ") . implode(", ", $DN); |
|
| 206 | - if ($modou > 0) { |
|
| 207 | - echo " ("; |
|
| 205 | + echo "<li>" . _("Distinguished Name: ") . implode(", ", $DN); |
|
| 206 | + if ($modou > 0) { |
|
| 207 | + echo " ("; |
|
| 208 | 208 | echo _("Organization field adjusted"). ': '; |
| 209 | - $desc = array(); |
|
| 210 | - if ($modou >= 2) { |
|
| 211 | - $desc[] = _("truncated to 64 chars"); |
|
| 212 | - } |
|
| 213 | - if ($modou == 1 || $modou == 3) { |
|
| 214 | - $desc[] = _("commas escaped"); |
|
| 209 | + $desc = array(); |
|
| 210 | + if ($modou >= 2) { |
|
| 211 | + $desc[] = _("truncated to 64 chars"); |
|
| 212 | + } |
|
| 213 | + if ($modou == 1 || $modou == 3) { |
|
| 214 | + $desc[] = _("commas escaped"); |
|
| 215 | 215 | } |
| 216 | - echo implode(', ', $desc); |
|
| 217 | - echo ")"; |
|
| 218 | - } |
|
| 216 | + echo implode(', ', $desc); |
|
| 217 | + echo ")"; |
|
| 218 | + } |
|
| 219 | 219 | echo "</li>"; |
| 220 | 220 | echo "<li>" . _("subjectAltName:DNS : ") . implode(", ", $serverList) . "</li>"; |
| 221 | 221 | echo "<li>" . _("Requester Contact Details: ") . $firstName . " <" . $firstMail . ">" . "</li>"; |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | <?php if (empty($policies)) {?> |
| 358 | 358 | eduroam IdP/SP |
| 359 | 359 | <?php } else { |
| 360 | - echo implode(', ', $policies); |
|
| 360 | + echo implode(', ', $policies); |
|
| 361 | 361 | }?> |
| 362 | 362 | </span> |
| 363 | 363 | </h3> |