GEANT /
CAT
@@ -16,12 +16,12 @@ |
||
| 16 | 16 | * License: see the web/copyright.inc.php file in the file structure or |
| 17 | 17 | * <base_url>/copyright.php after deploying the software |
| 18 | 18 | */?> |
| 19 | -<h1>Example Skin (Pick-Up and Status page for <?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>)</h1> |
|
| 20 | -<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","consortium_logo.png");?>"/> |
|
| 19 | +<h1>Example Skin (Pick-Up and Status page for <?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>)</h1> |
|
| 20 | +<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "consortium_logo.png"); ?>"/> |
|
| 21 | 21 | <p>This skin is much more sober and less bloated than the default one. As it happens, it also doesn't do anything.</p> |
| 22 | 22 | <p>But at least it goes to show that it's possible to include custom images/CSS/external software using findResourceUrl(..., $filename): |
| 23 | -<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","custom.png");?>"/> |
|
| 24 | -<p>For <?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>, this page can make use of the request status info we have collected prior to invocation of the skinned page:</p> |
|
| 23 | +<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "custom.png"); ?>"/> |
|
| 24 | +<p>For <?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>, this page can make use of the request status info we have collected prior to invocation of the skinned page:</p> |
|
| 25 | 25 | <pre> |
| 26 | - <?php print_r($statusInfo);?> |
|
| 26 | + <?php print_r($statusInfo); ?> |
|
| 27 | 27 | </pre> |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | * @package UserGUI |
| 28 | 28 | * |
| 29 | 29 | */ |
| 30 | -require dirname(dirname(__FILE__)) . "/config/_config.php"; |
|
| 30 | +require dirname(dirname(__FILE__))."/config/_config.php"; |
|
| 31 | 31 | $loggerInstance = new \core\common\Logging(); |
| 32 | 32 | $langObject = new \core\common\Language(); |
| 33 | 33 | $cat = new \core\CAT(); |
@@ -51,9 +51,9 @@ discard block |
||
| 51 | 51 | <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'> |
| 52 | 52 | <img src="<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') ?>/resources/images/consortium_logo.png" style="padding-right:20px; padding-top:20px; float:right" alt="logo" /> |
| 53 | 53 | |
| 54 | - <div id="motd"><?php print ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : ' '); ?></div> |
|
| 54 | + <div id="motd"><?php print (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : ' '); ?></div> |
|
| 55 | 55 | |
| 56 | - <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang(); ?>"><?php echo CONFIG['APPEARANCE']['productname']; ?></a></h1> |
|
| 56 | + <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang(); ?>"><?php echo CONFIG['APPEARANCE']['productname']; ?></a></h1> |
|
| 57 | 57 | <div id="tou"> |
| 58 | 58 | <?php |
| 59 | 59 | require "user/tou.php"; |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | </td> |
| 68 | 68 | <?php |
| 69 | 69 | if (!empty(CONFIG['APPEARANCE']['privacy_notice_url'])) { |
| 70 | - $retval .= "<td><a href='".CONFIG['APPEARANCE']['privacy_notice_url']."'>" . sprintf(_("%s Privacy Notice"),CONFIG_CONFASSISTANT['CONSORTIUM']['name']) . "</a></td>"; |
|
| 70 | + $retval .= "<td><a href='".CONFIG['APPEARANCE']['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), CONFIG_CONFASSISTANT['CONSORTIUM']['name'])."</a></td>"; |
|
| 71 | 71 | } |
| 72 | 72 | ?> |
| 73 | 73 | <td style='padding-left:80px; padding-right:20px; text-align:right; vertical-align:top;'> |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | * @author Tomasz Wolniewicz <[email protected]> |
| 36 | 36 | * @package ModuleWriting |
| 37 | 37 | */ |
| 38 | - class Device_W8_10 extends WindowsCommon { |
|
| 38 | + class Device_W8_10 extends WindowsCommon { |
|
| 39 | 39 | final public function __construct() { |
| 40 | 40 | parent::__construct(); |
| 41 | 41 | \core\common\Entity::intoThePotatoes(); |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | $this->caArray = $this->getAttribute('internal:CAs')[0]; |
| 66 | 66 | $outerId = $this->determineOuterIdString(); |
| 67 | 67 | $this->useAnon = $outerId === NULL ? FALSE : TRUE; |
| 68 | - $this->servers = empty($this->attributes['eap:server_name']) ? '' : implode(';', $this->attributes['eap:server_name']); |
|
| 68 | + $this->servers = empty($this->attributes['eap:server_name']) ? '' : implode(';', $this->attributes['eap:server_name']); |
|
| 69 | 69 | $allSSID = $this->attributes['internal:SSID']; |
| 70 | 70 | $delSSIDs = $this->attributes['internal:remove_SSID']; |
| 71 | 71 | $this->prepareInstallerLang(); |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | $delProfiles[] = $ssid; |
| 79 | 79 | } |
| 80 | 80 | if ($cipher == 'TKIP') { |
| 81 | - $delProfiles[] = $ssid . ' (TKIP)'; |
|
| 81 | + $delProfiles[] = $ssid.' (TKIP)'; |
|
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | 84 | $windowsProfile = []; |
@@ -86,13 +86,13 @@ discard block |
||
| 86 | 86 | $iterator = 0; |
| 87 | 87 | foreach ($allSSID as $ssid => $cipher) { |
| 88 | 88 | if ($cipher == 'TKIP') { |
| 89 | - $windowsProfile[$iterator] = $this->writeWLANprofile($ssid . ' (TKIP)', $ssid, 'WPA', 'TKIP', $eapConfig, $iterator); |
|
| 89 | + $windowsProfile[$iterator] = $this->writeWLANprofile($ssid.' (TKIP)', $ssid, 'WPA', 'TKIP', $eapConfig, $iterator); |
|
| 90 | 90 | $iterator++; |
| 91 | 91 | } |
| 92 | 92 | $windowsProfile[$iterator] = $this->writeWLANprofile($ssid, $ssid, 'WPA2', 'AES', $eapConfig, $iterator); |
| 93 | 93 | $iterator++; |
| 94 | 94 | } |
| 95 | - if (($this->device_id !== 'w8') && (count($this->attributes['internal:consortia']) > 0 )) { |
|
| 95 | + if (($this->device_id !== 'w8') && (count($this->attributes['internal:consortia']) > 0)) { |
|
| 96 | 96 | // this SSID name is later used in common.inc so if you decide to chage it here change it there as well |
| 97 | 97 | $ssid = 'cat-passpoint-profile'; |
| 98 | 98 | $windowsProfile[$iterator] = $this->writeWLANprofile($ssid, $ssid, 'WPA2', 'AES', $eapConfig, $iterator, TRUE); |
@@ -141,13 +141,13 @@ discard block |
||
| 141 | 141 | if (empty($this->attributes['internal:realm'][0])) { |
| 142 | 142 | $retval .= CONFIG_CONFASSISTANT['CONSORTIUM']['interworking-domainname-fallback']; |
| 143 | 143 | } else { |
| 144 | - $retval .= $this->attributes['internal:realm'][0]; |
|
| 144 | + $retval .= $this->attributes['internal:realm'][0]; |
|
| 145 | 145 | } |
| 146 | 146 | $retval .= '</DomainName>'; |
| 147 | - $retval .= '<RoamingConsortium><OUI>' . |
|
| 148 | - implode('</OUI><OUI>', $this->attributes['internal:consortia']) . |
|
| 147 | + $retval .= '<RoamingConsortium><OUI>'. |
|
| 148 | + implode('</OUI><OUI>', $this->attributes['internal:consortia']). |
|
| 149 | 149 | '</OUI></RoamingConsortium>'; |
| 150 | - $retval .= '</Hotspot2>'; |
|
| 150 | + $retval .= '</Hotspot2>'; |
|
| 151 | 151 | return($retval); |
| 152 | 152 | } |
| 153 | 153 | |
@@ -156,11 +156,11 @@ discard block |
||
| 156 | 156 | $profileFileCont = '<EAPConfig><EapHostConfig xmlns="http://www.microsoft.com/provisioning/EapHostConfig"> |
| 157 | 157 | <EapMethod> |
| 158 | 158 | '; |
| 159 | - $profileFileCont .= '<Type xmlns="http://www.microsoft.com/provisioning/EapCommon">' . |
|
| 160 | - $this->selectedEap["OUTER"] . '</Type> |
|
| 159 | + $profileFileCont .= '<Type xmlns="http://www.microsoft.com/provisioning/EapCommon">'. |
|
| 160 | + $this->selectedEap["OUTER"].'</Type> |
|
| 161 | 161 | <VendorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorId> |
| 162 | 162 | <VendorType xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorType> |
| 163 | -<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">' . $authorId . '</AuthorId> |
|
| 163 | +<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">' . $authorId.'</AuthorId> |
|
| 164 | 164 | </EapMethod> |
| 165 | 165 | '; |
| 166 | 166 | return($profileFileCont); |
@@ -171,10 +171,10 @@ discard block |
||
| 171 | 171 | <eapTls:ServerValidation> |
| 172 | 172 | <eapTls:DisableUserPromptForServerValidation>true</eapTls:DisableUserPromptForServerValidation> |
| 173 | 173 | '; |
| 174 | - $profileFileCont .= '<eapTls:ServerNames>' . $this->servers . '</eapTls:ServerNames>'; |
|
| 174 | + $profileFileCont .= '<eapTls:ServerNames>'.$this->servers.'</eapTls:ServerNames>'; |
|
| 175 | 175 | foreach ($this->caArray as $certAuthority) { |
| 176 | 176 | if ($certAuthority['root']) { |
| 177 | - $profileFileCont .= "<eapTls:TrustedRootCA>" . $certAuthority['sha1'] . "</eapTls:TrustedRootCA>\n"; |
|
| 177 | + $profileFileCont .= "<eapTls:TrustedRootCA>".$certAuthority['sha1']."</eapTls:TrustedRootCA>\n"; |
|
| 178 | 178 | } |
| 179 | 179 | } |
| 180 | 180 | $profileFileCont .= '</eapTls:ServerValidation> |
@@ -186,10 +186,10 @@ discard block |
||
| 186 | 186 | $profileFileCont = ' |
| 187 | 187 | <ServerValidation> |
| 188 | 188 | '; |
| 189 | - $profileFileCont .= '<ServerNames>' . $this->servers . '</ServerNames> '; |
|
| 189 | + $profileFileCont .= '<ServerNames>'.$this->servers.'</ServerNames> '; |
|
| 190 | 190 | foreach ($this->caArray as $certAuthority) { |
| 191 | 191 | if ($certAuthority['root']) { |
| 192 | - $profileFileCont .= "<TrustedRootCAHash>" . chunk_split($certAuthority['sha1'], 2, ' ') . "</TrustedRootCAHash>\n"; |
|
| 192 | + $profileFileCont .= "<TrustedRootCAHash>".chunk_split($certAuthority['sha1'], 2, ' ')."</TrustedRootCAHash>\n"; |
|
| 193 | 193 | } |
| 194 | 194 | } |
| 195 | 195 | $profileFileCont .= '<DisablePrompt>true</DisablePrompt> |
@@ -221,10 +221,10 @@ discard block |
||
| 221 | 221 | $profileFileCont = ' |
| 222 | 222 | <ServerValidation> |
| 223 | 223 | <DisableUserPromptForServerValidation>true</DisableUserPromptForServerValidation> |
| 224 | -<ServerNames>' . $this->servers . '</ServerNames>'; |
|
| 224 | +<ServerNames>' . $this->servers.'</ServerNames>'; |
|
| 225 | 225 | foreach ($this->caArray as $certAuthority) { |
| 226 | 226 | if ($certAuthority['root']) { |
| 227 | - $profileFileCont .= "<TrustedRootCA>" . $certAuthority['sha1'] . "</TrustedRootCA>\n"; |
|
| 227 | + $profileFileCont .= "<TrustedRootCA>".$certAuthority['sha1']."</TrustedRootCA>\n"; |
|
| 228 | 228 | } |
| 229 | 229 | } |
| 230 | 230 | $profileFileCont .= '</ServerValidation> |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | if ($this->useAnon) { |
| 281 | 281 | $profileFileCont .= '<IdentityPrivacy>true</IdentityPrivacy> |
| 282 | 282 | '; |
| 283 | - $profileFileCont .= '<AnonymousIdentity>' . $this->outerId . '</AnonymousIdentity> |
|
| 283 | + $profileFileCont .= '<AnonymousIdentity>'.$this->outerId.'</AnonymousIdentity> |
|
| 284 | 284 | '; |
| 285 | 285 | } else { |
| 286 | 286 | $profileFileCont .= '<IdentityPrivacy>false</IdentityPrivacy> |
@@ -297,10 +297,10 @@ discard block |
||
| 297 | 297 | $profileFileCont = ' |
| 298 | 298 | <Config xmlns="http://www.microsoft.com/provisioning/EapHostConfig"> |
| 299 | 299 | <EAPIdentityProviderList xmlns="urn:ietf:params:xml:ns:yang:ietf-eap-metadata"> |
| 300 | -<EAPIdentityProvider ID="' . $this->deviceUUID . '" namespace="urn:UUID"> |
|
| 300 | +<EAPIdentityProvider ID="' . $this->deviceUUID.'" namespace="urn:UUID"> |
|
| 301 | 301 | |
| 302 | 302 | <ProviderInfo> |
| 303 | -<DisplayName>' . $this->translateString($this->attributes['general:instname'][0], $this->codePage) . '</DisplayName> |
|
| 303 | +<DisplayName>' . $this->translateString($this->attributes['general:instname'][0], $this->codePage).'</DisplayName> |
|
| 304 | 304 | </ProviderInfo> |
| 305 | 305 | <AuthenticationMethods> |
| 306 | 306 | <AuthenticationMethod> |
@@ -312,7 +312,7 @@ discard block |
||
| 312 | 312 | if ($this->outerUser == '') { |
| 313 | 313 | $profileFileCont .= '<AnonymousIdentity>@</AnonymousIdentity>'; |
| 314 | 314 | } else { |
| 315 | - $profileFileCont .= '<AnonymousIdentity>' . $this->outerId . '</AnonymousIdentity>'; |
|
| 315 | + $profileFileCont .= '<AnonymousIdentity>'.$this->outerId.'</AnonymousIdentity>'; |
|
| 316 | 316 | } |
| 317 | 317 | } |
| 318 | 318 | $profileFileCont .= '</ClientSideCredential> |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | $profileFileCont .= $this->glTtlsServerValidation(); |
| 321 | 321 | $profileFileCont .= ' |
| 322 | 322 | <InnerAuthenticationMethod> |
| 323 | -<NonEAPAuthMethod>' . \core\common\EAP::eapDisplayName($this->selectedEap)['INNER'] . '</NonEAPAuthMethod> |
|
| 323 | +<NonEAPAuthMethod>' . \core\common\EAP::eapDisplayName($this->selectedEap)['INNER'].'</NonEAPAuthMethod> |
|
| 324 | 324 | </InnerAuthenticationMethod> |
| 325 | 325 | <VendorSpecific> |
| 326 | 326 | <SessionResumption>false</SessionResumption> |
@@ -351,7 +351,7 @@ discard block |
||
| 351 | 351 | <UseWinLogonCredentials>false</UseWinLogonCredentials> |
| 352 | 352 | </EapType> |
| 353 | 353 | </Eap> |
| 354 | -<EnableQuarantineChecks>' . $nea . '</EnableQuarantineChecks> |
|
| 354 | +<EnableQuarantineChecks>' . $nea.'</EnableQuarantineChecks> |
|
| 355 | 355 | <RequireCryptoBinding>false</RequireCryptoBinding> |
| 356 | 356 | '; |
| 357 | 357 | if ($this->useAnon) { |
@@ -363,7 +363,7 @@ discard block |
||
| 363 | 363 | $profileFileCont .= '<AnonymousUserName/> |
| 364 | 364 | '; |
| 365 | 365 | } else { |
| 366 | - $profileFileCont .= '<AnonymousUserName>' . $this->outerUser . '</AnonymousUserName> |
|
| 366 | + $profileFileCont .= '<AnonymousUserName>'.$this->outerUser.'</AnonymousUserName> |
|
| 367 | 367 | '; |
| 368 | 368 | } |
| 369 | 369 | $profileFileCont .= '</IdentityPrivacy> |
@@ -397,7 +397,7 @@ discard block |
||
| 397 | 397 | private function prepareEapConfig() { |
| 398 | 398 | if ($this->useAnon) { |
| 399 | 399 | $this->outerUser = $this->attributes['internal:anon_local_value'][0]; |
| 400 | - $this->outerId = $this->outerUser . '@' . $this->attributes['internal:realm'][0]; |
|
| 400 | + $this->outerId = $this->outerUser.'@'.$this->attributes['internal:realm'][0]; |
|
| 401 | 401 | } |
| 402 | 402 | |
| 403 | 403 | $profileFileCont = $this->eapConfigHeader(); |
@@ -422,7 +422,7 @@ discard block |
||
| 422 | 422 | default: |
| 423 | 423 | break; |
| 424 | 424 | } |
| 425 | - return(['win' => $profileFileCont . '</EapHostConfig></EAPConfig>']); |
|
| 425 | + return(['win' => $profileFileCont.'</EapHostConfig></EAPConfig>']); |
|
| 426 | 426 | } |
| 427 | 427 | |
| 428 | 428 | /** |
@@ -439,10 +439,10 @@ discard block |
||
| 439 | 439 | private function writeWLANprofile($wlanProfileName, $ssid, $auth, $encryption, $eapConfig, $profileNumber, $hs20 = FALSE) { |
| 440 | 440 | $profileFileCont = '<?xml version="1.0"?> |
| 441 | 441 | <WLANProfile xmlns="http://www.microsoft.com/networking/WLAN/profile/v1"> |
| 442 | -<name>' . $wlanProfileName . '</name> |
|
| 442 | +<name>' . $wlanProfileName.'</name> |
|
| 443 | 443 | <SSIDConfig> |
| 444 | 444 | <SSID> |
| 445 | -<name>' . $ssid . '</name> |
|
| 445 | +<name>' . $ssid.'</name> |
|
| 446 | 446 | </SSID> |
| 447 | 447 | <nonBroadcast>true</nonBroadcast> |
| 448 | 448 | </SSIDConfig>'; |
@@ -456,8 +456,8 @@ discard block |
||
| 456 | 456 | <MSM> |
| 457 | 457 | <security> |
| 458 | 458 | <authEncryption> |
| 459 | -<authentication>' . $auth . '</authentication> |
|
| 460 | -<encryption>' . $encryption . '</encryption> |
|
| 459 | +<authentication>' . $auth.'</authentication> |
|
| 460 | +<encryption>' . $encryption.'</encryption> |
|
| 461 | 461 | <useOneX>true</useOneX> |
| 462 | 462 | </authEncryption> |
| 463 | 463 | '; |
@@ -484,7 +484,7 @@ discard block |
||
| 484 | 484 | mkdir('w8'); |
| 485 | 485 | } |
| 486 | 486 | $xmlFname = "w8/wlan_prof-$profileNumber.xml"; |
| 487 | - file_put_contents($xmlFname, $profileFileCont . $eapConfig['win'] . $closing); |
|
| 487 | + file_put_contents($xmlFname, $profileFileCont.$eapConfig['win'].$closing); |
|
| 488 | 488 | $this->loggerInstance->debug(2, "Installer has been written into directory $this->FPATH\n"); |
| 489 | 489 | return("\"$wlanProfileName\" \"$encryption\""); |
| 490 | 490 | } |
@@ -511,7 +511,7 @@ discard block |
||
| 511 | 511 | mkdir('w8'); |
| 512 | 512 | } |
| 513 | 513 | $xmlFname = "w8/lan_prof.xml"; |
| 514 | - file_put_contents($xmlFname, $profileFileCont . $eapConfig['win'] . $closing); |
|
| 514 | + file_put_contents($xmlFname, $profileFileCont.$eapConfig['win'].$closing); |
|
| 515 | 515 | $this->loggerInstance->debug(2, "Installer has been written into directory $this->FPATH\n"); |
| 516 | 516 | } |
| 517 | 517 | |
@@ -532,7 +532,7 @@ discard block |
||
| 532 | 532 | } |
| 533 | 533 | foreach ($caArray as $certAuthority) { |
| 534 | 534 | $store = $certAuthority['root'] ? "root" : "ca"; |
| 535 | - $fcontentsCerts .= '!insertmacro install_ca_cert "' . $certAuthority['file'] . '" "' . $certAuthority['sha1'] . '" "' . $store . "\"\n"; |
|
| 535 | + $fcontentsCerts .= '!insertmacro install_ca_cert "'.$certAuthority['file'].'" "'.$certAuthority['sha1'].'" "'.$store."\"\n"; |
|
| 536 | 536 | } |
| 537 | 537 | fwrite($fileHandleCerts, $fcontentsCerts); |
| 538 | 538 | fclose($fileHandleCerts); |
@@ -541,7 +541,7 @@ discard block |
||
| 541 | 541 | private function writeMainNSH($eap, $attr) { |
| 542 | 542 | $this->loggerInstance->debug(4, "writeMainNSH"); |
| 543 | 543 | $this->loggerInstance->debug(4, $attr); |
| 544 | - $this->loggerInstance->debug(4, "Device_id = " . $this->device_id . "\n"); |
|
| 544 | + $this->loggerInstance->debug(4, "Device_id = ".$this->device_id."\n"); |
|
| 545 | 545 | $fcontents = "!define W8\n"; |
| 546 | 546 | if ($this->device_id == 'w10') { |
| 547 | 547 | $fcontents .= "!define W10\n"; |
@@ -571,8 +571,8 @@ discard block |
||
| 571 | 571 | if ($eap == \core\common\EAP::EAPTYPE_SILVERBULLET) { |
| 572 | 572 | $fcontents .= "!define SILVERBULLET\n"; |
| 573 | 573 | } |
| 574 | - $fcontents .= '!define ' . $eapStr; |
|
| 575 | - $fcontents .= "\n" . '!define EXECLEVEL "' . $execLevel . '"'; |
|
| 574 | + $fcontents .= '!define '.$eapStr; |
|
| 575 | + $fcontents .= "\n".'!define EXECLEVEL "'.$execLevel.'"'; |
|
| 576 | 576 | $fcontents .= $this->writeNsisDefines($attr); |
| 577 | 577 | file_put_contents('main.nsh', $fcontents); |
| 578 | 578 | } |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | nsArray::Set Delete_files "GEANTLink-ARM64.msi" |
| 93 | 93 | File "GEANTLink-ARM64.msi" |
| 94 | 94 | IfSilent +2 |
| 95 | - MessageBox MB_OK "<?php WindowsCommon::echo_nsi( _("An additional piece of software 'GEANTlink' needs to be installed. This installation requires Administrator rights; you will be prompted to give permission for that action."))?>" |
|
| 95 | + MessageBox MB_OK "<?php WindowsCommon::echo_nsi(_("An additional piece of software 'GEANTlink' needs to be installed. This installation requires Administrator rights; you will be prompted to give permission for that action."))?>" |
|
| 96 | 96 | !insertmacro debug_cat 1 "Run GEANTLink installer" |
| 97 | 97 | !insertmacro debug_cat 3 'Execute: msiexec.exe /i "$OUTDIR\GEANTLink-$Platform.msi" REBOOT=Supress' |
| 98 | 98 | ClearErrors |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | Pop $rebootRequired |
| 105 | 105 | ${Else} |
| 106 | 106 | IfSilent +2 |
| 107 | - MessageBox MB_OK "<?php WindowsCommon::echo_nsi( _("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>" |
|
| 107 | + MessageBox MB_OK "<?php WindowsCommon::echo_nsi(_("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>" |
|
| 108 | 108 | Quit |
| 109 | 109 | ${EndIf} |
| 110 | 110 | Cont2: |
@@ -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 | /** |
