| @@ -68,13 +68,12 @@ | ||
| 68 | 68 | |
| 69 | 69 | <?php | 
| 70 | 70 | /** | 
| 71 | - * The OS object holds operating system descriptions | |
| 72 | - * @param name is the main title | |
| 73 | - * @param subtitle - the subtitle | |
| 74 | - * @param path - the path to the scriin-dump image | |
| 75 | - * @param signed - if true show information that the module is signed | |
| 76 | - | |
| 77 | -*/ | |
| 71 | + * The OS object holds operating system descriptions | |
| 72 | + * @param name is the main title | |
| 73 | + * @param subtitle - the subtitle | |
| 74 | + * @param path - the path to the scriin-dump image | |
| 75 | + * @param signed - if true show information that the module is signed | |
| 76 | + */ | |
| 78 | 77 | ?> | 
| 79 | 78 | |
| 80 | 79 |  function OS(name, subtitle, path, signed) { | 
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | core\ProfileSilverbullet::triggerNewOCSPStatement($serialRow->serial_number); | 
| 24 | 24 | } | 
| 25 | 25 | |
| 26 | - /* | |
| 26 | + /* | |
| 27 | 27 | * and then writes all recently updated statements to a temporary directory. The | 
| 28 | 28 | * calling script ocsp_update.sh should then scp all the files to their | 
| 29 | 29 | * destination. | 
| @@ -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)) { | 
| @@ -11,15 +11,15 @@ | ||
| 11 | 11 | namespace devices\redirect_dev; | 
| 12 | 12 | |
| 13 | 13 |  class Device_RedirectDev extends \core\DeviceConfig { | 
| 14 | - /** | |
| 15 | - * Constructs a Device object. | |
| 16 | - * | |
| 17 | - * @final not to be redefined | |
| 18 | - */ | |
| 14 | + /** | |
| 15 | + * Constructs a Device object. | |
| 16 | + * | |
| 17 | + * @final not to be redefined | |
| 18 | + */ | |
| 19 | 19 |      final public function __construct() { | 
| 20 | 20 | parent::__construct(); | 
| 21 | - $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]); | |
| 22 | - $this->loggerInstance->debug(4,"RedirectEx called"); | |
| 21 | + $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]); | |
| 22 | + $this->loggerInstance->debug(4,"RedirectEx called"); | |
| 23 | 23 | } | 
| 24 | 24 |      public function writeDeviceInfo() { | 
| 25 | 25 | $out = "<p>"; | 
| @@ -206,8 +206,7 @@ | ||
| 206 | 206 | $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "accountstatus/"); | 
| 207 | 207 |          } elseif (strrpos($_SERVER['PHP_SELF'], "diag/")) { | 
| 208 | 208 | $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "diag/"); | 
| 209 | - } | |
| 210 | -            else { | |
| 209 | +        } else { | |
| 211 | 210 | $cutoffPosition = strrpos($_SERVER['PHP_SELF'], "/"); | 
| 212 | 211 | } | 
| 213 | 212 | |
| @@ -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) { | 
| @@ -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" | 
| @@ -11,14 +11,14 @@ discard block | ||
| 11 | 11 | <?php | 
| 12 | 12 | $cat = new core\CAT(); | 
| 13 | 13 |  function escaped_echo($s) { | 
| 14 | -   echo preg_replace('/"/','"',$s); | |
| 14 | +    echo preg_replace('/"/','"',$s); | |
| 15 | 15 | } | 
| 16 | 16 | |
| 17 | 17 | $langObject = new \core\common\Language(); | 
| 18 | 18 |  $langObject->setTextDomain('web_user'); | 
| 19 | 19 | $idpId = filter_input(INPUT_GET, 'idp', FILTER_VALIDATE_INT) ?? filter_input(INPUT_POST, 'idp', FILTER_VALIDATE_INT); | 
| 20 | 20 | $profileId = filter_input(INPUT_GET, 'profile', FILTER_VALIDATE_INT) ?? filter_input(INPUT_POST, 'profile', FILTER_VALIDATE_INT); | 
| 21 | - ?> | |
| 21 | + ?> | |
| 22 | 22 | var n; | 
| 23 | 23 | var profile; | 
| 24 | 24 | var generateTimer; | 
| @@ -353,7 +353,7 @@ discard block | ||
| 353 | 353 | } | 
| 354 | 354 | |
| 355 | 355 |  <?php if($idpId) {  | 
| 356 | - print "front_page = 0;\n"; | |
| 356 | + print "front_page = 0;\n"; | |
| 357 | 357 | } ?> | 
| 358 | 358 | |
| 359 | 359 |  function showTOU(){ | 
| @@ -487,7 +487,7 @@ discard block | ||
| 487 | 487 |  if ($profileId) { | 
| 488 | 488 | print "listProfiles($idpId,$profileId);"; | 
| 489 | 489 | } | 
| 490 | - ?> | |
| 490 | + ?> | |
| 491 | 491 | |
| 492 | 492 |  $(".signin").click(function(event){ | 
| 493 | 493 | pressedButton = $(this); | 
| @@ -548,12 +548,12 @@ discard block | ||
| 548 | 548 | }); | 
| 549 | 549 |  DiscoJuice.Constants.Countries = { | 
| 550 | 550 | <?php | 
| 551 | - $C = $Gui->printCountryList(1); | |
| 552 | - $ret = ''; | |
| 553 | -   foreach ($C as $key => $val) { | |
| 551 | + $C = $Gui->printCountryList(1); | |
| 552 | + $ret = ''; | |
| 553 | +    foreach ($C as $key => $val) { | |
| 554 | 554 | $ret .= "'$key': \"$val\","; | 
| 555 | - } | |
| 556 | - echo substr($ret, 0, -1); | |
| 555 | + } | |
| 556 | + echo substr($ret, 0, -1); | |
| 557 | 557 | ?> | 
| 558 | 558 | }; | 
| 559 | 559 | |
| @@ -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() { |