GEANT / CAT

devices/apple_mobileconfig/MobileconfigSuperclass.php

Indentation +2 added lines, -2 removed lines

@@ -522,7 +522,7 @@ 
         if (
                 get_class($this) == "devices\apple_mobileconfig\DeviceMobileconfigIos12plus" || 
                 get_class($this) == "devices\apple_mobileconfig\DeviceMobileconfigOsX"
-           ) {
+            ) {
                     return "WPA2";
                 } else {
                     return "WPA";
@@ -809,7 +809,7 @@ 
                             \core\common\Entity::$nomenclature_idp, 
                             count($this->CAsAccountedFor)+1, 
                             ($ca['root'] ? _("Root") : _("Intermediate"))) . 
-              "</string>
+                "</string>
                <key>PayloadIdentifier</key>
                <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.credential.$this->caSerial</string>
                <key>PayloadOrganization</key>

Spacing +51 added lines, -51 removed lines

@@ -145,7 +145,7 @@ 
         \core\common\Entity::intoThePotatoes();
         // that's what all variants support. Sub-classes can change it.
         $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_PEAP_MSCHAP2, \core\common\EAP::EAPTYPE_TTLS_PAP, \core\common\EAP::EAPTYPE_TTLS_MSCHAP2, \core\common\EAP::EAPTYPE_SILVERBULLET]);
-        foreach(\core\common\EAP::listKnownEAPTypes() as $eapType) {
+        foreach (\core\common\EAP::listKnownEAPTypes() as $eapType) {
             if ($eapType->isPasswordRequired() || $eapType->isPasswordOptional()) {
                 $this->specialities['internal:verify_userinput_suffix'][serialize($eapType->getArrayRep())] = _("It is not possible to actively verify the user input for suffix match; but if there is no 'Terms of Use' configured, the installer will display a corresponding hint to the user instead.");
                 $this->specialities['media:consortium_OI'][serialize($eapType->getArrayRep())] = _("Passpoint networks are not provisioned due to severe UI limitations during install time.");
@@ -184,15 +184,15 @@ 
       <key>PayloadDescription</key>
          <string>$tagline</string>
       <key>PayloadDisplayName</key>
-         <string>" . \config\ConfAssistant::CONSORTIUM['display_name'] . "</string>
+         <string>".\config\ConfAssistant::CONSORTIUM['display_name']."</string>
       <key>PayloadIdentifier</key>
-         <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string>
+         <string>" . self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string>
       <key>PayloadOrganization</key>
-         <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>
+         <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>
       <key>PayloadType</key>
          <string>Configuration</string>
       <key>PayloadUUID</key>
-         <string>" . \core\common\Entity::uuid('', self::IPHONE_PAYLOAD_PREFIX . $this->massagedConsortium . $this->massagedCountry . $this->massagedInst . $this->massagedProfile) . "</string>
+         <string>" . \core\common\Entity::uuid('', self::IPHONE_PAYLOAD_PREFIX.$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile)."</string>
       <key>PayloadVersion</key>
          <integer>1</integer>";
         \core\common\Entity::outOfThePotatoes();
@@ -224,21 +224,21 @@ 
     {
         \core\common\Entity::intoThePotatoes();
         if (isset($this->attributes['support:info_file'])) {
-            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;
+            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;
         }
         if ($this->attributes['internal:verify_userinput_suffix'][0] != 0) {
             if ($this->attributes['internal:hint_userinput_suffix'][0] != 0) {
-                $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE . sprintf(_("Important Notice: your username MUST end exactly with '...@%s' !"), $this->attributes['internal:realm'][0]) . MobileconfigSuperclass::BUFFER_CONSENT_POST;
+                $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE.sprintf(_("Important Notice: your username MUST end exactly with '...@%s' !"), $this->attributes['internal:realm'][0]).MobileconfigSuperclass::BUFFER_CONSENT_POST;
                 \core\common\Entity::outOfThePotatoes();
                 return $retval;
             } else { 
             if (strlen($this->attributes['internal:realm'][0]) > 0) {
                 /// note space between variable and exclamation mark - makes sure users don't mistakenly think the exclamation mark is part of the required username!
-                $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE . sprintf(_("Important Notice: your username MUST contain an '@' and end with ...%s !"), $this->attributes['internal:realm'][0]) . MobileconfigSuperclass::BUFFER_CONSENT_POST;
+                $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE.sprintf(_("Important Notice: your username MUST contain an '@' and end with ...%s !"), $this->attributes['internal:realm'][0]).MobileconfigSuperclass::BUFFER_CONSENT_POST;
                 \core\common\Entity::outOfThePotatoes();
                 return $retval;
             }
-            $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;
+            $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;
             \core\common\Entity::outOfThePotatoes();
             return $retval;
             }
@@ -262,7 +262,7 @@ 
         // also escape htmlspecialchars
         // not all names and profiles have a name, so be prepared
 
-        $this->loggerInstance->debug(5, "List of available attributes: " . var_export($this->attributes, TRUE));
+        $this->loggerInstance->debug(5, "List of available attributes: ".var_export($this->attributes, TRUE));
 
         $this->instName = $this->attributes['general:instname'][0] ?? _("Unnamed Organisation");
         $this->profileName = $this->attributes['profile:name'][0] ?? _("Unnamed Profile");
@@ -304,7 +304,7 @@ 
 
         file_put_contents('installer_profile', $outputXml);
 
-        $fileName = $this->installerBasename . '.mobileconfig';
+        $fileName = $this->installerBasename.'.mobileconfig';
 
         if (!$this->sign) {
             rename("installer_profile", $fileName);
@@ -313,7 +313,7 @@ 
         }
         // still here? Then we are signing.
         $retval = 0;
-        $signing = system($this->sign . " installer_profile '$fileName' > /dev/null", $retval);
+        $signing = system($this->sign." installer_profile '$fileName' > /dev/null", $retval);
         if ($retval !== 0 || $signing === FALSE) {
             $this->loggerInstance->debug(2, "Signing the mobileconfig installer $fileName FAILED!\n");
             // we are passing a name that will be then used as a path - this will not exist, hence an error will
@@ -340,19 +340,19 @@ 
             $oiCount = $oiCount + count($netDetail['oi']);
         }
         $certCount = count($this->attributes['internal:CAs'][0]);
-        $out = "<p>" . _("For best results, please use the built-in browser (Safari) to open the configuration file.") . "</p>";
+        $out = "<p>"._("For best results, please use the built-in browser (Safari) to open the configuration file.")."</p>";
         $out .= "<p>";
         $out .= _("The profile will install itself after you click (or tap) the button. You will be asked for confirmation/input at several points:");
         $out .= "<ul>";
-        $out .= "<li>" . _("to install the profile") . "</li>";
-        $out .= "<li>" . ngettext("to accept the server certificate authority", "to accept the server certificate authorities", $certCount);
+        $out .= "<li>"._("to install the profile")."</li>";
+        $out .= "<li>".ngettext("to accept the server certificate authority", "to accept the server certificate authorities", $certCount);
         if ($certCount > 1) {
-            $out .= " " . sprintf(_("(%d times)"), $certCount);
+            $out .= " ".sprintf(_("(%d times)"), $certCount);
         }
         $out .= "</li>";
-        $out .= "<li>" . _("to enter the username and password you have been given by your organisation");
+        $out .= "<li>"._("to enter the username and password you have been given by your organisation");
         if ($ssidCount > 1) {
-            $out .= " " . sprintf(_("(%d times each, because %d SSIDs and %d Passpoint networks are installed)"), $ssidCount+$oiCount, $ssidCount, $oiCount);
+            $out .= " ".sprintf(_("(%d times each, because %d SSIDs and %d Passpoint networks are installed)"), $ssidCount + $oiCount, $ssidCount, $oiCount);
         }
         $out .= "</li>";
         $out .= "</ul>";
@@ -392,7 +392,7 @@ 
                <key>ServiceProviderRoamingEnabled</key>
                <true/>
                <key>DisplayedOperatorName</key>
-               <string>" . $oiName . "</string>";
+               <string>" . $oiName."</string>";
         // if we don't know the realm, omit the entire DomainName key
         if (isset($this->attributes['internal:realm'])) {
             $retval .= "<key>DomainName</key>
@@ -405,7 +405,7 @@ 
                 <array>";
 
         foreach ($consortiumOi as $oneCons) {
-            $retval .= "<string>" . strtoupper($oneCons) . "</string>";
+            $retval .= "<string>".strtoupper($oneCons)."</string>";
         }
 
         $retval .= "</array>";
@@ -443,7 +443,7 @@ 
                   <dict>
                       <key>AcceptEAPTypes</key>
                          <array>
-                            <integer>" . $eapType['OUTER'] . "</integer>
+                            <integer>" . $eapType['OUTER']."</integer>
                          </array>
                       <key>EAPFASTProvisionPAC</key>
                             <true />
@@ -456,7 +456,7 @@ 
 ";
         if ($realm !== NULL) {
             $retval .= "<key>OuterIdentity</key>
-                                    <string>" . htmlspecialchars($realm, ENT_XML1, 'UTF-8') . "</string>
+                                    <string>" . htmlspecialchars($realm, ENT_XML1, 'UTF-8')."</string>
 ";
         }
         $retval .= "<key>PayloadCertificateAnchorUUID</key>
@@ -480,11 +480,11 @@ 
         $retval .= "
                          </array>";
         if ($eapType['INNER'] == \core\common\EAP::NE_SILVERBULLET) {
-            $retval .= "<key>UserName</key><string>" . $this->clientCert["certObject"]->username . "</string>";
+            $retval .= "<key>UserName</key><string>".$this->clientCert["certObject"]->username."</string>";
         }
         $retval .= "
                       <key>TTLSInnerAuthentication</key>
-                         <string>" . ($eapType['INNER'] == \core\common\EAP::NE_PAP ? "PAP" : "MSCHAPv2") . "</string>
+                         <string>" . ($eapType['INNER'] == \core\common\EAP::NE_PAP ? "PAP" : "MSCHAPv2")."</string>
                    </dict>";
         return $retval;
     }
@@ -504,9 +504,9 @@ 
             // characters are still reversed, invert on use!
             $buffer .= "<string>Manual</string>
                   <key>ProxyServer</key>
-                  <string>" . strrev($serverAndPort[1]) . "</string>
+                  <string>" . strrev($serverAndPort[1])."</string>
                   <key>ProxyServerPort</key>
-                  <integer>" . strrev($serverAndPort[0]) . "</integer>
+                  <integer>" . strrev($serverAndPort[0])."</integer>
                   <key>ProxyPACFallbackAllowed</key>
                   <false/>";
         } else {
@@ -556,7 +556,7 @@ 
                     throw new Exception("SSID must be a string!");
                 }
                 $escapedSSID = htmlspecialchars($toBeConfigured, ENT_XML1, 'UTF-8');
-                $payloadIdentifier = "wifi." . $this->serial;
+                $payloadIdentifier = "wifi.".$this->serial;
                 $payloadShortName = sprintf(_("%s - SSID %s"), $prettyName, $escapedSSID);
                 $payloadName = sprintf(_("%s configuration for network name %s"), $prettyName, $escapedSSID);
                 $encryptionTypeString = $this->encryptionString();
@@ -586,9 +586,9 @@ 
                 if (count($toBeConfigured) == 0) {
                     return "";
                 }
-                $payloadIdentifier = "hs20.".implode('-',$toBeConfigured);
+                $payloadIdentifier = "hs20.".implode('-', $toBeConfigured);
                 $payloadShortName = sprintf(_("%s - RCOI"), $prettyName);
-                $payloadName = sprintf(_("%s configuration (Passpoint RCOI)"),$prettyName);
+                $payloadName = sprintf(_("%s configuration (Passpoint RCOI)"), $prettyName);
                 $encryptionTypeString = $this->encryptionString();
                 $setupModesString = "";
                 $wifiNetworkIdentification = $this->passPointBlock($toBeConfigured, $prettyName);
@@ -607,11 +607,11 @@ 
                <key>PayloadDisplayName</key>
                   <string>$payloadShortName</string>
                <key>PayloadIdentifier</key>
-                  <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.$payloadIdentifier</string>
+                  <string>".self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.$payloadIdentifier</string>
                <key>PayloadOrganization</key>
-                  <string>" . $this->massagedConsortium . ".1x-config.org</string>
+                  <string>".$this->massagedConsortium.".1x-config.org</string>
                <key>PayloadType</key>
-                  <string>com.apple." . ($blocktype == MobileconfigSuperclass::NETWORK_BLOCK_TYPE_WIRED ? "firstactiveethernet" : "wifi") . ".managed</string>";
+                  <string>com.apple." . ($blocktype == MobileconfigSuperclass::NETWORK_BLOCK_TYPE_WIRED ? "firstactiveethernet" : "wifi").".managed</string>";
         $retval .= $this->proxySettings();
         $retval .= $setupModesString;
         if ($eapType['INNER'] == \core\common\EAP::NE_SILVERBULLET) {
@@ -623,7 +623,7 @@ 
         }
         $retval .= "
                <key>PayloadUUID</key>
-                  <string>" . \core\common\Entity::uuid() . "</string>
+                  <string>" . \core\common\Entity::uuid()."</string>
                <key>PayloadVersion</key>
                   <integer>1</integer>
                   $wifiNetworkIdentification</dict>";
@@ -653,15 +653,15 @@ 
 	<key>IsHotspot</key>
 	<false/>
 	<key>PayloadDescription</key>
-	<string>" . sprintf(_("This SSID should not be used after bootstrapping %s"), \config\ConfAssistant::CONSORTIUM['display_name']) . "</string>
+	<string>" . sprintf(_("This SSID should not be used after bootstrapping %s"), \config\ConfAssistant::CONSORTIUM['display_name'])."</string>
 	<key>PayloadDisplayName</key>
-	<string>" . _("Disabled WiFi network") . "</string>
+	<string>" . _("Disabled WiFi network")."</string>
 	<key>PayloadIdentifier</key>
-	<string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.wifi.disabled.$this->removeSerial</string>
+	<string>" . self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.wifi.disabled.$this->removeSerial</string>
 	<key>PayloadType</key>
 	<string>com.apple.wifi.managed</string>
 	<key>PayloadUUID</key>
-	<string>" . \core\common\Entity::uuid() . "</string>
+	<string>".\core\common\Entity::uuid()."</string>
 	<key>PayloadVersion</key>
 	<real>1</real>";
         $retval .= $this->proxySettings();
@@ -741,12 +741,12 @@ 
         $mimeBlob = base64_encode($binaryBlob);
         $mimeFormatted = chunk_split($mimeBlob, 52, "\r\n");
         $payloadUUID = \core\common\Entity::uuid('', $mimeBlob);
-        $retArray = ["block" => "<dict>" .
+        $retArray = ["block" => "<dict>".
             // we don't include the import password. It's displayed on screen, and should be input by the user.
             // <key>Password</key>
             //   <string>" . $this->clientCert['password'] . "</string>
             "<key>PayloadCertificateFileName</key>
-                     <string>" . $this->massagedConsortium . ".pfx</string>
+                     <string>" . $this->massagedConsortium.".pfx</string>
                   <key>PayloadContent</key>
                      <data>
 $mimeFormatted
@@ -754,7 +754,7 @@ 
                   <key>PayloadDescription</key>
                      <string>MIME Base-64 encoded PKCS#12 Client Certificate</string>
                   <key>PayloadDisplayName</key>
-                     <string>" . _("User certificate") . "</string>
+                     <string>"._("User certificate")."</string>
                   <key>PayloadIdentifier</key>
                      <string>com.apple.security.pkcs12.$payloadUUID</string>
                   <key>PayloadType</key>
@@ -764,7 +764,7 @@ 
                   <key>PayloadVersion</key>
                      <integer>1</integer>
                 </dict>",
-            "UUID" => $payloadUUID,];
+            "UUID" => $payloadUUID, ];
         \core\common\Entity::outOfThePotatoes();
         return $retArray;
     }
@@ -782,7 +782,7 @@ 
         }
         $expiryTime = new \DateTime($this->clientCert['certObject']->expiry);
         return "<key>RemovalDate</key>
-        <date>" . $expiryTime->format("Y-m-d") . "T" . $expiryTime->format("H:i:s") . "Z</date>";
+        <date>" . $expiryTime->format("Y-m-d")."T".$expiryTime->format("H:i:s")."Z</date>";
     }
 
     /**
@@ -804,27 +804,27 @@ 
             $stream = "
             <dict>
                <key>PayloadCertificateFileName</key>
-               <string>" . $ca['uuid'] . ".der</string>
+               <string>" . $ca['uuid'].".der</string>
                <key>PayloadContent</key>
                <data>
-" . $trimmedPem . "</data>
+" . $trimmedPem."</data>
                <key>PayloadDescription</key>
-               <string>" . sprintf(_("The %s Certification Authority"), \core\common\Entity::$nomenclature_idp) . "</string>
+               <string>" . sprintf(_("The %s Certification Authority"), \core\common\Entity::$nomenclature_idp)."</string>
                <key>PayloadDisplayName</key>
                <string>" . 
                     /// example: "Identity Provider CA #1 (Root)"
-                    sprintf(_("%s CA #%d (%s)" ), 
+                    sprintf(_("%s CA #%d (%s)"), 
                             \core\common\Entity::$nomenclature_idp, 
-                            count($this->CAsAccountedFor)+1, 
-                            ($ca['root'] ? _("Root") : _("Intermediate"))) . 
+                            count($this->CAsAccountedFor) + 1, 
+                            ($ca['root'] ? _("Root") : _("Intermediate"))). 
               "</string>
                <key>PayloadIdentifier</key>
-               <string>" . self::IPHONE_PAYLOAD_PREFIX . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.credential.$this->caSerial</string>
+               <string>" . self::IPHONE_PAYLOAD_PREFIX.".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.credential.$this->caSerial</string>
                <key>PayloadOrganization</key>
-               <string>" . $this->massagedConsortium . ".1x-config.org</string>
+               <string>".$this->massagedConsortium.".1x-config.org</string>
                <key>PayloadType</key>
                <string>com.apple.security.root</string>
-               <key>PayloadUUID</key><string>" . $ca['uuid'] . "</string>
+               <key>PayloadUUID</key><string>" . $ca['uuid']."</string>
                <key>PayloadVersion</key>
                <integer>1</integer>
             </dict>";

utils/notify_invitation_expiry.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
 
 // please run this as a cron job every hour
 
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 
 // iterate through all federations and see if there are recently expired 
 // invitations for any of them
@@ -55,7 +55,7 @@ 
     $admins = $this_fed->listFederationAdmins();
     $mailtext = "Hello,
 
-invitation tokens for the following new ". \config\ConfAssistant::CONSORTIUM['nomenclature_participant'] ." have recently expired:
+invitation tokens for the following new ". \config\ConfAssistant::CONSORTIUM['nomenclature_participant']." have recently expired:
 
 ";
     foreach ($listofinstnames as $instname) {
@@ -65,7 +65,7 @@ 
     if ($numberofexistingidps > 0) {
         $mailtext .= "
 
-Additionally, $numberofexistingidps invitations for an existing ". \config\ConfAssistant::CONSORTIUM['nomenclature_participant']." have expired.
+Additionally, $numberofexistingidps invitations for an existing ".\config\ConfAssistant::CONSORTIUM['nomenclature_participant']." have expired.
         ";
     }
     $mailtext .= "
@@ -73,7 +73,7 @@ 
 
 Greetings,
 
-A humble " . \config\Master::APPEARANCE['productname'] . " cron job
+A humble " . \config\Master::APPEARANCE['productname']." cron job
 ";
 
     foreach ($admins as $admin) {

devices/ms/DeviceVista7.php

Spacing +31 added lines, -31 removed lines

@@ -76,7 +76,7 @@ 
                 $delProfiles[] = $ssid;
             }
             if ($cipher == 'TKIP') {
-                $delProfiles[] = $ssid . ' (TKIP)';
+                $delProfiles[] = $ssid.' (TKIP)';
             }
         }
 
@@ -86,7 +86,7 @@ 
             $iterator = 0;
             foreach ($allSSID as $ssid => $cipher) {
                 if ($cipher == 'TKIP') {
-                    $windowsProfile[$iterator] = $this->writeWLANprofile($ssid . ' (TKIP)', $ssid, 'WPA', 'TKIP', $eapConfig, $iterator);
+                    $windowsProfile[$iterator] = $this->writeWLANprofile($ssid.' (TKIP)', $ssid, 'WPA', 'TKIP', $eapConfig, $iterator);
                     $iterator++;
                 }
                 $windowsProfile[$iterator] = $this->writeWLANprofile($ssid, $ssid, 'WPA2', 'AES', $eapConfig, $iterator);
@@ -148,10 +148,10 @@ 
         $profileFileCont = '<EAPConfig><EapHostConfig xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
 <EapMethod>
 <Type xmlns="http://www.microsoft.com/provisioning/EapCommon">' .
-                $this->selectedEap["OUTER"] . '</Type>
+                $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>
 ';
 
@@ -164,9 +164,9 @@ 
             $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($attr['general:instname'][0]) . '</DisplayName>
+<DisplayName>' . $this->translateString($attr['general:instname'][0]).'</DisplayName>
 </ProviderInfo>
 <AuthenticationMethods>
 <AuthenticationMethod>
@@ -178,7 +178,7 @@ 
                 if ($outerUser == '') {
                     $profileFileCont .= '<AnonymousIdentity>@</AnonymousIdentity>';
                 } else {
-                    $profileFileCont .= '<AnonymousIdentity>' . $outerUser . '@' . $realm . '</AnonymousIdentity>';
+                    $profileFileCont .= '<AnonymousIdentity>'.$outerUser.'@'.$realm.'</AnonymousIdentity>';
                 }
             }
             $profileFileCont .= '</ClientSideCredential>
@@ -196,7 +196,7 @@ 
             $profileFileCont .= '
 </ServerSideCredential>
 <InnerAuthenticationMethod>
-<NonEAPAuthMethod>' .$innerMethod. '</NonEAPAuthMethod>
+<NonEAPAuthMethod>' .$innerMethod.'</NonEAPAuthMethod>
 </InnerAuthenticationMethod>
 <VendorSpecific>
 <SessionResumption>false</SessionResumption>
@@ -221,11 +221,11 @@ 
 </eapTls:CredentialsSource>
 <eapTls:ServerValidation>
 <eapTls:DisableUserPromptForServerValidation>true</eapTls:DisableUserPromptForServerValidation>
-<eapTls:ServerNames>' . $servers . '</eapTls:ServerNames>';
+<eapTls:ServerNames>' . $servers.'</eapTls:ServerNames>';
             if ($caArray) {
                 foreach ($caArray as $certAuthority) {
                     if ($certAuthority['root']) {
-                        $profileFileCont .= "<eapTls:TrustedRootCA>" . $certAuthority['sha1'] . "</eapTls:TrustedRootCA>\n";
+                        $profileFileCont .= "<eapTls:TrustedRootCA>".$certAuthority['sha1']."</eapTls:TrustedRootCA>\n";
                     }
                 }
             }
@@ -257,11 +257,11 @@ 
 <msPeap:EapType>
 <msPeap:ServerValidation>
 <msPeap:DisableUserPromptForServerValidation>true</msPeap:DisableUserPromptForServerValidation> 
-<msPeap:ServerNames>' . $servers . '</msPeap:ServerNames>';
+<msPeap:ServerNames>' . $servers.'</msPeap:ServerNames>';
             if ($caArray) {
                 foreach ($caArray as $certAuthority) {
                     if ($certAuthority['root']) {
-                        $vistaExt .= "<msPeap:TrustedRootCA>" . $certAuthority['sha1'] . "</msPeap:TrustedRootCA>\n";
+                        $vistaExt .= "<msPeap:TrustedRootCA>".$certAuthority['sha1']."</msPeap:TrustedRootCA>\n";
                     }
                 }
             }
@@ -274,7 +274,7 @@ 
 <msChapV2:UseWinLogonCredentials>false</msChapV2:UseWinLogonCredentials> 
 </msChapV2:EapType>
 </baseEap:Eap>
-<msPeap:EnableQuarantineChecks>' . $nea . '</msPeap:EnableQuarantineChecks>
+<msPeap:EnableQuarantineChecks>' . $nea.'</msPeap:EnableQuarantineChecks>
 <msPeap:RequireCryptoBinding>false</msPeap:RequireCryptoBinding>
 </msPeap:EapType>
 </baseEap:Eap>
@@ -286,11 +286,11 @@ 
 <EapType xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV1">
 <ServerValidation>
 <DisableUserPromptForServerValidation>true</DisableUserPromptForServerValidation>
-<ServerNames>' . $servers . '</ServerNames>';
+<ServerNames>' . $servers.'</ServerNames>';
             if ($caArray) {
                 foreach ($caArray as $certAuthority) {
                     if ($certAuthority['root']) {
-                        $w7Ext .= "<TrustedRootCA>" . $certAuthority['sha1'] . "</TrustedRootCA>\n";
+                        $w7Ext .= "<TrustedRootCA>".$certAuthority['sha1']."</TrustedRootCA>\n";
                     }
                 }
             }
@@ -303,14 +303,14 @@ 
 <UseWinLogonCredentials>false</UseWinLogonCredentials> 
 </EapType>
 </Eap>
-<EnableQuarantineChecks>' . $nea . '</EnableQuarantineChecks>
+<EnableQuarantineChecks>' . $nea.'</EnableQuarantineChecks>
 <RequireCryptoBinding>false</RequireCryptoBinding>
 ';
             if ($useAnon) {
                 $w7Ext .= '<PeapExtensions>
 <IdentityPrivacy xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV2">
 <EnableIdentityPrivacy>true</EnableIdentityPrivacy>
-<AnonymousUserName>' . $outerUser . '</AnonymousUserName>
+<AnonymousUserName>' . $outerUser.'</AnonymousUserName>
 </IdentityPrivacy>
 </PeapExtensions>
             ';
@@ -328,8 +328,8 @@ 
         $profileFileContEnd = '</EapHostConfig></EAPConfig>
 ';
         $returnArray = [];
-        $returnArray['vista'] = $profileFileCont . $vistaExt . $profileFileContEnd;
-        $returnArray['w7'] = $profileFileCont . $w7Ext . $profileFileContEnd;
+        $returnArray['vista'] = $profileFileCont.$vistaExt.$profileFileContEnd;
+        $returnArray['w7'] = $profileFileCont.$w7Ext.$profileFileContEnd;
         return $returnArray;
     }
 
@@ -348,10 +348,10 @@ 
     private function writeWLANprofile($wlanProfileName, $ssid, $auth, $encryption, $eapConfig, $profileNumber) {
         $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>
@@ -361,8 +361,8 @@ 
 <MSM>
 <security>
 <authEncryption>
-<authentication>' . $auth . '</authentication>
-<encryption>' . $encryption . '</encryption>
+<authentication>' . $auth.'</authentication>
+<encryption>' . $encryption.'</encryption>
 <useOneX>true</useOneX>
 </authEncryption>
 ';
@@ -392,9 +392,9 @@ 
             mkdir('vista');
         }
         $vistaFileName = "vista/wlan_prof-$profileNumber.xml";
-        file_put_contents($vistaFileName, $profileFileCont . $eapConfig['vista'] . $closing);
+        file_put_contents($vistaFileName, $profileFileCont.$eapConfig['vista'].$closing);
         $sevenFileName = "w7/wlan_prof-$profileNumber.xml";
-        file_put_contents($sevenFileName, $profileFileCont . $eapConfig['w7'] . $closing);
+        file_put_contents($sevenFileName, $profileFileCont.$eapConfig['w7'].$closing);
         $this->loggerInstance->debug(2, "Installer has been written into directory $this->FPATH\n");
         $this->loggerInstance->debug(4, "WLAN_Profile:$wlanProfileName:$encryption\n");
         return("\"$wlanProfileName\" \"$encryption\"");
@@ -431,8 +431,8 @@ 
             mkdir('vista');
         }
         
-        file_put_contents("vista/lan_prof.xml", $profileFileCont . $eapConfig['vista'] . $closing);
-        file_put_contents("w7/lan_prof.xml", $profileFileCont . $eapConfig['w7'] . $closing);
+        file_put_contents("vista/lan_prof.xml", $profileFileCont.$eapConfig['vista'].$closing);
+        file_put_contents("w7/lan_prof.xml", $profileFileCont.$eapConfig['w7'].$closing);
         
     }
 
@@ -446,7 +446,7 @@ 
     private function writeMainNSH($eap, $attr) {
         $this->loggerInstance->debug(4, "writeMainNSH");
         $this->loggerInstance->debug(4, $attr);
-        $this->loggerInstance->debug(4, "MYLANG=" . $this->lang . "\n");
+        $this->loggerInstance->debug(4, "MYLANG=".$this->lang."\n");
 
         $eapOptions = [
             \core\common\EAP::PEAP => ['str' => 'PEAP', 'exec' => 'user'],
@@ -477,8 +477,8 @@ 
         $this->loggerInstance->debug(4, "EAP_STR=$eapStr\n");
         $this->loggerInstance->debug(4, $eap);
 
-        $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);
     }
@@ -507,7 +507,7 @@ 
         }
         foreach ($caArray as $certAuthority) {
             $store = $certAuthority['root'] ? "root" : "ca";
-            $contentCerts .= '!insertmacro install_ca_cert "' . $certAuthority['file'] . '" "' . $certAuthority['sha1'] . '" "' . $store . "\"\n";
+            $contentCerts .= '!insertmacro install_ca_cert "'.$certAuthority['file'].'" "'.$certAuthority['sha1'].'" "'.$store."\"\n";
         }
         fwrite($fileHandleCerts, $contentCerts);
         fclose($fileHandleCerts);

devices/ms/MsTlsProfile.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
     private function getCredentialSource()
     {
         $element = new \core\DeviceXMLmain();
-        $element->setChild('CertificateStore','');
+        $element->setChild('CertificateStore', '');
         return($element);
     }
     

devices/ms/MsPeapProfile.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
     {
         $element = new \core\DeviceXMLmain();
         $element->setChild('ServerValidation', $this->getPeapServerValidation());
-        $element->setChild('FastReconnect','true');
+        $element->setChild('FastReconnect', 'true');
         $element->setChild('InnerEapOptional', 'false');
         $element->setChild('Eap', $this->getMsChapV2(), self::MS_BASEEAPCONN_NS);
         $element->setChild('EnableQuarantineChecks', $this->nea);

devices/ms/MsOneX.php

Spacing +2 added lines, -2 removed lines

@@ -43,8 +43,8 @@
     {
         $element = new \core\DeviceXMLmain();
         $element->setChild('Type', $this->eapConfig->type, self::MS_EAPCOMMON_NS);
-        $element->setChild('VendorId',0, self::MS_EAPCOMMON_NS);
-        $element->setChild('VendorType',0, self::MS_EAPCOMMON_NS);
+        $element->setChild('VendorId', 0, self::MS_EAPCOMMON_NS);
+        $element->setChild('VendorType', 0, self::MS_EAPCOMMON_NS);
         $element->setChild('AuthorId', $this->eapConfig->authorId, self::MS_EAPCOMMON_NS);
         return($element);
     }

devices/ms/MsWlanProfile.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
         $dom = new \DOMDocument('1.0', 'utf-8');
         $root = $dom->createElement($rootname);
         $dom->appendChild($root);
-        $ns = $dom->createAttributeNS( null, 'xmlns' );
+        $ns = $dom->createAttributeNS(null, 'xmlns');
         $ns->value = "http://www.microsoft.com/networking/WLAN/profile/v1";
         $root->appendChild($ns);        
         \core\DeviceXMLmain::marshalObject($dom, $root, 'WLANprofile', $this->getWLANprofile(), '', true);

core/DeviceXMLmain.php

Spacing +3 added lines, -3 removed lines

@@ -211,7 +211,7 @@ 
                 $node->appendChild($childNode);
             }
             if (!empty($namespace)) {
-                $ns = $domElement->createAttributeNS(null,'xmlns');
+                $ns = $domElement->createAttributeNS(null, 'xmlns');
                 $ns->value = $namespace;
                 $childNode->appendChild($ns);  
             }
@@ -238,7 +238,7 @@ 
                 $nextChild = $domElement->createElement($nameC, $cl);    
                 $childNode->appendChild($nextChild);
                 if (!empty($namespaceC)) {
-                    $ns = $domElement->createAttributeNS(null,'xmlns');
+                    $ns = $domElement->createAttributeNS(null, 'xmlns');
                     $ns->value = $namespaceC;
                     $nextChild->appendChild($ns);  
                 }
@@ -260,7 +260,7 @@ 
                             $childNode->appendChild($nextChild);
                         }
                         if (!empty($namespaceC)) {
-                            $ns = $domElement->createAttributeNS(null,'xmlns');
+                            $ns = $domElement->createAttributeNS(null, 'xmlns');
                             $ns->value = $namespaceC;
                             $nextChild->appendChild($ns);  
                         }

config/ConfAssistant-template.php

Spacing +4 added lines, -4 removed lines

@@ -90,7 +90,7 @@ 
                     ], 
                 'condition' => TRUE],
             'OpenRoaming® (%REALM%)' => [
-                'ssid' => [],     /* OpenRoaming has left SSIDs behind */
+                'ssid' => [], /* OpenRoaming has left SSIDs behind */
                 'oi' => [
                     '5A03BA0000', /* OpenRoaming/AllIdentities/SettlementFree/NoPersonalData/BaselineQoS */
                     '5A03BA0800', /* OpenRoaming/EduIdentities/SettlementFree/NoPersonalData/BaselineQoS */
@@ -155,7 +155,7 @@ 
         'makensis' => 'makensis',
         'zip' => 'zip',
         'trust-store-mozilla' => '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem',
-        'trust-store-custom' => __DIR__ . "/known-roots.pem",
+        'trust-store-custom' => __DIR__."/known-roots.pem",
     ];
 
     /**
@@ -193,13 +193,13 @@ 
             'db' => 'radacct',
             'user' => 'someuser',
             'pass' => 'somepass',
-            'readonly' => TRUE,],
+            'readonly' => TRUE, ],
         'RADIUS_2' => [
             'host' => 'auth-2.hosted.eduroam.org',
             'db' => 'radacct',
             'user' => 'someuser',
             'pass' => 'somepass',
-            'readonly' => TRUE,],
+            'readonly' => TRUE, ],
     ];
 
     /**