| @@ -83,7 +83,7 @@ | ||
| 83 | 83 | */ | 
| 84 | 84 |      public function htmlShowtime($wizard = FALSE, $additional = FALSE) { | 
| 85 | 85 |          if (!$this->readOnly) { | 
| 86 | - // return $this->htmlPreEdit($wizard, $additional) . $this->htmlPostEdit(TRUE); | |
| 86 | + // return $this->htmlPreEdit($wizard, $additional) . $this->htmlPostEdit(TRUE); | |
| 87 | 87 | return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . $this->htmlPostEdit(TRUE); | 
| 88 | 88 | } | 
| 89 | 89 | } | 
| @@ -211,7 +211,7 @@ | ||
| 211 | 211 | } | 
| 212 | 212 | |
| 213 | 213 |          if (!empty($this->attributes['internal:realm'][0])) { | 
| 214 | - $config['user_realm'] = $this->attributes['internal:realm'][0]; | |
| 214 | + $config['user_realm'] = $this->attributes['internal:realm'][0]; | |
| 215 | 215 | } | 
| 216 | 216 | |
| 217 | 217 |          if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) { | 
| @@ -22,15 +22,15 @@ | ||
| 22 | 22 | namespace devices\redirect_dev; | 
| 23 | 23 | |
| 24 | 24 |  class DeviceRedirectDev extends \core\DeviceConfig { | 
| 25 | - /** | |
| 26 | - * Constructs a Device object. | |
| 27 | - * | |
| 28 | - * @final not to be redefined | |
| 29 | - */ | |
| 25 | + /** | |
| 26 | + * Constructs a Device object. | |
| 27 | + * | |
| 28 | + * @final not to be redefined | |
| 29 | + */ | |
| 30 | 30 |      final public function __construct() { | 
| 31 | 31 | parent::__construct(); | 
| 32 | - $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]); | |
| 33 | - $this->loggerInstance->debug(4,"RedirectEx called"); | |
| 32 | + $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]); | |
| 33 | + $this->loggerInstance->debug(4,"RedirectEx called"); | |
| 34 | 34 | } | 
| 35 | 35 | |
| 36 | 36 | /** | 
| @@ -91,7 +91,7 @@ | ||
| 91 | 91 |           <?php if (empty($_REQUEST['idp'])) { ?> | 
| 92 | 92 | <div id="front_page"> | 
| 93 | 93 | <?php | 
| 94 | - echo $divs->divTopWelcome(); | |
| 94 | + echo $divs->divTopWelcome(); | |
| 95 | 95 | // echo $divs->div_roller(); | 
| 96 | 96 | // echo $divs->div_main_button(); ?> | 
| 97 | 97 | </div> <!-- id="front_page" --> | 
| @@ -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" | 
| @@ -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. | 
| @@ -49,14 +49,14 @@ | ||
| 49 | 49 | } | 
| 50 | 50 | |
| 51 | 51 |  switch ($_GET['token']) { | 
| 52 | - case "SELF-REGISTER": | |
| 53 | - $token = "SELF-REGISTER"; | |
| 54 | - $checkval = \core\UserManagement::TOKENSTATUS_OK_NEW; | |
| 55 | - $federation = \config\ConfAssistant::CONSORTIUM['selfservice_registration']; | |
| 56 | - break; | |
| 57 | - default: | |
| 58 | - $token = $validator->token(filter_input(INPUT_GET,'token',FILTER_SANITIZE_STRING)); | |
| 59 | - $checkval = $usermgmt->checkTokenValidity($token); | |
| 52 | + case "SELF-REGISTER": | |
| 53 | + $token = "SELF-REGISTER"; | |
| 54 | + $checkval = \core\UserManagement::TOKENSTATUS_OK_NEW; | |
| 55 | + $federation = \config\ConfAssistant::CONSORTIUM['selfservice_registration']; | |
| 56 | + break; | |
| 57 | + default: | |
| 58 | + $token = $validator->token(filter_input(INPUT_GET,'token',FILTER_SANITIZE_STRING)); | |
| 59 | + $checkval = $usermgmt->checkTokenValidity($token); | |
| 60 | 60 | } | 
| 61 | 61 | |
| 62 | 62 |  if ($checkval < 0) { | 
| @@ -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]); |