| @@ -156,8 +156,8 @@ | ||
| 156 | 156 | // replace namespace separators with directory separators | 
| 157 | 157 | // in the relative class name, append with .php | 
| 158 | 158 | $file = $base_dir | 
| 159 | -                  . str_replace('\\', '/', $relative_class) | |
| 160 | - . '.php'; | |
| 159 | +                    . str_replace('\\', '/', $relative_class) | |
| 160 | + . '.php'; | |
| 161 | 161 | |
| 162 | 162 | // if the mapped file exists, require it | 
| 163 | 163 |              if ($this->requireFile($file)) { | 
| @@ -246,11 +246,11 @@ discard block | ||
| 246 | 246 | } | 
| 247 | 247 | |
| 248 | 248 | /** | 
| 249 | - * This function parses a X.509 cert and returns all certificatePolicies OIDs | |
| 250 | - * | |
| 251 | - * @param array $cert (returned from openssl_x509_parse) | |
| 252 | - * @return array of OIDs | |
| 253 | - */ | |
| 249 | + * This function parses a X.509 cert and returns all certificatePolicies OIDs | |
| 250 | + * | |
| 251 | + * @param array $cert (returned from openssl_x509_parse) | |
| 252 | + * @return array of OIDs | |
| 253 | + */ | |
| 254 | 254 |      private function propertyCheckPolicy($cert) { | 
| 255 | 255 | $oids = []; | 
| 256 | 256 |          if ($cert['extensions']['certificatePolicies']) { | 
| @@ -263,11 +263,11 @@ discard block | ||
| 263 | 263 | return $oids; | 
| 264 | 264 | } | 
| 265 | 265 | /** | 
| 266 | - * This function parses a X.509 cert and returns the value of $field | |
| 267 | - * | |
| 268 | - * @param array $cert (returned from openssl_x509_parse) | |
| 269 | - * @return string value of the issuer field or '' | |
| 270 | - */ | |
| 266 | + * This function parses a X.509 cert and returns the value of $field | |
| 267 | + * | |
| 268 | + * @param array $cert (returned from openssl_x509_parse) | |
| 269 | + * @return string value of the issuer field or '' | |
| 270 | + */ | |
| 271 | 271 |      private function getCertificateIssuer($cert) { | 
| 272 | 272 | $issuer = ''; | 
| 273 | 273 |          foreach ($cert['issuer'] as $key => $val) { | 
| @@ -53,14 +53,14 @@ | ||
| 53 | 53 | } | 
| 54 | 54 | |
| 55 | 55 |  switch ($_GET['token']) { | 
| 56 | - case "SELF-REGISTER": | |
| 57 | - $token = "SELF-REGISTER"; | |
| 58 | - $checkval = \core\UserManagement::TOKENSTATUS_OK_NEW; | |
| 59 | - $federation = CONFIG_CONFASSISTANT['CONSORTIUM']['selfservice_registration']; | |
| 60 | - break; | |
| 61 | - default: | |
| 62 | - $token = $validator->token(filter_input(INPUT_GET,'token',FILTER_SANITIZE_STRING)); | |
| 63 | - $checkval = $usermgmt->checkTokenValidity($token); | |
| 56 | + case "SELF-REGISTER": | |
| 57 | + $token = "SELF-REGISTER"; | |
| 58 | + $checkval = \core\UserManagement::TOKENSTATUS_OK_NEW; | |
| 59 | + $federation = CONFIG_CONFASSISTANT['CONSORTIUM']['selfservice_registration']; | |
| 60 | + break; | |
| 61 | + default: | |
| 62 | + $token = $validator->token(filter_input(INPUT_GET,'token',FILTER_SANITIZE_STRING)); | |
| 63 | + $checkval = $usermgmt->checkTokenValidity($token); | |
| 64 | 64 | } | 
| 65 | 65 | |
| 66 | 66 |  if ($checkval < 0) { | 
| @@ -1019,12 +1019,12 @@ | ||
| 1019 | 1019 |          $certUsernameLabel = WindowsCommon::sprint_nsi(_("Username:")); | 
| 1020 | 1020 | $certUsernameLength = strlen($certUsernameLabel); | 
| 1021 | 1021 | $labelLength = max($certPasswordLength,$certUsernameLength); | 
| 1022 | - ?> | |
| 1022 | + ?> | |
| 1023 | 1023 |    ${NSD_CreateLabel} 0 0 100% 32u "<?php WindowsCommon::echo_nsi(_("Selected file: \$Cert_file"))?>" | 
| 1024 | 1024 | !else | 
| 1025 | 1025 |    <?php $certPasswordLabel = WindowsCommon::sprint_nsi(_("import password:")); | 
| 1026 | 1026 | $certPasswordLength = strlen($certPasswordLabel); | 
| 1027 | - ?> | |
| 1027 | + ?> | |
| 1028 | 1028 | !insertmacro debug_cat 4 "Unpacking SB_cert.p12" | 
| 1029 | 1029 | File "SB_cert.p12" | 
| 1030 | 1030 | nsArray::Set Delete_files "SB_cert.p12" | 
| @@ -185,7 +185,6 @@ | ||
| 185 | 185 | * - RETVAL_NOTCONFIGURED; needs CONFIG_DIAGNOSTICS['RADIUSTESTS']['TLS-discoverytag'] | 
| 186 | 186 | * - RETVAL_INVALID (at least one format error) | 
| 187 | 187 | * - RETVAL_OK (all fine) | 
| 188 | - | |
| 189 | 188 | * @return int one of two RETVALs above | 
| 190 | 189 | */ | 
| 191 | 190 |      public function relevantNAPTRcompliance() { | 
| @@ -370,9 +370,9 @@ | ||
| 370 | 370 | // inspired by https://stackoverflow.com/questions/2390604/how-to-pass-variables-as-stdin-into-command-line-from-php | 
| 371 | 371 | $proc = CONFIG['PATHS']['openssl']." crl -inform der"; | 
| 372 | 372 | $descriptorspec = [ | 
| 373 | - 0 => ["pipe", "r"], | |
| 374 | - 1 => ["pipe", "w"], | |
| 375 | - 2 => ["pipe", "w"], | |
| 373 | + 0 => ["pipe", "r"], | |
| 374 | + 1 => ["pipe", "w"], | |
| 375 | + 2 => ["pipe", "w"], | |
| 376 | 376 | ]; | 
| 377 | 377 | $process = proc_open($proc, $descriptorspec, $pipes); | 
| 378 | 378 |          if (!is_resource($process)) { | 
| @@ -397,7 +397,6 @@ | ||
| 397 | 397 | * | 
| 398 | 398 | * @param string $format only "der" and "pem" are currently allowed | 
| 399 | 399 | * @return array an array of arrays or empty array on error | 
| 400 | - | |
| 401 | 400 | */ | 
| 402 | 401 |      final protected function saveCertificateFiles($format) { | 
| 403 | 402 |          switch ($format) { | 
| @@ -42,7 +42,7 @@ | ||
| 42 | 42 | $certObject->triggerNewOCSPStatement(); | 
| 43 | 43 | } | 
| 44 | 44 | |
| 45 | - /* | |
| 45 | + /* | |
| 46 | 46 | * and then writes all recently updated statements to a temporary directory. The | 
| 47 | 47 | * calling script ocsp_update.sh should then scp all the files to their | 
| 48 | 48 | * destination. | 
| @@ -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['APPEARANCE']['productname'], | 
| 41 | 41 | CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], | 
| 42 | 42 | CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], |