@@ -129,6 +129,7 @@ |
||
| 129 | 129 | * |
| 130 | 130 | * @param string $device |
| 131 | 131 | * @param AbstractProfile $profile |
| 132 | + * @param string $generatedFor |
|
| 132 | 133 | * @return array info about the new installer (mime and link) |
| 133 | 134 | */ |
| 134 | 135 | private function generateNewInstaller($device, $profile, $generatedFor, $token, $password) { |
@@ -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 | |
@@ -205,7 +205,7 @@ |
||
| 205 | 205 | * @param int $rowid the HTML field base name of the option to be displayed |
| 206 | 206 | * @param string $optionName the name of the option to display |
| 207 | 207 | * @param string $optionValue the value of the option to display |
| 208 | - * @param mixed $optionLang the language of the option to display |
|
| 208 | + * @param null|string $optionLang the language of the option to display |
|
| 209 | 209 | * @return string HTML code |
| 210 | 210 | * @throws Exception |
| 211 | 211 | */ |
@@ -124,8 +124,7 @@ |
||
| 124 | 124 | $out .= "Config.eap_inner = '" . $eapMethod['INNER'] . "'\n"; |
| 125 | 125 | if ($this->selectedEap == \core\common\EAP::EAPTYPE_TLS && isset($this->attributes['eap-specific:tls_use_other_id']) && $this->attributes['eap-specific:tls_use_other_id'][0] == 'on') { |
| 126 | 126 | $out .= "Config.use_other_tls_id = True\n"; |
| 127 | - } |
|
| 128 | - else { |
|
| 127 | + } else { |
|
| 129 | 128 | $out .= "Config.use_other_tls_id = False\n"; |
| 130 | 129 | } |
| 131 | 130 | $tou = $this->mkUserConsent(); |
@@ -96,6 +96,12 @@ |
||
| 96 | 96 | */ |
| 97 | 97 | protected $frontendHandle; |
| 98 | 98 | |
| 99 | + /** |
|
| 100 | + * @param integer $idpIdentifier |
|
| 101 | + * @param string $deviceId |
|
| 102 | + * @param string $area |
|
| 103 | + * @param string $lang |
|
| 104 | + */ |
|
| 99 | 105 | protected function saveDownloadDetails($idpIdentifier, $profileId, $deviceId, $area, $lang, $eapType) { |
| 100 | 106 | if (CONFIG['PATHS']['logdir']) { |
| 101 | 107 | $file = fopen(CONFIG['PATHS']['logdir'] . "/download_details.log", "a"); |
@@ -216,7 +216,7 @@ |
||
| 216 | 216 | * realm (and indirectly that of the links and statuses of involved proxies |
| 217 | 217 | * and returns a judgment whether external Monitoring API tests are warranted |
| 218 | 218 | * or not |
| 219 | - * @return boolean TRUE if external tests have to be run |
|
| 219 | + * @return boolean|null TRUE if external tests have to be run |
|
| 220 | 220 | */ |
| 221 | 221 | private function CATInternalTests() { |
| 222 | 222 | // we are expecting to get a REJECT from all runs, because that means the packet got through to the IdP. |
@@ -254,7 +254,7 @@ |
||
| 254 | 254 | * create a CSR |
| 255 | 255 | * |
| 256 | 256 | * @param resource $privateKey the private key to create the CSR with |
| 257 | - * @return array with the CSR and some meta info |
|
| 257 | + * @return integer with the CSR and some meta info |
|
| 258 | 258 | */ |
| 259 | 259 | private function generateCsr($privateKey) { |
| 260 | 260 | // token leads us to the NRO, to set the OU property of the cert |