@@ -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."); |
@@ -701,7 +701,7 @@ |
||
701 | 701 | \core\common\Entity::$nomenclature_inst, |
702 | 702 | count($this->CAsAccountedFor)+1, |
703 | 703 | ($ca['root'] ? _("Root") : _("Intermediate"))) . |
704 | - "</string> |
|
704 | + "</string> |
|
705 | 705 | <key>PayloadIdentifier</key> |
706 | 706 | <string>" . self::$iPhonePayloadPrefix . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.credential.$this->caSerial</string> |
707 | 707 | <key>PayloadOrganization</key> |
@@ -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(); |
@@ -89,12 +89,12 @@ |
||
89 | 89 | $this->templates[WELCOME_ABOARD_TERMS] = ""; |
90 | 90 | foreach ([ |
91 | 91 | "eduroam" => [ |
92 | - "TOU" => "https://wiki.geant.org/display/H2eduroam/Terms+and+Conditions", |
|
93 | - "PRIV" => "https://www.eduroam.org/privacy/", |
|
92 | + "TOU" => "https://wiki.geant.org/display/H2eduroam/Terms+and+Conditions", |
|
93 | + "PRIV" => "https://www.eduroam.org/privacy/", |
|
94 | 94 | ], |
95 | 95 | "OpenRoaming" => [ |
96 | - "TOU" => "https://wballiance.com/openroaming/toc-2020/", |
|
97 | - "PRIV" => "https://wballiance.com/openroaming/privacy-policy-2020/", |
|
96 | + "TOU" => "https://wballiance.com/openroaming/toc-2020/", |
|
97 | + "PRIV" => "https://wballiance.com/openroaming/privacy-policy-2020/", |
|
98 | 98 | ] |
99 | 99 | ] as $consortium => $terms) { |
100 | 100 | $this->templates[WELCOME_ABOARD_TERMS] .= sprintf("<p>" . _("When connecting to %s hotspots, the following <a href='%s'>Terms and Conditions</a> and <a href='%s'>Privacy Notice</a> apply." . "</p>"), $consortium, $terms['TOU'], $terms['PRIV']); |