Inspection of "Coding style fixes" - GEANT/CAT - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — release_2_0 ( 504768...70923e )

by Tomasz

created 2019-11-06 08:58 UTC

Status

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -27,7 +27,7 @@  discard block
 block discarded – undo
  * @package UserGUI
  * 
  */
-require dirname(dirname(__FILE__)) . "/config/_config.php";
+require dirname(dirname(__FILE__))."/config/_config.php";
 $loggerInstance = new \core\common\Logging();
 $langObject = new \core\common\Language();
 $cat = new \core\CAT();
@@ -51,9 +51,9 @@  discard block
 block discarded – undo
     <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
         <img src="<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') ?>/resources/images/consortium_logo.png" style="padding-right:20px; padding-top:20px; float:right" alt="logo" />
 
-        <div id="motd"><?php print ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp'); ?></div>
+        <div id="motd"><?php print (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp'); ?></div>
 
-        <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang(); ?>"><?php echo CONFIG['APPEARANCE']['productname']; ?></a></h1>
+        <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang(); ?>"><?php echo CONFIG['APPEARANCE']['productname']; ?></a></h1>
         <div id="tou">
             <?php
             require "user/tou.php";
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
                     </td>
                     <?php
                     if (!empty(CONFIG['APPEARANCE']['privacy_notice_url'])) {
-                        $retval .= "<td><a href='".CONFIG['APPEARANCE']['privacy_notice_url']."'>" . sprintf(_("%s Privacy Notice"),CONFIG_CONFASSISTANT['CONSORTIUM']['name']) . "</a></td>";
+                        $retval .= "<td><a href='".CONFIG['APPEARANCE']['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), CONFIG_CONFASSISTANT['CONSORTIUM']['name'])."</a></td>";
                     }
                     ?>
                     <td style='padding-left:80px; padding-right:20px; text-align:right; vertical-align:top;'>

Please login to merge, or discard this patch.

devices/ms/Device_W8_10.php 2 patches

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -35,7 +35,7 @@
 block discarded – undo
  * @author Tomasz Wolniewicz <[email protected]>
  * @package ModuleWriting
  */
- class Device_W8_10 extends WindowsCommon {
+    class Device_W8_10 extends WindowsCommon {
     final public function __construct() {
         parent::__construct();
         \core\common\Entity::intoThePotatoes();

Please login to merge, or discard this patch.

Spacing +32 added lines, -32 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

devices/ms/Files/geant_link.inc 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -92,7 +92,7 @@  discard block
 block discarded – undo
   nsArray::Set Delete_files "GEANTLink-ARM64.msi"
   File "GEANTLink-ARM64.msi"
   IfSilent +2
-  MessageBox MB_OK  "<?php WindowsCommon::echo_nsi( _("An additional piece of software 'GEANTlink' needs to be installed. This installation requires Administrator rights; you will be prompted to give permission for that action."))?>"
+  MessageBox MB_OK  "<?php WindowsCommon::echo_nsi(_("An additional piece of software 'GEANTlink' needs to be installed. This installation requires Administrator rights; you will be prompted to give permission for that action."))?>"
   !insertmacro debug_cat 1 "Run GEANTLink installer"
   !insertmacro debug_cat 3 'Execute: msiexec.exe /i "$OUTDIR\GEANTLink-$Platform.msi" REBOOT=Supress'
   ClearErrors
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
   Pop $rebootRequired
   ${Else}
   IfSilent +2
-  MessageBox MB_OK "<?php WindowsCommon::echo_nsi( _("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>"
+  MessageBox MB_OK "<?php WindowsCommon::echo_nsi(_("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>"
   Quit
   ${EndIf}
   Cont2:

Please login to merge, or discard this patch.

devices/chromebook/Device_chromebook.php 1 patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -117,7 +117,7 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
      */
     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 @@  discard block
 block discarded – undo
         // 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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
             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 @@  discard block
 block discarded – undo
 
         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 @@  discard block
 block discarded – undo
         // 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");
         }

Please login to merge, or discard this patch.

devices/xml/XML.inc.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -118,7 +118,7 @@  discard block
 block discarded – undo
         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 @@  discard block
 block discarded – undo
     $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('/&/', '&amp;', $object->getValue());

Please login to merge, or discard this patch.

devices/xml/Device_XML.php 2 patches

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -294,7 +294,7 @@  discard block
 block discarded – undo
         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 @@  discard block
 block discarded – undo
     }
     
     private function getAuthMethod($eap) {
- //       $attr = $this->attributes;
+    //       $attr = $this->attributes;
         $authmethod = new AuthenticationMethod();
         $eapParams = $this->getAuthenticationMethodParams($eap);
         $eaptype = new Type();

Please login to merge, or discard this patch.

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -31,7 +31,7 @@  discard block
 block discarded – undo
  */
 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 @@  discard block
 block discarded – undo
         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 @@  discard block
 block discarded – undo
             $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 @@  discard block
 block discarded – undo
                 $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 @@  discard block
 block discarded – undo
             $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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
 
         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 @@  discard block
 block discarded – undo
         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) {

Please login to merge, or discard this patch.

devices/redirect_dev/Device_RedirectDev.php 2 patches

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -22,15 +22,15 @@
 block discarded – undo
 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");
     }
     
     /**

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -30,7 +30,7 @@
 block discarded – undo
     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");
     }
     
     /**

Please login to merge, or discard this patch.

devices/test_module/Device_TestModule.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -138,8 +138,8 @@
 block discarded – undo
      */
     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");
         }

Please login to merge, or discard this patch.

devices/linux/Device_Linux.php 3 patches

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -211,7 +211,7 @@
 block discarded – undo
         }
 
         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) {

Please login to merge, or discard this patch.

Spacing +21 added lines, -21 removed lines patch added patch discarded remove patch

@@ -54,9 +54,9 @@  discard block
 block discarded – undo
      *
      */
     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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
      * @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 @@  discard block
 block discarded – undo
         '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 @@  discard block
 block discarded – undo
         }
 
         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 @@  discard block
 block discarded – undo
             }
             $out .= "'DNS:$oneServer'";
         }
-        return "[" . $out. "]";
+        return "[".$out."]";
     }
 
     /**
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
         foreach ($ssids as $ssid => $cipher) {
             $outArray[] = "'$ssid'";
         }
-        return '[' . implode(', ', $outArray) . ']';
+        return '['.implode(', ', $outArray).']';
     }
     
     /**
@@ -321,7 +321,7 @@  discard block
 block discarded – undo
                 $outArray[] = "'$ssid'";
             }
         }
-        return '[' . implode(', ', $outArray) . ']';
+        return '['.implode(', ', $outArray).']';
     }
     
     /**
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
      * 
      * @return string
      */
-    private function mkCAfile(){
+    private function mkCAfile() {
         $out = '';
         $cAlist = $this->attributes['internal:CAs'][0];
         foreach ($cAlist as $oneCa) {
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
      */
     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;

Please login to merge, or discard this patch.

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

@@ -201,8 +201,7 @@
 block discarded – undo
             
         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";
         }
 

Please login to merge, or discard this patch.

		@@ -118,7 +118,7 @@ discard block
		block discarded – undo
118	118	if (is_scalar($value)) {
119	119	$this->value = strval($value);
120	120	} else {
121		- throw new Exception("unexpected value type passed" . gettype($value));
	121	+ throw new Exception("unexpected value type passed".gettype($value));
122	122	}
123	123	}
124	124
		@@ -434,7 +434,7 @@ discard block
		block discarded – undo
434	434	$qualClassName = get_class($object);
435	435	// remove namespace qualifier
436	436	$pos = strrpos($qualClassName, '\\');
437		- $className = substr($qualClassName, $pos + 1);
	437	+ $className = substr($qualClassName, $pos + 1);
438	438	$name = preg_replace("/_/", "-", $className);
439	439	if ($object->getValue()) {
440	440	$val = preg_replace('/&/', '&', $object->getValue());

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

		@@ -211,7 +211,7 @@
		block discarded – undo
211	211	}
212	212
213	213	if (!empty($this->attributes['internal:realm'][0])) {
214		- $config['user_realm'] = $this->attributes['internal:realm'][0];
	214	+ $config['user_realm'] = $this->attributes['internal:realm'][0];
215	215	}
216	216
217	217	if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {

		@@ -27,7 +27,7 @@ discard block
		block discarded – undo
27	27	* @package UserGUI
28	28	*
29	29	*/
30		-require dirname(dirname(__FILE__)) . "/config/_config.php";
	30	+require dirname(dirname(__FILE__))."/config/_config.php";
31	31	$loggerInstance = new \core\common\Logging();
32	32	$langObject = new \core\common\Language();
33	33	$cat = new \core\CAT();
		@@ -51,9 +51,9 @@ discard block
		block discarded – undo
51	51	<body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'>
52	52	<img src="<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') ?>/resources/images/consortium_logo.png" style="padding-right:20px; padding-top:20px; float:right" alt="logo" />
53	53
54		- <div id="motd"><?php print ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp'); ?></div>
	54	+ <div id="motd"><?php print (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp'); ?></div>
55	55
56		- <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang(); ?>"><?php echo CONFIG['APPEARANCE']['productname']; ?></a></h1>
	56	+ <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang(); ?>"><?php echo CONFIG['APPEARANCE']['productname']; ?></a></h1>
57	57	<div id="tou">
58	58	<?php
59	59	require "user/tou.php";
		@@ -67,7 +67,7 @@ discard block
		block discarded – undo
67	67	</td>
68	68	<?php
69	69	if (!empty(CONFIG['APPEARANCE']['privacy_notice_url'])) {
70		- $retval .= "<td><a href='".CONFIG['APPEARANCE']['privacy_notice_url']."'>" . sprintf(_("%s Privacy Notice"),CONFIG_CONFASSISTANT['CONSORTIUM']['name']) . "</a></td>";
	70	+ $retval .= "<td><a href='".CONFIG['APPEARANCE']['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), CONFIG_CONFASSISTANT['CONSORTIUM']['name'])."</a></td>";
71	71	}
72	72	?>
73	73	<td style='padding-left:80px; padding-right:20px; text-align:right; vertical-align:top;'>

		@@ -35,7 +35,7 @@
		block discarded – undo
35	35	* @author Tomasz Wolniewicz <[email protected]>
36	36	* @package ModuleWriting
37	37	*/
38		- class Device_W8_10 extends WindowsCommon {
	38	+ class Device_W8_10 extends WindowsCommon {
39	39	final public function __construct() {
40	40	parent::__construct();
41	41	\core\common\Entity::intoThePotatoes();

		@@ -96,7 +96,7 @@ discard block
		block discarded – undo
96	96	foreach ($this->attributes['internal:consortia'] as $oneCons) {
97	97	$knownOiName = array_search($oneCons, CONFIG_CONFASSISTANT['CONSORTIUM']['interworking-consortium-oi']);
98	98	if ($knownOiName === FALSE) { // a custom RCOI as set by the IdP admin; do not use the term "eduroam" in that one!
99		- $knownOiName = $this->attributes['general:instname'][0] . " "._("Roaming Partner") . " $roamingPartner";
	99	+ $knownOiName = $this->attributes['general:instname'][0]." "._("Roaming Partner")." $roamingPartner";
100	100	$roamingPartner++;
101	101	}
102	102	$ssid = 'cat-passpoint-profile';
		@@ -148,12 +148,12 @@ discard block
		block discarded – undo
148	148	if (empty($this->attributes['internal:realm'][0])) {
149	149	$retval .= CONFIG_CONFASSISTANT['CONSORTIUM']['interworking-domainname-fallback'];
150	150	} else {
151		- $retval .= $this->attributes['internal:realm'][0];
	151	+ $retval .= $this->attributes['internal:realm'][0];
152	152	}
153	153	$retval .= '</DomainName>';
154		- $retval .= '<RoamingConsortium><OUI>' . $oi .
	154	+ $retval .= '<RoamingConsortium><OUI>'.$oi.
155	155	'</OUI></RoamingConsortium>';
156		- $retval .= '</Hotspot2>';
	156	+ $retval .= '</Hotspot2>';
157	157	return($retval);
158	158	}
159	159
		@@ -162,11 +162,11 @@ discard block
		block discarded – undo
162	162	$profileFileCont = '<EAPConfig><EapHostConfig xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
163	163	<EapMethod>
164	164	';
165		- $profileFileCont .= '<Type xmlns="http://www.microsoft.com/provisioning/EapCommon">' .
166		- $this->selectedEap["OUTER"] . '</Type>
	165	+ $profileFileCont .= '<Type xmlns="http://www.microsoft.com/provisioning/EapCommon">'.
	166	+ $this->selectedEap["OUTER"].'</Type>
167	167	<VendorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorId>
168	168	<VendorType xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorType>
169		-<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">' . $authorId . '</AuthorId>
	169	+<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">' . $authorId.'</AuthorId>
170	170	</EapMethod>
171	171	';
172	172	return($profileFileCont);
		@@ -177,10 +177,10 @@ discard block
		block discarded – undo
177	177	<eapTls:ServerValidation>
178	178	<eapTls:DisableUserPromptForServerValidation>true</eapTls:DisableUserPromptForServerValidation>
179	179	';
180		- $profileFileCont .= '<eapTls:ServerNames>' . $this->servers . '</eapTls:ServerNames>';
	180	+ $profileFileCont .= '<eapTls:ServerNames>'.$this->servers.'</eapTls:ServerNames>';
181	181	foreach ($this->caArray as $certAuthority) {
182	182	if ($certAuthority['root']) {
183		- $profileFileCont .= "<eapTls:TrustedRootCA>" . $certAuthority['sha1'] . "</eapTls:TrustedRootCA>\n";
	183	+ $profileFileCont .= "<eapTls:TrustedRootCA>".$certAuthority['sha1']."</eapTls:TrustedRootCA>\n";
184	184	}
185	185	}
186	186	$profileFileCont .= '</eapTls:ServerValidation>
		@@ -192,10 +192,10 @@ discard block
		block discarded – undo
192	192	$profileFileCont = '
193	193	<ServerValidation>
194	194	';
195		- $profileFileCont .= '<ServerNames>' . $this->servers . '</ServerNames> ';
	195	+ $profileFileCont .= '<ServerNames>'.$this->servers.'</ServerNames> ';
196	196	foreach ($this->caArray as $certAuthority) {
197	197	if ($certAuthority['root']) {
198		- $profileFileCont .= "<TrustedRootCAHash>" . chunk_split($certAuthority['sha1'], 2, ' ') . "</TrustedRootCAHash>\n";
	198	+ $profileFileCont .= "<TrustedRootCAHash>".chunk_split($certAuthority['sha1'], 2, ' ')."</TrustedRootCAHash>\n";
199	199	}
200	200	}
201	201	$profileFileCont .= '<DisablePrompt>true</DisablePrompt>
		@@ -227,10 +227,10 @@ discard block
		block discarded – undo
227	227	$profileFileCont = '
228	228	<ServerValidation>
229	229	<DisableUserPromptForServerValidation>true</DisableUserPromptForServerValidation>
230		-<ServerNames>' . $this->servers . '</ServerNames>';
	230	+<ServerNames>' . $this->servers.'</ServerNames>';
231	231	foreach ($this->caArray as $certAuthority) {
232	232	if ($certAuthority['root']) {
233		- $profileFileCont .= "<TrustedRootCA>" . $certAuthority['sha1'] . "</TrustedRootCA>\n";
	233	+ $profileFileCont .= "<TrustedRootCA>".$certAuthority['sha1']."</TrustedRootCA>\n";
234	234	}
235	235	}
236	236	$profileFileCont .= '</ServerValidation>
		@@ -286,7 +286,7 @@ discard block
		block discarded – undo
286	286	if ($this->useAnon) {
287	287	$profileFileCont .= '<IdentityPrivacy>true</IdentityPrivacy>
288	288	';
289		- $profileFileCont .= '<AnonymousIdentity>' . $this->outerId . '</AnonymousIdentity>
	289	+ $profileFileCont .= '<AnonymousIdentity>'.$this->outerId.'</AnonymousIdentity>
290	290	';
291	291	} else {
292	292	$profileFileCont .= '<IdentityPrivacy>false</IdentityPrivacy>
		@@ -303,10 +303,10 @@ discard block
		block discarded – undo
303	303	$profileFileCont = '
304	304	<Config xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
305	305	<EAPIdentityProviderList xmlns="urn:ietf:params:xml:ns:yang:ietf-eap-metadata">
306		-<EAPIdentityProvider ID="' . $this->deviceUUID . '" namespace="urn:UUID">
	306	+<EAPIdentityProvider ID="' . $this->deviceUUID.'" namespace="urn:UUID">
307	307
308	308	<ProviderInfo>
309		-<DisplayName>' . $this->translateString($this->attributes['general:instname'][0], $this->codePage) . '</DisplayName>
	309	+<DisplayName>' . $this->translateString($this->attributes['general:instname'][0], $this->codePage).'</DisplayName>
310	310	</ProviderInfo>
311	311	<AuthenticationMethods>
312	312	<AuthenticationMethod>
		@@ -318,7 +318,7 @@ discard block
		block discarded – undo
318	318	if ($this->outerUser == '') {
319	319	$profileFileCont .= '<AnonymousIdentity>@</AnonymousIdentity>';
320	320	} else {
321		- $profileFileCont .= '<AnonymousIdentity>' . $this->outerId . '</AnonymousIdentity>';
	321	+ $profileFileCont .= '<AnonymousIdentity>'.$this->outerId.'</AnonymousIdentity>';
322	322	}
323	323	}
324	324	$profileFileCont .= '</ClientSideCredential>
		@@ -326,7 +326,7 @@ discard block
		block discarded – undo
326	326	$profileFileCont .= $this->glTtlsServerValidation();
327	327	$profileFileCont .= '
328	328	<InnerAuthenticationMethod>
329		-<NonEAPAuthMethod>' . \core\common\EAP::eapDisplayName($this->selectedEap)['INNER'] . '</NonEAPAuthMethod>
	329	+<NonEAPAuthMethod>' . \core\common\EAP::eapDisplayName($this->selectedEap)['INNER'].'</NonEAPAuthMethod>
330	330	</InnerAuthenticationMethod>
331	331	<VendorSpecific>
332	332	<SessionResumption>false</SessionResumption>
		@@ -357,7 +357,7 @@ discard block
		block discarded – undo
357	357	<UseWinLogonCredentials>false</UseWinLogonCredentials>
358	358	</EapType>
359	359	</Eap>
360		-<EnableQuarantineChecks>' . $nea . '</EnableQuarantineChecks>
	360	+<EnableQuarantineChecks>' . $nea.'</EnableQuarantineChecks>
361	361	<RequireCryptoBinding>false</RequireCryptoBinding>
362	362	';
363	363	if ($this->useAnon) {
		@@ -369,7 +369,7 @@ discard block
		block discarded – undo
369	369	$profileFileCont .= '<AnonymousUserName/>
370	370	';
371	371	} else {
372		- $profileFileCont .= '<AnonymousUserName>' . $this->outerUser . '</AnonymousUserName>
	372	+ $profileFileCont .= '<AnonymousUserName>'.$this->outerUser.'</AnonymousUserName>
373	373	';
374	374	}
375	375	$profileFileCont .= '</IdentityPrivacy>
		@@ -399,7 +399,7 @@ discard block
		block discarded – undo
399	399	private function prepareEapConfig() {
400	400	if ($this->useAnon) {
401	401	$this->outerUser = $this->attributes['internal:anon_local_value'][0];
402		- $this->outerId = $this->outerUser . '@' . $this->attributes['internal:realm'][0];
	402	+ $this->outerId = $this->outerUser.'@'.$this->attributes['internal:realm'][0];
403	403	}
404	404
405	405	$profileFileCont = $this->eapConfigHeader();
		@@ -424,7 +424,7 @@ discard block
		block discarded – undo
424	424	default:
425	425	break;
426	426	}
427		- return(['win' => $profileFileCont . '</EapHostConfig></EAPConfig>']);
	427	+ return(['win' => $profileFileCont.'</EapHostConfig></EAPConfig>']);
428	428	}
429	429
430	430	/**
		@@ -442,10 +442,10 @@ discard block
		block discarded – undo
442	442	private function writeWLANprofile($wlanProfileName, $ssid, $auth, $encryption, $eapConfig, $profileNumber, $oi = '') {
443	443	$profileFileCont = '<?xml version="1.0"?>
444	444	<WLANProfile xmlns="http://www.microsoft.com/networking/WLAN/profile/v1">
445		-<name>' . $wlanProfileName . '</name>
	445	+<name>' . $wlanProfileName.'</name>
446	446	<SSIDConfig>
447	447	<SSID>
448		-<name>' . $ssid . '</name>
	448	+<name>' . $ssid.'</name>
449	449	</SSID>
450	450	<nonBroadcast>true</nonBroadcast>
451	451	</SSIDConfig>';
		@@ -457,8 +457,8 @@ discard block
		block discarded – undo
457	457	<MSM>
458	458	<security>
459	459	<authEncryption>
460		-<authentication>' . $auth . '</authentication>
461		-<encryption>' . $encryption . '</encryption>
	460	+<authentication>' . $auth.'</authentication>
	461	+<encryption>' . $encryption.'</encryption>
462	462	<useOneX>true</useOneX>
463	463	</authEncryption>
464	464	';
		@@ -485,7 +485,7 @@ discard block
		block discarded – undo
485	485	mkdir('w8');
486	486	}
487	487	$xmlFname = "w8/wlan_prof-$profileNumber.xml";
488		- file_put_contents($xmlFname, $profileFileCont . $eapConfig['win'] . $closing);
	488	+ file_put_contents($xmlFname, $profileFileCont.$eapConfig['win'].$closing);
489	489	$this->loggerInstance->debug(2, "Installer has been written into directory $this->FPATH\n");
490	490	$hs20 = $oi == '' ? 0 : 1;
491	491	return("\"$wlanProfileName\" \"$encryption\" $hs20");
		@@ -513,7 +513,7 @@ discard block
		block discarded – undo
513	513	mkdir('w8');
514	514	}
515	515	$xmlFname = "w8/lan_prof.xml";
516		- file_put_contents($xmlFname, $profileFileCont . $eapConfig['win'] . $closing);
	516	+ file_put_contents($xmlFname, $profileFileCont.$eapConfig['win'].$closing);
517	517	$this->loggerInstance->debug(2, "Installer has been written into directory $this->FPATH\n");
518	518	}
519	519
		@@ -534,7 +534,7 @@ discard block
		block discarded – undo
534	534	}
535	535	foreach ($caArray as $certAuthority) {
536	536	$store = $certAuthority['root'] ? "root" : "ca";
537		- $fcontentsCerts .= '!insertmacro install_ca_cert "' . $certAuthority['file'] . '" "' . $certAuthority['sha1'] . '" "' . $store . "\"\n";
	537	+ $fcontentsCerts .= '!insertmacro install_ca_cert "'.$certAuthority['file'].'" "'.$certAuthority['sha1'].'" "'.$store."\"\n";
538	538	}
539	539	fwrite($fileHandleCerts, $fcontentsCerts);
540	540	fclose($fileHandleCerts);
		@@ -543,7 +543,7 @@ discard block
		block discarded – undo
543	543	private function writeMainNSH($eap, $attr) {
544	544	$this->loggerInstance->debug(4, "writeMainNSH");
545	545	$this->loggerInstance->debug(4, $attr);
546		- $this->loggerInstance->debug(4, "Device_id = " . $this->device_id . "\n");
	546	+ $this->loggerInstance->debug(4, "Device_id = ".$this->device_id."\n");
547	547	$fcontents = "!define W8\n";
548	548	if ($this->device_id == 'w10') {
549	549	$fcontents .= "!define W10\n";
		@@ -573,8 +573,8 @@ discard block
		block discarded – undo
573	573	if ($eap == \core\common\EAP::EAPTYPE_SILVERBULLET) {
574	574	$fcontents .= "!define SILVERBULLET\n";
575	575	}
576		- $fcontents .= '!define ' . $eapStr;
577		- $fcontents .= "\n" . '!define EXECLEVEL "' . $execLevel . '"';
	576	+ $fcontents .= '!define '.$eapStr;
	577	+ $fcontents .= "\n".'!define EXECLEVEL "'.$execLevel.'"';
578	578	$fcontents .= $this->writeNsisDefines($attr);
579	579	file_put_contents('main.nsh', $fcontents);
580	580	}

		@@ -92,7 +92,7 @@ discard block
		block discarded – undo
92	92	nsArray::Set Delete_files "GEANTLink-ARM64.msi"
93	93	File "GEANTLink-ARM64.msi"
94	94	IfSilent +2
95		- MessageBox MB_OK "<?php WindowsCommon::echo_nsi( _("An additional piece of software 'GEANTlink' needs to be installed. This installation requires Administrator rights; you will be prompted to give permission for that action."))?>"
	95	+ MessageBox MB_OK "<?php WindowsCommon::echo_nsi(_("An additional piece of software 'GEANTlink' needs to be installed. This installation requires Administrator rights; you will be prompted to give permission for that action."))?>"
96	96	!insertmacro debug_cat 1 "Run GEANTLink installer"
97	97	!insertmacro debug_cat 3 'Execute: msiexec.exe /i "$OUTDIR\GEANTLink-$Platform.msi" REBOOT=Supress'
98	98	ClearErrors
		@@ -104,7 +104,7 @@ discard block
		block discarded – undo
104	104	Pop $rebootRequired
105	105	${Else}
106	106	IfSilent +2
107		- MessageBox MB_OK "<?php WindowsCommon::echo_nsi( _("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>"
	107	+ MessageBox MB_OK "<?php WindowsCommon::echo_nsi(_("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>"
108	108	Quit
109	109	${EndIf}
110	110	Cont2:

		@@ -117,7 +117,7 @@ discard block
		block discarded – undo
117	117	$cryptoJson = openssl_encrypt($clearJson, 'AES-256-CBC', $encryptionKey, OPENSSL_RAW_DATA, $initVector);
118	118	$hmac = hash_hmac("sha1", $cryptoJson, $encryptionKey, TRUE);
119	119
120		- $this->loggerInstance->debug(4, "Clear = $clearJson\nSalt = $salt\nPW = " . $password . "\nb(IV) = " . base64_encode($initVector) . "\nb(Cipher) = " . base64_encode($cryptoJson) . "\nb(HMAC) = " . base64_encode($hmac));
	120	+ $this->loggerInstance->debug(4, "Clear = $clearJson\nSalt = $salt\nPW = ".$password."\nb(IV) = ".base64_encode($initVector)."\nb(Cipher) = ".base64_encode($cryptoJson)."\nb(HMAC) = ".base64_encode($hmac));
121	121
122	122	// now, generate the container that holds all the crypto data
123	123	$finalArray = [
		@@ -188,7 +188,7 @@ discard block
		block discarded – undo
188	188	*/
189	189	private function wiredBlock($eapdetails) {
190	190	return [
191		- "GUID" => \core\common\Entity::uuid('', "wired-dot1x-ethernet") . "}",
	191	+ "GUID" => \core\common\Entity::uuid('', "wired-dot1x-ethernet")."}",
192	192	"Name" => "eduroam configuration (wired network)",
193	193	"Remove" => false,
194	194	"Type" => "Ethernet",
		@@ -228,7 +228,7 @@ discard block
		block discarded – undo
228	228	// if silverbullet, we deliver the client cert inline
229	229
230	230	if ($selectedEap == \core\common\EAP::EAPTYPE_SILVERBULLET) {
231		- $eaparray['ClientCertRef'] = "[" . $this->clientCert['GUID'] . "]";
	231	+ $eaparray['ClientCertRef'] = "[".$this->clientCert['GUID']."]";
232	232	$eaparray['ClientCertType'] = "Ref";
233	233	}
234	234
		@@ -261,7 +261,7 @@ discard block
		block discarded – undo
261	261	$jsonArray = ["Type" => "UnencryptedConfiguration"];
262	262
263	263	foreach ($this->attributes['internal:CAs'][0] as $ca) {
264		- $caRefs[] = "{" . $ca['uuid'] . "}";
	264	+ $caRefs[] = "{".$ca['uuid']."}";
265	265	}
266	266	// define CA certificates
267	267	foreach ($this->attributes['internal:CAs'][0] as $ca) {
		@@ -271,15 +271,15 @@ discard block
		block discarded – undo
271	271	if ($caSanitized1 === FALSE) {
272	272	throw new Exception("Error cropping PEM data at its BEGIN marker.");
273	273	}
274		- $this->loggerInstance->debug(4, $caSanitized1 . "\n");
	274	+ $this->loggerInstance->debug(4, $caSanitized1."\n");
275	275	// remove \n
276	276	$caSanitized = str_replace("\n", "", $caSanitized1);
277		- $jsonArray["Certificates"][] = ["GUID" => "{" . $ca['uuid'] . "}", "Remove" => false, "Type" => "Authority", "X509" => $caSanitized];
278		- $this->loggerInstance->debug(3, $caSanitized . "\n");
	277	+ $jsonArray["Certificates"][] = ["GUID" => "{".$ca['uuid']."}", "Remove" => false, "Type" => "Authority", "X509" => $caSanitized];
	278	+ $this->loggerInstance->debug(3, $caSanitized."\n");
279	279	}
280	280	// if we are doing silverbullet, include the unencrypted(!) P12 as a client certificate
281	281	if ($this->selectedEap == \core\common\EAP::EAPTYPE_SILVERBULLET) {
282		- $jsonArray["Certificates"][] = ["GUID" => "[" . $this->clientCert['GUID'] . "]", "PKCS12" => base64_encode($this->clientCert['certdataclear']), "Remove" => false, "Type" => "Client"];
	282	+ $jsonArray["Certificates"][] = ["GUID" => "[".$this->clientCert['GUID']."]", "PKCS12" => base64_encode($this->clientCert['certdataclear']), "Remove" => false, "Type" => "Client"];
283	283	}
284	284	$eaparray = $this->eapBlock($caRefs);
285	285	// define Wi-Fi networks
		@@ -300,7 +300,7 @@ discard block
		block discarded – undo
300	300
301	301	file_put_contents('installer_profile', $finalJson);
302	302
303		- $fileName = $this->installerBasename . '.onc';
	303	+ $fileName = $this->installerBasename.'.onc';
304	304
305	305	if (!$this->sign) {
306	306	rename("installer_profile", $fileName);
		@@ -311,7 +311,7 @@ discard block
		block discarded – undo
311	311	// have the notion of signing
312	312	// but if they ever change their mind, we are prepared
313	313
314		- $outputFromSigning = system($this->sign . " installer_profile '$fileName' > /dev/null");
	314	+ $outputFromSigning = system($this->sign." installer_profile '$fileName' > /dev/null");
315	315	if ($outputFromSigning === FALSE) {
316	316	$this->loggerInstance->debug(2, "Signing the ONC installer $fileName FAILED!\n");
317	317	}

		@@ -294,7 +294,7 @@ discard block
		block discarded – undo
294	294	return $helpdesk;
295	295	}
296	296
297		- private function getCredentialApplicability() {
	297	+ private function getCredentialApplicability() {
298	298	$ssids = $this->attributes['internal:SSID'];
299	299	$oids = $this->attributes['internal:consortia'];
300	300	$credentialapplicability = new CredentialApplicability();
		@@ -420,7 +420,7 @@ discard block
		block discarded – undo
420	420	}
421	421
422	422	private function getAuthMethod($eap) {
423		- // $attr = $this->attributes;
	423	+ // $attr = $this->attributes;
424	424	$authmethod = new AuthenticationMethod();
425	425	$eapParams = $this->getAuthenticationMethodParams($eap);
426	426	$eaptype = new Type();

		@@ -31,7 +31,7 @@ discard block
		block discarded – undo
31	31	*/
32	32	namespace devices\xml;
33	33	use Exception;
34		-require_once dirname(__FILE__) . '/XML.inc.php';
	34	+require_once dirname(__FILE__).'/XML.inc.php';
35	35
36	36	/**
37	37	* This class implements full functionality of the generic XML device
		@@ -132,11 +132,11 @@ discard block
		block discarded – undo
132	132	marshalObject($root, $eapIdp);
133	133	$dom = dom_import_simplexml($root)->ownerDocument;
134	134	//TODO schema validation makes sense so probably should be used
135		- if ($dom->schemaValidate(ROOT . '/devices/xml/eap-metadata.xsd') === FALSE) {
	135	+ if ($dom->schemaValidate(ROOT.'/devices/xml/eap-metadata.xsd') === FALSE) {
136	136	throw new Exception("Schema validation failed for eap-metadata");
137	137	}
138		- file_put_contents($this->installerBasename . '.eap-config', $dom->saveXML());
139		- return($this->installerBasename . '.eap-config');
	138	+ file_put_contents($this->installerBasename.'.eap-config', $dom->saveXML());
	139	+ return($this->installerBasename.'.eap-config');
140	140	}
141	141
142	142	private $AttributeNames = [
		@@ -162,7 +162,7 @@ discard block
		block discarded – undo
162	162	$this->loggerInstance->debug(4, "Missing class definition for $attrName\n");
163	163	return([]);
164	164	}
165		- $className = "\devices\xml\\" . $this->AttributeNames[$attrName];
	165	+ $className = "\devices\xml\\".$this->AttributeNames[$attrName];
166	166	$objs = [];
167	167	if ($this->langScope === 'global') {
168	168	foreach ($attributeList['langs'] as $language => $value) {
		@@ -200,7 +200,7 @@ discard block
		block discarded – undo
200	200	$displayname = new DisplayName();
201	201	if (isset($profileNameLangs)) {
202	202	$langOrC = isset($profileNameLangs[$language]) ? $profileNameLangs[$language] : $profileNameLangs['C'];
203		- $value .= ' - ' . $langOrC;
	203	+ $value .= ' - '.$langOrC;
204	204	}
205	205	$displayname->setValue($value);
206	206	$displayname->setAttributes(['lang' => $language]);
		@@ -210,7 +210,7 @@ discard block
		block discarded – undo
210	210	$displayname = new DisplayName();
211	211	$value = $attr['general:instname'][0];
212	212	if ($attr['internal:profile_count'][0] > 1) {
213		- $value .= ' - ' . $attr['profile:name'][0];
	213	+ $value .= ' - '.$attr['profile:name'][0];
214	214	}
215	215	$displayname->setValue($value);
216	216	$objs[] = $displayname;
		@@ -227,7 +227,7 @@ discard block
		block discarded – undo
227	227	$attr = $this->attributes;
228	228	if (isset($attr['general:logo_file'][0])) {
229	229	$logoString = base64_encode($attr['general:logo_file'][0]);
230		- $logoMime = 'image/' . $attr['internal:logo_file'][0]['mime'];
	230	+ $logoMime = 'image/'.$attr['internal:logo_file'][0]['mime'];
231	231	$providerlogo = new ProviderLogo();
232	232	$providerlogo->setAttributes(['mime' => $logoMime, 'encoding' => 'base64']);
233	233	$providerlogo->setValue($logoString);
		@@ -327,7 +327,7 @@ discard block
		block discarded – undo
327	327
328	328	if (isset($inner["METHOD"]) && $inner["METHOD"]) {
329	329	$innerauthmethod = new InnerAuthenticationMethod();
330		- $typeOfInner = "\devices\xml\\" . ($inner["EAP"] ? 'EAPMethod' : 'NonEAPAuthMethod');
	330	+ $typeOfInner = "\devices\xml\\".($inner["EAP"] ? 'EAPMethod' : 'NonEAPAuthMethod');
331	331	$eapmethod = new $typeOfInner();
332	332	$eaptype = new Type();
333	333	$eaptype->setValue($inner['METHOD']);
		@@ -364,7 +364,7 @@ discard block
		block discarded – undo
364	364	return($serversidecredential);
365	365	}
366	366
367		- private function setClientSideRealm ($clientsidecredential) {
	367	+ private function setClientSideRealm($clientsidecredential) {
368	368	$attr = $this->attributes;
369	369	$realm = \core\common\Entity::getAttributeValue($attr, 'internal:realm', 0);
370	370	if ($realm === NULL) {

		@@ -22,15 +22,15 @@
		block discarded – undo
22	22	namespace devices\redirect_dev;
23	23
24	24	class Device_RedirectDev extends \core\DeviceConfig {
25		- /**
26		- * Constructs a Device object.
27		- *
28		- * @final not to be redefined
29		- */
	25	+ /**
	26	+ * Constructs a Device object.
	27	+ *
	28	+ * @final not to be redefined
	29	+ */
30	30	final public function __construct() {
31	31	parent::__construct();
32		- $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]);
33		- $this->loggerInstance->debug(4,"RedirectEx called");
	32	+ $this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]);
	33	+ $this->loggerInstance->debug(4,"RedirectEx called");
34	34	}
35	35
36	36	/**

		@@ -30,7 +30,7 @@
		block discarded – undo
30	30	final public function __construct() {
31	31	parent::__construct();
32	32	$this->setSupportedEapMethods([\core\common\EAP::EAPTYPE_NONE]);
33		- $this->loggerInstance->debug(4,"RedirectEx called");
	33	+ $this->loggerInstance->debug(4, "RedirectEx called");
34	34	}
35	35
36	36	/**

		@@ -54,9 +54,9 @@ discard block
		block discarded – undo
54	54	*
55	55	*/
56	56	public function writeInstaller() {
57		- $installerPath = $this->installerBasename . ".py";
	57	+ $installerPath = $this->installerBasename.".py";
58	58	$this->copyFile("main.py", $installerPath);
59		- $installer = fopen($installerPath,"a");
	59	+ $installer = fopen($installerPath, "a");
60	60	if ($installer === FALSE) {
61	61	throw new Exception("Unable to open installer file for writing!");
62	62	}
		@@ -83,9 +83,9 @@ discard block
		block discarded – undo
83	83	$out .= "<p>";
84	84	if ($ssidCount > 1) {
85	85	if ($ssidCount > 2) {
86		- $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"), implode(', ', CONFIG_CONFASSISTANT['CONSORTIUM']['ssid'])) . " ";
	86	+ $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"), implode(', ', CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']))." ";
87	87	} else {
88		- $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"), implode(', ', CONFIG_CONFASSISTANT['CONSORTIUM']['ssid'])) . " ";
	88	+ $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"), implode(', ', CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']))." ";
89	89	}
90	90	$iterator = 0;
91	91	foreach ($this->attributes['internal:SSID'] as $ssid => $v) {
		@@ -123,8 +123,8 @@ discard block
		block discarded – undo
123	123	* @return void
124	124	*/
125	125	private function writeConfigLine($file, $prefix, $name, $text) {
126		- $out = $prefix . $name . ' = "' . $text;
127		- fwrite($file, wordwrap($out, 70, " \" \\\n \"") . "\n");
	126	+ $out = $prefix.$name.' = "'.$text;
	127	+ fwrite($file, wordwrap($out, 70, " \" \\\n \"")."\n");
128	128	}
129	129
130	130	/**
		@@ -163,7 +163,7 @@ discard block
		block discarded – undo
163	163	'user_cert_missing' => _("personal certificate file not found"),
164	164	];
165	165	foreach ($messages as $name => $value) {
166		- $this->writeConfigLine($file, 'Messages.', $name, $value . '"');
	166	+ $this->writeConfigLine($file, 'Messages.', $name, $value.'"');
167	167	}
168	168	\core\common\Entity::outOfThePotatoes();
169	169	}
		@@ -207,39 +207,39 @@ discard block
		block discarded – undo
207	207	}
208	208
209	209	if ($outerId !== NULL) {
210		- $configRaw['anonymous_identity'] = '"' . $outerId . '"';
	210	+ $configRaw['anonymous_identity'] = '"'.$outerId.'"';
211	211	}
212	212
213	213	if (!empty($this->attributes['internal:realm'][0])) {
214	214	$config['user_realm'] = $this->attributes['internal:realm'][0];
215	215	}
216	216
217		- if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
	217	+ if (!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) {
218	218	$configRaw['hint_user_input'] = "True";
219	219	}
220	220
221		- if(!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) {
	221	+ if (!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) {
222	222	$configRaw['verify_user_realm_input'] = "True";
223	223	}
224	224
225	225	foreach ($config as $name => $value) {
226		- $this->writeConfigLine($file, 'Config.', $name, $value . '"');
	226	+ $this->writeConfigLine($file, 'Config.', $name, $value.'"');
227	227	}
228	228
229	229	foreach ($configRaw as $name => $value) {
230		- fwrite($file, 'Config.' . $name . ' = ' . $value . "\n");
	230	+ fwrite($file, 'Config.'.$name.' = '.$value."\n");
231	231	}
232	232
233	233	if ($tou === '') {
234		- fwrite($file, 'Config.tou = ""' . "\n");
	234	+ fwrite($file, 'Config.tou = ""'."\n");
235	235	} else {
236		- fwrite($file, 'Config.tou = """' . $tou . '"""' . "\n");
	236	+ fwrite($file, 'Config.tou = """'.$tou.'"""'."\n");
237	237	}
238	238
239		- fwrite($file, 'Config.CA = """' . $this->mkCAfile() . '"""' . "\n");
	239	+ fwrite($file, 'Config.CA = """'.$this->mkCAfile().'"""'."\n");
240	240	$sbUserFile = $this->mkSbUserFile();
241	241	if ($sbUserFile !== '') {
242		- fwrite($file, 'Config.sb_user_file = """' . $sbUserFile . '"""' . "\n");
	242	+ fwrite($file, 'Config.sb_user_file = """'.$sbUserFile.'"""'."\n");
243	243	}
244	244	}
245	245
		@@ -291,7 +291,7 @@ discard block
		block discarded – undo
291	291	}
292	292	$out .= "'DNS:$oneServer'";
293	293	}
294		- return "[" . $out. "]";
	294	+ return "[".$out."]";
295	295	}
296	296
297	297	/**
		@@ -305,7 +305,7 @@ discard block
		block discarded – undo
305	305	foreach ($ssids as $ssid => $cipher) {
306	306	$outArray[] = "'$ssid'";
307	307	}
308		- return '[' . implode(', ', $outArray) . ']';
	308	+ return '['.implode(', ', $outArray).']';
309	309	}
310	310
311	311	/**
		@@ -321,7 +321,7 @@ discard block
		block discarded – undo
321	321	$outArray[] = "'$ssid'";
322	322	}
323	323	}
324		- return '[' . implode(', ', $outArray) . ']';
	324	+ return '['.implode(', ', $outArray).']';
325	325	}
326	326
327	327	/**
		@@ -329,7 +329,7 @@ discard block
		block discarded – undo
329	329	*
330	330	* @return string
331	331	*/
332		- private function mkCAfile(){
	332	+ private function mkCAfile() {
333	333	$out = '';
334	334	$cAlist = $this->attributes['internal:CAs'][0];
335	335	foreach ($cAlist as $oneCa) {
		@@ -345,7 +345,7 @@ discard block
		block discarded – undo
345	345	*/
346	346	private function mkIntro() {
347	347	\core\common\Entity::intoThePotatoes();
348		- $out = _("This installer has been prepared for {0}") . '\n\n' . _("More information and comments:") . '\n\nEMAIL: {1}\nWWW: {2}\n\n' .
	348	+ $out = _("This installer has been prepared for {0}").'\n\n'._("More information and comments:").'\n\nEMAIL: {1}\nWWW: {2}\n\n'.
349	349	_("Installer created with software from the GEANT project.");
350	350	\core\common\Entity::outOfThePotatoes();
351	351	return $out;

		@@ -201,8 +201,7 @@
		block discarded – undo
201	201
202	202	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') {
203	203	$configRaw['use_other_tls_id'] = "True";
204		- }
205		- else {
	204	+ } else {
206	205	$configRaw['use_other_tls_id'] = "False";
207	206	}
208	207

GEANT / CAT

Push — release_2_0 ( 504768...70923e )

Status

Category

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +32 added lines, -32 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +21 added lines, -21 removed lines patch added patch discarded remove patch

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch