GEANT /
CAT
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | $delProfiles[] = $ssid; |
| 72 | 72 | } |
| 73 | 73 | if ($cipher == 'TKIP') { |
| 74 | - $delProfiles[] = $ssid . ' (TKIP)'; |
|
| 74 | + $delProfiles[] = $ssid.' (TKIP)'; |
|
| 75 | 75 | } |
| 76 | 76 | } |
| 77 | 77 | |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | $iterator = 0; |
| 82 | 82 | foreach ($allSSID as $ssid => $cipher) { |
| 83 | 83 | if ($cipher == 'TKIP') { |
| 84 | - $windowsProfile[$iterator] = $this->writeWLANprofile($ssid . ' (TKIP)', $ssid, 'WPA', 'TKIP', $eapConfig, $iterator); |
|
| 84 | + $windowsProfile[$iterator] = $this->writeWLANprofile($ssid.' (TKIP)', $ssid, 'WPA', 'TKIP', $eapConfig, $iterator); |
|
| 85 | 85 | $iterator++; |
| 86 | 86 | } |
| 87 | 87 | $windowsProfile[$iterator] = $this->writeWLANprofile($ssid, $ssid, 'WPA2', 'AES', $eapConfig, $iterator); |
@@ -142,10 +142,10 @@ discard block |
||
| 142 | 142 | $profileFileCont = '<EAPConfig><EapHostConfig xmlns="http://www.microsoft.com/provisioning/EapHostConfig"> |
| 143 | 143 | <EapMethod> |
| 144 | 144 | <Type xmlns="http://www.microsoft.com/provisioning/EapCommon">' . |
| 145 | - $this->selectedEap["OUTER"] . '</Type> |
|
| 145 | + $this->selectedEap["OUTER"].'</Type> |
|
| 146 | 146 | <VendorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorId> |
| 147 | 147 | <VendorType xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorType> |
| 148 | -<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">' . $authorId . '</AuthorId> |
|
| 148 | +<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">' . $authorId.'</AuthorId> |
|
| 149 | 149 | </EapMethod> |
| 150 | 150 | '; |
| 151 | 151 | |
@@ -158,9 +158,9 @@ discard block |
||
| 158 | 158 | $profileFileCont .= ' |
| 159 | 159 | <Config xmlns="http://www.microsoft.com/provisioning/EapHostConfig"> |
| 160 | 160 | <EAPIdentityProviderList xmlns="urn:ietf:params:xml:ns:yang:ietf-eap-metadata"> |
| 161 | -<EAPIdentityProvider ID="' . $this->deviceUUID . '" namespace="urn:UUID"> |
|
| 161 | +<EAPIdentityProvider ID="' . $this->deviceUUID.'" namespace="urn:UUID"> |
|
| 162 | 162 | <ProviderInfo> |
| 163 | -<DisplayName>' . $this->translateString($attr['general:instname'][0], $this->codePage) . '</DisplayName> |
|
| 163 | +<DisplayName>' . $this->translateString($attr['general:instname'][0], $this->codePage).'</DisplayName> |
|
| 164 | 164 | </ProviderInfo> |
| 165 | 165 | <AuthenticationMethods> |
| 166 | 166 | <AuthenticationMethod> |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | if ($outerUser == '') { |
| 173 | 173 | $profileFileCont .= '<AnonymousIdentity>@</AnonymousIdentity>'; |
| 174 | 174 | } else { |
| 175 | - $profileFileCont .= '<AnonymousIdentity>' . $outerUser . '@' . $realm . '</AnonymousIdentity>'; |
|
| 175 | + $profileFileCont .= '<AnonymousIdentity>'.$outerUser.'@'.$realm.'</AnonymousIdentity>'; |
|
| 176 | 176 | } |
| 177 | 177 | } |
| 178 | 178 | $profileFileCont .= '</ClientSideCredential> |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | $profileFileCont .= ' |
| 191 | 191 | </ServerSideCredential> |
| 192 | 192 | <InnerAuthenticationMethod> |
| 193 | -<NonEAPAuthMethod>' .$innerMethod. '</NonEAPAuthMethod> |
|
| 193 | +<NonEAPAuthMethod>' .$innerMethod.'</NonEAPAuthMethod> |
|
| 194 | 194 | </InnerAuthenticationMethod> |
| 195 | 195 | <VendorSpecific> |
| 196 | 196 | <SessionResumption>false</SessionResumption> |
@@ -215,11 +215,11 @@ discard block |
||
| 215 | 215 | </eapTls:CredentialsSource> |
| 216 | 216 | <eapTls:ServerValidation> |
| 217 | 217 | <eapTls:DisableUserPromptForServerValidation>true</eapTls:DisableUserPromptForServerValidation> |
| 218 | -<eapTls:ServerNames>' . $servers . '</eapTls:ServerNames>'; |
|
| 218 | +<eapTls:ServerNames>' . $servers.'</eapTls:ServerNames>'; |
|
| 219 | 219 | if ($caArray) { |
| 220 | 220 | foreach ($caArray as $certAuthority) { |
| 221 | 221 | if ($certAuthority['root']) { |
| 222 | - $profileFileCont .= "<eapTls:TrustedRootCA>" . $certAuthority['sha1'] . "</eapTls:TrustedRootCA>\n"; |
|
| 222 | + $profileFileCont .= "<eapTls:TrustedRootCA>".$certAuthority['sha1']."</eapTls:TrustedRootCA>\n"; |
|
| 223 | 223 | } |
| 224 | 224 | } |
| 225 | 225 | } |
@@ -251,11 +251,11 @@ discard block |
||
| 251 | 251 | <msPeap:EapType> |
| 252 | 252 | <msPeap:ServerValidation> |
| 253 | 253 | <msPeap:DisableUserPromptForServerValidation>true</msPeap:DisableUserPromptForServerValidation> |
| 254 | -<msPeap:ServerNames>' . $servers . '</msPeap:ServerNames>'; |
|
| 254 | +<msPeap:ServerNames>' . $servers.'</msPeap:ServerNames>'; |
|
| 255 | 255 | if ($caArray) { |
| 256 | 256 | foreach ($caArray as $certAuthority) { |
| 257 | 257 | if ($certAuthority['root']) { |
| 258 | - $vistaExt .= "<msPeap:TrustedRootCA>" . $certAuthority['sha1'] . "</msPeap:TrustedRootCA>\n"; |
|
| 258 | + $vistaExt .= "<msPeap:TrustedRootCA>".$certAuthority['sha1']."</msPeap:TrustedRootCA>\n"; |
|
| 259 | 259 | } |
| 260 | 260 | } |
| 261 | 261 | } |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | <msChapV2:UseWinLogonCredentials>false</msChapV2:UseWinLogonCredentials> |
| 269 | 269 | </msChapV2:EapType> |
| 270 | 270 | </baseEap:Eap> |
| 271 | -<msPeap:EnableQuarantineChecks>' . $nea . '</msPeap:EnableQuarantineChecks> |
|
| 271 | +<msPeap:EnableQuarantineChecks>' . $nea.'</msPeap:EnableQuarantineChecks> |
|
| 272 | 272 | <msPeap:RequireCryptoBinding>false</msPeap:RequireCryptoBinding> |
| 273 | 273 | </msPeap:EapType> |
| 274 | 274 | </baseEap:Eap> |
@@ -280,11 +280,11 @@ discard block |
||
| 280 | 280 | <EapType xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV1"> |
| 281 | 281 | <ServerValidation> |
| 282 | 282 | <DisableUserPromptForServerValidation>true</DisableUserPromptForServerValidation> |
| 283 | -<ServerNames>' . $servers . '</ServerNames>'; |
|
| 283 | +<ServerNames>' . $servers.'</ServerNames>'; |
|
| 284 | 284 | if ($caArray) { |
| 285 | 285 | foreach ($caArray as $certAuthority) { |
| 286 | 286 | if ($certAuthority['root']) { |
| 287 | - $w7Ext .= "<TrustedRootCA>" . $certAuthority['sha1'] . "</TrustedRootCA>\n"; |
|
| 287 | + $w7Ext .= "<TrustedRootCA>".$certAuthority['sha1']."</TrustedRootCA>\n"; |
|
| 288 | 288 | } |
| 289 | 289 | } |
| 290 | 290 | } |
@@ -297,14 +297,14 @@ discard block |
||
| 297 | 297 | <UseWinLogonCredentials>false</UseWinLogonCredentials> |
| 298 | 298 | </EapType> |
| 299 | 299 | </Eap> |
| 300 | -<EnableQuarantineChecks>' . $nea . '</EnableQuarantineChecks> |
|
| 300 | +<EnableQuarantineChecks>' . $nea.'</EnableQuarantineChecks> |
|
| 301 | 301 | <RequireCryptoBinding>false</RequireCryptoBinding> |
| 302 | 302 | '; |
| 303 | 303 | if ($useAnon) { |
| 304 | 304 | $w7Ext .= '<PeapExtensions> |
| 305 | 305 | <IdentityPrivacy xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV2"> |
| 306 | 306 | <EnableIdentityPrivacy>true</EnableIdentityPrivacy> |
| 307 | -<AnonymousUserName>' . $outerUser . '</AnonymousUserName> |
|
| 307 | +<AnonymousUserName>' . $outerUser.'</AnonymousUserName> |
|
| 308 | 308 | </IdentityPrivacy> |
| 309 | 309 | </PeapExtensions> |
| 310 | 310 | '; |
@@ -322,8 +322,8 @@ discard block |
||
| 322 | 322 | $profileFileContEnd = '</EapHostConfig></EAPConfig> |
| 323 | 323 | '; |
| 324 | 324 | $returnArray = []; |
| 325 | - $returnArray['vista'] = $profileFileCont . $vistaExt . $profileFileContEnd; |
|
| 326 | - $returnArray['w7'] = $profileFileCont . $w7Ext . $profileFileContEnd; |
|
| 325 | + $returnArray['vista'] = $profileFileCont.$vistaExt.$profileFileContEnd; |
|
| 326 | + $returnArray['w7'] = $profileFileCont.$w7Ext.$profileFileContEnd; |
|
| 327 | 327 | return $returnArray; |
| 328 | 328 | } |
| 329 | 329 | |
@@ -342,10 +342,10 @@ discard block |
||
| 342 | 342 | private function writeWLANprofile($wlanProfileName, $ssid, $auth, $encryption, $eapConfig, $profileNumber) { |
| 343 | 343 | $profileFileCont = '<?xml version="1.0"?> |
| 344 | 344 | <WLANProfile xmlns="http://www.microsoft.com/networking/WLAN/profile/v1"> |
| 345 | -<name>' . $wlanProfileName . '</name> |
|
| 345 | +<name>' . $wlanProfileName.'</name> |
|
| 346 | 346 | <SSIDConfig> |
| 347 | 347 | <SSID> |
| 348 | -<name>' . $ssid . '</name> |
|
| 348 | +<name>' . $ssid.'</name> |
|
| 349 | 349 | </SSID> |
| 350 | 350 | <nonBroadcast>true</nonBroadcast> |
| 351 | 351 | </SSIDConfig> |
@@ -355,8 +355,8 @@ discard block |
||
| 355 | 355 | <MSM> |
| 356 | 356 | <security> |
| 357 | 357 | <authEncryption> |
| 358 | -<authentication>' . $auth . '</authentication> |
|
| 359 | -<encryption>' . $encryption . '</encryption> |
|
| 358 | +<authentication>' . $auth.'</authentication> |
|
| 359 | +<encryption>' . $encryption.'</encryption> |
|
| 360 | 360 | <useOneX>true</useOneX> |
| 361 | 361 | </authEncryption> |
| 362 | 362 | '; |
@@ -386,9 +386,9 @@ discard block |
||
| 386 | 386 | mkdir('vista'); |
| 387 | 387 | } |
| 388 | 388 | $vistaFileName = "vista/wlan_prof-$profileNumber.xml"; |
| 389 | - file_put_contents($vistaFileName, $profileFileCont . $eapConfig['vista'] . $closing); |
|
| 389 | + file_put_contents($vistaFileName, $profileFileCont.$eapConfig['vista'].$closing); |
|
| 390 | 390 | $sevenFileName = "w7/wlan_prof-$profileNumber.xml"; |
| 391 | - file_put_contents($sevenFileName, $profileFileCont . $eapConfig['w7'] . $closing); |
|
| 391 | + file_put_contents($sevenFileName, $profileFileCont.$eapConfig['w7'].$closing); |
|
| 392 | 392 | $this->loggerInstance->debug(2, "Installer has been written into directory $this->FPATH\n"); |
| 393 | 393 | $this->loggerInstance->debug(4, "WLAN_Profile:$wlanProfileName:$encryption\n"); |
| 394 | 394 | return("\"$wlanProfileName\" \"$encryption\""); |
@@ -424,8 +424,8 @@ discard block |
||
| 424 | 424 | mkdir('vista'); |
| 425 | 425 | } |
| 426 | 426 | |
| 427 | - file_put_contents("vista/lan_prof.xml", $profileFileCont . $eapConfig['vista'] . $closing); |
|
| 428 | - file_put_contents("w7/lan_prof.xml", $profileFileCont . $eapConfig['w7'] . $closing); |
|
| 427 | + file_put_contents("vista/lan_prof.xml", $profileFileCont.$eapConfig['vista'].$closing); |
|
| 428 | + file_put_contents("w7/lan_prof.xml", $profileFileCont.$eapConfig['w7'].$closing); |
|
| 429 | 429 | |
| 430 | 430 | } |
| 431 | 431 | |
@@ -439,7 +439,7 @@ discard block |
||
| 439 | 439 | private function writeMainNSH($eap, $attr) { |
| 440 | 440 | $this->loggerInstance->debug(4, "writeMainNSH"); |
| 441 | 441 | $this->loggerInstance->debug(4, $attr); |
| 442 | - $this->loggerInstance->debug(4, "MYLANG=" . $this->lang . "\n"); |
|
| 442 | + $this->loggerInstance->debug(4, "MYLANG=".$this->lang."\n"); |
|
| 443 | 443 | |
| 444 | 444 | $eapOptions = [ |
| 445 | 445 | \core\common\EAP::PEAP => ['str' => 'PEAP', 'exec' => 'user'], |
@@ -470,8 +470,8 @@ discard block |
||
| 470 | 470 | $this->loggerInstance->debug(4, "EAP_STR=$eapStr\n"); |
| 471 | 471 | $this->loggerInstance->debug(4, $eap); |
| 472 | 472 | |
| 473 | - $fcontents .= '!define ' . $eapStr; |
|
| 474 | - $fcontents .= "\n" . '!define EXECLEVEL "' . $execLevel . '"'; |
|
| 473 | + $fcontents .= '!define '.$eapStr; |
|
| 474 | + $fcontents .= "\n".'!define EXECLEVEL "'.$execLevel.'"'; |
|
| 475 | 475 | $fcontents .= $this->writeNsisDefines($attr); |
| 476 | 476 | file_put_contents('main.nsh', $fcontents); |
| 477 | 477 | } |
@@ -500,7 +500,7 @@ discard block |
||
| 500 | 500 | } |
| 501 | 501 | foreach ($caArray as $certAuthority) { |
| 502 | 502 | $store = $certAuthority['root'] ? "root" : "ca"; |
| 503 | - $contentCerts .= '!insertmacro install_ca_cert "' . $certAuthority['file'] . '" "' . $certAuthority['sha1'] . '" "' . $store . "\"\n"; |
|
| 503 | + $contentCerts .= '!insertmacro install_ca_cert "'.$certAuthority['file'].'" "'.$certAuthority['sha1'].'" "'.$store."\"\n"; |
|
| 504 | 504 | } |
| 505 | 505 | fwrite($fileHandleCerts, $contentCerts); |
| 506 | 506 | fclose($fileHandleCerts); |
@@ -515,7 +515,7 @@ discard block |
||
| 515 | 515 | */ |
| 516 | 516 | private function copyFiles($eap) { |
| 517 | 517 | $this->loggerInstance->debug(4, "copyFiles start\n"); |
| 518 | - $this->loggerInstance->debug(4, "code_page=" . $this->codePage . "\n"); |
|
| 518 | + $this->loggerInstance->debug(4, "code_page=".$this->codePage."\n"); |
|
| 519 | 519 | $this->copyBasicFiles(); |
| 520 | 520 | |
| 521 | 521 | switch ($eap["OUTER"]) { |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | $cryptoJson = openssl_encrypt($clearJson, 'AES-256-CBC', $encryptionKey, OPENSSL_RAW_DATA, $initVector); |
| 118 | 118 | $hmac = hash_hmac("sha1", $cryptoJson, $encryptionKey, TRUE); |
| 119 | 119 | |
| 120 | - $this->loggerInstance->debug(4, "Clear = $clearJson\nSalt = $salt\nPW = " . $password . "\nb(IV) = " . base64_encode($initVector) . "\nb(Cipher) = " . base64_encode($cryptoJson) . "\nb(HMAC) = " . base64_encode($hmac)); |
|
| 120 | + $this->loggerInstance->debug(4, "Clear = $clearJson\nSalt = $salt\nPW = ".$password."\nb(IV) = ".base64_encode($initVector)."\nb(Cipher) = ".base64_encode($cryptoJson)."\nb(HMAC) = ".base64_encode($hmac)); |
|
| 121 | 121 | |
| 122 | 122 | // now, generate the container that holds all the crypto data |
| 123 | 123 | $finalArray = [ |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | */ |
| 189 | 189 | private function wiredBlock($eapdetails) { |
| 190 | 190 | return [ |
| 191 | - "GUID" => \core\common\Entity::uuid('', "wired-dot1x-ethernet") . "}", |
|
| 191 | + "GUID" => \core\common\Entity::uuid('', "wired-dot1x-ethernet")."}", |
|
| 192 | 192 | "Name" => "eduroam configuration (wired network)", |
| 193 | 193 | "Remove" => false, |
| 194 | 194 | "Type" => "Ethernet", |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | // if silverbullet, we deliver the client cert inline |
| 229 | 229 | |
| 230 | 230 | if ($selectedEap == \core\common\EAP::EAPTYPE_SILVERBULLET) { |
| 231 | - $eaparray['ClientCertRef'] = "[" . $this->clientCert['GUID'] . "]"; |
|
| 231 | + $eaparray['ClientCertRef'] = "[".$this->clientCert['GUID']."]"; |
|
| 232 | 232 | $eaparray['ClientCertType'] = "Ref"; |
| 233 | 233 | } |
| 234 | 234 | |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | $jsonArray = ["Type" => "UnencryptedConfiguration"]; |
| 262 | 262 | |
| 263 | 263 | foreach ($this->attributes['internal:CAs'][0] as $ca) { |
| 264 | - $caRefs[] = "{" . $ca['uuid'] . "}"; |
|
| 264 | + $caRefs[] = "{".$ca['uuid']."}"; |
|
| 265 | 265 | } |
| 266 | 266 | // define CA certificates |
| 267 | 267 | foreach ($this->attributes['internal:CAs'][0] as $ca) { |
@@ -271,15 +271,15 @@ discard block |
||
| 271 | 271 | if ($caSanitized1 === FALSE) { |
| 272 | 272 | throw new Exception("Error cropping PEM data at its BEGIN marker."); |
| 273 | 273 | } |
| 274 | - $this->loggerInstance->debug(4, $caSanitized1 . "\n"); |
|
| 274 | + $this->loggerInstance->debug(4, $caSanitized1."\n"); |
|
| 275 | 275 | // remove \n |
| 276 | 276 | $caSanitized = str_replace("\n", "", $caSanitized1); |
| 277 | - $jsonArray["Certificates"][] = ["GUID" => "{" . $ca['uuid'] . "}", "Remove" => false, "Type" => "Authority", "X509" => $caSanitized]; |
|
| 278 | - $this->loggerInstance->debug(3, $caSanitized . "\n"); |
|
| 277 | + $jsonArray["Certificates"][] = ["GUID" => "{".$ca['uuid']."}", "Remove" => false, "Type" => "Authority", "X509" => $caSanitized]; |
|
| 278 | + $this->loggerInstance->debug(3, $caSanitized."\n"); |
|
| 279 | 279 | } |
| 280 | 280 | // if we are doing silverbullet, include the unencrypted(!) P12 as a client certificate |
| 281 | 281 | if ($this->selectedEap == \core\common\EAP::EAPTYPE_SILVERBULLET) { |
| 282 | - $jsonArray["Certificates"][] = ["GUID" => "[" . $this->clientCert['GUID'] . "]", "PKCS12" => base64_encode($this->clientCert['certdataclear']), "Remove" => false, "Type" => "Client"]; |
|
| 282 | + $jsonArray["Certificates"][] = ["GUID" => "[".$this->clientCert['GUID']."]", "PKCS12" => base64_encode($this->clientCert['certdataclear']), "Remove" => false, "Type" => "Client"]; |
|
| 283 | 283 | } |
| 284 | 284 | $eaparray = $this->eapBlock($caRefs); |
| 285 | 285 | // define Wi-Fi networks |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | |
| 301 | 301 | file_put_contents('installer_profile', $finalJson); |
| 302 | 302 | |
| 303 | - $fileName = $this->installerBasename . '.onc'; |
|
| 303 | + $fileName = $this->installerBasename.'.onc'; |
|
| 304 | 304 | |
| 305 | 305 | if (!$this->sign) { |
| 306 | 306 | rename("installer_profile", $fileName); |
@@ -311,7 +311,7 @@ discard block |
||
| 311 | 311 | // have the notion of signing |
| 312 | 312 | // but if they ever change their mind, we are prepared |
| 313 | 313 | |
| 314 | - $outputFromSigning = system($this->sign . " installer_profile '$fileName' > /dev/null"); |
|
| 314 | + $outputFromSigning = system($this->sign." installer_profile '$fileName' > /dev/null"); |
|
| 315 | 315 | if ($outputFromSigning === FALSE) { |
| 316 | 316 | $this->loggerInstance->debug(2, "Signing the ONC installer $fileName FAILED!\n"); |
| 317 | 317 | } |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | if (is_scalar($value)) { |
| 119 | 119 | $this->value = strval($value); |
| 120 | 120 | } else { |
| 121 | - throw new Exception("unexpected value type passed" . gettype($value)); |
|
| 121 | + throw new Exception("unexpected value type passed".gettype($value)); |
|
| 122 | 122 | } |
| 123 | 123 | } |
| 124 | 124 | |
@@ -434,7 +434,7 @@ discard block |
||
| 434 | 434 | $qualClassName = get_class($object); |
| 435 | 435 | // remove namespace qualifier |
| 436 | 436 | $pos = strrpos($qualClassName, '\\'); |
| 437 | - $className = substr($qualClassName, $pos + 1); |
|
| 437 | + $className = substr($qualClassName, $pos + 1); |
|
| 438 | 438 | $name = preg_replace("/_/", "-", $className); |
| 439 | 439 | if ($object->getValue()) { |
| 440 | 440 | $val = preg_replace('/&/', '&', $object->getValue()); |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | return $helpdesk; |
| 295 | 295 | } |
| 296 | 296 | |
| 297 | - private function getCredentialApplicability() { |
|
| 297 | + private function getCredentialApplicability() { |
|
| 298 | 298 | $ssids = $this->attributes['internal:SSID']; |
| 299 | 299 | $oids = $this->attributes['internal:consortia']; |
| 300 | 300 | $credentialapplicability = new CredentialApplicability(); |
@@ -420,7 +420,7 @@ discard block |
||
| 420 | 420 | } |
| 421 | 421 | |
| 422 | 422 | private function getAuthMethod($eap) { |
| 423 | - // $attr = $this->attributes; |
|
| 423 | + // $attr = $this->attributes; |
|
| 424 | 424 | $authmethod = new AuthenticationMethod(); |
| 425 | 425 | $eapParams = $this->getAuthenticationMethodParams($eap); |
| 426 | 426 | $eaptype = new Type(); |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | */ |
| 32 | 32 | namespace devices\xml; |
| 33 | 33 | use Exception; |
| 34 | -require_once dirname(__FILE__) . '/XML.inc.php'; |
|
| 34 | +require_once dirname(__FILE__).'/XML.inc.php'; |
|
| 35 | 35 | |
| 36 | 36 | /** |
| 37 | 37 | * This class implements full functionality of the generic XML device |
@@ -132,11 +132,11 @@ discard block |
||
| 132 | 132 | marshalObject($root, $eapIdp); |
| 133 | 133 | $dom = dom_import_simplexml($root)->ownerDocument; |
| 134 | 134 | //TODO schema validation makes sense so probably should be used |
| 135 | - if ($dom->schemaValidate(ROOT . '/devices/xml/eap-metadata.xsd') === FALSE) { |
|
| 135 | + if ($dom->schemaValidate(ROOT.'/devices/xml/eap-metadata.xsd') === FALSE) { |
|
| 136 | 136 | throw new Exception("Schema validation failed for eap-metadata"); |
| 137 | 137 | } |
| 138 | - file_put_contents($this->installerBasename . '.eap-config', $dom->saveXML()); |
|
| 139 | - return($this->installerBasename . '.eap-config'); |
|
| 138 | + file_put_contents($this->installerBasename.'.eap-config', $dom->saveXML()); |
|
| 139 | + return($this->installerBasename.'.eap-config'); |
|
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | private $AttributeNames = [ |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | $this->loggerInstance->debug(4, "Missing class definition for $attrName\n"); |
| 163 | 163 | return([]); |
| 164 | 164 | } |
| 165 | - $className = "\devices\xml\\" . $this->AttributeNames[$attrName]; |
|
| 165 | + $className = "\devices\xml\\".$this->AttributeNames[$attrName]; |
|
| 166 | 166 | $objs = []; |
| 167 | 167 | if ($this->langScope === 'global') { |
| 168 | 168 | foreach ($attributeList['langs'] as $language => $value) { |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | $displayname = new DisplayName(); |
| 201 | 201 | if (isset($profileNameLangs)) { |
| 202 | 202 | $langOrC = isset($profileNameLangs[$language]) ? $profileNameLangs[$language] : $profileNameLangs['C']; |
| 203 | - $value .= ' - ' . $langOrC; |
|
| 203 | + $value .= ' - '.$langOrC; |
|
| 204 | 204 | } |
| 205 | 205 | $displayname->setValue($value); |
| 206 | 206 | $displayname->setAttributes(['lang' => $language]); |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | $displayname = new DisplayName(); |
| 211 | 211 | $value = $attr['general:instname'][0]; |
| 212 | 212 | if ($attr['internal:profile_count'][0] > 1) { |
| 213 | - $value .= ' - ' . $attr['profile:name'][0]; |
|
| 213 | + $value .= ' - '.$attr['profile:name'][0]; |
|
| 214 | 214 | } |
| 215 | 215 | $displayname->setValue($value); |
| 216 | 216 | $objs[] = $displayname; |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | $attr = $this->attributes; |
| 228 | 228 | if (isset($attr['general:logo_file'][0])) { |
| 229 | 229 | $logoString = base64_encode($attr['general:logo_file'][0]); |
| 230 | - $logoMime = 'image/' . $attr['internal:logo_file'][0]['mime']; |
|
| 230 | + $logoMime = 'image/'.$attr['internal:logo_file'][0]['mime']; |
|
| 231 | 231 | $providerlogo = new ProviderLogo(); |
| 232 | 232 | $providerlogo->setAttributes(['mime' => $logoMime, 'encoding' => 'base64']); |
| 233 | 233 | $providerlogo->setValue($logoString); |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | |
| 328 | 328 | if (isset($inner["METHOD"]) && $inner["METHOD"]) { |
| 329 | 329 | $innerauthmethod = new InnerAuthenticationMethod(); |
| 330 | - $typeOfInner = "\devices\xml\\" . ($inner["EAP"] ? 'EAPMethod' : 'NonEAPAuthMethod'); |
|
| 330 | + $typeOfInner = "\devices\xml\\".($inner["EAP"] ? 'EAPMethod' : 'NonEAPAuthMethod'); |
|
| 331 | 331 | $eapmethod = new $typeOfInner(); |
| 332 | 332 | $eaptype = new Type(); |
| 333 | 333 | $eaptype->setValue($inner['METHOD']); |
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | return($serversidecredential); |
| 365 | 365 | } |
| 366 | 366 | |
| 367 | - private function setClientSideRealm ($clientsidecredential) { |
|
| 367 | + private function setClientSideRealm($clientsidecredential) { |
|
| 368 | 368 | $attr = $this->attributes; |
| 369 | 369 | $realm = \core\common\Entity::getAttributeValue($attr, 'internal:realm', 0); |
| 370 | 370 | if ($realm === NULL) { |
@@ -22,15 +22,15 @@ |
||
| 22 | 22 | namespace devices\redirect_dev; |
| 23 | 23 | |
| 24 | 24 | class Device_RedirectDev 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 | /** |
@@ -30,7 +30,7 @@ |
||
| 30 | 30 | final public function __construct() { |
| 31 | 31 | parent::__construct(); |
| 32 | 32 | $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]); |
| 33 | - $this->loggerInstance->debug(4,"RedirectEx called"); |
|
| 33 | + $this->loggerInstance->debug(4, "RedirectEx called"); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | /** |
@@ -138,8 +138,8 @@ |
||
| 138 | 138 | */ |
| 139 | 139 | private function zipInstaller() { |
| 140 | 140 | // one can always access $this->attributes to check things |
| 141 | - $fileName = $this->installerBasename . '.zip'; |
|
| 142 | - $output = system('zip -q ' . $fileName . ' *'); |
|
| 141 | + $fileName = $this->installerBasename.'.zip'; |
|
| 142 | + $output = system('zip -q '.$fileName.' *'); |
|
| 143 | 143 | if ($output === FALSE) { |
| 144 | 144 | $this->loggerInstance->debug(2, "unable to zip the installer\n"); |
| 145 | 145 | } |
@@ -93,15 +93,15 @@ discard block |
||
| 93 | 93 | <key>PayloadDescription</key> |
| 94 | 94 | <string>$tagline</string> |
| 95 | 95 | <key>PayloadDisplayName</key> |
| 96 | - <string>" . CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'] . "</string> |
|
| 96 | + <string>".CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']."</string> |
|
| 97 | 97 | <key>PayloadIdentifier</key> |
| 98 | - <string>" . self::$iPhonePayloadPrefix . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string> |
|
| 98 | + <string>" . self::$iPhonePayloadPrefix.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string> |
|
| 99 | 99 | <key>PayloadOrganization</key> |
| 100 | - <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ( $this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string> |
|
| 100 | + <string>".htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8').($this->attributes['internal:profile_count'][0] > 1 ? " (".htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8').")" : "")."</string> |
|
| 101 | 101 | <key>PayloadType</key> |
| 102 | 102 | <string>Configuration</string> |
| 103 | 103 | <key>PayloadUUID</key> |
| 104 | - <string>" . \core\common\Entity::uuid('', self::$iPhonePayloadPrefix . $this->massagedConsortium . $this->massagedCountry . $this->massagedInst . $this->massagedProfile) . "</string> |
|
| 104 | + <string>" . \core\common\Entity::uuid('', self::$iPhonePayloadPrefix.$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile)."</string> |
|
| 105 | 105 | <key>PayloadVersion</key> |
| 106 | 106 | <integer>1</integer>"; |
| 107 | 107 | \core\common\Entity::outOfThePotatoes(); |
@@ -132,15 +132,15 @@ discard block |
||
| 132 | 132 | protected function consentBlock() { |
| 133 | 133 | \core\common\Entity::intoThePotatoes(); |
| 134 | 134 | if (isset($this->attributes['support:info_file'])) { |
| 135 | - return MobileconfigSuperclass::BUFFER_CONSENT_PRE . htmlspecialchars(iconv("UTF-8", "UTF-8//TRANSLIT", $this->attributes['support:info_file'][0]), ENT_XML1, 'UTF-8') . MobileconfigSuperclass::BUFFER_CONSENT_POST; |
|
| 135 | + return MobileconfigSuperclass::BUFFER_CONSENT_PRE.htmlspecialchars(iconv("UTF-8", "UTF-8//TRANSLIT", $this->attributes['support:info_file'][0]), ENT_XML1, 'UTF-8').MobileconfigSuperclass::BUFFER_CONSENT_POST; |
|
| 136 | 136 | } |
| 137 | 137 | if ($this->attributes['internal:verify_userinput_suffix'][0] != 0) { |
| 138 | 138 | if (strlen($this->attributes['internal:realm'][0]) > 0) { |
| 139 | - $retval =MobileconfigSuperclass::BUFFER_CONSENT_PRE . sprintf(_("Important Notice: your username must end with @%s!"), $this->attributes['internal:realm'][0]) . MobileconfigSuperclass::BUFFER_CONSENT_POST; |
|
| 139 | + $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE.sprintf(_("Important Notice: your username must end with @%s!"), $this->attributes['internal:realm'][0]).MobileconfigSuperclass::BUFFER_CONSENT_POST; |
|
| 140 | 140 | \core\common\Entity::outOfThePotatoes(); |
| 141 | 141 | return $retval; |
| 142 | 142 | } |
| 143 | - $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE . _("Important Notice: your username MUST be in the form of xxx@yyy where the yyy is a common suffix identifying your Identity Provider. Please find out what to use there and enter the username in the correct format.") . MobileconfigSuperclass::BUFFER_CONSENT_POST; |
|
| 143 | + $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE._("Important Notice: your username MUST be in the form of xxx@yyy where the yyy is a common suffix identifying your Identity Provider. Please find out what to use there and enter the username in the correct format.").MobileconfigSuperclass::BUFFER_CONSENT_POST; |
|
| 144 | 144 | \core\common\Entity::outOfThePotatoes(); |
| 145 | 145 | return $retval; |
| 146 | 146 | } |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | // also escape htmlspecialchars |
| 166 | 166 | // not all names and profiles have a name, so be prepared |
| 167 | 167 | |
| 168 | - $this->loggerInstance->debug(5, "List of available attributes: " . var_export($this->attributes, TRUE)); |
|
| 168 | + $this->loggerInstance->debug(5, "List of available attributes: ".var_export($this->attributes, TRUE)); |
|
| 169 | 169 | |
| 170 | 170 | $this->instName = $this->attributes['general:instname'][0] ?? _("Unnamed Organisation"); |
| 171 | 171 | $this->profileName = $this->attributes['profile:name'][0] ?? _("Unnamed Profile"); |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | |
| 210 | 210 | textdomain($dom); |
| 211 | 211 | |
| 212 | - $fileName = $this->installerBasename . '.mobileconfig'; |
|
| 212 | + $fileName = $this->installerBasename.'.mobileconfig'; |
|
| 213 | 213 | |
| 214 | 214 | if (!$this->sign) { |
| 215 | 215 | rename("installer_profile", $fileName); |
@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | return $fileName; |
| 218 | 218 | } |
| 219 | 219 | // still here? Then we are signing. |
| 220 | - $signing = system($this->sign . " installer_profile '$fileName' > /dev/null"); |
|
| 220 | + $signing = system($this->sign." installer_profile '$fileName' > /dev/null"); |
|
| 221 | 221 | if ($signing === FALSE) { |
| 222 | 222 | $this->loggerInstance->debug(2, "Signing the mobileconfig installer $fileName FAILED!\n"); |
| 223 | 223 | } |
@@ -235,19 +235,19 @@ discard block |
||
| 235 | 235 | \core\common\Entity::intoThePotatoes(); |
| 236 | 236 | $ssidCount = count($this->attributes['internal:SSID']); |
| 237 | 237 | $certCount = count($this->attributes['internal:CAs'][0]); |
| 238 | - $out = "<p>" . _("For best results, please use the built-in browser (Safari) to open the configuration file.") . "</p>"; |
|
| 238 | + $out = "<p>"._("For best results, please use the built-in browser (Safari) to open the configuration file.")."</p>"; |
|
| 239 | 239 | $out .= "<p>"; |
| 240 | 240 | $out .= _("The profile will install itself after you click (or tap) the button. You will be asked for confirmation/input at several points:"); |
| 241 | 241 | $out .= "<ul>"; |
| 242 | - $out .= "<li>" . _("to install the profile") . "</li>"; |
|
| 243 | - $out .= "<li>" . ngettext("to accept the server certificate authority", "to accept the server certificate authorities", $certCount); |
|
| 242 | + $out .= "<li>"._("to install the profile")."</li>"; |
|
| 243 | + $out .= "<li>".ngettext("to accept the server certificate authority", "to accept the server certificate authorities", $certCount); |
|
| 244 | 244 | if ($certCount > 1) { |
| 245 | - $out .= " " . sprintf(_("(%d times)"), $certCount); |
|
| 245 | + $out .= " ".sprintf(_("(%d times)"), $certCount); |
|
| 246 | 246 | } |
| 247 | 247 | $out .= "</li>"; |
| 248 | - $out .= "<li>" . _("to enter the username and password you have been given by your organisation"); |
|
| 248 | + $out .= "<li>"._("to enter the username and password you have been given by your organisation"); |
|
| 249 | 249 | if ($ssidCount > 1) { |
| 250 | - $out .= " " . sprintf(_("(%d times each, because %s is installed for %d SSIDs)"), $ssidCount, CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $ssidCount); |
|
| 250 | + $out .= " ".sprintf(_("(%d times each, because %s is installed for %d SSIDs)"), $ssidCount, CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $ssidCount); |
|
| 251 | 251 | } |
| 252 | 252 | $out .= "</li>"; |
| 253 | 253 | $out .= "</ul>"; |
@@ -284,7 +284,7 @@ discard block |
||
| 284 | 284 | <key>ServiceProviderRoamingEnabled</key> |
| 285 | 285 | <true/> |
| 286 | 286 | <key>DisplayedOperatorName</key> |
| 287 | - <string>" . CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'] . " via Passpoint</string>"; |
|
| 287 | + <string>" . CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']." via Passpoint</string>"; |
|
| 288 | 288 | // if we don't know the realm, omit the entire DomainName key |
| 289 | 289 | if (isset($this->attributes['internal:realm'])) { |
| 290 | 290 | $retval .= "<key>DomainName</key> |
@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | <dict> |
| 333 | 333 | <key>AcceptEAPTypes</key> |
| 334 | 334 | <array> |
| 335 | - <integer>" . $eapType['OUTER'] . "</integer> |
|
| 335 | + <integer>" . $eapType['OUTER']."</integer> |
|
| 336 | 336 | </array> |
| 337 | 337 | <key>EAPFASTProvisionPAC</key> |
| 338 | 338 | <true /> |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | "; |
| 346 | 346 | if ($realm !== NULL) { |
| 347 | 347 | $retval .= "<key>OuterIdentity</key> |
| 348 | - <string>" . htmlspecialchars($realm, ENT_XML1, 'UTF-8') . "</string> |
|
| 348 | + <string>" . htmlspecialchars($realm, ENT_XML1, 'UTF-8')."</string> |
|
| 349 | 349 | "; |
| 350 | 350 | } |
| 351 | 351 | $retval .= "<key>PayloadCertificateAnchorUUID</key> |
@@ -369,11 +369,11 @@ discard block |
||
| 369 | 369 | $retval .= " |
| 370 | 370 | </array>"; |
| 371 | 371 | if ($eapType['INNER'] == \core\common\EAP::NE_SILVERBULLET) { |
| 372 | - $retval .= "<key>UserName</key><string>" . $this->clientCert["certObject"]->username . "</string>"; |
|
| 372 | + $retval .= "<key>UserName</key><string>".$this->clientCert["certObject"]->username."</string>"; |
|
| 373 | 373 | } |
| 374 | 374 | $retval .= " |
| 375 | 375 | <key>TTLSInnerAuthentication</key> |
| 376 | - <string>" . ($eapType['INNER'] == \core\common\EAP::NONE ? "PAP" : "MSCHAPv2") . "</string> |
|
| 376 | + <string>" . ($eapType['INNER'] == \core\common\EAP::NONE ? "PAP" : "MSCHAPv2")."</string> |
|
| 377 | 377 | </dict>"; |
| 378 | 378 | return $retval; |
| 379 | 379 | } |
@@ -392,9 +392,9 @@ discard block |
||
| 392 | 392 | // characters are still reversed, invert on use! |
| 393 | 393 | $buffer .= "<string>Manual</string> |
| 394 | 394 | <key>ProxyServer</key> |
| 395 | - <string>" . strrev($serverAndPort[1]) . "</string> |
|
| 395 | + <string>" . strrev($serverAndPort[1])."</string> |
|
| 396 | 396 | <key>ProxyServerPort</key> |
| 397 | - <integer>" . strrev($serverAndPort[0]) . "</integer> |
|
| 397 | + <integer>" . strrev($serverAndPort[0])."</integer> |
|
| 398 | 398 | <key>ProxyPACFallbackAllowed</key> |
| 399 | 399 | <false/>"; |
| 400 | 400 | } else { |
@@ -422,7 +422,7 @@ discard block |
||
| 422 | 422 | throw new Exception("SSID must be a string!"); |
| 423 | 423 | } |
| 424 | 424 | $escapedSSID = htmlspecialchars($toBeConfigured, ENT_XML1, 'UTF-8'); |
| 425 | - $payloadIdentifier = "wifi." . $this->serial; |
|
| 425 | + $payloadIdentifier = "wifi.".$this->serial; |
|
| 426 | 426 | $payloadShortName = sprintf(_("SSID %s"), $escapedSSID); |
| 427 | 427 | $payloadName = sprintf(_("%s configuration for network name %s"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $escapedSSID); |
| 428 | 428 | $encryptionTypeString = "WPA"; |
@@ -470,11 +470,11 @@ discard block |
||
| 470 | 470 | <key>PayloadDisplayName</key> |
| 471 | 471 | <string>$payloadShortName</string> |
| 472 | 472 | <key>PayloadIdentifier</key> |
| 473 | - <string>" . self::$iPhonePayloadPrefix . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.$payloadIdentifier</string> |
|
| 473 | + <string>".self::$iPhonePayloadPrefix.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.$payloadIdentifier</string> |
|
| 474 | 474 | <key>PayloadOrganization</key> |
| 475 | - <string>" . $this->massagedConsortium . ".1x-config.org</string> |
|
| 475 | + <string>".$this->massagedConsortium.".1x-config.org</string> |
|
| 476 | 476 | <key>PayloadType</key> |
| 477 | - <string>com.apple." . ($blocktype == MobileconfigSuperclass::NETWORK_BLOCK_TYPE_WIRED ? "firstactiveethernet" : "wifi") . ".managed</string>"; |
|
| 477 | + <string>com.apple." . ($blocktype == MobileconfigSuperclass::NETWORK_BLOCK_TYPE_WIRED ? "firstactiveethernet" : "wifi").".managed</string>"; |
|
| 478 | 478 | $retval .= $this->proxySettings(); |
| 479 | 479 | $retval .= $setupModesString; |
| 480 | 480 | if ($eapType['INNER'] == \core\common\EAP::NE_SILVERBULLET) { |
@@ -486,7 +486,7 @@ discard block |
||
| 486 | 486 | } |
| 487 | 487 | $retval .= " |
| 488 | 488 | <key>PayloadUUID</key> |
| 489 | - <string>" . \core\common\Entity::uuid() . "</string> |
|
| 489 | + <string>" . \core\common\Entity::uuid()."</string> |
|
| 490 | 490 | <key>PayloadVersion</key> |
| 491 | 491 | <integer>1</integer> |
| 492 | 492 | $wifiNetworkIdentification</dict>"; |
@@ -515,15 +515,15 @@ discard block |
||
| 515 | 515 | <key>IsHotspot</key> |
| 516 | 516 | <false/> |
| 517 | 517 | <key>PayloadDescription</key> |
| 518 | - <string>" . sprintf(_("This SSID should not be used after bootstrapping %s"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) . "</string> |
|
| 518 | + <string>" . sprintf(_("This SSID should not be used after bootstrapping %s"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])."</string> |
|
| 519 | 519 | <key>PayloadDisplayName</key> |
| 520 | - <string>" . _("Disabled WiFi network") . "</string> |
|
| 520 | + <string>" . _("Disabled WiFi network")."</string> |
|
| 521 | 521 | <key>PayloadIdentifier</key> |
| 522 | - <string>" . self::$iPhonePayloadPrefix . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.wifi.disabled.$this->removeSerial</string> |
|
| 522 | + <string>" . self::$iPhonePayloadPrefix.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.wifi.disabled.$this->removeSerial</string> |
|
| 523 | 523 | <key>PayloadType</key> |
| 524 | 524 | <string>com.apple.wifi.managed</string> |
| 525 | 525 | <key>PayloadUUID</key> |
| 526 | - <string>" . \core\common\Entity::uuid() . "</string> |
|
| 526 | + <string>".\core\common\Entity::uuid()."</string> |
|
| 527 | 527 | <key>PayloadVersion</key> |
| 528 | 528 | <real>1</real>"; |
| 529 | 529 | $retval .= $this->proxySettings(); |
@@ -597,7 +597,7 @@ discard block |
||
| 597 | 597 | $mimeBlob = base64_encode($binaryBlob); |
| 598 | 598 | $mimeFormatted = chunk_split($mimeBlob, 52, "\r\n"); |
| 599 | 599 | $payloadUUID = \core\common\Entity::uuid('', $mimeBlob); |
| 600 | - $retArray = ["block" => "<dict>" . |
|
| 600 | + $retArray = ["block" => "<dict>". |
|
| 601 | 601 | // we don't include the import password. It's displayed on screen, and should be input by the user. |
| 602 | 602 | // <key>Password</key> |
| 603 | 603 | // <string>" . $this->clientCert['password'] . "</string> |
@@ -610,7 +610,7 @@ discard block |
||
| 610 | 610 | <key>PayloadDescription</key> |
| 611 | 611 | <string>MIME Base-64 encoded PKCS#12 Client Certificate</string> |
| 612 | 612 | <key>PayloadDisplayName</key> |
| 613 | - <string>" . _("eduroam user certificate") . "</string> |
|
| 613 | + <string>"._("eduroam user certificate")."</string> |
|
| 614 | 614 | <key>PayloadIdentifier</key> |
| 615 | 615 | <string>com.apple.security.pkcs12.$payloadUUID</string> |
| 616 | 616 | <key>PayloadType</key> |
@@ -620,7 +620,7 @@ discard block |
||
| 620 | 620 | <key>PayloadVersion</key> |
| 621 | 621 | <integer>1</integer> |
| 622 | 622 | </dict>", |
| 623 | - "UUID" => $payloadUUID,]; |
|
| 623 | + "UUID" => $payloadUUID, ]; |
|
| 624 | 624 | \core\common\Entity::outOfThePotatoes(); |
| 625 | 625 | return $retArray; |
| 626 | 626 | } |
@@ -638,7 +638,7 @@ discard block |
||
| 638 | 638 | } |
| 639 | 639 | $expiryTime = new \DateTime($this->clientCert['certObject']->expiry); |
| 640 | 640 | return "<key>RemovalDate</key> |
| 641 | - <date>" . $expiryTime->format("Y-m-d") . "T" . $expiryTime->format("H:i:s") . "Z</date>"; |
|
| 641 | + <date>" . $expiryTime->format("Y-m-d")."T".$expiryTime->format("H:i:s")."Z</date>"; |
|
| 642 | 642 | } |
| 643 | 643 | |
| 644 | 644 | private $CAsAccountedFor = []; |
@@ -661,21 +661,21 @@ discard block |
||
| 661 | 661 | $stream = " |
| 662 | 662 | <dict> |
| 663 | 663 | <key>PayloadCertificateFileName</key> |
| 664 | - <string>" . $ca['uuid'] . ".der</string> |
|
| 664 | + <string>" . $ca['uuid'].".der</string> |
|
| 665 | 665 | <key>PayloadContent</key> |
| 666 | 666 | <data> |
| 667 | -" . $trimmedPem . "</data> |
|
| 667 | +" . $trimmedPem."</data> |
|
| 668 | 668 | <key>PayloadDescription</key> |
| 669 | - <string>" . sprintf(_("The %s Certification Authority"), \core\common\Entity::$nomenclature_inst) . "</string> |
|
| 669 | + <string>" . sprintf(_("The %s Certification Authority"), \core\common\Entity::$nomenclature_inst)."</string> |
|
| 670 | 670 | <key>PayloadDisplayName</key> |
| 671 | - <string>" . sprintf(_("%s CA"), \core\common\Entity::$nomenclature_inst) . "</string> |
|
| 671 | + <string>" . sprintf(_("%s CA"), \core\common\Entity::$nomenclature_inst)."</string> |
|
| 672 | 672 | <key>PayloadIdentifier</key> |
| 673 | - <string>" . self::$iPhonePayloadPrefix . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.credential.$this->caSerial</string> |
|
| 673 | + <string>" . self::$iPhonePayloadPrefix.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.credential.$this->caSerial</string> |
|
| 674 | 674 | <key>PayloadOrganization</key> |
| 675 | - <string>" . $this->massagedConsortium . ".1x-config.org</string> |
|
| 675 | + <string>".$this->massagedConsortium.".1x-config.org</string> |
|
| 676 | 676 | <key>PayloadType</key> |
| 677 | 677 | <string>com.apple.security.root</string> |
| 678 | - <key>PayloadUUID</key><string>" . $ca['uuid'] . "</string> |
|
| 678 | + <key>PayloadUUID</key><string>" . $ca['uuid']."</string> |
|
| 679 | 679 | <key>PayloadVersion</key> |
| 680 | 680 | <integer>1</integer> |
| 681 | 681 | </dict>"; |
@@ -361,7 +361,7 @@ discard block |
||
| 361 | 361 | "eduroamCAT", |
| 362 | 362 | "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>", |
| 363 | 363 | "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>", |
| 364 | - "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"), |
|
| 364 | + "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"), |
|
| 365 | 365 | ], |
| 366 | 366 | ], |
| 367 | 367 | 'android_oreo' => [ |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | "eduroamCAT", |
| 377 | 377 | "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>", |
| 378 | 378 | "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>", |
| 379 | - "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"), |
|
| 379 | + "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"), |
|
| 380 | 380 | ], |
| 381 | 381 | ], |
| 382 | 382 | 'android_nougat' => [ |
@@ -391,7 +391,7 @@ discard block |
||
| 391 | 391 | "eduroamCAT", |
| 392 | 392 | "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>", |
| 393 | 393 | "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>", |
| 394 | - "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"), |
|
| 394 | + "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"), |
|
| 395 | 395 | ], |
| 396 | 396 | ], |
| 397 | 397 | 'android_marshmallow' => [ |
@@ -406,7 +406,7 @@ discard block |
||
| 406 | 406 | "eduroamCAT", |
| 407 | 407 | "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>", |
| 408 | 408 | "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>", |
| 409 | - "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"), |
|
| 409 | + "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"), |
|
| 410 | 410 | ], |
| 411 | 411 | ], |
| 412 | 412 | 'android_lollipop' => [ |
@@ -421,7 +421,7 @@ discard block |
||
| 421 | 421 | "eduroamCAT", |
| 422 | 422 | "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>", |
| 423 | 423 | "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>", |
| 424 | - "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"), |
|
| 424 | + "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"), |
|
| 425 | 425 | ], |
| 426 | 426 | ], |
| 427 | 427 | 'android_kitkat' => [ |
@@ -436,7 +436,7 @@ discard block |
||
| 436 | 436 | "eduroamCAT", |
| 437 | 437 | "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>", |
| 438 | 438 | "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>", |
| 439 | - "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"), |
|
| 439 | + "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"), |
|
| 440 | 440 | ], |
| 441 | 441 | ], |
| 442 | 442 | 'android_43' => [ |
@@ -451,7 +451,7 @@ discard block |
||
| 451 | 451 | "eduroamCAT", |
| 452 | 452 | "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>", |
| 453 | 453 | "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>", |
| 454 | - "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"), |
|
| 454 | + "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"), |
|
| 455 | 455 | ], |
| 456 | 456 | ], |
| 457 | 457 | 'android_legacy' => [ |
@@ -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) { |
@@ -54,9 +54,9 @@ discard block |
||
| 54 | 54 | * |
| 55 | 55 | */ |
| 56 | 56 | public function writeInstaller() { |
| 57 | - $installerPath = $this->installerBasename . ".py"; |
|
| 57 | + $installerPath = $this->installerBasename.".py"; |
|
| 58 | 58 | $this->copyFile("main.py", $installerPath); |
| 59 | - $installer = fopen($installerPath,"a"); |
|
| 59 | + $installer = fopen($installerPath, "a"); |
|
| 60 | 60 | if ($installer === FALSE) { |
| 61 | 61 | throw new Exception("Unable to open installer file for writing!"); |
| 62 | 62 | } |
@@ -83,9 +83,9 @@ discard block |
||
| 83 | 83 | $out .= "<p>"; |
| 84 | 84 | if ($ssidCount > 1) { |
| 85 | 85 | if ($ssidCount > 2) { |
| 86 | - $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"), implode(', ', CONFIG_CONFASSISTANT['CONSORTIUM']['ssid'])) . " "; |
|
| 86 | + $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"), implode(', ', CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']))." "; |
|
| 87 | 87 | } else { |
| 88 | - $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"), implode(', ', CONFIG_CONFASSISTANT['CONSORTIUM']['ssid'])) . " "; |
|
| 88 | + $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"), implode(', ', CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']))." "; |
|
| 89 | 89 | } |
| 90 | 90 | $iterator = 0; |
| 91 | 91 | foreach ($this->attributes['internal:SSID'] as $ssid => $v) { |
@@ -123,8 +123,8 @@ discard block |
||
| 123 | 123 | * @return void |
| 124 | 124 | */ |
| 125 | 125 | private function writeConfigLine($file, $prefix, $name, $text) { |
| 126 | - $out = $prefix . $name . ' = "' . $text; |
|
| 127 | - fwrite($file, wordwrap($out, 70, " \" \\\n \"") . "\n"); |
|
| 126 | + $out = $prefix.$name.' = "'.$text; |
|
| 127 | + fwrite($file, wordwrap($out, 70, " \" \\\n \"")."\n"); |
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | /** |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | 'user_cert_missing' => _("personal certificate file not found"), |
| 164 | 164 | ]; |
| 165 | 165 | foreach ($messages as $name => $value) { |
| 166 | - $this->writeConfigLine($file, 'Messages.', $name, $value . '"'); |
|
| 166 | + $this->writeConfigLine($file, 'Messages.', $name, $value.'"'); |
|
| 167 | 167 | } |
| 168 | 168 | \core\common\Entity::outOfThePotatoes(); |
| 169 | 169 | } |
@@ -207,39 +207,39 @@ discard block |
||
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | if ($outerId !== NULL) { |
| 210 | - $configRaw['anonymous_identity'] = '"' . $outerId . '"'; |
|
| 210 | + $configRaw['anonymous_identity'] = '"'.$outerId.'"'; |
|
| 211 | 211 | } |
| 212 | 212 | |
| 213 | 213 | if (!empty($this->attributes['internal:realm'][0])) { |
| 214 | 214 | $config['user_realm'] = $this->attributes['internal:realm'][0]; |
| 215 | 215 | } |
| 216 | 216 | |
| 217 | - if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) { |
|
| 217 | + if (!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) { |
|
| 218 | 218 | $configRaw['hint_user_input'] = "True"; |
| 219 | 219 | } |
| 220 | 220 | |
| 221 | - if(!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) { |
|
| 221 | + if (!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) { |
|
| 222 | 222 | $configRaw['verify_user_realm_input'] = "True"; |
| 223 | 223 | } |
| 224 | 224 | |
| 225 | 225 | foreach ($config as $name => $value) { |
| 226 | - $this->writeConfigLine($file, 'Config.', $name, $value . '"'); |
|
| 226 | + $this->writeConfigLine($file, 'Config.', $name, $value.'"'); |
|
| 227 | 227 | } |
| 228 | 228 | |
| 229 | 229 | foreach ($configRaw as $name => $value) { |
| 230 | - fwrite($file, 'Config.' . $name . ' = ' . $value . "\n"); |
|
| 230 | + fwrite($file, 'Config.'.$name.' = '.$value."\n"); |
|
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | if ($tou === '') { |
| 234 | - fwrite($file, 'Config.tou = ""' . "\n"); |
|
| 234 | + fwrite($file, 'Config.tou = ""'."\n"); |
|
| 235 | 235 | } else { |
| 236 | - fwrite($file, 'Config.tou = """' . $tou . '"""' . "\n"); |
|
| 236 | + fwrite($file, 'Config.tou = """'.$tou.'"""'."\n"); |
|
| 237 | 237 | } |
| 238 | 238 | |
| 239 | - fwrite($file, 'Config.CA = """' . $this->mkCAfile() . '"""' . "\n"); |
|
| 239 | + fwrite($file, 'Config.CA = """'.$this->mkCAfile().'"""'."\n"); |
|
| 240 | 240 | $sbUserFile = $this->mkSbUserFile(); |
| 241 | 241 | if ($sbUserFile !== '') { |
| 242 | - fwrite($file, 'Config.sb_user_file = """' . $sbUserFile . '"""' . "\n"); |
|
| 242 | + fwrite($file, 'Config.sb_user_file = """'.$sbUserFile.'"""'."\n"); |
|
| 243 | 243 | } |
| 244 | 244 | } |
| 245 | 245 | |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | } |
| 292 | 292 | $out .= "'DNS:$oneServer'"; |
| 293 | 293 | } |
| 294 | - return "[" . $out. "]"; |
|
| 294 | + return "[".$out."]"; |
|
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | /** |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | foreach ($ssids as $ssid => $cipher) { |
| 306 | 306 | $outArray[] = "'$ssid'"; |
| 307 | 307 | } |
| 308 | - return '[' . implode(', ', $outArray) . ']'; |
|
| 308 | + return '['.implode(', ', $outArray).']'; |
|
| 309 | 309 | } |
| 310 | 310 | |
| 311 | 311 | /** |
@@ -321,7 +321,7 @@ discard block |
||
| 321 | 321 | $outArray[] = "'$ssid'"; |
| 322 | 322 | } |
| 323 | 323 | } |
| 324 | - return '[' . implode(', ', $outArray) . ']'; |
|
| 324 | + return '['.implode(', ', $outArray).']'; |
|
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | /** |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | * |
| 330 | 330 | * @return string |
| 331 | 331 | */ |
| 332 | - private function mkCAfile(){ |
|
| 332 | + private function mkCAfile() { |
|
| 333 | 333 | $out = ''; |
| 334 | 334 | $cAlist = $this->attributes['internal:CAs'][0]; |
| 335 | 335 | foreach ($cAlist as $oneCa) { |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | */ |
| 346 | 346 | private function mkIntro() { |
| 347 | 347 | \core\common\Entity::intoThePotatoes(); |
| 348 | - $out = _("This installer has been prepared for {0}") . '\n\n' . _("More information and comments:") . '\n\nEMAIL: {1}\nWWW: {2}\n\n' . |
|
| 348 | + $out = _("This installer has been prepared for {0}").'\n\n'._("More information and comments:").'\n\nEMAIL: {1}\nWWW: {2}\n\n'. |
|
| 349 | 349 | _("Installer created with software from the GEANT project."); |
| 350 | 350 | \core\common\Entity::outOfThePotatoes(); |
| 351 | 351 | return $out; |
@@ -201,8 +201,7 @@ |
||
| 201 | 201 | |
| 202 | 202 | 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') { |
| 203 | 203 | $configRaw['use_other_tls_id'] = "True"; |
| 204 | - } |
|
| 205 | - else { |
|
| 204 | + } else { |
|
| 206 | 205 | $configRaw['use_other_tls_id'] = "False"; |
| 207 | 206 | } |
| 208 | 207 | |
