|
@@ -137,14 +137,14 @@ discard block |
|
|
block discarded – undo |
|
137
|
137
|
$windowsProfileSSID = $this->generateWlanProfile($profileName, $network['ssid'], 'WPA2', 'AES', [], false); |
|
138
|
138
|
$this->saveProfile($windowsProfileSSID, $this->iterator, true); |
|
139
|
139
|
$out = "!insertmacro define_wlan_profile \"$profileName\" \"AES\" 0\n"; |
|
140
|
|
- $this->iterator ++; |
|
|
140
|
+ $this->iterator++; |
|
141
|
141
|
$profileName .= " via partner"; |
|
142
|
142
|
} |
|
143
|
143
|
if (!empty($network['oi'])) { |
|
144
|
144
|
$windowsProfileHS = $this->generateWlanProfile($profileName, ['cat-passpoint-profile'], 'WPA2', 'AES', $network['oi'], true); |
|
145
|
145
|
$this->saveProfile($windowsProfileHS, $this->iterator, true); |
|
146
|
146
|
$out .= "!insertmacro define_wlan_profile \"$profileName\" \"AES\" 1\n"; |
|
147
|
|
- $this->iterator ++; |
|
|
147
|
+ $this->iterator++; |
|
148
|
148
|
} |
|
149
|
149
|
return($out); |
|
150
|
150
|
} |
|
@@ -169,7 +169,7 @@ discard block |
|
|
block discarded – undo |
|
169
|
169
|
$windowsProfile = $this->generateWlanProfile($profileName, $network['ssid'], 'WPA2', 'AES', [], false); |
|
170
|
170
|
$this->saveProfile($windowsProfile, $this->iterator, false); |
|
171
|
171
|
} |
|
172
|
|
- $this->iterator ++; |
|
|
172
|
+ $this->iterator++; |
|
173
|
173
|
return("!insertmacro define_wlan_profile \"$profileName\" \"AES\" 1\n"); |
|
174
|
174
|
} |
|
175
|
175
|
|
|
@@ -255,7 +255,7 @@ discard block |
|
|
block discarded – undo |
|
255
|
255
|
* @param int $profileNumber the profile index or NULL to indicate a LAN profile |
|
256
|
256
|
* @param boolean $hs20 for WLAN profiles indicates if use the nohs prefix |
|
257
|
257
|
*/ |
|
258
|
|
- private function saveProfile($profile, $profileNumber=NULL, $hs20=false) |
|
|
258
|
+ private function saveProfile($profile, $profileNumber = NULL, $hs20 = false) |
|
259
|
259
|
{ |
|
260
|
260
|
if ($hs20) { |
|
261
|
261
|
$prefix = 'w'; |
|
@@ -304,7 +304,7 @@ discard block |
|
|
block discarded – undo |
|
304
|
304
|
$outerId = $this->determineOuterIdString(); |
|
305
|
305
|
$nea = (\core\common\Entity::getAttributeValue($this->attributes, 'media:wired', 0) === 'on') ? 'true' : 'false'; |
|
306
|
306
|
$otherTlsName = \core\common\Entity::getAttributeValue($this->attributes, 'eap-specific:tls_use_other_id', 0) === 'on' ? 'true' : 'false'; |
|
307
|
|
- $this->useGeantLink = \core\common\Entity::getAttributeValue($this->attributes, 'device-specific:geantlink', $this->device_id)[0] === 'on' ? true : false; |
|
|
307
|
+ $this->useGeantLink = \core\common\Entity::getAttributeValue($this->attributes, 'device-specific:geantlink', $this->device_id)[0] === 'on' ? true : false; |
|
308
|
308
|
$eapConfig = $this->setEapObject(); |
|
309
|
309
|
$eapConfig->setInnerType($this->selectedEap['INNER']); |
|
310
|
310
|
$eapConfig->setInnerTypeDisplay(\core\common\EAP::eapDisplayName($this->selectedEap)['INNER']); |