@@ -1115,12 +1115,12 @@ |
||
| 1115 | 1115 | $certUsernameLabel = WindowsCommon::sprintNsis(_("Username:")); |
| 1116 | 1116 | $certUsernameLength = strlen($certUsernameLabel); |
| 1117 | 1117 | $labelLength = max($certPasswordLength,$certUsernameLength); |
| 1118 | - ?> |
|
| 1118 | + ?> |
|
| 1119 | 1119 | ${NSD_CreateLabel} 0 0 100% 32u "<?php WindowsCommon::echoNsis(_("Selected file: \$Cert_file"))?>" |
| 1120 | 1120 | !else |
| 1121 | 1121 | <?php $certPasswordLabel = WindowsCommon::sprintNsis(_("import password:")); |
| 1122 | 1122 | $certPasswordLength = strlen($certPasswordLabel); |
| 1123 | - ?> |
|
| 1123 | + ?> |
|
| 1124 | 1124 | !insertmacro debug_cat 4 "Unpacking SB_cert.p12" |
| 1125 | 1125 | File "SB_cert.p12" |
| 1126 | 1126 | nsArray::Set Delete_files "SB_cert.p12" |
@@ -285,7 +285,7 @@ |
||
| 285 | 285 | * @throws Exception |
| 286 | 286 | */ |
| 287 | 287 | public static function getCaEngine($type) { |
| 288 | - switch ($type) { |
|
| 288 | + switch ($type) { |
|
| 289 | 289 | case \devices\Devices::SUPPORT_EMBEDDED_RSA: |
| 290 | 290 | $caEngine = new CertificationAuthorityEmbeddedRSA(); |
| 291 | 291 | break; |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | $caEngine->triggerNewOCSPStatement(/** @scrutinizer ignore-type */ $certObject->serial); |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - /* |
|
| 47 | + /* |
|
| 48 | 48 | * and then writes all recently updated statements to a temporary directory. The |
| 49 | 49 | * calling script ocsp_update.sh should then scp all the files to their |
| 50 | 50 | * destination. |
@@ -148,7 +148,6 @@ |
||
| 148 | 148 | * mails, just configure the signing cert with these parameters. All must |
| 149 | 149 | * be non-NULL for signing to happen. If you don't need a keypass, make |
| 150 | 150 | * it an empty string instead. |
| 151 | - |
|
| 152 | 151 | * @var array |
| 153 | 152 | */ |
| 154 | 153 | const MAILSETTINGS = [// we always use Submission |
@@ -42,8 +42,8 @@ |
||
| 42 | 42 | $auth->authenticate(); |
| 43 | 43 | } |
| 44 | 44 | if (isset($_SESSION['admin_diag_auth'])) { |
| 45 | - $admin = 1; |
|
| 46 | - unset($_SESSION['admin_diag_auth']); |
|
| 45 | + $admin = 1; |
|
| 46 | + unset($_SESSION['admin_diag_auth']); |
|
| 47 | 47 | } |
| 48 | 48 | $Gui = new \web\lib\user\Gui(); |
| 49 | 49 | $skinObject = new \web\lib\user\Skinjob($_REQUEST['skin'] ?? $_SESSION['skin'] ?? $fedskin[0] ?? \config\Master::APPEARANCE['skins'][0]); |
@@ -34,9 +34,9 @@ |
||
| 34 | 34 | $skinObject = new \web\lib\user\Skinjob("classic"); |
| 35 | 35 | /// eduroam CAT, twice the consortium name eduroam, twice eduroam CAT |
| 36 | 36 | $out = sprintf(_("<span class='edu_cat'>%s</span> is built as a cooperation platform."))."<p>". |
| 37 | - sprintf(_("Local %s administrators enter their %s configuration details and based on them, <span class='edu_cat'>%s</span> builds customised installers for a number of popular platforms. ". |
|
| 38 | - "An installer prepared for one organisation will not work for users of another one, therefore if your organisation is not on the list, you cannot use this system. ". |
|
| 39 | - "Please contact your local administrators and try to influence them to add your %s configuration to <span class='edu_cat'>%s</span>."), |
|
| 37 | + sprintf(_("Local %s administrators enter their %s configuration details and based on them, <span class='edu_cat'>%s</span> builds customised installers for a number of popular platforms. ". |
|
| 38 | + "An installer prepared for one organisation will not work for users of another one, therefore if your organisation is not on the list, you cannot use this system. ". |
|
| 39 | + "Please contact your local administrators and try to influence them to add your %s configuration to <span class='edu_cat'>%s</span>."), |
|
| 40 | 40 | \config\Master::APPEARANCE['productname'], |
| 41 | 41 | \config\ConfAssistant::CONSORTIUM['display_name'], |
| 42 | 42 | \config\ConfAssistant::CONSORTIUM['display_name'], |
@@ -371,9 +371,9 @@ |
||
| 371 | 371 | // inspired by https://stackoverflow.com/questions/2390604/how-to-pass-variables-as-stdin-into-command-line-from-php |
| 372 | 372 | $proc = \config\Master::PATHS['openssl']." crl -inform der"; |
| 373 | 373 | $descriptorspec = [ |
| 374 | - 0 => ["pipe", "r"], |
|
| 375 | - 1 => ["pipe", "w"], |
|
| 376 | - 2 => ["pipe", "w"], |
|
| 374 | + 0 => ["pipe", "r"], |
|
| 375 | + 1 => ["pipe", "w"], |
|
| 376 | + 2 => ["pipe", "w"], |
|
| 377 | 377 | ]; |
| 378 | 378 | $process = proc_open($proc, $descriptorspec, $pipes); |
| 379 | 379 | if (!is_resource($process)) { |
@@ -194,7 +194,6 @@ |
||
| 194 | 194 | * - RETVAL_NOTCONFIGURED; needs \config\Diagnostics::RADIUSTESTS['TLS-discoverytag'] |
| 195 | 195 | * - RETVAL_INVALID (at least one format error) |
| 196 | 196 | * - RETVAL_OK (all fine) |
| 197 | - |
|
| 198 | 197 | * @return int one of two RETVALs above |
| 199 | 198 | */ |
| 200 | 199 | public function relevantNAPTRcompliance() { |
@@ -331,14 +331,14 @@ |
||
| 331 | 331 | } |
| 332 | 332 | |
| 333 | 333 | /** |
| 334 | - * join new attributes to existing ones, but only if not already defined on |
|
| 335 | - * a different level in the existing set |
|
| 336 | - * |
|
| 337 | - * @param array $existing the already existing attributes |
|
| 338 | - * @param array $new the new set of attributes |
|
| 339 | - * @param string $newlevel the level of the new attributes |
|
| 340 | - * @return array the new set of attributes |
|
| 341 | - */ |
|
| 334 | + * join new attributes to existing ones, but only if not already defined on |
|
| 335 | + * a different level in the existing set |
|
| 336 | + * |
|
| 337 | + * @param array $existing the already existing attributes |
|
| 338 | + * @param array $new the new set of attributes |
|
| 339 | + * @param string $newlevel the level of the new attributes |
|
| 340 | + * @return array the new set of attributes |
|
| 341 | + */ |
|
| 342 | 342 | protected function levelPrecedenceAttributeJoin($existing, $new, $newlevel) { |
| 343 | 343 | foreach ($new as $attrib) { |
| 344 | 344 | $ignore = ""; |