GEANT / CAT

devices/ms/DeviceVista7.php

Spacing +31 added lines, -31 removed lines

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

devices/ms/MsTlsProfile.php

Spacing +1 added lines, -1 removed lines

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

devices/ms/MsPeapProfile.php

Spacing +1 added lines, -1 removed lines

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

devices/ms/MsOneX.php

Spacing +2 added lines, -2 removed lines

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

devices/ms/MsWlanProfile.php

Spacing +1 added lines, -1 removed lines

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

core/DeviceXMLmain.php

Spacing +3 added lines, -3 removed lines

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

config/ConfAssistant-template.php

Spacing +4 added lines, -4 removed lines

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

web/admin/inc/profileAutodetectCA.inc.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $languageInstance = new \core\common\Language();

web/user/about_cat.inc.php

Indentation +3 added lines, -3 removed lines

@@ -34,9 +34,9 @@
 $skinObject = new \web\lib\user\Skinjob("classic");
 /// eduroam CAT, twice the consortium name eduroam, twice eduroam CAT
 $out = sprintf(_("<span class='edu_cat'>%s</span> is built as a cooperation platform."), \config\Master::APPEARANCE['productname'])."<p>".
-       sprintf(_("Local %s administrators enter their %s configuration details and based on them, <span class='edu_cat'>%s</span> builds customised installers for a number of popular platforms. ".
-                 "An installer prepared for one organisation will not work for users of another one, therefore if your organisation is not on the list, you cannot use this system. ".
-                 "Please contact your local administrators and try to influence them to add your %s configuration to <span class='edu_cat'>%s</span>."), 
+        sprintf(_("Local %s administrators enter their %s configuration details and based on them, <span class='edu_cat'>%s</span> builds customised installers for a number of popular platforms. ".
+                    "An installer prepared for one organisation will not work for users of another one, therefore if your organisation is not on the list, you cannot use this system. ".
+                    "Please contact your local administrators and try to influence them to add your %s configuration to <span class='edu_cat'>%s</span>."), 
         \config\Master::APPEARANCE['productname'], 
         \config\ConfAssistant::CONSORTIUM['display_name'], 
         \config\ConfAssistant::CONSORTIUM['display_name'], 

Spacing +6 added lines, -6 removed lines

@@ -42,24 +42,24 @@
         \config\ConfAssistant::CONSORTIUM['display_name'], 
         \config\Master::APPEARANCE['productname'], 
         \config\Master::APPEARANCE['productname']);
-$out .= "<p>" . sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), \config\Master::APPEARANCE['productname']) . "</p>";
-$out .= "<table><tr><th>" . _("Device Group") . "</th><th>" . _("Device") . "</th>";
+$out .= "<p>".sprintf(_("<span class='edu_cat'>%s</span> currently supports the following devices and EAP type combinations:"), \config\Master::APPEARANCE['productname'])."</p>";
+$out .= "<table><tr><th>"._("Device Group")."</th><th>"._("Device")."</th>";
 foreach (\core\common\EAP::listKnownEAPTypes() as $oneeap) {
-    $out .= "<th style='min-width: 80px;'>" . $oneeap->getPrintableRep() . "</th>";
+    $out .= "<th style='min-width: 80px;'>".$oneeap->getPrintableRep()."</th>";
 }
 $out .= "</tr>";
 foreach (\devices\Devices::listDevices() as $index => $onedevice) {
     if (isset($onedevice['options'])) {
-        if ((isset($onedevice['options']['hidden']) && ( $onedevice['options']['hidden'] == 1 || $onedevice['options']['hidden'] == 2 ))|| (isset($onedevice['options']['redirect']) && ($onedevice['options']['redirect'] == 1))) {
+        if ((isset($onedevice['options']['hidden']) && ($onedevice['options']['hidden'] == 1 || $onedevice['options']['hidden'] == 2)) || (isset($onedevice['options']['redirect']) && ($onedevice['options']['redirect'] == 1))) {
             continue;
         }
     }
-    $vendor = (new \web\lib\user\Skinjob())->findResourceUrl("IMAGES", "vendorlogo/" . $onedevice['group'] . ".png");
+    $vendor = (new \web\lib\user\Skinjob())->findResourceUrl("IMAGES", "vendorlogo/".$onedevice['group'].".png");
     $vendorImg = "";
     if ($vendor !== FALSE) {
         $vendorImg = "<img src='$vendor' alt='logo'>";
     }
-    $out .= "<tr><td class='vendor'>$vendorImg</td><td>" . $onedevice['display'] . "</td>";
+    $out .= "<tr><td class='vendor'>$vendorImg</td><td>".$onedevice['display']."</td>";
     $device_instance = new \core\DeviceFactory($index);
     foreach (\core\common\EAP::listKnownEAPTypes() as $oneeap) {
         $out .= "<td>";