GEANT / CAT

devices/ms/Device_W8_10.php

Spacing +32 added lines, -32 removed lines

@@ -96,7 +96,7 @@ 
             foreach ($this->attributes['internal:consortia'] as $oneCons) {
                 $knownOiName = array_search($oneCons, CONFIG_CONFASSISTANT['CONSORTIUM']['interworking-consortium-oi']);
                 if ($knownOiName === FALSE) { // a custom RCOI as set by the IdP admin; do not use the term "eduroam" in that one!
-                    $knownOiName = $this->attributes['general:instname'][0] . " "._("Roaming Partner") . " $roamingPartner";
+                    $knownOiName = $this->attributes['general:instname'][0]." "._("Roaming Partner")." $roamingPartner";
                     $roamingPartner++;
                 }
                 $ssid = 'cat-passpoint-profile';
@@ -148,12 +148,12 @@ 
         if (empty($this->attributes['internal:realm'][0])) {
             $retval .= CONFIG_CONFASSISTANT['CONSORTIUM']['interworking-domainname-fallback'];
         } else {
-            $retval .=  $this->attributes['internal:realm'][0];
+            $retval .= $this->attributes['internal:realm'][0];
         }
         $retval .= '</DomainName>';
-        $retval .= '<RoamingConsortium><OUI>' . $oi .
+        $retval .= '<RoamingConsortium><OUI>'.$oi.
             '</OUI></RoamingConsortium>';
-        $retval .=  '</Hotspot2>';
+        $retval .= '</Hotspot2>';
         return($retval);
     }
     
@@ -162,11 +162,11 @@ 
         $profileFileCont = '<EAPConfig><EapHostConfig xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
 <EapMethod>
 ';
-        $profileFileCont .= '<Type xmlns="http://www.microsoft.com/provisioning/EapCommon">' .
-                $this->selectedEap["OUTER"] . '</Type>
+        $profileFileCont .= '<Type xmlns="http://www.microsoft.com/provisioning/EapCommon">'.
+                $this->selectedEap["OUTER"].'</Type>
 <VendorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorId>
 <VendorType xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorType>
-<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">' . $authorId . '</AuthorId>
+<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">' . $authorId.'</AuthorId>
 </EapMethod>
 ';
         return($profileFileCont);
@@ -177,10 +177,10 @@ 
 <eapTls:ServerValidation>
 <eapTls:DisableUserPromptForServerValidation>true</eapTls:DisableUserPromptForServerValidation>
 ';
-        $profileFileCont .= '<eapTls:ServerNames>' . $this->servers . '</eapTls:ServerNames>';
+        $profileFileCont .= '<eapTls:ServerNames>'.$this->servers.'</eapTls:ServerNames>';
         foreach ($this->caArray as $certAuthority) {
             if ($certAuthority['root']) {
-                $profileFileCont .= "<eapTls:TrustedRootCA>" . $certAuthority['sha1'] . "</eapTls:TrustedRootCA>\n";
+                $profileFileCont .= "<eapTls:TrustedRootCA>".$certAuthority['sha1']."</eapTls:TrustedRootCA>\n";
             }
         }
         $profileFileCont .= '</eapTls:ServerValidation>
@@ -192,10 +192,10 @@ 
         $profileFileCont = '
         <ServerValidation>
 ';
-        $profileFileCont .= '<ServerNames>' . $this->servers . '</ServerNames> ';
+        $profileFileCont .= '<ServerNames>'.$this->servers.'</ServerNames> ';
         foreach ($this->caArray as $certAuthority) {
             if ($certAuthority['root']) {
-                $profileFileCont .= "<TrustedRootCAHash>" . chunk_split($certAuthority['sha1'], 2, ' ') . "</TrustedRootCAHash>\n";
+                $profileFileCont .= "<TrustedRootCAHash>".chunk_split($certAuthority['sha1'], 2, ' ')."</TrustedRootCAHash>\n";
             }
         }
         $profileFileCont .= '<DisablePrompt>true</DisablePrompt>
@@ -227,10 +227,10 @@ 
         $profileFileCont = '
         <ServerValidation>
 <DisableUserPromptForServerValidation>true</DisableUserPromptForServerValidation>
-<ServerNames>' . $this->servers . '</ServerNames>';
+<ServerNames>' . $this->servers.'</ServerNames>';
         foreach ($this->caArray as $certAuthority) {
             if ($certAuthority['root']) {
-                $profileFileCont .= "<TrustedRootCA>" . $certAuthority['sha1'] . "</TrustedRootCA>\n";
+                $profileFileCont .= "<TrustedRootCA>".$certAuthority['sha1']."</TrustedRootCA>\n";
             }
         }
         $profileFileCont .= '</ServerValidation>
@@ -286,7 +286,7 @@ 
         if ($this->useAnon) {
             $profileFileCont .= '<IdentityPrivacy>true</IdentityPrivacy>
 ';
-            $profileFileCont .= '<AnonymousIdentity>' . $this->outerId . '</AnonymousIdentity>
+            $profileFileCont .= '<AnonymousIdentity>'.$this->outerId.'</AnonymousIdentity>
                 ';
         } else {
             $profileFileCont .= '<IdentityPrivacy>false</IdentityPrivacy>
@@ -303,10 +303,10 @@ 
         $profileFileCont = '
 <Config xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
 <EAPIdentityProviderList xmlns="urn:ietf:params:xml:ns:yang:ietf-eap-metadata">
-<EAPIdentityProvider ID="' . $this->deviceUUID . '" namespace="urn:UUID">
+<EAPIdentityProvider ID="' . $this->deviceUUID.'" namespace="urn:UUID">
 
 <ProviderInfo>
-<DisplayName>' . $this->translateString($this->attributes['general:instname'][0], $this->codePage) . '</DisplayName>
+<DisplayName>' . $this->translateString($this->attributes['general:instname'][0], $this->codePage).'</DisplayName>
 </ProviderInfo>
 <AuthenticationMethods>
 <AuthenticationMethod>
@@ -318,7 +318,7 @@ 
             if ($this->outerUser == '') {
                 $profileFileCont .= '<AnonymousIdentity>@</AnonymousIdentity>';
             } else {
-                $profileFileCont .= '<AnonymousIdentity>' . $this->outerId . '</AnonymousIdentity>';
+                $profileFileCont .= '<AnonymousIdentity>'.$this->outerId.'</AnonymousIdentity>';
             }
         }
         $profileFileCont .= '</ClientSideCredential>
@@ -326,7 +326,7 @@ 
         $profileFileCont .= $this->glTtlsServerValidation();
         $profileFileCont .= '
 <InnerAuthenticationMethod>
-<NonEAPAuthMethod>' . \core\common\EAP::eapDisplayName($this->selectedEap)['INNER'] . '</NonEAPAuthMethod>
+<NonEAPAuthMethod>' . \core\common\EAP::eapDisplayName($this->selectedEap)['INNER'].'</NonEAPAuthMethod>
 </InnerAuthenticationMethod>
 <VendorSpecific>
 <SessionResumption>false</SessionResumption>
@@ -357,7 +357,7 @@ 
 <UseWinLogonCredentials>false</UseWinLogonCredentials>
 </EapType>
 </Eap>
-<EnableQuarantineChecks>' . $nea . '</EnableQuarantineChecks>
+<EnableQuarantineChecks>' . $nea.'</EnableQuarantineChecks>
 <RequireCryptoBinding>false</RequireCryptoBinding>
 ';
         if ($this->useAnon) {
@@ -369,7 +369,7 @@ 
                 $profileFileCont .= '<AnonymousUserName/>
 ';
             } else {
-                $profileFileCont .= '<AnonymousUserName>' . $this->outerUser . '</AnonymousUserName>
+                $profileFileCont .= '<AnonymousUserName>'.$this->outerUser.'</AnonymousUserName>
                 ';
             }
             $profileFileCont .= '</IdentityPrivacy>
@@ -399,7 +399,7 @@ 
     private function prepareEapConfig() {
         if ($this->useAnon) {
             $this->outerUser = $this->attributes['internal:anon_local_value'][0];
-            $this->outerId = $this->outerUser . '@' . $this->attributes['internal:realm'][0];
+            $this->outerId = $this->outerUser.'@'.$this->attributes['internal:realm'][0];
         }
 
         $profileFileCont = $this->eapConfigHeader();
@@ -424,7 +424,7 @@ 
             default:
                 break;
         }
-        return(['win' => $profileFileCont . '</EapHostConfig></EAPConfig>']);
+        return(['win' => $profileFileCont.'</EapHostConfig></EAPConfig>']);
     }
 
     /**
@@ -442,10 +442,10 @@ 
     private function writeWLANprofile($wlanProfileName, $ssid, $auth, $encryption, $eapConfig, $profileNumber, $oi = '') {
         $profileFileCont = '<?xml version="1.0"?>
 <WLANProfile xmlns="http://www.microsoft.com/networking/WLAN/profile/v1">
-<name>' . $wlanProfileName . '</name>
+<name>' . $wlanProfileName.'</name>
 <SSIDConfig>
 <SSID>
-<name>' . $ssid . '</name>
+<name>' . $ssid.'</name>
 </SSID>
 <nonBroadcast>true</nonBroadcast>
 </SSIDConfig>';
@@ -457,8 +457,8 @@ 
 <MSM>
 <security>
 <authEncryption>
-<authentication>' . $auth . '</authentication>
-<encryption>' . $encryption . '</encryption>
+<authentication>' . $auth.'</authentication>
+<encryption>' . $encryption.'</encryption>
 <useOneX>true</useOneX>
 </authEncryption>
 ';
@@ -485,7 +485,7 @@ 
             mkdir('w8');
         }
         $xmlFname = "w8/wlan_prof-$profileNumber.xml";
-        file_put_contents($xmlFname, $profileFileCont . $eapConfig['win'] . $closing);
+        file_put_contents($xmlFname, $profileFileCont.$eapConfig['win'].$closing);
         $this->loggerInstance->debug(2, "Installer has been written into directory $this->FPATH\n");
         $hs20 = $oi == '' ? 0 : 1;
         return("\"$wlanProfileName\" \"$encryption\" $hs20");
@@ -513,7 +513,7 @@ 
             mkdir('w8');
         }
         $xmlFname = "w8/lan_prof.xml";
-        file_put_contents($xmlFname, $profileFileCont . $eapConfig['win'] . $closing);
+        file_put_contents($xmlFname, $profileFileCont.$eapConfig['win'].$closing);
         $this->loggerInstance->debug(2, "Installer has been written into directory $this->FPATH\n");
     }
 
@@ -534,7 +534,7 @@ 
         }
         foreach ($caArray as $certAuthority) {
             $store = $certAuthority['root'] ? "root" : "ca";
-            $fcontentsCerts .= '!insertmacro install_ca_cert "' . $certAuthority['file'] . '" "' . $certAuthority['sha1'] . '" "' . $store . "\"\n";
+            $fcontentsCerts .= '!insertmacro install_ca_cert "'.$certAuthority['file'].'" "'.$certAuthority['sha1'].'" "'.$store."\"\n";
         }
         fwrite($fileHandleCerts, $fcontentsCerts);
         fclose($fileHandleCerts);
@@ -543,7 +543,7 @@ 
     private function writeMainNSH($eap, $attr) {
         $this->loggerInstance->debug(4, "writeMainNSH");
         $this->loggerInstance->debug(4, $attr);
-        $this->loggerInstance->debug(4, "Device_id = " . $this->device_id . "\n");
+        $this->loggerInstance->debug(4, "Device_id = ".$this->device_id."\n");
         $fcontents = "!define W8\n";
         if ($this->device_id == 'w10') {
             $fcontents .= "!define W10\n";
@@ -573,8 +573,8 @@ 
         if ($eap == \core\common\EAP::EAPTYPE_SILVERBULLET) {
             $fcontents .= "!define SILVERBULLET\n";
         }
-        $fcontents .= '!define ' . $eapStr;
-        $fcontents .= "\n" . '!define EXECLEVEL "' . $execLevel . '"';
+        $fcontents .= '!define '.$eapStr;
+        $fcontents .= "\n".'!define EXECLEVEL "'.$execLevel.'"';
         $fcontents .= $this->writeNsisDefines($attr);
         file_put_contents('main.nsh', $fcontents);
     }