GEANT / CAT

devices/chromebook/Device_chromebook.php

Spacing +10 added lines, -10 removed lines

@@ -117,7 +117,7 @@ 
         $cryptoJson = openssl_encrypt($clearJson, 'AES-256-CBC', $encryptionKey, OPENSSL_RAW_DATA, $initVector);
         $hmac = hash_hmac("sha1", $cryptoJson, $encryptionKey, TRUE);
 
-        $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));
+        $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));
 
         // now, generate the container that holds all the crypto data
         $finalArray = [
@@ -188,7 +188,7 @@ 
      */
     private function wiredBlock($eapdetails) {
         return [
-            "GUID" => \core\common\Entity::uuid('', "wired-dot1x-ethernet") . "}",
+            "GUID" => \core\common\Entity::uuid('', "wired-dot1x-ethernet")."}",
             "Name" => "eduroam configuration (wired network)",
             "Remove" => false,
             "Type" => "Ethernet",
@@ -228,7 +228,7 @@ 
         // if silverbullet, we deliver the client cert inline
 
         if ($selectedEap == \core\common\EAP::EAPTYPE_SILVERBULLET) {
-            $eaparray['ClientCertRef'] = "[" . $this->clientCert['GUID'] . "]";
+            $eaparray['ClientCertRef'] = "[".$this->clientCert['GUID']."]";
             $eaparray['ClientCertType'] = "Ref";
         }
 
@@ -261,7 +261,7 @@ 
         $jsonArray = ["Type" => "UnencryptedConfiguration"];
 
         foreach ($this->attributes['internal:CAs'][0] as $ca) {
-            $caRefs[] = "{" . $ca['uuid'] . "}";
+            $caRefs[] = "{".$ca['uuid']."}";
         }
         // define CA certificates
         foreach ($this->attributes['internal:CAs'][0] as $ca) {
@@ -271,15 +271,15 @@ 
             if ($caSanitized1 === FALSE) {
                 throw new Exception("Error cropping PEM data at its BEGIN marker.");
             }
-            $this->loggerInstance->debug(4, $caSanitized1 . "\n");
+            $this->loggerInstance->debug(4, $caSanitized1."\n");
             // remove \n
             $caSanitized = str_replace("\n", "", $caSanitized1);
-            $jsonArray["Certificates"][] = ["GUID" => "{" . $ca['uuid'] . "}", "Remove" => false, "Type" => "Authority", "X509" => $caSanitized];
-            $this->loggerInstance->debug(3, $caSanitized . "\n");
+            $jsonArray["Certificates"][] = ["GUID" => "{".$ca['uuid']."}", "Remove" => false, "Type" => "Authority", "X509" => $caSanitized];
+            $this->loggerInstance->debug(3, $caSanitized."\n");
         }
         // if we are doing silverbullet, include the unencrypted(!) P12 as a client certificate
         if ($this->selectedEap == \core\common\EAP::EAPTYPE_SILVERBULLET) {
-            $jsonArray["Certificates"][] = ["GUID" => "[" . $this->clientCert['GUID'] . "]", "PKCS12" => base64_encode($this->clientCert['certdataclear']), "Remove" => false, "Type" => "Client"];
+            $jsonArray["Certificates"][] = ["GUID" => "[".$this->clientCert['GUID']."]", "PKCS12" => base64_encode($this->clientCert['certdataclear']), "Remove" => false, "Type" => "Client"];
         }
         $eaparray = $this->eapBlock($caRefs);
         // define Wi-Fi networks
@@ -300,7 +300,7 @@ 
 
         file_put_contents('installer_profile', $finalJson);
 
-        $fileName = $this->installerBasename . '.onc';
+        $fileName = $this->installerBasename.'.onc';
 
         if (!$this->sign) {
             rename("installer_profile", $fileName);
@@ -311,7 +311,7 @@ 
         // have the notion of signing
         // but if they ever change their mind, we are prepared
 
-        $outputFromSigning = system($this->sign . " installer_profile '$fileName' > /dev/null");
+        $outputFromSigning = system($this->sign." installer_profile '$fileName' > /dev/null");
         if ($outputFromSigning === FALSE) {
             $this->loggerInstance->debug(2, "Signing the ONC installer $fileName FAILED!\n");
         }

devices/xml/XML.inc.php

Spacing +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
         if (is_scalar($value)) {
             $this->value = strval($value);
         } else {
-            throw new Exception("unexpected value type passed" . gettype($value));
+            throw new Exception("unexpected value type passed".gettype($value));
         }
     }
 
@@ -434,7 +434,7 @@ 
     $qualClassName = get_class($object);
     // remove namespace qualifier
     $pos = strrpos($qualClassName, '\\');
-    $className =  substr($qualClassName, $pos + 1);
+    $className = substr($qualClassName, $pos + 1);
     $name = preg_replace("/_/", "-", $className);
     if ($object->getValue()) {
         $val = preg_replace('/&/', '&', $object->getValue());

devices/xml/Device_XML.php

Indentation +2 added lines, -2 removed lines

@@ -294,7 +294,7 @@ 
         return $helpdesk;
     }
 
-   private function getCredentialApplicability() {
+    private function getCredentialApplicability() {
         $ssids = $this->attributes['internal:SSID'];
         $oids = $this->attributes['internal:consortia'];
         $credentialapplicability = new CredentialApplicability();
@@ -420,7 +420,7 @@ 
     }
     
     private function getAuthMethod($eap) {
- //       $attr = $this->attributes;
+    //       $attr = $this->attributes;
         $authmethod = new AuthenticationMethod();
         $eapParams = $this->getAuthenticationMethodParams($eap);
         $eaptype = new Type();

Spacing +10 added lines, -10 removed lines

@@ -31,7 +31,7 @@ 
  */
 namespace devices\xml;
 use Exception;
-require_once dirname(__FILE__) . '/XML.inc.php';
+require_once dirname(__FILE__).'/XML.inc.php';
 
 /**
  * This class implements full functionality of the generic XML device
@@ -132,11 +132,11 @@ 
         marshalObject($root, $eapIdp);
         $dom = dom_import_simplexml($root)->ownerDocument;
         //TODO schema validation makes sense so probably should be used
-        if ($dom->schemaValidate(ROOT . '/devices/xml/eap-metadata.xsd') === FALSE) {
+        if ($dom->schemaValidate(ROOT.'/devices/xml/eap-metadata.xsd') === FALSE) {
             throw new Exception("Schema validation failed for eap-metadata");
         }
-        file_put_contents($this->installerBasename . '.eap-config', $dom->saveXML());
-        return($this->installerBasename . '.eap-config');
+        file_put_contents($this->installerBasename.'.eap-config', $dom->saveXML());
+        return($this->installerBasename.'.eap-config');
     }
 
     private $AttributeNames = [
@@ -162,7 +162,7 @@ 
             $this->loggerInstance->debug(4, "Missing class definition for $attrName\n");
             return([]);
         }
-        $className = "\devices\xml\\" . $this->AttributeNames[$attrName];
+        $className = "\devices\xml\\".$this->AttributeNames[$attrName];
         $objs = [];
         if ($this->langScope === 'global') {
             foreach ($attributeList['langs'] as $language => $value) {
@@ -200,7 +200,7 @@ 
                 $displayname = new DisplayName();
                 if (isset($profileNameLangs)) {
                     $langOrC = isset($profileNameLangs[$language]) ? $profileNameLangs[$language] : $profileNameLangs['C'];
-                    $value .= ' - ' . $langOrC;
+                    $value .= ' - '.$langOrC;
                 }
                 $displayname->setValue($value);
                 $displayname->setAttributes(['lang' => $language]);
@@ -210,7 +210,7 @@ 
             $displayname = new DisplayName();
             $value = $attr['general:instname'][0];
             if ($attr['internal:profile_count'][0] > 1) {
-                $value .= ' - ' . $attr['profile:name'][0];
+                $value .= ' - '.$attr['profile:name'][0];
             }
             $displayname->setValue($value);
             $objs[] = $displayname;
@@ -227,7 +227,7 @@ 
         $attr = $this->attributes;
         if (isset($attr['general:logo_file'][0])) {
             $logoString = base64_encode($attr['general:logo_file'][0]);
-            $logoMime = 'image/' . $attr['internal:logo_file'][0]['mime'];
+            $logoMime = 'image/'.$attr['internal:logo_file'][0]['mime'];
             $providerlogo = new ProviderLogo();
             $providerlogo->setAttributes(['mime' => $logoMime, 'encoding' => 'base64']);
             $providerlogo->setValue($logoString);
@@ -327,7 +327,7 @@ 
 
         if (isset($inner["METHOD"]) && $inner["METHOD"]) {
             $innerauthmethod = new InnerAuthenticationMethod();
-            $typeOfInner = "\devices\xml\\" . ($inner["EAP"] ? 'EAPMethod' : 'NonEAPAuthMethod');
+            $typeOfInner = "\devices\xml\\".($inner["EAP"] ? 'EAPMethod' : 'NonEAPAuthMethod');
             $eapmethod = new $typeOfInner();
             $eaptype = new Type();
             $eaptype->setValue($inner['METHOD']);
@@ -364,7 +364,7 @@ 
         return($serversidecredential);
     }
     
-    private function setClientSideRealm ($clientsidecredential) {
+    private function setClientSideRealm($clientsidecredential) {
         $attr = $this->attributes;
         $realm = \core\common\Entity::getAttributeValue($attr, 'internal:realm', 0);
         if ($realm === NULL) {

devices/redirect_dev/Device_RedirectDev.php

Indentation +7 added lines, -7 removed lines

@@ -22,15 +22,15 @@
 namespace devices\redirect_dev;
 
 class Device_RedirectDev extends \core\DeviceConfig {
-   /**
-    * Constructs a Device object.
-    *
-    * @final not to be redefined
-    */
+    /**
+     * Constructs a Device object.
+     *
+     * @final not to be redefined
+     */
     final public function __construct() {
         parent::__construct();
-      $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]);
-      $this->loggerInstance->debug(4,"RedirectEx called");
+        $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]);
+        $this->loggerInstance->debug(4,"RedirectEx called");
     }
     
     /**

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
     final public function __construct() {
         parent::__construct();
       $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]);
-      $this->loggerInstance->debug(4,"RedirectEx called");
+      $this->loggerInstance->debug(4, "RedirectEx called");
     }
     
     /**

devices/test_module/Device_TestModule.php

Spacing +2 added lines, -2 removed lines

@@ -138,8 +138,8 @@
      */
     private function zipInstaller() {
         // one can always access $this->attributes to check things
-        $fileName = $this->installerBasename . '.zip';
-        $output = system('zip -q ' . $fileName . ' *');
+        $fileName = $this->installerBasename.'.zip';
+        $output = system('zip -q '.$fileName.' *');
         if ($output === FALSE) {
             $this->loggerInstance->debug(2, "unable to zip the installer\n");
         }

devices/apple_mobileconfig/MobileconfigSuperclass.php

Spacing +43 added lines, -43 removed lines

@@ -93,15 +93,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::$iPhonePayloadPrefix . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string>
+         <string>" . self::$iPhonePayloadPrefix.".$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::$iPhonePayloadPrefix . $this->massagedConsortium . $this->massagedCountry . $this->massagedInst . $this->massagedProfile) . "</string>
+         <string>" . \core\common\Entity::uuid('', self::$iPhonePayloadPrefix.$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile)."</string>
       <key>PayloadVersion</key>
          <integer>1</integer>";
         \core\common\Entity::outOfThePotatoes();
@@ -132,15 +132,15 @@ 
     protected function consentBlock() {
         \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 (strlen($this->attributes['internal:realm'][0]) > 0) {
-                $retval =MobileconfigSuperclass::BUFFER_CONSENT_PRE . sprintf(_("Important Notice: your username must end with @%s!"), $this->attributes['internal:realm'][0]) . MobileconfigSuperclass::BUFFER_CONSENT_POST;
+                $retval = MobileconfigSuperclass::BUFFER_CONSENT_PRE.sprintf(_("Important Notice: your username must 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;
         }
@@ -165,7 +165,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");
@@ -209,7 +209,7 @@ 
 
         textdomain($dom);
 
-        $fileName = $this->installerBasename . '.mobileconfig';
+        $fileName = $this->installerBasename.'.mobileconfig';
 
         if (!$this->sign) {
             rename("installer_profile", $fileName);
@@ -217,7 +217,7 @@ 
             return $fileName;
         }
         // still here? Then we are signing.
-        $signing = system($this->sign . " installer_profile '$fileName' > /dev/null");
+        $signing = system($this->sign." installer_profile '$fileName' > /dev/null");
         if ($signing === FALSE) {
             $this->loggerInstance->debug(2, "Signing the mobileconfig installer $fileName FAILED!\n");
         }
@@ -235,19 +235,19 @@ 
         \core\common\Entity::intoThePotatoes();
         $ssidCount = count($this->attributes['internal:SSID']);
         $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 %s is installed for %d SSIDs)"), $ssidCount, CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $ssidCount);
+            $out .= " ".sprintf(_("(%d times each, because %s is installed for %d SSIDs)"), $ssidCount, CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $ssidCount);
         }
         $out .= "</li>";
         $out .= "</ul>";
@@ -284,7 +284,7 @@ 
                <key>ServiceProviderRoamingEnabled</key>
                <true/>
                <key>DisplayedOperatorName</key>
-               <string>" . CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'] . " via Passpoint</string>";
+               <string>" . CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']." via Passpoint</string>";
         // if we don't know the realm, omit the entire DomainName key
         if (isset($this->attributes['internal:realm'])) {
             $retval .= "<key>DomainName</key>
@@ -332,7 +332,7 @@ 
                   <dict>
                       <key>AcceptEAPTypes</key>
                          <array>
-                            <integer>" . $eapType['OUTER'] . "</integer>
+                            <integer>" . $eapType['OUTER']."</integer>
                          </array>
                       <key>EAPFASTProvisionPAC</key>
                             <true />
@@ -345,7 +345,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>
@@ -369,11 +369,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::NONE ? "PAP" : "MSCHAPv2") . "</string>
+                         <string>" . ($eapType['INNER'] == \core\common\EAP::NONE ? "PAP" : "MSCHAPv2")."</string>
                    </dict>";
         return $retval;
     }
@@ -392,9 +392,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 {
@@ -422,7 +422,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(_("SSID %s"), $escapedSSID);
                 $payloadName = sprintf(_("%s configuration for network name %s"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $escapedSSID);
                 $encryptionTypeString = "WPA";
@@ -470,11 +470,11 @@ 
                <key>PayloadDisplayName</key>
                   <string>$payloadShortName</string>
                <key>PayloadIdentifier</key>
-                  <string>" . self::$iPhonePayloadPrefix . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.$payloadIdentifier</string>
+                  <string>".self::$iPhonePayloadPrefix.".$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) {
@@ -486,7 +486,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>";
@@ -515,15 +515,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::$iPhonePayloadPrefix . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang.wifi.disabled.$this->removeSerial</string>
+	<string>" . self::$iPhonePayloadPrefix.".$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();
@@ -597,7 +597,7 @@ 
         $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>
@@ -610,7 +610,7 @@ 
                   <key>PayloadDescription</key>
                      <string>MIME Base-64 encoded PKCS#12 Client Certificate</string>
                   <key>PayloadDisplayName</key>
-                     <string>" . _("eduroam user certificate") . "</string>
+                     <string>"._("eduroam user certificate")."</string>
                   <key>PayloadIdentifier</key>
                      <string>com.apple.security.pkcs12.$payloadUUID</string>
                   <key>PayloadType</key>
@@ -620,7 +620,7 @@ 
                   <key>PayloadVersion</key>
                      <integer>1</integer>
                 </dict>",
-            "UUID" => $payloadUUID,];
+            "UUID" => $payloadUUID, ];
         \core\common\Entity::outOfThePotatoes();
         return $retArray;
     }
@@ -638,7 +638,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>";
     }
 
     private $CAsAccountedFor = [];
@@ -661,21 +661,21 @@ 
             $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_inst) . "</string>
+               <string>" . sprintf(_("The %s Certification Authority"), \core\common\Entity::$nomenclature_inst)."</string>
                <key>PayloadDisplayName</key>
-               <string>" . sprintf(_("%s CA"), \core\common\Entity::$nomenclature_inst) . "</string>
+               <string>" . sprintf(_("%s CA"), \core\common\Entity::$nomenclature_inst)."</string>
                <key>PayloadIdentifier</key>
-               <string>" . self::$iPhonePayloadPrefix . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.credential.$this->caSerial</string>
+               <string>" . self::$iPhonePayloadPrefix.".$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>";

devices/Devices-template.php

Spacing +7 added lines, -7 removed lines

@@ -361,7 +361,7 @@ 
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_oreo' => [
@@ -376,7 +376,7 @@ 
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_nougat' => [
@@ -391,7 +391,7 @@ 
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_marshmallow' => [
@@ -406,7 +406,7 @@ 
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_lollipop' => [
@@ -421,7 +421,7 @@ 
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_kitkat' => [
@@ -436,7 +436,7 @@ 
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_43' => [
@@ -451,7 +451,7 @@ 
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>",
-                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
                 ],
             ],
             'android_legacy' => [

devices/linux/Device_Linux.php

Indentation +1 added lines, -1 removed lines

@@ -211,7 +211,7 @@
         }
 
         if (!empty($this->attributes['internal:realm'][0])) {
-           $config['user_realm'] = $this->attributes['internal:realm'][0];
+            $config['user_realm'] = $this->attributes['internal:realm'][0];
         }
         
         if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {

Spacing +21 added lines, -21 removed lines

@@ -54,9 +54,9 @@ 
      *
      */
     public function writeInstaller() {
-        $installerPath = $this->installerBasename . ".py";
+        $installerPath = $this->installerBasename.".py";
         $this->copyFile("main.py", $installerPath);
-        $installer = fopen($installerPath,"a");
+        $installer = fopen($installerPath, "a");
         if ($installer === FALSE) {
             throw new Exception("Unable to open installer file for writing!");
         }
@@ -83,9 +83,9 @@ 
         $out .= "<p>";
         if ($ssidCount > 1) {
             if ($ssidCount > 2) {
-                $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"), implode(', ', CONFIG_CONFASSISTANT['CONSORTIUM']['ssid'])) . " ";
+                $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"), implode(', ', CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']))." ";
             } else {
-                $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"), implode(', ', CONFIG_CONFASSISTANT['CONSORTIUM']['ssid'])) . " ";
+                $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"), implode(', ', CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']))." ";
             }
             $iterator = 0;
             foreach ($this->attributes['internal:SSID'] as $ssid => $v) {
@@ -123,8 +123,8 @@ 
      * @return void
      */
     private function writeConfigLine($file, $prefix, $name, $text) {
-        $out = $prefix . $name . ' = "' . $text;
-        fwrite($file, wordwrap($out, 70, " \" \\\n    \"") . "\n");
+        $out = $prefix.$name.' = "'.$text;
+        fwrite($file, wordwrap($out, 70, " \" \\\n    \"")."\n");
     }
     
     /**
@@ -163,7 +163,7 @@ 
         'user_cert_missing' => _("personal certificate file not found"),
         ];
         foreach ($messages as $name => $value) {
-            $this->writeConfigLine($file, 'Messages.', $name, $value . '"');
+            $this->writeConfigLine($file, 'Messages.', $name, $value.'"');
         }
         \core\common\Entity::outOfThePotatoes();
     }
@@ -207,39 +207,39 @@ 
         }
 
         if ($outerId !== NULL) {
-            $configRaw['anonymous_identity'] = '"' . $outerId . '"';
+            $configRaw['anonymous_identity'] = '"'.$outerId.'"';
         }
 
         if (!empty($this->attributes['internal:realm'][0])) {
            $config['user_realm'] = $this->attributes['internal:realm'][0];
         }
         
-        if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
+        if (!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
             $configRaw['hint_user_input'] = "True";
         }
         
-        if(!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) {
+        if (!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) {
             $configRaw['verify_user_realm_input'] = "True";
         }
         
         foreach ($config as $name => $value) {
-            $this->writeConfigLine($file, 'Config.', $name, $value . '"');
+            $this->writeConfigLine($file, 'Config.', $name, $value.'"');
         }
         
         foreach ($configRaw as $name => $value) {
-            fwrite($file, 'Config.' . $name . ' = ' . $value . "\n");
+            fwrite($file, 'Config.'.$name.' = '.$value."\n");
         }
         
         if ($tou === '') {
-            fwrite($file, 'Config.tou = ""' . "\n");
+            fwrite($file, 'Config.tou = ""'."\n");
         } else {
-            fwrite($file, 'Config.tou = """' . $tou . '"""' . "\n");
+            fwrite($file, 'Config.tou = """'.$tou.'"""'."\n");
         }
         
-        fwrite($file, 'Config.CA = """' . $this->mkCAfile() . '"""' . "\n");
+        fwrite($file, 'Config.CA = """'.$this->mkCAfile().'"""'."\n");
         $sbUserFile = $this->mkSbUserFile();
         if ($sbUserFile !== '') {
-            fwrite($file, 'Config.sb_user_file = """' . $sbUserFile . '"""' . "\n");
+            fwrite($file, 'Config.sb_user_file = """'.$sbUserFile.'"""'."\n");
         }
     }
 
@@ -291,7 +291,7 @@ 
             }
             $out .= "'DNS:$oneServer'";
         }
-        return "[" . $out. "]";
+        return "[".$out."]";
     }
 
     /**
@@ -305,7 +305,7 @@ 
         foreach ($ssids as $ssid => $cipher) {
             $outArray[] = "'$ssid'";
         }
-        return '[' . implode(', ', $outArray) . ']';
+        return '['.implode(', ', $outArray).']';
     }
     
     /**
@@ -321,7 +321,7 @@ 
                 $outArray[] = "'$ssid'";
             }
         }
-        return '[' . implode(', ', $outArray) . ']';
+        return '['.implode(', ', $outArray).']';
     }
     
     /**
@@ -329,7 +329,7 @@ 
      * 
      * @return string
      */
-    private function mkCAfile(){
+    private function mkCAfile() {
         $out = '';
         $cAlist = $this->attributes['internal:CAs'][0];
         foreach ($cAlist as $oneCa) {
@@ -345,7 +345,7 @@ 
      */
     private function mkIntro() {
         \core\common\Entity::intoThePotatoes();
-        $out = _("This installer has been prepared for {0}") . '\n\n' . _("More information and comments:") . '\n\nEMAIL: {1}\nWWW: {2}\n\n' .
+        $out = _("This installer has been prepared for {0}").'\n\n'._("More information and comments:").'\n\nEMAIL: {1}\nWWW: {2}\n\n'.
             _("Installer created with software from the GEANT project.");
         \core\common\Entity::outOfThePotatoes();
         return $out;

Braces +1 added lines, -2 removed lines

@@ -201,8 +201,7 @@
             
         if ($this->selectedEap == \core\common\EAP::EAPTYPE_TLS && isset($this->attributes['eap-specific:tls_use_other_id']) && $this->attributes['eap-specific:tls_use_other_id'][0] == 'on') {
             $configRaw['use_other_tls_id'] = "True";
-        }
-        else {
+        } else {
             $configRaw['use_other_tls_id'] = "False";
         }
 

web/index.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
  * @author Stefan Winter <stefan.winter@restena.lu>
  * @package Core
  */
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
+require_once dirname(dirname(__FILE__))."/config/_config.php";
 
 $Gui = new \web\lib\user\Gui();
 // ... unless overwritten by direct GET/POST parameter in the request or a SESSION setting