GEANT / CAT

devices/ms/Device_Vista7.php

Spacing +32 added lines, -32 removed lines

@@ -71,7 +71,7 @@ 
                 $delProfiles[] = $ssid;
             }
             if ($cipher == 'TKIP') {
-                $delProfiles[] = $ssid . ' (TKIP)';
+                $delProfiles[] = $ssid.' (TKIP)';
             }
         }
 
@@ -81,7 +81,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);
@@ -142,10 +142,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>
 ';
 
@@ -158,9 +158,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], $this->codePage) . '</DisplayName>
+<DisplayName>' . $this->translateString($attr['general:instname'][0], $this->codePage).'</DisplayName>
 </ProviderInfo>
 <AuthenticationMethods>
 <AuthenticationMethod>
@@ -172,7 +172,7 @@ 
                 if ($outerUser == '') {
                     $profileFileCont .= '<AnonymousIdentity>@</AnonymousIdentity>';
                 } else {
-                    $profileFileCont .= '<AnonymousIdentity>' . $outerUser . '@' . $realm . '</AnonymousIdentity>';
+                    $profileFileCont .= '<AnonymousIdentity>'.$outerUser.'@'.$realm.'</AnonymousIdentity>';
                 }
             }
             $profileFileCont .= '</ClientSideCredential>
@@ -190,7 +190,7 @@ 
             $profileFileCont .= '
 </ServerSideCredential>
 <InnerAuthenticationMethod>
-<NonEAPAuthMethod>' .$innerMethod. '</NonEAPAuthMethod>
+<NonEAPAuthMethod>' .$innerMethod.'</NonEAPAuthMethod>
 </InnerAuthenticationMethod>
 <VendorSpecific>
 <SessionResumption>false</SessionResumption>
@@ -215,11 +215,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";
                     }
                 }
             }
@@ -251,11 +251,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";
                     }
                 }
             }
@@ -268,7 +268,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>
@@ -280,11 +280,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";
                     }
                 }
             }
@@ -297,14 +297,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>
             ';
@@ -322,8 +322,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;
     }
 
@@ -342,10 +342,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>
@@ -355,8 +355,8 @@ 
 <MSM>
 <security>
 <authEncryption>
-<authentication>' . $auth . '</authentication>
-<encryption>' . $encryption . '</encryption>
+<authentication>' . $auth.'</authentication>
+<encryption>' . $encryption.'</encryption>
 <useOneX>true</useOneX>
 </authEncryption>
 ';
@@ -386,9 +386,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\"");
@@ -424,8 +424,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);
         
     }
 
@@ -439,7 +439,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'],
@@ -470,8 +470,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);
     }
@@ -500,7 +500,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);
@@ -515,7 +515,7 @@ 
      */
     private function copyFiles($eap) {
         $this->loggerInstance->debug(4, "copyFiles start\n");
-        $this->loggerInstance->debug(4, "code_page=" . $this->codePage . "\n");
+        $this->loggerInstance->debug(4, "code_page=".$this->codePage."\n");
         $this->copyBasicFiles();
 
         switch ($eap["OUTER"]) {

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

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

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/linux/Device_Linux.php

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;

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

core/SilverbulletCertificate.php

Spacing +20 added lines, -20 removed lines

@@ -155,7 +155,7 @@ 
         $invitationObject = new SilverbulletInvitation($token);
         $profile = new ProfileSilverbullet($invitationObject->profile);
         $inst = new IdP($profile->institution);
-        $loggerInstance->debug(5, "tokenStatus: done, got " . $invitationObject->invitationTokenStatus . ", " . $invitationObject->profile . ", " . $invitationObject->userId . ", " . $invitationObject->expiry . ", " . $invitationObject->invitationTokenString . "\n");
+        $loggerInstance->debug(5, "tokenStatus: done, got ".$invitationObject->invitationTokenStatus.", ".$invitationObject->profile.", ".$invitationObject->userId.", ".$invitationObject->expiry.", ".$invitationObject->invitationTokenString."\n");
         if ($invitationObject->invitationTokenStatus != SilverbulletInvitation::SB_TOKENSTATUS_VALID && $invitationObject->invitationTokenStatus != SilverbulletInvitation::SB_TOKENSTATUS_PARTIALLY_REDEEMED) {
             throw new Exception("Attempt to generate a SilverBullet installer with an invalid/redeemed/expired token. The user should never have gotten that far!");
         }
@@ -168,12 +168,12 @@ 
             throw new Exception("Despite a valid token, the corresponding user was not found in database or database query error!");
         }
         $expiryObject = mysqli_fetch_object(/** @scrutinizer ignore-type */ $userrow);
-        $loggerInstance->debug(5, "EXP: " . $expiryObject->expiry . "\n");
+        $loggerInstance->debug(5, "EXP: ".$expiryObject->expiry."\n");
         $expiryDateObject = date_create_from_format("Y-m-d H:i:s", $expiryObject->expiry);
         if ($expiryDateObject === FALSE) {
             throw new Exception("The expiry date we got from the DB is bogus!");
         }
-        $loggerInstance->debug(5, $expiryDateObject->format("Y-m-d H:i:s") . "\n");
+        $loggerInstance->debug(5, $expiryDateObject->format("Y-m-d H:i:s")."\n");
         // date_create with no parameters can't fail, i.e. is never FALSE
         $validity = date_diff(/** @scrutinizer ignore-type */ date_create(), $expiryDateObject);
         $expiryDays = $validity->days + 1;
@@ -222,7 +222,7 @@ 
         $certString = "";
         openssl_x509_export($cert, $certString);
         $parsedCert = $x509->processCertificate($certString);
-        $loggerInstance->debug(5, "CERTINFO: " . print_r($parsedCert['full_details'], true));
+        $loggerInstance->debug(5, "CERTINFO: ".print_r($parsedCert['full_details'], true));
         $realExpiryDate = date_create_from_format("U", $parsedCert['full_details']['validTo_time_t'])->format("Y-m-d H:i:s");
 
         // store new cert info in DB
@@ -280,26 +280,26 @@ 
                 $cat = new CAT();
                 $tempdirArray = $cat->createTemporaryDirectory("test");
                 $tempdir = $tempdirArray['dir'];
-                $nowIndexTxt = (new \DateTime())->format("ymdHis") . "Z";
-                $expiryIndexTxt = $originalExpiry->format("ymdHis") . "Z";
+                $nowIndexTxt = (new \DateTime())->format("ymdHis")."Z";
+                $expiryIndexTxt = $originalExpiry->format("ymdHis")."Z";
                 $serialHex = strtoupper(dechex($this->serial));
                 if (strlen($serialHex) % 2 == 1) {
-                    $serialHex = "0" . $serialHex;
+                    $serialHex = "0".$serialHex;
                 }
 
-                $indexStatement = "$certstatus\t$expiryIndexTxt\t" . ($certstatus == "R" ? "$nowIndexTxt,unspecified" : "") . "\t$serialHex\tunknown\t/O=" . CONFIG_CONFASSISTANT['CONSORTIUM']['name'] . "/OU=$federation/CN=$this->username\n";
+                $indexStatement = "$certstatus\t$expiryIndexTxt\t".($certstatus == "R" ? "$nowIndexTxt,unspecified" : "")."\t$serialHex\tunknown\t/O=".CONFIG_CONFASSISTANT['CONSORTIUM']['name']."/OU=$federation/CN=$this->username\n";
                 $logHandle->debug(4, "index.txt contents-to-be: $indexStatement");
-                if (!file_put_contents($tempdir . "/index.txt", $indexStatement)) {
+                if (!file_put_contents($tempdir."/index.txt", $indexStatement)) {
                     $logHandle->debug(1, "Unable to write openssl index.txt file for revocation handling!");
                 }
                 // index.txt.attr is dull but needs to exist
-                file_put_contents($tempdir . "/index.txt.attr", "unique_subject = yes\n");
+                file_put_contents($tempdir."/index.txt.attr", "unique_subject = yes\n");
                 // call "openssl ocsp" to manufacture our own OCSP statement
                 // adding "-rmd sha1" to the following command-line makes the
                 // choice of signature algorithm for the response explicit
                 // but it's only available from openssl-1.1.0 (which we do not
                 // want to require just for that one thing).
-                $execCmd = CONFIG['PATHS']['openssl'] . " ocsp -issuer " . ROOT . "/config/SilverbulletClientCerts/real-".$this->ca_type.".pem -sha1 -ndays 10 -no_nonce -serial 0x$serialHex -CA " . ROOT . "/config/SilverbulletClientCerts/real-".$this->ca_type.".pem -rsigner " . ROOT . "/config/SilverbulletClientCerts/real-".$this->ca_type.".pem -rkey " . ROOT . "/config/SilverbulletClientCerts/real-".$this->ca_type.".key -index $tempdir/index.txt -no_cert_verify -respout $tempdir/$serialHex.response.der";
+                $execCmd = CONFIG['PATHS']['openssl']." ocsp -issuer ".ROOT."/config/SilverbulletClientCerts/real-".$this->ca_type.".pem -sha1 -ndays 10 -no_nonce -serial 0x$serialHex -CA ".ROOT."/config/SilverbulletClientCerts/real-".$this->ca_type.".pem -rsigner ".ROOT."/config/SilverbulletClientCerts/real-".$this->ca_type.".pem -rkey ".ROOT."/config/SilverbulletClientCerts/real-".$this->ca_type.".key -index $tempdir/index.txt -no_cert_verify -respout $tempdir/$serialHex.response.der";
                 $logHandle->debug(2, "Calling openssl ocsp with following cmdline: $execCmd\n");
                 $output = [];
                 $return = 999;
@@ -307,11 +307,11 @@ 
                 if ($return !== 0) {
                     throw new Exception("Non-zero return value from openssl ocsp!");
                 }
-                $ocsp = file_get_contents($tempdir . "/$serialHex.response.der");
+                $ocsp = file_get_contents($tempdir."/$serialHex.response.der");
                 // remove the temp dir!
-                unlink($tempdir . "/$serialHex.response.der");
-                unlink($tempdir . "/index.txt.attr");
-                unlink($tempdir . "/index.txt");
+                unlink($tempdir."/$serialHex.response.der");
+                unlink($tempdir."/index.txt.attr");
+                unlink($tempdir."/index.txt");
                 rmdir($tempdir);
                 break;
             default:
@@ -365,7 +365,7 @@ 
         $username = "";
         while ($usernameIsUnique === FALSE) {
             $usernameLocalPart = common\Entity::randomString(64 - 1 - strlen($realm), "0123456789abcdefghijklmnopqrstuvwxyz");
-            $username = $usernameLocalPart . "@" . $realm;
+            $username = $usernameLocalPart."@".$realm;
             $uniquenessQuery = $databaseHandle->exec("SELECT cn from silverbullet_certificate WHERE cn = ?", "s", $username);
             // SELECT -> resource, not boolean
             if (mysqli_num_rows(/** @scrutinizer ignore-type */ $uniquenessQuery) == 0) {
@@ -417,10 +417,10 @@ 
         $databaseHandle = DBConnection::handle("INST");
         switch (CONFIG_CONFASSISTANT['SILVERBULLET']['CA']['type']) {
             case "embedded":
-                $rootCaPem = file_get_contents(ROOT . "/config/SilverbulletClientCerts/rootca-$certtype.pem");
-                $issuingCaPem = file_get_contents(ROOT . "/config/SilverbulletClientCerts/real-$certtype.pem");
+                $rootCaPem = file_get_contents(ROOT."/config/SilverbulletClientCerts/rootca-$certtype.pem");
+                $issuingCaPem = file_get_contents(ROOT."/config/SilverbulletClientCerts/real-$certtype.pem");
                 $issuingCa = openssl_x509_read($issuingCaPem);
-                $issuingCaKey = openssl_pkey_get_private("file://" . ROOT . "/config/SilverbulletClientCerts/real-$certtype.key");
+                $issuingCaKey = openssl_pkey_get_private("file://".ROOT."/config/SilverbulletClientCerts/real-$certtype.key");
                 $nonDupSerialFound = FALSE;
                 do {
                     $serial = random_int(1000000000, PHP_INT_MAX);
@@ -442,7 +442,7 @@ 
                         throw new Exception("Unknown cert type!");
                 }
                 return [
-                    "CERT" => openssl_csr_sign($csr, $issuingCa, $issuingCaKey, $expiryDays, ['digest_alg' => $alg, 'config' => dirname(__DIR__) . "/config/SilverbulletClientCerts/openssl-$certtype.cnf"], $serial),
+                    "CERT" => openssl_csr_sign($csr, $issuingCa, $issuingCaKey, $expiryDays, ['digest_alg' => $alg, 'config' => dirname(__DIR__)."/config/SilverbulletClientCerts/openssl-$certtype.cnf"], $serial),
                     "SERIAL" => $serial,
                     "ISSUER" => $issuingCaPem,
                     "ROOT" => $rootCaPem,