@@ -236,7 +236,7 @@ |
||
236 | 236 | const AUXATTRIB_SB_USERNAME = "ATTRIB-MANAGED-USERNAME"; |
237 | 237 | const AUXATTRIB_SB_USERID = "ATTRIB-MANAGED-USERID"; |
238 | 238 | const AUXATTRIB_SB_CERTSERIAL = "ATTRIB-MANAGED-CERTSERIAL"; |
239 | - const AUXATTRIB_SB_CERTCN = "ATTRIB-MANAGED-CERTCN"; |
|
239 | + const AUXATTRIB_SB_CERTCN = "ATTRIB-MANAGED-CERTCN"; |
|
240 | 240 | const AUXATTRIB_SB_CERTANNOTATION = "ATTRIB-MANAGED-CERTANNOTATION"; |
241 | 241 | const AUXATTRIB_SB_EXPIRY = "ATTRIB-MANAGED-EXPIRY"; /* MySQL timestamp format */ |
242 | 242 | const AUXATTRIB_TOKEN = "ATTRIB-TOKEN"; |
@@ -417,7 +417,7 @@ |
||
417 | 417 | $userId = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_SB_USERID); |
418 | 418 | $userName = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_SB_USERNAME); |
419 | 419 | $certSerial = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_SB_CERTSERIAL); |
420 | - $certCN = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_SB_CERTCN); |
|
420 | + $certCN = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_SB_CERTCN); |
|
421 | 421 | if ($userId === FALSE && $userName === FALSE && $certSerial === FALSE && $certCN === FALSE) { |
422 | 422 | // we need at least one of those |
423 | 423 | $adminApi->returnError(\web\lib\admin\API::ERROR_MISSING_PARAMETER, "At least one of User ID, Username, certificate serial, or certificate CN is required."); |
@@ -201,7 +201,7 @@ |
||
201 | 201 | } |
202 | 202 | |
203 | 203 | if (!empty($this->attributes['internal:realm'][0])) { |
204 | - $config['USER_REALM'] = $this->attributes['internal:realm'][0]; |
|
204 | + $config['USER_REALM'] = $this->attributes['internal:realm'][0]; |
|
205 | 205 | } |
206 | 206 | |
207 | 207 | if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) { |
@@ -197,7 +197,6 @@ |
||
197 | 197 | * - RETVAL_NOTCONFIGURED; needs \config\Diagnostics::RADIUSTESTS['TLS-discoverytag'] |
198 | 198 | * - RETVAL_INVALID (at least one format error) |
199 | 199 | * - RETVAL_OK (all fine) |
200 | - |
|
201 | 200 | * @return int one of two RETVALs above |
202 | 201 | */ |
203 | 202 | public function relevantNAPTRcompliance() |
@@ -109,7 +109,6 @@ |
||
109 | 109 | * ["my.server.name"] => "my.server.name" |
110 | 110 | * ["foo.bar.de", "baz.bar.ge"] => "e" |
111 | 111 | * ["server1.example.com", "server2.example.com", "serverN.example.com"] => ".example.com" |
112 | - |
|
113 | 112 | * @return string |
114 | 113 | */ |
115 | 114 | public function longestNameSuffix() |
@@ -19,7 +19,7 @@ |
||
19 | 19 | * License: see the web/copyright.inc.php file in the file structure or |
20 | 20 | * <base_url>/copyright.php after deploying the software |
21 | 21 | */ |
22 | - ?> |
|
22 | + ?> |
|
23 | 23 | <script> |
24 | 24 | var L_OK = <?php echo \core\common\Entity::L_OK ?>; |
25 | 25 | var L_WARN = <?php echo \core\common\Entity::L_WARN ?>; |
@@ -4,12 +4,12 @@ |
||
4 | 4 | define('OPNAME_SUFFIX', '.hosted.eduroam.org'); |
5 | 5 | |
6 | 6 | function cat_socket($obj) { |
7 | - $sock = socket_create(AF_UNIX, SOCK_STREAM, 0); |
|
8 | - $conn = socket_connect($sock, SOCKET); |
|
9 | - if ( $conn ) { |
|
10 | - socket_write ($sock, $obj, strlen($obj)); |
|
11 | - $out = socket_read ($sock, 2048); |
|
12 | - return $out; |
|
13 | - } |
|
14 | - return 'FAILURE'; |
|
7 | + $sock = socket_create(AF_UNIX, SOCK_STREAM, 0); |
|
8 | + $conn = socket_connect($sock, SOCKET); |
|
9 | + if ( $conn ) { |
|
10 | + socket_write ($sock, $obj, strlen($obj)); |
|
11 | + $out = socket_read ($sock, 2048); |
|
12 | + return $out; |
|
13 | + } |
|
14 | + return 'FAILURE'; |
|
15 | 15 | } |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | return $helpdesk; |
267 | 267 | } |
268 | 268 | |
269 | - private function getCredentialApplicability() { |
|
269 | + private function getCredentialApplicability() { |
|
270 | 270 | $setWired = isset($this->attributes['media:wired'][0]) && |
271 | 271 | $this->attributes['media:wired'][0] == 'on' ? 1 : 0; |
272 | 272 | $ssids = $this->attributes['internal:SSID']; |
@@ -393,7 +393,7 @@ discard block |
||
393 | 393 | } |
394 | 394 | |
395 | 395 | private function getAuthMethod($eap) { |
396 | - // $attr = $this->attributes; |
|
396 | + // $attr = $this->attributes; |
|
397 | 397 | $authmethod = new AuthenticationMethod(); |
398 | 398 | $eapParams = $this->getAuthenticationMethodParams($eap); |
399 | 399 | $eaptype = new Type(); |
@@ -34,13 +34,13 @@ |
||
34 | 34 | */ |
35 | 35 | class Diagnostics |
36 | 36 | { |
37 | - /** |
|
38 | - * Various paths. |
|
39 | - * eapol_test: absolute path to the eapol_test executable. If you just fill in "eapol_test" the one from the system $PATH will be taken. |
|
40 | - * c_rehash: absolute path to the c_rehash executable. If you just fill in "c_rehash" the one from the system $PATH will be taken. |
|
41 | - * See also NSIS_VERSION further down |
|
42 | - * @var array |
|
43 | - */ |
|
37 | + /** |
|
38 | + * Various paths. |
|
39 | + * eapol_test: absolute path to the eapol_test executable. If you just fill in "eapol_test" the one from the system $PATH will be taken. |
|
40 | + * c_rehash: absolute path to the c_rehash executable. If you just fill in "c_rehash" the one from the system $PATH will be taken. |
|
41 | + * See also NSIS_VERSION further down |
|
42 | + * @var array |
|
43 | + */ |
|
44 | 44 | const PATHS = [ |
45 | 45 | 'c_rehash' => 'c_rehash', |
46 | 46 | 'eapol_test' => 'eapol_test', |