GEANT / CAT

devices/xml/XML.php

Spacing +78 added lines, -78 removed lines

@@ -41,9 +41,9 @@ 
 public $VendorSpecific;
 
 public function writeDeviceInfo() {
-    $ssid_ct=count($this->attributes['internal:SSID']);
+    $ssid_ct = count($this->attributes['internal:SSID']);
     $out = "<p>";
-    $out .= sprintf(_("This is a generic configuration file in the IETF <a href='%s'>EAP Metadata -00</a> XML format."),"https://tools.ietf.org/html/draft-winter-opsawg-eap-metadata-00");
+    $out .= sprintf(_("This is a generic configuration file in the IETF <a href='%s'>EAP Metadata -00</a> XML format."), "https://tools.ietf.org/html/draft-winter-opsawg-eap-metadata-00");
     return $out;
     }
 
@@ -54,38 +54,38 @@ 
     $eap_idp = new EAPIdentityProvider();
 //    $eap_idp->setProperty('ValidUntil',$this->getValidUntil());
 // ProviderInfo->
-    $eap_idp->setProperty('ProviderInfo',$this->getProviderInfo());
+    $eap_idp->setProperty('ProviderInfo', $this->getProviderInfo());
 // TODO    $eap_idp->setProperty('VendorSpecific',$this->getVendorSpecific());
 //AuthenticationMethods
 // TODO
 //ID attribute
 //lang attribute
     $authmethods = [];
-    if($this->all_eaps) {
+    if ($this->all_eaps) {
       $EAPs = [];
       foreach ($attr['all_eaps'] as $eap) {
-         if(in_array($eap, $this->supportedEapMethods))
+         if (in_array($eap, $this->supportedEapMethods))
             $EAPs[] = $eap;
       }
     } else
-      $EAPs = [ $this->selected_eap];
+      $EAPs = [$this->selected_eap];
 
     foreach ($EAPs as $eap) {
        $authmethods[] = $this->getAuthMethod($eap);
     }
     $authenticationmethods = new AuthenticationMethods();
-    $authenticationmethods->setProperty('AuthenticationMethods',$authmethods);
-    $eap_idp->setProperty('AuthenticationMethods',$authenticationmethods);
-    if(empty($attr['internal:realm'][0])) {
-       $eap_idp->setAttribute('ID','undefined');
-       $eap_idp->setAttribute('namespace','urn:undefined');
+    $authenticationmethods->setProperty('AuthenticationMethods', $authmethods);
+    $eap_idp->setProperty('AuthenticationMethods', $authenticationmethods);
+    if (empty($attr['internal:realm'][0])) {
+       $eap_idp->setAttribute('ID', 'undefined');
+       $eap_idp->setAttribute('namespace', 'urn:undefined');
     } else {
-       $eap_idp->setAttribute('ID',$attr['internal:realm'][0]);
-       $eap_idp->setAttribute('namespace',$NAMESPACE);
+       $eap_idp->setAttribute('ID', $attr['internal:realm'][0]);
+       $eap_idp->setAttribute('namespace', $NAMESPACE);
     }
-    if($this->lang_scope === 'single')
-       $eap_idp->setAttribute('lang',$this->lang_index);
-    $eap_idp->setAttribute('version','1');
+    if ($this->lang_scope === 'single')
+       $eap_idp->setAttribute('lang', $this->lang_index);
+    $eap_idp->setAttribute('version', '1');
     
 
 // EAPIdentityProvider end
@@ -95,16 +95,16 @@ 
     $rootname = 'EAPIdentityProviderList';
     $root = new SimpleXMLElement("<?xml version=\"1.0\" encoding=\"utf-8\" ?><{$rootname} xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"eap-metadata.xsd\"></{$rootname}>");
 
-    marshalObject($root,$eap_idp);
+    marshalObject($root, $eap_idp);
     $dom = dom_import_simplexml($root)->ownerDocument;
-    $res = $dom->schemaValidate(CAT::$root .'/devices/xml/eap-metadata.xsd');
-    $f = fopen($this->installerBasename.'.eap-config',"w");
-    fwrite($f,$dom->saveXML());
+    $res = $dom->schemaValidate(CAT::$root . '/devices/xml/eap-metadata.xsd');
+    $f = fopen($this->installerBasename . '.eap-config', "w");
+    fwrite($f, $dom->saveXML());
     fclose($f);
-    return($this->installerBasename.'.eap-config');
+    return($this->installerBasename . '.eap-config');
 }
 
-private $AttributeNames =  [
+private $AttributeNames = [
    'support:email' => 'EmailAddress',
    'support:url'   => 'WebAddress',
    'support:phone' => 'Phone',
@@ -114,10 +114,10 @@ 
 ];
 
 private function getSimpleAttribute($attr_name) {
-   if(isset($this->attributes[$attr_name][0]) && $this->attributes[$attr_name][0]) {
+   if (isset($this->attributes[$attr_name][0]) && $this->attributes[$attr_name][0]) {
       $a = $this->attributes[$attr_name];
-      if(! isset($this->AttributeNames[$attr_name])) {
-         debug(4,"Missing class definition for $attr_name\n");
+      if (!isset($this->AttributeNames[$attr_name])) {
+         debug(4, "Missing class definition for $attr_name\n");
          return;
       }
       $class_name = $this->AttributeNames[$attr_name];
@@ -130,17 +130,17 @@ 
 
 
 private function getSimpleMLAttribute($attr_name) {
-   if(isset($this->attributes[$attr_name][0]) && $this->attributes[$attr_name][0]) {
+   if (isset($this->attributes[$attr_name][0]) && $this->attributes[$attr_name][0]) {
       $a = $this->attributes[$attr_name];
-      if(! isset($this->AttributeNames[$attr_name])) {
-         debug(4,"Missing class definition for $attr_name\n");
+      if (!isset($this->AttributeNames[$attr_name])) {
+         debug(4, "Missing class definition for $attr_name\n");
          return;
       }
       $class_name = $this->AttributeNames[$attr_name];
       $objs = [];
-      if($this->lang_scope === 'global') {
-         foreach( $a['langs'] as $l => $v ) {
-            $l = ( $l === 'C' ? 'any' : $l );
+      if ($this->lang_scope === 'global') {
+         foreach ($a['langs'] as $l => $v) {
+            $l = ($l === 'C' ? 'any' : $l);
             $obj = new $class_name();
             $obj->setValue($v);
             $obj->setAttributes(['lang' => $l]);
@@ -160,16 +160,16 @@ 
 private function getDisplayName() {
    $attr = $this->attributes;
    $objs = [];
-   if($this->lang_scope === 'global') {
+   if ($this->lang_scope === 'global') {
       $I = $attr['general:instname']['langs'];
-      if($attr['internal:profile_count'][0] > 1)
+      if ($attr['internal:profile_count'][0] > 1)
         $P = $attr['profile:name']['langs'];
-      foreach( $I as $l => $v ) {
-        $l = ( $l === 'C' ? 'any' : $l );
+      foreach ($I as $l => $v) {
+        $l = ($l === 'C' ? 'any' : $l);
         $displayname = new DisplayName();
-        if(isset($P)) {
+        if (isset($P)) {
           $p = isset($P[$l]) ? $P[$l] : $P['C'];  
-          $v .= ' - '. $p;
+          $v .= ' - ' . $p;
         }
         $displayname->setValue($v);
         $displayname->setAttributes(['lang' => $l]);
@@ -178,8 +178,8 @@ 
    } else {
    $displayname = new DisplayName();
    $v = $attr['general:instname'][0];
-   if($attr['internal:profile_count'][0] > 1)
-       $v .= ' - '.$attr['profile:name'][0];
+   if ($attr['internal:profile_count'][0] > 1)
+       $v .= ' - ' . $attr['profile:name'][0];
    $displayname->setValue($v);
      $objs[] = $displayname;
    }
@@ -188,9 +188,9 @@ 
 
 private function getProviderLogo() {
    $attr = $this->attributes;
-   if(isset($attr['general:logo_file'][0])){
+   if (isset($attr['general:logo_file'][0])) {
       $logo_string = base64_encode($attr['general:logo_file'][0]);
-      $logo_mime = 'image/'.$attr['internal:logo_file'][0]['mime'];
+      $logo_mime = 'image/' . $attr['internal:logo_file'][0]['mime'];
       $providerlogo = new ProviderLogo();
       $providerlogo->setAttributes(['mime'=>$logo_mime, 'encoding'=>'base64']);
       $providerlogo->setValue($logo_string);
@@ -200,34 +200,34 @@ 
 
 private function getProviderInfo() {
    $providerinfo = new ProviderInfo();
-   $providerinfo->setProperty('DisplayName',$this->getDisplayName());
-   $providerinfo->setProperty('Description',$this->getSimpleMLAttribute('profile:description'));
-   $providerinfo->setProperty('ProviderLocation',$this->getProvideLocation());
-   $providerinfo->setProperty('ProviderLogo',$this->getProviderLogo());
-   $providerinfo->setProperty('TermsOfUse',$this->getSimpleMLAttribute('support:info_file'));
-   $providerinfo->setProperty('Helpdesk',$this->getHelpdesk());
+   $providerinfo->setProperty('DisplayName', $this->getDisplayName());
+   $providerinfo->setProperty('Description', $this->getSimpleMLAttribute('profile:description'));
+   $providerinfo->setProperty('ProviderLocation', $this->getProvideLocation());
+   $providerinfo->setProperty('ProviderLogo', $this->getProviderLogo());
+   $providerinfo->setProperty('TermsOfUse', $this->getSimpleMLAttribute('support:info_file'));
+   $providerinfo->setProperty('Helpdesk', $this->getHelpdesk());
    return $providerinfo;
 }
 
 private function getProvideLocation() {
    $attr = $this->attributes;
-   if(isset($attr['general:geo_coordinates'])){
+   if (isset($attr['general:geo_coordinates'])) {
       $at = $attr['general:geo_coordinates'];
       if (count($at) > 1) {
           $at1 = [];
           foreach ($at as $a) {
                $providerlocation = new ProviderLocation();
                $b = unserialize($a);
-               $providerlocation->setProperty('Longitude',$b['lon']);
-               $providerlocation->setProperty('Latitude',$b['lat']);
+               $providerlocation->setProperty('Longitude', $b['lon']);
+               $providerlocation->setProperty('Latitude', $b['lat']);
                $at1[] = $providerlocation;
           }
          }
          else {
                $providerlocation = new ProviderLocation();
                $b = unserialize($at[0]);
-               $providerlocation->setProperty('Longitude',$b['lon']);
-               $providerlocation->setProperty('Latitude',$b['lat']);
+               $providerlocation->setProperty('Longitude', $b['lon']);
+               $providerlocation->setProperty('Latitude', $b['lat']);
                $at1 = $providerlocation;
          }
          return$at1;
@@ -236,9 +236,9 @@ 
   
 private function getHelpdesk() {
    $helpdesk = new Helpdesk();
-   $helpdesk->setProperty('EmailAddress',$this->getSimpleMLAttribute('support:email'));
-   $helpdesk->setProperty('WebAddress',$this->getSimpleMLAttribute('support:url'));
-   $helpdesk->setProperty('Phone',$this->getSimpleMLAttribute('support:phone'));
+   $helpdesk->setProperty('EmailAddress', $this->getSimpleMLAttribute('support:email'));
+   $helpdesk->setProperty('WebAddress', $this->getSimpleMLAttribute('support:url'));
+   $helpdesk->setProperty('Phone', $this->getSimpleMLAttribute('support:phone'));
    return $helpdesk;  
 }
 
@@ -248,11 +248,11 @@ 
    $ieee80211s = [];
    foreach ($SSIDs as $ssid => $ciph) {
       $ieee80211 = new IEEE80211();
-      $ieee80211->setProperty('SSID',$ssid);
+      $ieee80211->setProperty('SSID', $ssid);
       $ieee80211->setProperty('MinRSNProto', $ciph == 'AES' ? 'CCMP' : 'TKIP');
       $ieee80211s[] = $ieee80211;
    }
-   $compatibleuses->setProperty('IEEE80211',$ieee80211s);
+   $compatibleuses->setProperty('IEEE80211', $ieee80211s);
 // TODO IEEE8023, ABFAB
    return($compatibleuses);
 }
@@ -261,17 +261,17 @@ 
    $inner = EAP::innerAuth($eap);
    $outer_id = $eap["OUTER"];
 
-   if(isset($inner["METHOD"]) && $inner["METHOD"]) {
+   if (isset($inner["METHOD"]) && $inner["METHOD"]) {
       $innerauthmethod = new InnerAuthenticationMethod();
       $class_name = $inner["EAP"] ? 'EAPMethod' : 'NonEAPAuthMethod';
       $eapmethod = new $class_name();
       $eaptype = new  Type();
       $eaptype->setValue($inner['METHOD']); 
-      $eapmethod->setProperty('Type',$eaptype);
-      $innerauthmethod->setProperty($class_name,$eapmethod);
-      return ['inner_method'=>$innerauthmethod,'methodID'=> $outer_id, 'inner_methodID'=>$inner['METHOD']];
+      $eapmethod->setProperty('Type', $eaptype);
+      $innerauthmethod->setProperty($class_name, $eapmethod);
+      return ['inner_method'=>$innerauthmethod, 'methodID'=> $outer_id, 'inner_methodID'=>$inner['METHOD']];
    } else
-   return ['inner_method'=>0,'methodID'=>$outer_id, 'inner_methodID'=>0];
+   return ['inner_method'=>0, 'methodID'=>$outer_id, 'inner_methodID'=>0];
 }
 
 private function getAuthMethod($eap) {
@@ -281,19 +281,19 @@ 
    $eapmethod = new EAPMethod();
    $eaptype = new Type();
    $eaptype->setValue($eapParams['methodID']);
-   $eapmethod->setProperty('Type',$eaptype);
-   if(isset($this->VendorSpecific)) {
+   $eapmethod->setProperty('Type', $eaptype);
+   if (isset($this->VendorSpecific)) {
      $vendorspecifics = [];
-     foreach($this->VendorSpecific as $vs) {
+     foreach ($this->VendorSpecific as $vs) {
         $vendorspecific = new VendorSpecific();
-        $vs['value']->addAttribute('xsi:noNamespaceSchemaLocation',"xxx.xsd");
+        $vs['value']->addAttribute('xsi:noNamespaceSchemaLocation', "xxx.xsd");
         $vendorspecific->setValue($vs['value']);
         $vendorspecific->setAttributes(['vendor'=>$vs['vendor']]);
         $vendorspecifics[] = $vendorspecific;
      }
-     $eapmethod->setProperty('VendorSpecific',$vendorspecifics);
+     $eapmethod->setProperty('VendorSpecific', $vendorspecifics);
    }
-   $authmethod->setProperty('EAPMethod',$eapmethod);
+   $authmethod->setProperty('EAPMethod', $eapmethod);
 
 // ServerSideCredentials
    $serversidecredential = new ServerSideCredential();
@@ -317,22 +317,22 @@ 
       $serverids[] = $serverid; 
    }
 
-   $serversidecredential->setProperty('EAPType',$eaptype->getValue());
-   $serversidecredential->setProperty('CA',$CAs);
-   $serversidecredential->setProperty('ServerID',$serverids);
-   $authmethod->setProperty('ServerSideCredential',$serversidecredential);
+   $serversidecredential->setProperty('EAPType', $eaptype->getValue());
+   $serversidecredential->setProperty('CA', $CAs);
+   $serversidecredential->setProperty('ServerID', $serverids);
+   $authmethod->setProperty('ServerSideCredential', $serversidecredential);
 
 // ClientSideCredentials
 
    $clientsidecredential = new ClientSideCredential();
 
 // OuterIdentity 
-   if($attr['internal:use_anon_outer'] [0])
-      $clientsidecredential->setProperty('OuterIdentity',$attr['internal:anon_local_value'][0].'@'.$attr['internal:realm'][0]);
-   $clientsidecredential->setProperty('EAPType',$eapParams['inner_methodID'] ? $eapParams['inner_methodID'] : $eapParams['methodID']);
-   $authmethod->setProperty('ClientSideCredential',$clientsidecredential);
-   if($eapParams['inner_method'])
-      $authmethod->setProperty('InnerAuthenticationMethod',$eapParams['inner_method']);
+   if ($attr['internal:use_anon_outer'] [0])
+      $clientsidecredential->setProperty('OuterIdentity', $attr['internal:anon_local_value'][0] . '@' . $attr['internal:realm'][0]);
+   $clientsidecredential->setProperty('EAPType', $eapParams['inner_methodID'] ? $eapParams['inner_methodID'] : $eapParams['methodID']);
+   $authmethod->setProperty('ClientSideCredential', $clientsidecredential);
+   if ($eapParams['inner_method'])
+      $authmethod->setProperty('InnerAuthenticationMethod', $eapParams['inner_method']);
    return $authmethod;
 }
 

devices/xml/XML_TTLS_MSCHAP2.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 
 class Device_XML_TTLS_MSCHAP2 extends Device_XML {
     final public function __construct() {
-      $this->supportedEapMethods  =
+      $this->supportedEapMethods =
             [
               EAP::$TTLS_MSCHAP2,
        ];

devices/xml/XML_PWD.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 
 class Device_XML_PWD extends Device_XML {
     final public function __construct() {
-      $this->supportedEapMethods  =
+      $this->supportedEapMethods =
             [
               EAP::$PWD,
        ];

devices/xml/Lollipop.php

Spacing +2 added lines, -2 removed lines

@@ -3,9 +3,9 @@
 require_once('DeviceConfig.php');
 require_once('XML.php');
 
-class Device_Lollipop extends Device_XML{
+class Device_Lollipop extends Device_XML {
     final public function __construct() {
-      $this->supportedEapMethods  =
+      $this->supportedEapMethods =
             [
               EAP::$PEAP_MSCHAP2,
               EAP::$TTLS_PAP,

devices/chromebook/chromebook.php

Spacing +3 added lines, -3 removed lines

@@ -172,13 +172,13 @@
         // define CA certificates
         foreach ($this->attributes['internal:CAs'][0] as $ca) {
             // strip -----BEGIN CERTIFICATE----- and -----END CERTIFICATE-----
-            debug(2,$ca['pem']);
+            debug(2, $ca['pem']);
             $ca_sanitized = substr($ca['pem'], 27, strlen($ca['pem']) - 27 - 25 - 1);
-            debug(2,$ca_sanitized."\n");
+            debug(2, $ca_sanitized . "\n");
             // remove \n
             $ca_sanitized = str_replace("\n", "", $ca_sanitized);
             $json_array["Certificates"][] = ["GUID" => "{" . $ca['uuid'] . "}", "Type" => "Authority", "X509" => $ca_sanitized];
-            debug(2,$ca_sanitized."\n");
+            debug(2, $ca_sanitized . "\n");
         }
                 
         $output_json = json_encode($json_array, JSON_PRETTY_PRINT);

devices/apple_mobileconfig/mobileconfig_superclass.php

Spacing +5 added lines, -5 removed lines

@@ -127,7 +127,7 @@ 
       <key>PayloadIdentifier</key>
          <string>" . mobileconfig_superclass::$IPHONE_PAYLOAD_PREFIX . ".$this->massaged_consortium.$this->massaged_country.$this->massaged_inst.$this->massaged_profile.$this->lang</string>
       <key>PayloadOrganization</key>
-         <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ( $this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string>
+         <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ($this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string>
       <key>PayloadType</key>
          <string>Configuration</string>
       <key>PayloadUUID</key>
@@ -164,7 +164,7 @@ 
     public function writeDeviceInfo() {
         $ssid_ct = count($this->attributes['internal:SSID']);
         $cert_ct = count($this->attributes['internal:CAs'][0]);
-        $out = "<p>"._("For best results, please use the built-in browser (Safari) to open the configuration file.")."</p>";
+        $out = "<p>" . _("For best results, please use the built-in browser (Safari) to open the configuration file.") . "</p>";
         $out .= "<p>";
         $out .= _("The profile will install itself after you click (or tap) the button. You will be asked for confirmation/input at several points:");
         $out .= "<ul>";
@@ -273,13 +273,13 @@ 
             $retval .= "wifi." . $this->serial;
         else
             $retval .= "hs20";
-        $retval .="</string>
+        $retval .= "</string>
                <key>PayloadOrganization</key>
                   <string>" . $this->massaged_consortium . ".1x-config.org</string>
                <key>PayloadType</key>
                   <string>com.apple." . ($wired ? "firstactiveethernet" : "wifi") . ".managed</string>";
         debug(2, get_class($this));
-        if ( get_class($this) != "Device_mobileconfig_ios_56" ) {
+        if (get_class($this) != "Device_mobileconfig_ios_56") {
         $retval .= "<key>ProxyType</key>
                   <string>Auto</string>
                 ";
@@ -348,7 +348,7 @@ 
 	<string>" . uuid() . "</string>
 	<key>PayloadVersion</key>
 	<real>1</real>";
-        if ( get_class($this) != "Device_mobileconfig_ios_56") {
+        if (get_class($this) != "Device_mobileconfig_ios_56") {
         $retval .= "<key>ProxyType</key>
 	<string>Auto</string>";
         }