GEANT / CAT

devices/xml/XML_ALL.php

Indentation +9 added lines, -9 removed lines

@@ -5,16 +5,16 @@
 
 class Device_XML_ALL extends Device_XML{
     final public function __construct() {
-      $this->supportedEapMethods  =
+        $this->supportedEapMethods  =
             [
-              EAP::$PEAP_MSCHAP2,
-              EAP::$TTLS_PAP,
-              EAP::$TTLS_MSCHAP2,
-              EAP::$TLS,
-              EAP::$PWD,
-       ];
-      $this->lang_scope = 'single';
-      $this->all_eaps = TRUE;
+                EAP::$PEAP_MSCHAP2,
+                EAP::$TTLS_PAP,
+                EAP::$TTLS_MSCHAP2,
+                EAP::$TLS,
+                EAP::$PWD,
+        ];
+        $this->lang_scope = 'single';
+        $this->all_eaps = TRUE;
     }
 }
 

devices/xml/KitKat.php

Indentation +7 added lines, -7 removed lines

@@ -5,14 +5,14 @@
 
 class Device_KitKat extends Device_XML{
     final public function __construct() {
-      $this->supportedEapMethods  =
+        $this->supportedEapMethods  =
             [
-              EAP::$PEAP_MSCHAP2,
-              EAP::$TTLS_PAP,
-              EAP::$TTLS_MSCHAP2,
-       ];
-      $this->lang_scope = 'single';
-      $this->all_eaps = TRUE;
+                EAP::$PEAP_MSCHAP2,
+                EAP::$TTLS_PAP,
+                EAP::$TTLS_MSCHAP2,
+        ];
+        $this->lang_scope = 'single';
+        $this->all_eaps = TRUE;
     }
 }
 

devices/xml/XML_TLS.php

Indentation +4 added lines, -4 removed lines

@@ -5,11 +5,11 @@
 
 class Device_XML_TLS extends Device_XML {
     final public function __construct() {
-      $this->supportedEapMethods  =
+        $this->supportedEapMethods  =
             [
-              EAP::$TLS,
-       ];
-      $this->lang_scope = 'single';
+                EAP::$TLS,
+        ];
+        $this->lang_scope = 'single';
     }
 }
 

devices/xml/XML.inc.php

Indentation +119 added lines, -119 removed lines

@@ -20,100 +20,100 @@ 
  * base class extended by every element
  */
 class XMLElement {
-  private $attributes;
-  private $value;
+    private $attributes;
+    private $value;
 
-  protected function getObjectVars($obj) {
-  return get_object_vars($obj);
-  }
+    protected function getObjectVars($obj) {
+    return get_object_vars($obj);
+    }
 /**
- *  @var array $AuthMethodElements is used to limit
- *  XML elements present within ServerSideCredentials and
- *  ClientSideCredentials to ones which are relevant
- *  for a given EAP method.
- *  @var array of XLM element names which are allowed
- *  EAP method names are defined in core/EAP.php
- */
-  public static $AuthMethodElements =  [
-     'server' => [
+     *  @var array $AuthMethodElements is used to limit
+     *  XML elements present within ServerSideCredentials and
+     *  ClientSideCredentials to ones which are relevant
+     *  for a given EAP method.
+     *  @var array of XLM element names which are allowed
+     *  EAP method names are defined in core/EAP.php
+     */
+    public static $AuthMethodElements =  [
+        'server' => [
         TLS => ['CA', 'ServerID'],
         FAST => ['CA','ServerID'],
         PEAP => ['CA','ServerID'],
         TTLS => ['CA','ServerID'],
         PWD => [],
-     ],
-     'client' => [
-       TLS => ['UserName','Password','ClientCertificate'], 
-       MSCHAP2 => ['UserName','Password','OuterIdentity'], 
-       GTC => ['UserName','OneTimeToken'], 
-       NE_PAP => ['UserName','Password','OuterIdentity'], 
-     ]
-  ];
+        ],
+        'client' => [
+        TLS => ['UserName','Password','ClientCertificate'], 
+        MSCHAP2 => ['UserName','Password','OuterIdentity'], 
+        GTC => ['UserName','OneTimeToken'], 
+        NE_PAP => ['UserName','Password','OuterIdentity'], 
+        ]
+    ];
 
-  public function __construct() {
+    public function __construct() {
     $this->attributes = [];
     $this->value = [];
-  }
-  public function setAttributes($attributes) {
+    }
+    public function setAttributes($attributes) {
     $this->attributes = $attributes;
-  }
-  public function getAttributes() {
+    }
+    public function getAttributes() {
     return $this->attributes;
-  }
-  public function setValue($value) {
+    }
+    public function setValue($value) {
     $this->value = $value;
-  }
-  public function getValue() {
+    }
+    public function getValue() {
     return $this->value;
-  }
-  public function areAttributes() {
+    }
+    public function areAttributes() {
     return empty($this->attributes)?0:1;
-  }
-  public function setAttribute($attribute,$value) {
+    }
+    public function setAttribute($attribute,$value) {
     if( ! isset($this->attributes))
-       $this->attributes = [];
+        $this->attributes = [];
     $this->attributes[$attribute] = $value;
-  }
-  public function setProperty($property,$value) {
+    }
+    public function setProperty($property,$value) {
     $this->$property = $value;
-  }
-  public function getAll() {
+    }
+    public function getAll() {
     $elems = get_object_vars($this);
     $objvars = [];
     foreach ($elems as $key=>$val) 
-      if ( ($key!='attributes') && ($key!='value') ) 
+        if ( ($key!='attributes') && ($key!='value') ) 
         $objvars[$key] = $val;
     return $objvars;
-  }
+    }
 }
 class EAPIdentityProvider extends XMLElement {
-  protected $ValidUntil; 
-  protected $AuthenticationMethods;
-  protected $ProviderInfo;
-  protected $VendorSpecific;
+    protected $ValidUntil; 
+    protected $AuthenticationMethods;
+    protected $ProviderInfo;
+    protected $VendorSpecific;
 }
 
 class AuthenticationMethods extends XMLElement {
-  protected $AuthenticationMethod;
+    protected $AuthenticationMethod;
 }
 
 class AuthenticationMethod extends XMLElement {
-  protected $EAPMethod;
-  protected $ServerSideCredential;
-  protected $ClientSideCredential;
-  protected $InnerAuthenticationMethod;
+    protected $EAPMethod;
+    protected $ServerSideCredential;
+    protected $ClientSideCredential;
+    protected $InnerAuthenticationMethod;
 }
 
 class EAPMethod extends XMLElement {
-  protected $Type;
-  protected $TypeSpecific;
-  protected $VendorSpecific;
+    protected $Type;
+    protected $TypeSpecific;
+    protected $VendorSpecific;
 }
 
 class NonEAPAuthMethod extends XMLElement {
-  protected $Type;
-  protected $TypeSpecific;
-  protected $VendorSpecific;
+    protected $Type;
+    protected $TypeSpecific;
+    protected $VendorSpecific;
 }
 
 class Type extends XMLElement {
@@ -126,34 +126,34 @@ 
 }
 
 class ServerSideCredential extends XMLElement {
-  protected $CA; // multi
-  protected $ServerID; //multi
-  public function getAll() {
+    protected $CA; // multi
+    protected $ServerID; //multi
+    public function getAll() {
     if(isset(XMLElement::$AuthMethodElements['server'][$this->EAPType]) && XMLElement::$AuthMethodElements['server'][$this->EAPType]) {
     $E = XMLElement::$AuthMethodElements['server'][$this->EAPType];
     $out = get_object_vars($this);
     $OUT = [];
     foreach ($out as $o => $v) {
-       if(in_array($o, $E)) 
-         $OUT[$o] = $v;
+        if(in_array($o, $E)) 
+            $OUT[$o] = $v;
     }
     return($OUT);
-  }
-  }
+    }
+    }
 }
 
 class ServerID extends XMLElement {
 }
 
 class ClientSideCredential extends XMLElement {
-  protected $OuterIdentity;
-  protected $UserName;
-  protected $Password;
-  protected $ClientCertificate;
-  protected $Passphrase;
-  protected $PAC;
-  protected $ProvisionPAC;
-  public function getAll() {
+    protected $OuterIdentity;
+    protected $UserName;
+    protected $Password;
+    protected $ClientCertificate;
+    protected $Passphrase;
+    protected $PAC;
+    protected $ProvisionPAC;
+    public function getAll() {
     if(isset(XMLElement::$AuthMethodElements['client'][$this->EAPType]) && XMLElement::$AuthMethodElements['client'][$this->EAPType]) {
     $E = XMLElement::$AuthMethodElements['client'][$this->EAPType];
     $out = get_object_vars($this);
@@ -161,31 +161,31 @@ 
 debug(4,"EEE:".$this->EAPType.":\n");
 debug(4,$E);
     foreach ($out as $o => $v) {
-       if(in_array($o, $E)) 
-          $OUT[$o] = $v;
+        if(in_array($o, $E)) 
+            $OUT[$o] = $v;
     }
     return($OUT);
     }
-  }
+    }
 }
 class ClientCertificate extends XMLElement {
 }
 class CA extends XMLElement {
 }
 class InnerAuthenticationMethod extends XMLElement {
-  protected $EAPMethod;
-  protected $NonEAPAuthMethod;
-  protected $ServerSideCredential;
-  protected $ClientSideCredential;
+    protected $EAPMethod;
+    protected $NonEAPAuthMethod;
+    protected $ServerSideCredential;
+    protected $ClientSideCredential;
 }
 
 class ProviderInfo extends XMLElement {
-  protected $DisplayName;
-  protected $Description;
-  protected $ProviderLocation;
-  protected $ProviderLogo;
-  protected $TermsOfUse;
-  protected $Helpdesk;
+    protected $DisplayName;
+    protected $Description;
+    protected $ProviderLocation;
+    protected $ProviderLogo;
+    protected $TermsOfUse;
+    protected $Helpdesk;
 }
 
 class DisplayName extends XMLElement {
@@ -195,8 +195,8 @@ 
 }
 
 class ProviderLocation extends XMLElement {
-  protected $Longitude;
-  protected $Latitude;
+    protected $Longitude;
+    protected $Latitude;
 }
 
 class ProviderLogo  extends XMLElement {
@@ -206,9 +206,9 @@ 
 }
 
 class Helpdesk extends XMLElement {
-  protected $EmailAddress;
-  protected $WebAddress;
-  protected $Phone;
+    protected $EmailAddress;
+    protected $WebAddress;
+    protected $Phone;
 }
 
 class EmailAddress extends XMLElement {
@@ -242,61 +242,61 @@ 
 
 */
 function SimpleXMLElement_append($key, $value) {
-  if (trim((string) $value) == '') {
+    if (trim((string) $value) == '') {
     $element = $key->addChild($value->getName());
     foreach ($value->attributes() as $attKey => $attValue) {
-      $element->addAttribute($attKey, $attValue);
+        $element->addAttribute($attKey, $attValue);
     }
     foreach ($value->children() as $child) {
-      SimpleXMLElement_append($element, $child);
+        SimpleXMLElement_append($element, $child);
     }
-  } else {
+    } else {
     $element = $key->addChild($value->getName(), trim((string) $value));
-  }
+    }
 }
 
 function marshalObject($node, $object) {
 
-  $name = get_class($object);
-  $name = preg_replace("/_/", "-", $name);
-  if ($object->getValue()) $val = $object->getValue();
-  else $val = '';
-  $simplexmlelement = '';
-  if ($val instanceof SimpleXMLElement) {
+    $name = get_class($object);
+    $name = preg_replace("/_/", "-", $name);
+    if ($object->getValue()) $val = $object->getValue();
+    else $val = '';
+    $simplexmlelement = '';
+    if ($val instanceof SimpleXMLElement) {
     $simplexmlelement = $val;
     $val = '';
-  }
-  if ($val) { 
+    }
+    if ($val) { 
     if(getType($val) == 'string')
-       $val = preg_replace('/&/','&',$val);
+        $val = preg_replace('/&/','&',$val);
     $node = $node->addChild($name, $val);
-  } 
-  else 
+    } 
+    else 
     $node = $node->addChild($name);
-  if ($object->areAttributes()) {
+    if ($object->areAttributes()) {
     $attrs = $object->getAttributes();
     foreach ($attrs as $attrt=>$attrv)
-      $node->addAttribute($attrt, $attrv);
-  }
-  if ($simplexmlelement == '') {
+        $node->addAttribute($attrt, $attrv);
+    }
+    if ($simplexmlelement == '') {
     $fields = $object->getAll();
     if (!empty($fields)) {
-      foreach ($fields as $name=>$value) {
+        foreach ($fields as $name=>$value) {
         if (getType($value)=='string' || getType($value)=='integer' || getType($value)=='double') {
-          $node->addChild($name, $value);
+            $node->addChild($name, $value);
         } else {
-          if (getType($value)=='array') {
+            if (getType($value)=='array') {
             foreach ($value as $v)
-              if (is_object($v))
+                if (is_object($v))
                 marshalObject($node, $v);
-          } else if (getType($value)=='object')  {
+            } else if (getType($value)=='object')  {
             marshalObject($node, $value);
-          }
+            }
+        }
         }
-      }
     }
-  } else {
+    } else {
     SimpleXMLElement_append($node, $simplexmlelement);
-  }
+    }
 }
 

devices/xml/XML_PEAP.php

Indentation +4 added lines, -4 removed lines

@@ -5,11 +5,11 @@
 
 class Device_XML_PEAP extends Device_XML {
     final public function __construct() {
-      $this->supportedEapMethods  =
+        $this->supportedEapMethods  =
             [
-              EAP::$PEAP_MSCHAP2,
-       ];
-      $this->lang_scope = 'single';
+                EAP::$PEAP_MSCHAP2,
+        ];
+        $this->lang_scope = 'single';
     }
 }
 

devices/xml/XML.php

Indentation +186 added lines, -186 removed lines

@@ -22,13 +22,13 @@ 
 require_once('XML.inc.php');
 
 /**
-  * This class implements full functionality of the generic XML device
-  * the only fuction of the extenstions of this class is to specify
-  * supported EAP methods.
-  * Instead of specifying supported EAPS an extension can set $all_eaps to true
-  * this will cause the installer to configure all EAP methods supported by 
-  * the current profile and declared by the given device.
-  */
+ * This class implements full functionality of the generic XML device
+ * the only fuction of the extenstions of this class is to specify
+ * supported EAP methods.
+ * Instead of specifying supported EAPS an extension can set $all_eaps to true
+ * this will cause the installer to configure all EAP methods supported by 
+ * the current profile and declared by the given device.
+ */
 abstract class Device_XML extends DeviceConfig {
 
 /**
@@ -62,29 +62,29 @@ 
 //lang attribute
     $authmethods = [];
     if($this->all_eaps) {
-      $EAPs = [];
-      foreach ($attr['all_eaps'] as $eap) {
-         if(in_array($eap, $this->supportedEapMethods))
+        $EAPs = [];
+        foreach ($attr['all_eaps'] as $eap) {
+            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);
+        $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');
+        $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('lang',$this->lang_index);
     $eap_idp->setAttribute('version','1');
     
 
@@ -105,235 +105,235 @@ 
 }
 
 private $AttributeNames =  [
-   'support:email' => 'EmailAddress',
-   'support:url'   => 'WebAddress',
-   'support:phone' => 'Phone',
-   'profile:description' => 'Description',
-   'support:info_file' => 'TermsOfUse',
-   'general:logo_file' => 'ProviderLogo',
+    'support:email' => 'EmailAddress',
+    'support:url'   => 'WebAddress',
+    'support:phone' => 'Phone',
+    'profile:description' => 'Description',
+    'support:info_file' => 'TermsOfUse',
+    'general:logo_file' => 'ProviderLogo',
 ];
 
 private function getSimpleAttribute($attr_name) {
-   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");
-         return;
-      }
-      $class_name = $this->AttributeNames[$attr_name];
-      $obj = new $class_name();
-      $obj->setValue($a[0]);
-      return($obj);   
-   } else
-     return '';
+    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");
+            return;
+        }
+        $class_name = $this->AttributeNames[$attr_name];
+        $obj = new $class_name();
+        $obj->setValue($a[0]);
+        return($obj);   
+    } else
+        return '';
 }
 
 
 private function getSimpleMLAttribute($attr_name) {
-   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");
-         return;
-      }
-      $class_name = $this->AttributeNames[$attr_name];
-      $objs = [];
-      if($this->lang_scope === 'global') {
-         foreach( $a['langs'] as $l => $v ) {
+    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");
+            return;
+        }
+        $class_name = $this->AttributeNames[$attr_name];
+        $objs = [];
+        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]);
             $objs[] = $obj;
-         }
-       } else {
-         $obj = new $class_name();
-         $obj->setValue($a[0]);
-         $objs[] = $obj;
-      }
-
-      return($objs);
-      } else
-     return '';
+            }
+        } else {
+            $obj = new $class_name();
+            $obj->setValue($a[0]);
+            $objs[] = $obj;
+        }
+
+        return($objs);
+        } else
+        return '';
 }
 
 private function getDisplayName() {
-   $attr = $this->attributes;
-   $objs = [];
-   if($this->lang_scope === 'global') {
-      $I = $attr['general:instname']['langs'];
-      if($attr['internal:profile_count'][0] > 1)
+    $attr = $this->attributes;
+    $objs = [];
+    if($this->lang_scope === 'global') {
+        $I = $attr['general:instname']['langs'];
+        if($attr['internal:profile_count'][0] > 1)
         $P = $attr['profile:name']['langs'];
-      foreach( $I as $l => $v ) {
+        foreach( $I as $l => $v ) {
         $l = ( $l === 'C' ? 'any' : $l );
         $displayname = new DisplayName();
         if(isset($P)) {
-          $p = isset($P[$l]) ? $P[$l] : $P['C'];  
-          $v .= ' - '. $p;
+            $p = isset($P[$l]) ? $P[$l] : $P['C'];  
+            $v .= ' - '. $p;
         }
         $displayname->setValue($v);
         $displayname->setAttributes(['lang' => $l]);
         $objs[] = $displayname;
-      }
-   } else {
-   $displayname = new DisplayName();
-   $v = $attr['general:instname'][0];
-   if($attr['internal:profile_count'][0] > 1)
-       $v .= ' - '.$attr['profile:name'][0];
-   $displayname->setValue($v);
-     $objs[] = $displayname;
-   }
-   return $objs;
+        }
+    } else {
+    $displayname = new DisplayName();
+    $v = $attr['general:instname'][0];
+    if($attr['internal:profile_count'][0] > 1)
+        $v .= ' - '.$attr['profile:name'][0];
+    $displayname->setValue($v);
+        $objs[] = $displayname;
+    }
+    return $objs;
 }
 
 private function getProviderLogo() {
-   $attr = $this->attributes;
-   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'];
-      $providerlogo = new ProviderLogo();
-      $providerlogo->setAttributes(['mime'=>$logo_mime, 'encoding'=>'base64']);
-      $providerlogo->setValue($logo_string);
-      return $providerlogo;
-  }
+    $attr = $this->attributes;
+    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'];
+        $providerlogo = new ProviderLogo();
+        $providerlogo->setAttributes(['mime'=>$logo_mime, 'encoding'=>'base64']);
+        $providerlogo->setValue($logo_string);
+        return $providerlogo;
+    }
 }
 
 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());
-   return $providerinfo;
+    $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());
+    return $providerinfo;
 }
 
 private function getProvideLocation() {
-   $attr = $this->attributes;
-   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']);
-               $at1[] = $providerlocation;
-          }
-         }
-         else {
-               $providerlocation = new ProviderLocation();
-               $b = unserialize($at[0]);
-               $providerlocation->setProperty('Longitude',$b['lon']);
-               $providerlocation->setProperty('Latitude',$b['lat']);
-               $at1 = $providerlocation;
-         }
-         return$at1;
+    $attr = $this->attributes;
+    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']);
+                $at1[] = $providerlocation;
+            }
+            }
+            else {
+                $providerlocation = new ProviderLocation();
+                $b = unserialize($at[0]);
+                $providerlocation->setProperty('Longitude',$b['lon']);
+                $providerlocation->setProperty('Latitude',$b['lat']);
+                $at1 = $providerlocation;
+            }
+            return$at1;
     }
 }
   
 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'));
-   return $helpdesk;  
+    $helpdesk = new Helpdesk();
+    $helpdesk->setProperty('EmailAddress',$this->getSimpleMLAttribute('support:email'));
+    $helpdesk->setProperty('WebAddress',$this->getSimpleMLAttribute('support:url'));
+    $helpdesk->setProperty('Phone',$this->getSimpleMLAttribute('support:phone'));
+    return $helpdesk;  
 }
 
 private function getCompatibleUses() {
-   $SSIDs = $this->attributes['internal:SSID'];
-   $compatibleuses = new CompatibleUses();
-   $ieee80211s = [];
-   foreach ($SSIDs as $ssid => $ciph) {
-      $ieee80211 = new IEEE80211();
-      $ieee80211->setProperty('SSID',$ssid);
-      $ieee80211->setProperty('MinRSNProto', $ciph == 'AES' ? 'CCMP' : 'TKIP');
-      $ieee80211s[] = $ieee80211;
-   }
-   $compatibleuses->setProperty('IEEE80211',$ieee80211s);
+    $SSIDs = $this->attributes['internal:SSID'];
+    $compatibleuses = new CompatibleUses();
+    $ieee80211s = [];
+    foreach ($SSIDs as $ssid => $ciph) {
+        $ieee80211 = new IEEE80211();
+        $ieee80211->setProperty('SSID',$ssid);
+        $ieee80211->setProperty('MinRSNProto', $ciph == 'AES' ? 'CCMP' : 'TKIP');
+        $ieee80211s[] = $ieee80211;
+    }
+    $compatibleuses->setProperty('IEEE80211',$ieee80211s);
 // TODO IEEE8023, ABFAB
-   return($compatibleuses);
+    return($compatibleuses);
 }
 
 private function getAuthenticationMethodParams($eap) {
-   $inner = EAP::innerAuth($eap);
-   $outer_id = $eap["OUTER"];
-
-   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']];
-   } else
-   return ['inner_method'=>0,'methodID'=>$outer_id, 'inner_methodID'=>0];
+    $inner = EAP::innerAuth($eap);
+    $outer_id = $eap["OUTER"];
+
+    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']];
+    } else
+    return ['inner_method'=>0,'methodID'=>$outer_id, 'inner_methodID'=>0];
 }
 
 private function getAuthMethod($eap) {
-   $attr = $this->attributes;
-   $eapParams = $this->getAuthenticationMethodParams($eap);
-   $authmethod = new AuthenticationMethod();
-   $eapmethod = new EAPMethod();
-   $eaptype = new Type();
-   $eaptype->setValue($eapParams['methodID']);
-   $eapmethod->setProperty('Type',$eaptype);
-   if(isset($this->VendorSpecific)) {
-     $vendorspecifics = [];
-     foreach($this->VendorSpecific as $vs) {
+    $attr = $this->attributes;
+    $eapParams = $this->getAuthenticationMethodParams($eap);
+    $authmethod = new AuthenticationMethod();
+    $eapmethod = new EAPMethod();
+    $eaptype = new Type();
+    $eaptype->setValue($eapParams['methodID']);
+    $eapmethod->setProperty('Type',$eaptype);
+    if(isset($this->VendorSpecific)) {
+        $vendorspecifics = [];
+        foreach($this->VendorSpecific as $vs) {
         $vendorspecific = new VendorSpecific();
         $vs['value']->addAttribute('xsi:noNamespaceSchemaLocation',"xxx.xsd");
         $vendorspecific->setValue($vs['value']);
         $vendorspecific->setAttributes(['vendor'=>$vs['vendor']]);
         $vendorspecifics[] = $vendorspecific;
-     }
-     $eapmethod->setProperty('VendorSpecific',$vendorspecifics);
-   }
-   $authmethod->setProperty('EAPMethod',$eapmethod);
+        }
+        $eapmethod->setProperty('VendorSpecific',$vendorspecifics);
+    }
+    $authmethod->setProperty('EAPMethod',$eapmethod);
 
 // ServerSideCredentials
-   $serversidecredential = new ServerSideCredential();
+    $serversidecredential = new ServerSideCredential();
 
 // Certificates and server names
 
-   $CAs = [];
-   $cas = $attr['internal:CAs'][0];
-   foreach ($cas as $ca) {
-      $CA = new CA();
-      $CA->setValue(base64_encode($ca['der']));
-      $CA->setAttributes(['format'=>'X.509', 'encoding'=>'base64']);
-      $CAs[] = $CA;
-   }
-
-   $serverids = [];
-   $servers = $attr['eap:server_name'];
-   foreach ($servers as $server) {
-      $serverid = new ServerID();
-      $serverid->setValue($server);
-      $serverids[] = $serverid; 
-   }
-
-   $serversidecredential->setProperty('EAPType',$eaptype->getValue());
-   $serversidecredential->setProperty('CA',$CAs);
-   $serversidecredential->setProperty('ServerID',$serverids);
-   $authmethod->setProperty('ServerSideCredential',$serversidecredential);
+    $CAs = [];
+    $cas = $attr['internal:CAs'][0];
+    foreach ($cas as $ca) {
+        $CA = new CA();
+        $CA->setValue(base64_encode($ca['der']));
+        $CA->setAttributes(['format'=>'X.509', 'encoding'=>'base64']);
+        $CAs[] = $CA;
+    }
+
+    $serverids = [];
+    $servers = $attr['eap:server_name'];
+    foreach ($servers as $server) {
+        $serverid = new ServerID();
+        $serverid->setValue($server);
+        $serverids[] = $serverid; 
+    }
+
+    $serversidecredential->setProperty('EAPType',$eaptype->getValue());
+    $serversidecredential->setProperty('CA',$CAs);
+    $serversidecredential->setProperty('ServerID',$serverids);
+    $authmethod->setProperty('ServerSideCredential',$serversidecredential);
 
 // ClientSideCredentials
 
-   $clientsidecredential = new ClientSideCredential();
+    $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']);
-   return $authmethod;
+    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

Indentation +4 added lines, -4 removed lines

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

devices/xml/XML_PWD.php

Indentation +4 added lines, -4 removed lines

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

devices/xml/Lollipop.php

Indentation +8 added lines, -8 removed lines

@@ -5,15 +5,15 @@
 
 class Device_Lollipop extends Device_XML{
     final public function __construct() {
-      $this->supportedEapMethods  =
+        $this->supportedEapMethods  =
             [
-              EAP::$PEAP_MSCHAP2,
-              EAP::$TTLS_PAP,
-              EAP::$TTLS_MSCHAP2,
-              EAP::$TLS,
-       ];
-      $this->lang_scope = 'single';
-      $this->all_eaps = TRUE;
+                EAP::$PEAP_MSCHAP2,
+                EAP::$TTLS_PAP,
+                EAP::$TTLS_MSCHAP2,
+                EAP::$TLS,
+        ];
+        $this->lang_scope = 'single';
+        $this->all_eaps = TRUE;
     }
 }