GEANT / CAT

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;
     }
 }
 

core/DeviceFactory.php

Indentation +10 added lines, -10 removed lines

@@ -46,7 +46,7 @@ 
      */
     public function __construct($blueprint) {
 
-      $Dev = Devices::listDevices();
+        $Dev = Devices::listDevices();
         if(isset($Dev[$blueprint])) {
             if($Dev[$blueprint]['directory'] && $Dev[$blueprint]['module'])
                 require_once("devices/".$Dev[$blueprint]['directory']."/".$Dev[$blueprint]['module'].".php");
@@ -60,15 +60,15 @@ 
         } else {
             error("unknown devicename:$blueprint");
         }
-       $this->device->module_path = CAT::$root.'/devices/'.$Dev[$blueprint]['directory'];
-       $this->device->signer = isset($Dev[$blueprint]['signer']) ? $Dev[$blueprint]['signer'] : 0; 
-       $this->device->device_id = $blueprint;
-       $options = Devices::$Options;
-       if(isset($Dev[$blueprint]['options'])) {
-          $Opt = $Dev[$blueprint]['options'];
-          foreach ($Opt as $option => $value)
+        $this->device->module_path = CAT::$root.'/devices/'.$Dev[$blueprint]['directory'];
+        $this->device->signer = isset($Dev[$blueprint]['signer']) ? $Dev[$blueprint]['signer'] : 0; 
+        $this->device->device_id = $blueprint;
+        $options = Devices::$Options;
+        if(isset($Dev[$blueprint]['options'])) {
+            $Opt = $Dev[$blueprint]['options'];
+            foreach ($Opt as $option => $value)
             $options[$option] = $value;
-       }
-       $this->device->options = $options;
+        }
+        $this->device->options = $options;
     }
 }
\ No newline at end of file

core/UserAPI.php

Indentation +391 added lines, -391 removed lines

@@ -52,7 +52,7 @@ 
  *  link - the path name of the resulting installer
  *  mime - the mimetype of the installer
  */
-  public function generateInstaller($device,$prof_id, $generated_for = "user") {
+    public function generateInstaller($device,$prof_id, $generated_for = "user") {
     $this->set_locale("devices");
     $Dev = Devices::listDevices();
     $Config = $Dev[$device];
@@ -61,93 +61,93 @@ 
     $attribs = $profile->getCollapsedAttributes();
     // test if the profile is production-ready and if not if the authenticated user is an owner
     if (!isset($attribs['profile:production']) || (isset($attribs['profile:production']) && $attribs['profile:production'][0] != "on")) {
-       debug(4,"Attempt to download a non-production ready installer fir profile: $prof_id\n");
-       require_once(Config::$AUTHENTICATION['ssp-path-to-autoloader']);
-       $as = new SimpleSAML_Auth_Simple(Config::$AUTHENTICATION['ssp-authsource']);
-       if($as->isAuthenticated()) {
-          $user_object = new User($_SESSION['user']);
-          if($user_object->isIdPOwner($profile->institution)) {
-              debug(4, "User is the owner - allowing access\n");
-          } else {
-             debug(2, "User not an owner of a non-production profile - access forbidden\n");
-       header("HTTP/1.0 403 Not Authorized");
-             return;
-          }
-       } else {
-          debug(2, "User NOT authenticated, rejecting request for a non-production installer\n");
-          header("HTTP/1.0 403 Not Authorized");
-          return;
-       }
+        debug(4,"Attempt to download a non-production ready installer fir profile: $prof_id\n");
+        require_once(Config::$AUTHENTICATION['ssp-path-to-autoloader']);
+        $as = new SimpleSAML_Auth_Simple(Config::$AUTHENTICATION['ssp-authsource']);
+        if($as->isAuthenticated()) {
+            $user_object = new User($_SESSION['user']);
+            if($user_object->isIdPOwner($profile->institution)) {
+                debug(4, "User is the owner - allowing access\n");
+            } else {
+                debug(2, "User not an owner of a non-production profile - access forbidden\n");
+        header("HTTP/1.0 403 Not Authorized");
+                return;
+            }
+        } else {
+            debug(2, "User NOT authenticated, rejecting request for a non-production installer\n");
+            header("HTTP/1.0 403 Not Authorized");
+            return;
+        }
     }
     $a = [];
     $a['profile'] = $prof_id;
     $a['device'] = $device;
     if( (isset(Devices::$Options['no_cache']) && Devices::$Options['no_cache'] ) || ( isset($Config['options']['no_cache']) && $Config['options']['no_cache'] ))
-      $this->i_path = FALSE;
+        $this->i_path = FALSE;
     else {
-      $cache = $profile->testCache($device);
-      $this->i_path = $cache['cache'];
+        $cache = $profile->testCache($device);
+        $this->i_path = $cache['cache'];
     }
     if($this->i_path && is_file($this->i_path)) { 
-      debug(4,"Using cached installer for: $device\n");
-      $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=".CAT::get_lang()."&profile=$prof_id&device=$device&generatedfor=$generated_for";
-      $a['mime'] = $cache['mime'];
+        debug(4,"Using cached installer for: $device\n");
+        $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=".CAT::get_lang()."&profile=$prof_id&device=$device&generatedfor=$generated_for";
+        $a['mime'] = $cache['mime'];
     } else {
-      $factory = new DeviceFactory($device);
-      $dev = $factory->device;
-      if(isset($dev)) {
-         $dev->setup($profile);
-         $installer = $dev->writeInstaller();
-         $i_path = $dev->FPATH.'/tmp/'.$installer;
-         if($i_path && is_file($i_path)) {
-         if(isset($dev->options['mime']))
-               $a['mime'] = $dev->options['mime'];
-         else {
-           $info = new finfo();
-           $a['mime'] = $info->file($i_path, FILEINFO_MIME_TYPE);
-         }
-         $this->i_path = $dev->FPATH.'/'.$installer;
-         rename($i_path, $this->i_path);
-         $profile->updateCache($device,$this->i_path,$a['mime']);
+        $factory = new DeviceFactory($device);
+        $dev = $factory->device;
+        if(isset($dev)) {
+            $dev->setup($profile);
+            $installer = $dev->writeInstaller();
+            $i_path = $dev->FPATH.'/tmp/'.$installer;
+            if($i_path && is_file($i_path)) {
+            if(isset($dev->options['mime']))
+                $a['mime'] = $dev->options['mime'];
+            else {
+            $info = new finfo();
+            $a['mime'] = $info->file($i_path, FILEINFO_MIME_TYPE);
+            }
+            $this->i_path = $dev->FPATH.'/'.$installer;
+            rename($i_path, $this->i_path);
+            $profile->updateCache($device,$this->i_path,$a['mime']);
 //         rrmdir($dev->FPATH.'/tmp');
-         debug(4,"Generated installer: ".$this->i_path.": for: $device\n");
-         $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=".CAT::get_lang()."&profile=$prof_id&device=$device&generatedfor=$generated_for";
-         } else {
-         debug(2,"Installer generation failed for: $prof_id:$device:".CAT::get_lang()."\n");
-         $a['link'] = 0;
-         }
-      } 
+            debug(4,"Generated installer: ".$this->i_path.": for: $device\n");
+            $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=".CAT::get_lang()."&profile=$prof_id&device=$device&generatedfor=$generated_for";
+            } else {
+            debug(2,"Installer generation failed for: $prof_id:$device:".CAT::get_lang()."\n");
+            $a['link'] = 0;
+            }
+        } 
     }
     $this->set_locale("web_user");
     return($a);
- }
+    }
 
- /**
-  * interface to Devices::listDevices() 
-  */
- public function listDevices($show_hidden = 0) {
+    /**
+     * interface to Devices::listDevices() 
+     */
+    public function listDevices($show_hidden = 0) {
     $Dev = Devices::listDevices();
     $R = [];
     $ct = 0;
     if($show_hidden !== 0 && $show_hidden != 1)
-      return;
+        return;
     foreach ($Dev as $device => $D) {
-      if(isset($D['options']['hidden']) && $D['options']['hidden'] && $show_hidden == 0)
-         continue;
-      $ct ++;
-      if($this->version == 1)
-         $D['device'] = $device;
-      else
-         $D['device'] = $device;
-      $group = isset($D['group']) ? $D['group'] : 'other';
-      if (! isset($R[$group]))
-         $R[$group] = [];
-      $R[$group][$device] = $D;
-    }
-   return $R;
- }
-
- public function deviceInfo($device,$prof_id) {
+        if(isset($D['options']['hidden']) && $D['options']['hidden'] && $show_hidden == 0)
+            continue;
+        $ct ++;
+        if($this->version == 1)
+            $D['device'] = $device;
+        else
+            $D['device'] = $device;
+        $group = isset($D['group']) ? $D['group'] : 'other';
+        if (! isset($R[$group]))
+            $R[$group] = [];
+        $R[$group][$device] = $D;
+    }
+    return $R;
+    }
+
+    public function deviceInfo($device,$prof_id) {
     $this->set_locale("devices");
     $out = 0;
     $profile = new Profile($prof_id);
@@ -155,11 +155,11 @@ 
     $dev = $factory->device;
     if(isset($dev)) {
 //       $dev->setup($profile);
-       $out = $dev->writeDeviceInfo();
-   }
+        $out = $dev->writeDeviceInfo();
+    }
     $this->set_locale("web_user");
     echo $out;
- }
+    }
 
 /**
  * Prepare the support data for a given profile
@@ -173,23 +173,23 @@ 
  * - description
  * - devices - an array of device names and their statuses (for a given profile)
  */
- public function profileAttributes($prof_id) {
+    public function profileAttributes($prof_id) {
     $this->set_locale("devices");
-      $profile = new Profile($prof_id);
-      $attr = $profile->getCollapsedAttributes();
-      $a = [];
-      if(isset($attr['support:email']))
-         $a['local_email'] = $attr['support:email'][0];
-      if(isset($attr['support:phone']))
-         $a['local_phone'] = $attr['support:phone'][0];
-      if(isset($attr['support:url']))
-         $a['local_url'] = $attr['support:url'][0];
-      if(isset($attr['profile:description']))
-         $a['description'] = $attr['profile:description'][0];
-      $a['devices'] = $profile->listDevices();
-      $this->set_locale("web_user");
-      return($a);
- }
+        $profile = new Profile($prof_id);
+        $attr = $profile->getCollapsedAttributes();
+        $a = [];
+        if(isset($attr['support:email']))
+            $a['local_email'] = $attr['support:email'][0];
+        if(isset($attr['support:phone']))
+            $a['local_phone'] = $attr['support:phone'][0];
+        if(isset($attr['support:url']))
+            $a['local_url'] = $attr['support:url'][0];
+        if(isset($attr['profile:description']))
+            $a['description'] = $attr['profile:description'][0];
+        $a['devices'] = $profile->listDevices();
+        $this->set_locale("web_user");
+        return($a);
+    }
 
 /*
    this method needs to be used with care, it could give wrong results in some
@@ -201,13 +201,13 @@ 
     $file= $F['file'];
     $file = substr($file,strlen(dirname(__DIR__)));
     while(substr($file,0,1) == '/')
-       $file = substr($file,1);
+        $file = substr($file,1);
     $n = count(explode('/',$file));
     $out = $_SERVER['SCRIPT_NAME'];
     for ($i= 0; $i < $n; $i++)
-      $out = dirname($out);
+        $out = dirname($out);
     if ($out == '/')
-      $out = '';
+        $out = '';
     $s = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] ? 'https' : 'http';
     $s .= '://'.$_SERVER['HTTP_HOST'] . $out;
     return $s;
@@ -215,29 +215,29 @@ 
 
 /* JSON functions */
 
-  public function return_json($data,$status=1) {
-     $return_array = [];
-     $return_array['status'] = $status;
-     $return_array['data'] = $data;
-     $return_array['tou'] =  "Please consult Terms of Use at: ".$this->GetRootURL()."/tou.php";
-     return(json_encode($return_array));
-  }
+    public function return_json($data,$status=1) {
+        $return_array = [];
+        $return_array['status'] = $status;
+        $return_array['data'] = $data;
+        $return_array['tou'] =  "Please consult Terms of Use at: ".$this->GetRootURL()."/tou.php";
+        return(json_encode($return_array));
+    }
 
 /**
-  * Return the list of supported languages.
-  *
-  * 
-  */
-  public function JSON_listLanguages() {
-     $return_array = [];
-     foreach(Config::$LANGUAGES as $id => $val){
-       if($this->version == 1)
-          $return_array[] = ['id'=>$id,'display'=>$val['display'],'locale'=>$val['locale']];
-       else
-          $return_array[] = ['lang'=>$id,'display'=>$val['display'],'locale'=>$val['locale']];
-     }
-     echo $this->return_json($return_array);
-  }
+ * Return the list of supported languages.
+ *
+ * 
+ */
+    public function JSON_listLanguages() {
+        $return_array = [];
+        foreach(Config::$LANGUAGES as $id => $val){
+        if($this->version == 1)
+            $return_array[] = ['id'=>$id,'display'=>$val['display'],'locale'=>$val['locale']];
+        else
+            $return_array[] = ['lang'=>$id,'display'=>$val['display'],'locale'=>$val['locale']];
+        }
+        echo $this->return_json($return_array);
+    }
 
 /**
  * Return the list of countiers with configured IdPs
@@ -245,17 +245,17 @@ 
  * @return string JSON encoded data
  */
 
-  public function JSON_listCountries() {
-     $FED = $this->printCountryList(1);
-     $return_array = [];
-     foreach ($FED as $id => $val) {
-       if($this->version == 1)
-          $return_array[] = ['id'=>$id,'display'=>$val];
-       else
-          $return_array[] = ['federation'=>$id,'display'=>$val];
-     }
-     echo $this->return_json($return_array);
-  }
+    public function JSON_listCountries() {
+        $FED = $this->printCountryList(1);
+        $return_array = [];
+        foreach ($FED as $id => $val) {
+        if($this->version == 1)
+            $return_array[] = ['id'=>$id,'display'=>$val];
+        else
+            $return_array[] = ['federation'=>$id,'display'=>$val];
+        }
+        echo $this->return_json($return_array);
+    }
 
 /**
  * Return the list of IdPs in a given country
@@ -264,17 +264,17 @@ 
  * @return string JSON encoded data
  */
 
-  public function JSON_listIdentityProviders($country) {
-     $idps = Federation::listAllIdentityProviders(1,$country);
-     $return_array = [];
-     foreach ($idps as $idp) {
+    public function JSON_listIdentityProviders($country) {
+        $idps = Federation::listAllIdentityProviders(1,$country);
+        $return_array = [];
+        foreach ($idps as $idp) {
         if($this->version == 1)
-           $return_array[] = ['id'=>$idp['entityID'],'display'=>$idp['title']];
+            $return_array[] = ['id'=>$idp['entityID'],'display'=>$idp['title']];
         else
-           $return_array[] = ['idp'=>$idp['entityID'],'display'=>$idp['title']];
-     }
-     echo $this->return_json($return_array);
-  }
+            $return_array[] = ['idp'=>$idp['entityID'],'display'=>$idp['title']];
+        }
+        echo $this->return_json($return_array);
+    }
 
 /**
  * return the list of all active IdPs
@@ -283,18 +283,18 @@ 
  * @return string JSON encoded data
  */
 
-  public function JSON_listIdentityProvidersForDisco() {
-     $idps = Federation::listAllIdentityProviders(1);
-     $return_array = [];
-     foreach ($idps as $idp) {
+    public function JSON_listIdentityProvidersForDisco() {
+        $idps = Federation::listAllIdentityProviders(1);
+        $return_array = [];
+        foreach ($idps as $idp) {
         if($this->version == 1)
-           $idp['id'] = $idp['entityID'];
-         else
-           $idp['idp'] = $idp['entityID'];
+            $idp['id'] = $idp['entityID'];
+            else
+            $idp['idp'] = $idp['entityID'];
         $return_array[] = $idp;
-      }
-     echo json_encode($return_array);
-  }
+        }
+        echo json_encode($return_array);
+    }
 
 
 
@@ -306,17 +306,17 @@ 
  */
 
 
-  public function JSON_orderIdentityProviders($country,$L=NULL) {
-     $idps = $this->orderIdentityProviders($country,$L);
-     $return_array = [];
-     foreach ($idps as $idp) {
+    public function JSON_orderIdentityProviders($country,$L=NULL) {
+        $idps = $this->orderIdentityProviders($country,$L);
+        $return_array = [];
+        foreach ($idps as $idp) {
         if($this->version == 1)
-           $return_array[] = ['id'=>$idp['id'],'display'=>$idp['title']];
+            $return_array[] = ['id'=>$idp['id'],'display'=>$idp['title']];
         else
-           $return_array[] = ['idp'=>$idp['id'],'display'=>$idp['title']];
-     }
-     echo $this->return_json($return_array);
-  }
+            $return_array[] = ['idp'=>$idp['id'],'display'=>$idp['title']];
+        }
+        echo $this->return_json($return_array);
+    }
 
 /**
  * Produce a list of profiles available for a given IdP
@@ -324,31 +324,31 @@ 
  * @param int $idp_id the IdP identifier
  * @return string JSON encoded data
  */
-  public function JSON_listProfiles($idp_id,$sort = 0) {
-     $this->set_locale("web_user");
-     $return_array = [];
-     try {     
-         $idp = new IdP($idp_id);
-     }
-     catch (Exception $fail) {
+    public function JSON_listProfiles($idp_id,$sort = 0) {
+        $this->set_locale("web_user");
+        $return_array = [];
+        try {     
+            $idp = new IdP($idp_id);
+        }
+        catch (Exception $fail) {
         echo $this->return_json($return_array,0);
         return;
-     }
-     $l = 0;
-     $logo = $idp->getAttributes('general:logo_file');
-     if($logo)
-       $l = 1;
-     $profiles = $idp->listProfiles(1);
-     if($sort == 1)
+        }
+        $l = 0;
+        $logo = $idp->getAttributes('general:logo_file');
+        if($logo)
+        $l = 1;
+        $profiles = $idp->listProfiles(1);
+        if($sort == 1)
         usort($profiles,"profile_sort");
-     foreach ($profiles as $P) {
-       if($this->version == 1)
-          $return_array[] = ['id'=>$P->identifier,'display'=>$P->name, 'idp_name'=>$P->inst_name,'logo'=>$l]; 
-       else
-          $return_array[] = ['profile'=>$P->identifier,'display'=>$P->name, 'idp_name'=>$P->inst_name,'logo'=>$l]; 
-     }
-     echo $this->return_json($return_array);
-  }
+        foreach ($profiles as $P) {
+        if($this->version == 1)
+            $return_array[] = ['id'=>$P->identifier,'display'=>$P->name, 'idp_name'=>$P->inst_name,'logo'=>$l]; 
+        else
+            $return_array[] = ['profile'=>$P->identifier,'display'=>$P->name, 'idp_name'=>$P->inst_name,'logo'=>$l]; 
+        }
+        echo $this->return_json($return_array);
+    }
 
 /**
  * Return the list of devices available for the given profile
@@ -356,34 +356,34 @@ 
  * @param int $profile_id the Profile identifier
  * @return string JSON encoded data
  */
-  public function JSON_listDevices($profile_id) {
-     $this->set_locale("web_user");
-     $return_array = [];
-     $a = $this->profileAttributes($profile_id);
-     $thedevices = $a['devices'];
-     if(!isset($profile_redirect) || ! $profile_redirect) {
-         $profile_redirect = 0;
-         foreach ($thedevices as $D) {
-              if(isset($D['options']) && isset($D['options']['hidden']) &&  $D['options']['hidden'])
-                   continue;
-              $disp = $D['display'];
-              if($this->version == 1) {
-                 if($D['id'] === '0') {
-                     $profile_redirect = 1;
-                     $disp = $c;
-                 }
+    public function JSON_listDevices($profile_id) {
+        $this->set_locale("web_user");
+        $return_array = [];
+        $a = $this->profileAttributes($profile_id);
+        $thedevices = $a['devices'];
+        if(!isset($profile_redirect) || ! $profile_redirect) {
+            $profile_redirect = 0;
+            foreach ($thedevices as $D) {
+                if(isset($D['options']) && isset($D['options']['hidden']) &&  $D['options']['hidden'])
+                    continue;
+                $disp = $D['display'];
+                if($this->version == 1) {
+                    if($D['id'] === '0') {
+                        $profile_redirect = 1;
+                        $disp = $c;
+                    }
                 $return_array[] = ['id'=>$D['id'], 'display'=>$disp, 'status'=>$D['status'], 'redirect'=>$D['redirect']];
-             } else {
-                 if($D['device'] === '0') {
-                     $profile_redirect = 1;
-                     $disp = $c;
-                 }
+                } else {
+                    if($D['device'] === '0') {
+                        $profile_redirect = 1;
+                        $disp = $c;
+                    }
                 $return_array[] = ['device'=>$D['id'], 'display'=>$disp, 'status'=>$D['status'], 'redirect'=>$D['redirect']];
-             }
-         }
+                }
+            }
 
-  }
-  echo $this->return_json($return_array);
+    }
+    echo $this->return_json($return_array);
 }
   
 /**
@@ -393,7 +393,7 @@ 
  * @param int $prof_id profile identifier
  * @return string JSON encoded data
  */
-  public function JSON_generateInstaller($device,$prof_id) {
+    public function JSON_generateInstaller($device,$prof_id) {
     debug(4,"JSON::generateInstaller arguments: $device,$prof_id\n");
     $o = $this->generateInstaller($device,$prof_id);
     debug(4,"output from GUI::generateInstaller:");
@@ -401,7 +401,7 @@ 
     debug(4,json_encode($o));
 //    header('Content-type: application/json; utf-8');
     echo $this->return_json($o);
- }
+    }
 
 /**
  * Generate and send the installer
@@ -411,14 +411,14 @@ 
  * @return binary installerFile
  */
 
- public function downloadInstaller($device,$prof_id,$generated_for='user') {
+    public function downloadInstaller($device,$prof_id,$generated_for='user') {
     debug(4,"downloadInstaller arguments: $device,$prof_id,$generated_for\n");
     $o = $this->generateInstaller($device,$prof_id);
     debug(4,"output from GUI::generateInstaller:");
     debug(4,$o);
     if(! $o['link']) {
-       header("HTTP/1.0 404 Not Found");
-       return;
+        header("HTTP/1.0 404 Not Found");
+        return;
     }
     $profile = new Profile($prof_id);
     $profile->incrementDownloadStats($device, $generated_for);
@@ -431,242 +431,242 @@ 
     ob_clean();
     flush();
     readfile($file);
- }
+    }
 /**
- * Get and prepare logo file 
- *
- * When called for DiscoJuice, first check if file cache exists
- * If not then generate the file and save it in the cache
- * @param int $idp_id IdP identifier
- * @param int $disco flag turning on image generation for DiscoJuice
- * @param int $width, $height  maximum width and height of the generated image 
- * if one of these is 0 then it is treated as no upper bound
- *
- */
+     * Get and prepare logo file 
+     *
+     * When called for DiscoJuice, first check if file cache exists
+     * If not then generate the file and save it in the cache
+     * @param int $idp_id IdP identifier
+     * @param int $disco flag turning on image generation for DiscoJuice
+     * @param int $width, $height  maximum width and height of the generated image 
+     * if one of these is 0 then it is treated as no upper bound
+     *
+     */
+
+    public function sendLogo($idp_id, $disco=FALSE, $width=0, $height=0) {
+    $ExpStr = '';
+    $resize = 0;
+    if(($width || $height) && is_numeric($width) && is_numeric($height)) {
+        $resize = 1;
+        if($height == 0)
+            $height = 10000;
+        if($width == 0)
+            $width = 10000;
+        $logo_file = CAT::$root.'/web/downloads/logos/'.$idp_id.'_'.$width.'_'.$height.'.png';
+    } elseif($disco == 1) {
+        $width = 120;
+        $height = 40;
+        $resize = 1;
+        $logo_file = CAT::$root.'/web/downloads/logos/'.$idp_id.'_'.$width.'_'.$height.'.png';
+    }
 
- public function sendLogo($idp_id, $disco=FALSE, $width=0, $height=0) {
-   $ExpStr = '';
-   $resize = 0;
-   if(($width || $height) && is_numeric($width) && is_numeric($height)) {
-       $resize = 1;
-       if($height == 0)
-          $height = 10000;
-       if($width == 0)
-          $width = 10000;
-       $logo_file = CAT::$root.'/web/downloads/logos/'.$idp_id.'_'.$width.'_'.$height.'.png';
-   } elseif($disco == 1) {
-       $width = 120;
-       $height = 40;
-       $resize = 1;
-       $logo_file = CAT::$root.'/web/downloads/logos/'.$idp_id.'_'.$width.'_'.$height.'.png';
-   }
-
-   if($resize && is_file($logo_file)){
-      debug(4,"Using cached logo $logo_file for: $idp_id\n");
-      $blob = file_get_contents($logo_file);
-      $filetype = 'image/png';
-   }
-   else {
-      $idp = new IdP($idp_id);
-      $at = $idp->getAttributes('general:logo_file');
-      $blob =  $at[0]['value'];
-      $info = new finfo();
-      $filetype = $info->buffer($blob, FILEINFO_MIME_TYPE);
-      $offset = 60 * 60 * 24 * 30;
-      $ExpStr = "Expires: " . gmdate( "D, d M Y H:i:s", time() + $offset ) . " GMT";
-      if($resize) {
-         $filetype = 'image/png';
-         $image = new Imagick();
-         $image->readImageBlob($blob);
-         if( $image->setImageFormat('PNG')) {
-           $image->thumbnailImage($width,$height,1);
-           $blob = $image->getImageBlob();
-           debug(4,"Writing cached logo $logo_file for: $idp_id\n");
-           file_put_contents($logo_file,$blob);
-         }
-         else
-           $blob = "XXXXXX";
-      }
-   }
-   header( "Content-type: ".$filetype );
-   header( "Cache-Control:max-age=36000, must-revalidate" );
-   header( $ExpStr );
-   echo $blob;
- }
-
- public function locateUser() {
-   $host = $_SERVER['REMOTE_ADDR'];
-   $record = geoip_record_by_name($host);
-   if($record) {
-     $result = ['status' => 'ok'];
-     $result['country'] = $record['country_code'];
+    if($resize && is_file($logo_file)){
+        debug(4,"Using cached logo $logo_file for: $idp_id\n");
+        $blob = file_get_contents($logo_file);
+        $filetype = 'image/png';
+    }
+    else {
+        $idp = new IdP($idp_id);
+        $at = $idp->getAttributes('general:logo_file');
+        $blob =  $at[0]['value'];
+        $info = new finfo();
+        $filetype = $info->buffer($blob, FILEINFO_MIME_TYPE);
+        $offset = 60 * 60 * 24 * 30;
+        $ExpStr = "Expires: " . gmdate( "D, d M Y H:i:s", time() + $offset ) . " GMT";
+        if($resize) {
+            $filetype = 'image/png';
+            $image = new Imagick();
+            $image->readImageBlob($blob);
+            if( $image->setImageFormat('PNG')) {
+            $image->thumbnailImage($width,$height,1);
+            $blob = $image->getImageBlob();
+            debug(4,"Writing cached logo $logo_file for: $idp_id\n");
+            file_put_contents($logo_file,$blob);
+            }
+            else
+            $blob = "XXXXXX";
+        }
+    }
+    header( "Content-type: ".$filetype );
+    header( "Cache-Control:max-age=36000, must-revalidate" );
+    header( $ExpStr );
+    echo $blob;
+    }
+
+    public function locateUser() {
+    $host = $_SERVER['REMOTE_ADDR'];
+    $record = geoip_record_by_name($host);
+    if($record) {
+        $result = ['status' => 'ok'];
+        $result['country'] = $record['country_code'];
 //  the two lines below are a dirty hack to take of the error in naming the UK federation
-     if($result['country'] == 'GB')
-         $result['country'] = 'UK';
-     $result['region'] = $record['region'];
-     $result['geo'] = ['lat' => (float)$record['latitude'] , 'lon' => (float)$record['longitude']];
-   } else {
-     $result = ['status' => 'error', 'error' =>'Problem listing countries']; 
-   }
-   return($result);
- }
-
-
- public function locateUser2() {
-   require_once Config::$GEOIP['geoip2-path-to-autoloader'];
-   $reader = new Reader(Config::$GEOIP['geoip2-path-to-db']);
-   $host = $_SERVER['REMOTE_ADDR'];
-   try {
-      $record = $reader->city($host);
-   } catch (Exception $e) {
-      $result = ['status' => 'error', 'error' =>'Problem listing countries']; 
-      return($result);
-   }
-   $result = ['status' => 'ok'];
-   $result['country'] = $record->country->isoCode;
+        if($result['country'] == 'GB')
+            $result['country'] = 'UK';
+        $result['region'] = $record['region'];
+        $result['geo'] = ['lat' => (float)$record['latitude'] , 'lon' => (float)$record['longitude']];
+    } else {
+        $result = ['status' => 'error', 'error' =>'Problem listing countries']; 
+    }
+    return($result);
+    }
+
+
+    public function locateUser2() {
+    require_once Config::$GEOIP['geoip2-path-to-autoloader'];
+    $reader = new Reader(Config::$GEOIP['geoip2-path-to-db']);
+    $host = $_SERVER['REMOTE_ADDR'];
+    try {
+        $record = $reader->city($host);
+    } catch (Exception $e) {
+        $result = ['status' => 'error', 'error' =>'Problem listing countries']; 
+        return($result);
+    }
+    $result = ['status' => 'ok'];
+    $result['country'] = $record->country->isoCode;
 //  the two lines below are a dirty hack to take of the error in naming the UK federation
-   if($result['country'] == 'GB')
-       $result['country'] = 'UK';
-   $result['region'] = $record->continent->name;
+    if($result['country'] == 'GB')
+        $result['country'] = 'UK';
+    $result['region'] = $record->continent->name;
 
-   $result['geo'] = ['lat' => (float)$record->location->latitude , 'lon' => (float)$record->location->longitude];
-   return($result);
- }
+    $result['geo'] = ['lat' => (float)$record->location->latitude , 'lon' => (float)$record->location->longitude];
+    return($result);
+    }
 
 public function JSON_locateUser() {
     header('Content-type: application/json; utf-8');
    
     if(empty(Config::$GEOIP['version']) || Config::$GEOIP['version'] == 0)
-      echo json_encode(['status' => 'error', 'error' =>'Geolocation not supported']);
+        echo json_encode(['status' => 'error', 'error' =>'Geolocation not supported']);
     if(Config::$GEOIP['version'] == 1)
-      echo json_encode($this->locateUser());
+        echo json_encode($this->locateUser());
     if(Config::$GEOIP['version'] == 2)
-      echo json_encode($this->locateUser2());
+        echo json_encode($this->locateUser2());
 }
 
 /**
  * Produce support data prepared within {@link GUI::profileAttributes()}
  * @return string JSON encoded data
  */
-  public function JSON_profileAttributes($prof_id) {
+    public function JSON_profileAttributes($prof_id) {
 //    header('Content-type: application/json; utf-8');
     echo $this->return_json($this->profileAttributes($prof_id));
-  }
+    }
 
 /**
-  * Calculate the distence in km between two points given their
-  * geo coordinates.
-  * @param array $P1 - first point as an 'lat', 'lon' array 
-  * @param array $P2 - second point as an 'lat', 'lon' array 
-  * @return float distance in km
-  */
+ * Calculate the distence in km between two points given their
+ * geo coordinates.
+ * @param array $P1 - first point as an 'lat', 'lon' array 
+ * @param array $P2 - second point as an 'lat', 'lon' array 
+ * @return float distance in km
+ */
 private function geoDistance($P1,$P2) {
 
-  $dist = sin(deg2rad($P1['lat'])) * sin(deg2rad($P2['lat'])) +  
+    $dist = sin(deg2rad($P1['lat'])) * sin(deg2rad($P2['lat'])) +  
          cos(deg2rad($P1['lat'])) * cos(deg2rad($P2['lat'])) * cos(deg2rad($P1['lon'] - $P2['lon']));
-  $dist = rad2deg(acos($dist)) * 60 * 1.1852 ;
-  return(round($dist));
+    $dist = rad2deg(acos($dist)) * 60 * 1.1852 ;
+    return(round($dist));
 }
 
 /**
-  * Order active identity providers according to their distance and name
-  * @param array $L - current location
-  * @return array $IdPs -  list of arrays ('id', 'name');
-  */
+ * Order active identity providers according to their distance and name
+ * @param array $L - current location
+ * @return array $IdPs -  list of arrays ('id', 'name');
+ */
 
 public function orderIdentityProviders($country,$L=NULL) {
-     $idps = Federation::listAllIdentityProviders(1,$country);
-
-  if(is_null($L)) {
-     $U = $this->locateUser();
-     if($U['status'] == 'ok') {
-     $L = $U['geo'];
-     } else {
-       $L = ['lat'=>"90",'lon'=>"0"];
-     }
-  }
-  $T=[];
-  $R=[];
-     foreach ($idps as $idp) {
+        $idps = Federation::listAllIdentityProviders(1,$country);
+
+    if(is_null($L)) {
+        $U = $this->locateUser();
+        if($U['status'] == 'ok') {
+        $L = $U['geo'];
+        } else {
+        $L = ['lat'=>"90",'lon'=>"0"];
+        }
+    }
+    $T=[];
+    $R=[];
+        foreach ($idps as $idp) {
         $T[$idp['entityID']] = $idp['title'];
         $dist = 10000;
         if(isset($idp['geo'])) {
-          $G=$idp['geo'];
-          if(isset($G['lon'])) {
-             $d1 = $this->geoDistance($L,$G); 
-             if( $d1 < $dist)
+            $G=$idp['geo'];
+            if(isset($G['lon'])) {
+                $d1 = $this->geoDistance($L,$G); 
+                if( $d1 < $dist)
                 $dist = $d1;
-          } else {
+            } else {
             foreach ($G as $g) {
-             $d1 = $this->geoDistance($L,$g); 
-             if( $d1 < $dist)
+                $d1 = $this->geoDistance($L,$g); 
+                if( $d1 < $dist)
                 $dist = $d1;
             }
-          }
+            }
         }
-       if($dist > 100)
-         $dist=10000;
-      $d = sprintf("%06d",$dist);
-      $R[$idp['entityID']] = $d." ".$idp['title'];
-     }
-     asort($R);
-     foreach (array_keys($R) as $r) {
-      if($this->version == 1)
-         $outarray[] = ['id'=>$r, 'title'=>$T[$r]];
-      else
-         $outarray[] = ['idp'=>$r, 'title'=>$T[$r]];
-      }
-     return($outarray);
+        if($dist > 100)
+            $dist=10000;
+        $d = sprintf("%06d",$dist);
+        $R[$idp['entityID']] = $d." ".$idp['title'];
+        }
+        asort($R);
+        foreach (array_keys($R) as $r) {
+        if($this->version == 1)
+            $outarray[] = ['id'=>$r, 'title'=>$T[$r]];
+        else
+            $outarray[] = ['idp'=>$r, 'title'=>$T[$r]];
+        }
+        return($outarray);
 }
 
 /**
-  * Detect the best device driver form the browser
-  *
-  * Detects the operating system and returns its id 
-  * display name and group membership (as in devices.php)
-  * @return array indexed by 'id', 'display', 'group'
-  */
+ * Detect the best device driver form the browser
+ *
+ * Detects the operating system and returns its id 
+ * display name and group membership (as in devices.php)
+ * @return array indexed by 'id', 'display', 'group'
+ */
 
 public function detectOS() {
-   $Dev = Devices::listDevices();
-   if( isset($_REQUEST['device']) && isset($Dev[$_REQUEST['device']]) && (!isset($device['options']['hidden']) || $device['options']['hidden'] == 0)) {
-      $dev_id = $_REQUEST['device'];
-      $device = $Dev[$dev_id];
-      if($this->version == 1)
-         return(['id'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
-      else
-         return(['device'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
-   }
-   $browser = $_SERVER['HTTP_USER_AGENT'];
-   debug(4,"HTTP_USER_AGENT=$browser\n");
-   foreach ($Dev as $dev_id => $device) {
-     if(!isset($device['match']))
+    $Dev = Devices::listDevices();
+    if( isset($_REQUEST['device']) && isset($Dev[$_REQUEST['device']]) && (!isset($device['options']['hidden']) || $device['options']['hidden'] == 0)) {
+        $dev_id = $_REQUEST['device'];
+        $device = $Dev[$dev_id];
+        if($this->version == 1)
+            return(['id'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
+        else
+            return(['device'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
+    }
+    $browser = $_SERVER['HTTP_USER_AGENT'];
+    debug(4,"HTTP_USER_AGENT=$browser\n");
+    foreach ($Dev as $dev_id => $device) {
+        if(!isset($device['match']))
         continue;
-     if(preg_match('/'.$device['match'].'/',$browser)) {
-       if(!isset($device['options']['hidden']) || $device['options']['hidden'] == 0) {
-          debug(4,"Browser_id: $dev_id\n");
-          if($this->version == 1)
-             return(['id'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
-          else
-             return(['device'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
-       }
-       else {
-         debug(2, "Unrecognised system: ".$_SERVER['HTTP_USER_AGENT']."\n");
-         return(false);
-       }
-     }
-   }
-   debug(2, "Unrecognised system: ".$_SERVER['HTTP_USER_AGENT']."\n");
-   return(false);
+        if(preg_match('/'.$device['match'].'/',$browser)) {
+        if(!isset($device['options']['hidden']) || $device['options']['hidden'] == 0) {
+            debug(4,"Browser_id: $dev_id\n");
+            if($this->version == 1)
+                return(['id'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
+            else
+                return(['device'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
+        }
+        else {
+            debug(2, "Unrecognised system: ".$_SERVER['HTTP_USER_AGENT']."\n");
+            return(false);
+        }
+        }
+    }
+    debug(2, "Unrecognised system: ".$_SERVER['HTTP_USER_AGENT']."\n");
+    return(false);
 }
 
 public function JSON_detectOS() {
-     $return_array=$this->detectOS();
-     if($return_array)
+        $return_array=$this->detectOS();
+        if($return_array)
         $status = 1;
-     else
+        else
         $status = 0;
-     echo $this->return_json($return_array,$status);
+        echo $this->return_json($return_array,$status);
 }
 
 
@@ -676,5 +676,5 @@ 
   
 }
 function profile_sort($P1,$P2) {
-   return strcasecmp($P1->name, $P2->name);
+    return strcasecmp($P1->name, $P2->name);
 } 
\ No newline at end of file

devices/ms/Vista7.php

Indentation +135 added lines, -135 removed lines

@@ -26,66 +26,66 @@ 
  */
 class Device_Vista7 extends WindowsCommon {
     final public function __construct() {
-      $this->supportedEapMethods = [EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$PWD];
-      debug(4,"This device supports the following EAP methods: ");
-      debug(4,$this->supportedEapMethods);
-      $this->specialities['anon_id'][serialize(EAP::$PEAP_MSCHAP2)] = _("Anonymous identities do not use the realm as specified in the profile - it is derived from the suffix of the user's username input instead.");
+        $this->supportedEapMethods = [EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$PWD];
+        debug(4,"This device supports the following EAP methods: ");
+        debug(4,$this->supportedEapMethods);
+        $this->specialities['anon_id'][serialize(EAP::$PEAP_MSCHAP2)] = _("Anonymous identities do not use the realm as specified in the profile - it is derived from the suffix of the user's username input instead.");
     }
 
-  public function writeInstaller() {
-      $dom = textdomain(NULL);
-      textdomain("devices");
-   // create certificate files and save their names in $CA_files arrary
-     $CA_files = $this->saveCertificateFiles('der');
+    public function writeInstaller() {
+        $dom = textdomain(NULL);
+        textdomain("devices");
+    // create certificate files and save their names in $CA_files arrary
+        $CA_files = $this->saveCertificateFiles('der');
 
-     $SSIDs = $this->attributes['internal:SSID'];
-     $delSSIDs = $this->attributes['internal:remove_SSID'];
-     $this->prepareInstallerLang();
-     $set_wired = isset($this->attributes['media:wired'][0]) && $this->attributes['media:wired'][0] == 'on' ? 1 : 0;
+        $SSIDs = $this->attributes['internal:SSID'];
+        $delSSIDs = $this->attributes['internal:remove_SSID'];
+        $this->prepareInstallerLang();
+        $set_wired = isset($this->attributes['media:wired'][0]) && $this->attributes['media:wired'][0] == 'on' ? 1 : 0;
 //   create a list of profiles to be deleted after installation
-     $delProfiles = [];
-     foreach ($delSSIDs as $ssid => $cipher) {
-         if($cipher == 'DEL') 
-          $delProfiles[] = $ssid;
-         if($cipher == 'TKIP') 
-          $delProfiles[] = $ssid.' (TKIP)';
-     }
-
-     if ($this->selected_eap == EAP::$TLS || $this->selected_eap == EAP::$PEAP_MSCHAP2 || $this->selected_eap == EAP::$PWD || $this->selected_eap == EAP::$TTLS_PAP) {
-       $WindowsProfile = [];
-       $eap_config = $this->prepareEapConfig($this->attributes);
-       $i = 0;
-       foreach ($SSIDs as $ssid => $cipher) {
-          if($cipher == 'TKIP') {
-             $WindowsProfile[$i] = $this->writeWLANprofile ($ssid.' (TKIP)',$ssid,'WPA','TKIP',$eap_config,$i);
-             $i++;
-          }
-          $WindowsProfile[$i] = $this->writeWLANprofile ($ssid,$ssid,'WPA2','AES',$eap_config,$i);
-          $i++;
-       }
-       if($set_wired) {
-         $this->writeLANprofile($eap_config);
-       }
-     } else {
-       error("  this EAP type is not handled yet");
-       return;
-     }
+        $delProfiles = [];
+        foreach ($delSSIDs as $ssid => $cipher) {
+            if($cipher == 'DEL') 
+            $delProfiles[] = $ssid;
+            if($cipher == 'TKIP') 
+            $delProfiles[] = $ssid.' (TKIP)';
+        }
+
+        if ($this->selected_eap == EAP::$TLS || $this->selected_eap == EAP::$PEAP_MSCHAP2 || $this->selected_eap == EAP::$PWD || $this->selected_eap == EAP::$TTLS_PAP) {
+        $WindowsProfile = [];
+        $eap_config = $this->prepareEapConfig($this->attributes);
+        $i = 0;
+        foreach ($SSIDs as $ssid => $cipher) {
+            if($cipher == 'TKIP') {
+                $WindowsProfile[$i] = $this->writeWLANprofile ($ssid.' (TKIP)',$ssid,'WPA','TKIP',$eap_config,$i);
+                $i++;
+            }
+            $WindowsProfile[$i] = $this->writeWLANprofile ($ssid,$ssid,'WPA2','AES',$eap_config,$i);
+            $i++;
+        }
+        if($set_wired) {
+            $this->writeLANprofile($eap_config);
+        }
+        } else {
+        error("  this EAP type is not handled yet");
+        return;
+        }
     debug(4,"WindowsProfile"); debug(4,$WindowsProfile);
     
     $this->writeProfilesNSH($WindowsProfile, $CA_files,$set_wired);
     $this->writeAdditionalDeletes($delProfiles);
     $this->copyFiles($this->selected_eap);
     if(isset($this->attributes['internal:logo_file']))
-       $this->combineLogo($this->attributes['internal:logo_file']);
+        $this->combineLogo($this->attributes['internal:logo_file']);
     $this->writeMainNSH($this->selected_eap,$this->attributes);
     $this->compileNSIS();
     $installer_path = $this->signInstaller($this->attributes); 
 
     textdomain($dom);
     return($installer_path);  
-  }
+    }
 
-  public function writeDeviceInfo() {
+    public function writeDeviceInfo() {
     $ssid_ct=count($this->attributes['internal:SSID']);
     $out = "<p>";
     $out .= sprintf(_("%s installer will be in the form of an EXE file. It will configure %s on your device, by creating wireless network profiles.<p>When you click the download button, the installer will be saved by your browser. Copy it to the machine you want to configure and execute."),Config::$CONSORTIUM['name'],Config::$CONSORTIUM['name']);
@@ -97,12 +97,12 @@ 
             $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"),implode(', ',Config::$CONSORTIUM['ssid']))." ";
         $i = 0;
         foreach ($this->attributes['internal:SSID'] as $ssid=>$v) {
-           if(! in_array($ssid, Config::$CONSORTIUM['ssid'])) {
-             if($i > 0)
-           $out .= ", ";
-         $i++;
-         $out .= "<strong>$ssid</strong>";
-       }
+            if(! in_array($ssid, Config::$CONSORTIUM['ssid'])) {
+                if($i > 0)
+            $out .= ", ";
+            $i++;
+            $out .= "<strong>$ssid</strong>";
+        }
     }
     $out .= "<p>";
     }
@@ -115,21 +115,21 @@ 
         $out .= "<p>";
         $out .= _("When you are connecting to the network for the first time, Windows will pop up a login box, where you should enter your user name and password. This information will be saved so that you will reconnect to the network automatically each time you are in the range.");
         if($ssid_ct > 1) {
-             $out .= "<p>";
-             $out .= _("You will be required to enter the same credentials for each of the configured notworks:")." ";
-             $i = 0;
+                $out .= "<p>";
+                $out .= _("You will be required to enter the same credentials for each of the configured notworks:")." ";
+                $i = 0;
             foreach ($this->attributes['internal:SSID'] as $ssid=>$v) {
-                 if($i > 0)
-                   $out .= ", ";
-                 $i++;
-                 $out .= "<strong>$ssid</strong>";
+                    if($i > 0)
+                    $out .= ", ";
+                    $i++;
+                    $out .= "<strong>$ssid</strong>";
             }
     }
 
-   }
+    }
 
-   }
-  return($out);
+    }
+    return($out);
 }
 
 private function prepareEapConfig($attr) {
@@ -137,25 +137,25 @@ 
     $w7_ext = '';
     $eap = $this->selected_eap;
     if ($eap != EAP::$TLS && $eap != EAP::$PEAP_MSCHAP2 && $eap != EAP::$PWD && $eap != EAP::$TTLS_PAP) {
-      debug(2,"this method only allows TLS, PEAP, TTLS-PAP or EAP-pwd");
-      error("this method only allows TLS, PEAP, TTLS-PAP or EAP-pwd");
-     return;
+        debug(2,"this method only allows TLS, PEAP, TTLS-PAP or EAP-pwd");
+        error("this method only allows TLS, PEAP, TTLS-PAP or EAP-pwd");
+        return;
+    }
+    $use_anon = $attr['internal:use_anon_outer'] [0];
+    $realm = $attr['internal:realm'] [0];
+    if ($use_anon) {
+        $outer_user = $attr['internal:anon_local_value'][0];
     }
-   $use_anon = $attr['internal:use_anon_outer'] [0];
-   $realm = $attr['internal:realm'] [0];
-   if ($use_anon) {
-     $outer_user = $attr['internal:anon_local_value'][0];
-   }
 //   $servers = preg_quote(implode(';',$attr['eap:server_name']));
-   $servers = implode(';',$attr['eap:server_name']);
-   $ca_array = $attr['internal:CAs'][0];
-   $author_id = "0";
-   if( $eap == EAP::$TTLS_PAP) {
-      $author_id = "17236";
-      $servers = implode('</ServerName><ServerName>',$attr['eap:server_name']);
-   }
-
-  $profile_file_contents = '<EAPConfig><EapHostConfig xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
+    $servers = implode(';',$attr['eap:server_name']);
+    $ca_array = $attr['internal:CAs'][0];
+    $author_id = "0";
+    if( $eap == EAP::$TTLS_PAP) {
+        $author_id = "17236";
+        $servers = implode('</ServerName><ServerName>',$attr['eap:server_name']);
+    }
+
+    $profile_file_contents = '<EAPConfig><EapHostConfig xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
 <EapMethod>
 <Type xmlns="http://www.microsoft.com/provisioning/EapCommon">'.
     $this->selected_eap["OUTER"] .'</Type>
@@ -166,7 +166,7 @@ 
 ';
 
 
-   if( $eap == EAP::$TTLS_PAP) {
+    if( $eap == EAP::$TTLS_PAP) {
 $profile_file_contents .= '
 <Config xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
 <EAPIdentityProviderList xmlns="urn:ietf:params:xml:ns:yang:ietf-eap-metadata">
@@ -201,14 +201,14 @@ 
 $profile_file_contents .= '<ServerSideCredential>
 ';
 
-   foreach ($ca_array as $ca) {
+    foreach ($ca_array as $ca) {
       
-      $profile_file_contents .= '<CA><format>PEM</format><cert-data>';
-      $profile_file_contents .= base64_encode($ca['der']);
-      $profile_file_contents .= '</cert-data></CA>
+        $profile_file_contents .= '<CA><format>PEM</format><cert-data>';
+        $profile_file_contents .= base64_encode($ca['der']);
+        $profile_file_contents .= '</cert-data></CA>
 ';
-   }
-   $profile_file_contents .= "<ServerName>$servers</ServerName>\n";
+    }
+    $profile_file_contents .= "<ServerName>$servers</ServerName>\n";
 
 $profile_file_contents .= '
 </ServerSideCredential>
@@ -228,7 +228,7 @@ 
 }
 
 elseif( $eap == EAP::$TLS) {
-  $profile_file_contents .= '
+    $profile_file_contents .= '
 
 <Config xmlns:baseEap="http://www.microsoft.com/provisioning/BaseEapConnectionPropertiesV1" 
   xmlns:eapTls="http://www.microsoft.com/provisioning/EapTlsConnectionPropertiesV1">
@@ -244,14 +244,14 @@ 
 if($ca_array) {
 foreach ($ca_array as $CA)
     if($CA['root'])
-       $profile_file_contents .= "<eapTls:TrustedRootCA>".$CA['sha1']."</eapTls:TrustedRootCA>\n";
+        $profile_file_contents .= "<eapTls:TrustedRootCA>".$CA['sha1']."</eapTls:TrustedRootCA>\n";
 }
 $profile_file_contents .= '</eapTls:ServerValidation>
 ';
 if(isset($attr['eap-specific:tls_use_other_id']) && $attr['eap-specific:tls_use_other_id'][0] == 'on')
-   $profile_file_contents .= '<eapTls:DifferentUsername>true</eapTls:DifferentUsername>';
+    $profile_file_contents .= '<eapTls:DifferentUsername>true</eapTls:DifferentUsername>';
 else
-   $profile_file_contents .= '<eapTls:DifferentUsername>false</eapTls:DifferentUsername>';
+    $profile_file_contents .= '<eapTls:DifferentUsername>false</eapTls:DifferentUsername>';
 $profile_file_contents .= '
 </eapTls:EapType>
 </baseEap:Eap>
@@ -259,9 +259,9 @@ 
 ';
 } elseif ( $eap == EAP::$PEAP_MSCHAP2) {
 if(isset($attr['eap:enable_nea']) && $attr['eap:enable_nea'][0] == 'on')
-   $nea = 'true';
+    $nea = 'true';
 else
-   $nea = 'false';
+    $nea = 'false';
 $vista_ext = '<Config xmlns:eapUser="http://www.microsoft.com/provisioning/EapUserPropertiesV1" 
 xmlns:baseEap="http://www.microsoft.com/provisioning/BaseEapConnectionPropertiesV1" 
   xmlns:msPeap="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV1" 
@@ -275,7 +275,7 @@ 
 if($ca_array) {
 foreach ($ca_array as $CA)
     if($CA['root'])
-       $vista_ext .= "<msPeap:TrustedRootCA>".$CA['sha1']."</msPeap:TrustedRootCA>\n";
+        $vista_ext .= "<msPeap:TrustedRootCA>".$CA['sha1']."</msPeap:TrustedRootCA>\n";
 }
 $vista_ext .= '</msPeap:ServerValidation>
 <msPeap:FastReconnect>true</msPeap:FastReconnect> 
@@ -329,7 +329,7 @@ 
 </Config>
 ';
 } elseif ( $eap == EAP::$PWD) {
-   $profile_file_contents .= '<ConfigBlob></ConfigBlob>';
+    $profile_file_contents .= '<ConfigBlob></ConfigBlob>';
 } 
 
 
@@ -351,7 +351,7 @@ 
 /**
  * produce PEAP and TLS configuration files for Vista and Windows 7
  */
-  private function writeWLANprofile($wlan_profile_name,$ssid,$auth,$encryption,$eap_config,$i) {
+    private function writeWLANprofile($wlan_profile_name,$ssid,$auth,$encryption,$eap_config,$i) {
 $profile_file_contents = '<?xml version="1.0"?>
 <WLANProfile xmlns="http://www.microsoft.com/networking/WLAN/profile/v1">
 <name>'.$wlan_profile_name.'</name>
@@ -391,9 +391,9 @@ 
 ';
 
 if(! is_dir('w7'))
-  mkdir('w7');
+    mkdir('w7');
 if(! is_dir('vista'))
-  mkdir('vista');
+    mkdir('vista');
 $xml_f_name = "vista/wlan_prof-$i.xml";
 $xml_f = fopen($xml_f_name,'w');
 fwrite($xml_f,$profile_file_contents. $eap_config['vista']. $closing) ;
@@ -423,9 +423,9 @@ 
 </LANProfile>
 ';
 if(! is_dir('w7'))
-  mkdir('w7');
+    mkdir('w7');
 if(! is_dir('vista'))
-  mkdir('vista');
+    mkdir('vista');
 $xml_f_name = "vista/lan_prof.xml";
 $xml_f = fopen($xml_f_name,'w');
 fwrite($xml_f,$profile_file_contents. $eap_config['vista']. $closing) ;
@@ -438,16 +438,16 @@ 
 
 private function glueServerNames($server_list) {
 //print_r($server_list);
- $A0 =  array_reverse(explode('.',array_shift($server_list)));
- $B = $A0;
- if($server_list) {
-   foreach($server_list as $a) {
-   $A= array_reverse(explode('.',$a));
-   $B = array_intersect_assoc($A0,$A);
-   $A0 = $B;
-   }
-  }
-  return(implode('.',array_reverse($B)));
+    $A0 =  array_reverse(explode('.',array_shift($server_list)));
+    $B = $A0;
+    if($server_list) {
+    foreach($server_list as $a) {
+    $A= array_reverse(explode('.',$a));
+    $B = array_intersect_assoc($A0,$A);
+    $A0 = $B;
+    }
+    }
+    return(implode('.',array_reverse($B)));
 }
 
 
@@ -502,7 +502,7 @@ 
 ';
 
 if(isset($this->attributes['media:wired'][0]) && $attr['media:wired'][0] == 'on')
-  $fcontents .= '!define WIRED
+    $fcontents .= '!define WIRED
 ';
 
 $f = fopen('main.nsh','w');
@@ -514,8 +514,8 @@ 
 private function writeProfilesNSH($P,$ca_array,$wired=0) {
 debug(4,"writeProfilesNSH");
 debug(4,$P);
-  $fcontents = '';
-  foreach($P as $p) 
+    $fcontents = '';
+    foreach($P as $p) 
     $fcontents .= "!insertmacro define_wlan_profile $p\n";
   
 $f = fopen('profiles.nsh','w');
@@ -526,8 +526,8 @@ 
 $f = fopen('certs.nsh','w');
 if($ca_array) {
 foreach ($ca_array as $CA) {
-      $store = $CA['root'] ? "root" : "ca";
-      $fcontents .= '!insertmacro install_ca_cert "'.$CA['file'].'" "'.$CA['sha1'].'" "'.$store."\"\n";
+        $store = $CA['root'] ? "root" : "ca";
+        $fcontents .= '!insertmacro install_ca_cert "'.$CA['file'].'" "'.$CA['sha1'].'" "'.$store."\"\n";
     }
 fwrite($f, $fcontents);
 }
@@ -537,33 +537,33 @@ 
 private function copyFiles ($eap) {
 debug(4,"copyFiles start\n");
 debug(4,"code_page=".$this->code_page."\n");
-   $result;
-   $result = $this->copyFile('wlan_test.exe');
-   $result = $this->copyFile('check_wired.cmd');
-   $result = $this->copyFile('install_wired.cmd');
-   $result = $this->copyFile('setEAPCred.exe');
-   $result = $this->copyFile('base64.nsh');
-   $result = $this->copyFile('cat_bg.bmp');
-   $result = $result && $this->copyFile('cat32.ico');
-   $result = $result && $this->copyFile('cat_150.bmp');
-   $this->translateFile('common.inc','common.nsh',$this->code_page);
-   if( $eap["OUTER"] == TTLS)  {
-     $result = $this->copyFile('GPL3.rtf');
-     $result = $result && $this->copyFile('ArnesLinkEn32.msi');
-     $result = $result && $this->copyFile('ArnesLinkEn64.msi');
-     $result = $result && $this->copyFile('dump_arneslink_profile.cmd');
-     $result = $result && $this->copyFile('install_arneslink_profile.cmd');
-     $this->translateFile('arnes_link.inc','cat.NSI',$this->code_page);
-   } elseif($eap["OUTER"] == PWD) {
-     $this->translateFile('pwd.inc','cat.NSI',$this->code_page);
-     $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x32.msi');
-     $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x64.msi');
+    $result;
+    $result = $this->copyFile('wlan_test.exe');
+    $result = $this->copyFile('check_wired.cmd');
+    $result = $this->copyFile('install_wired.cmd');
+    $result = $this->copyFile('setEAPCred.exe');
+    $result = $this->copyFile('base64.nsh');
+    $result = $this->copyFile('cat_bg.bmp');
+    $result = $result && $this->copyFile('cat32.ico');
+    $result = $result && $this->copyFile('cat_150.bmp');
+    $this->translateFile('common.inc','common.nsh',$this->code_page);
+    if( $eap["OUTER"] == TTLS)  {
+        $result = $this->copyFile('GPL3.rtf');
+        $result = $result && $this->copyFile('ArnesLinkEn32.msi');
+        $result = $result && $this->copyFile('ArnesLinkEn64.msi');
+        $result = $result && $this->copyFile('dump_arneslink_profile.cmd');
+        $result = $result && $this->copyFile('install_arneslink_profile.cmd');
+        $this->translateFile('arnes_link.inc','cat.NSI',$this->code_page);
+    } elseif($eap["OUTER"] == PWD) {
+        $this->translateFile('pwd.inc','cat.NSI',$this->code_page);
+        $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x32.msi');
+        $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x64.msi');
     } else {
-     $this->translateFile('peap_tls.inc','cat.NSI',$this->code_page);
-     $result = 1;
+        $this->translateFile('peap_tls.inc','cat.NSI',$this->code_page);
+        $result = 1;
     }
 debug(4,"copyFiles end\n");
-   return($result);
+    return($result);
 }
 
 }
\ No newline at end of file

devices/ms/W8.php

Indentation +114 added lines, -114 removed lines

@@ -26,74 +26,74 @@ 
  */
 class Device_W8 extends WindowsCommon {
     final public function __construct() {
-      $this->supportedEapMethods = [EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP, EAP::$TTLS_MSCHAP2, EAP::$PWD];
+        $this->supportedEapMethods = [EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP, EAP::$TTLS_MSCHAP2, EAP::$PWD];
 #      $this->supportedEapMethods = array(EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP, EAP::$PWD);
-      debug(4,"This device supports the following EAP methods: ");
-      debug(4,$this->supportedEapMethods);
-      $this->specialities['anon_id'][serialize(EAP::$PEAP_MSCHAP2)] = _("Anonymous identities do not use the realm as specified in the profile - it is derived from the suffix of the user's username input instead.");
+        debug(4,"This device supports the following EAP methods: ");
+        debug(4,$this->supportedEapMethods);
+        $this->specialities['anon_id'][serialize(EAP::$PEAP_MSCHAP2)] = _("Anonymous identities do not use the realm as specified in the profile - it is derived from the suffix of the user's username input instead.");
     }
 
-  public function writeInstaller() {
-      $dom = textdomain(NULL);
-      textdomain("devices");
-   // create certificate files and save their names in $CA_files arrary
-     $CA_files = $this->saveCertificateFiles('der');
+    public function writeInstaller() {
+        $dom = textdomain(NULL);
+        textdomain("devices");
+    // create certificate files and save their names in $CA_files arrary
+        $CA_files = $this->saveCertificateFiles('der');
 
-     $SSIDs = $this->attributes['internal:SSID'];
-     $delSSIDs = $this->attributes['internal:remove_SSID'];
-     $this->prepareInstallerLang();
-     $set_wired = isset($this->attributes['media:wired'][0]) && $this->attributes['media:wired'][0] == 'on' ? 1 : 0;
+        $SSIDs = $this->attributes['internal:SSID'];
+        $delSSIDs = $this->attributes['internal:remove_SSID'];
+        $this->prepareInstallerLang();
+        $set_wired = isset($this->attributes['media:wired'][0]) && $this->attributes['media:wired'][0] == 'on' ? 1 : 0;
 //   create a list of profiles to be deleted after installation
-     $delProfiles = [];
-     foreach ($delSSIDs as $ssid => $cipher) {
-         if($cipher == 'DEL')
-          $delProfiles[] = $ssid;
-         if($cipher == 'TKIP')
-          $delProfiles[] = $ssid.' (TKIP)';
-     }
-
-
-     if ($this->selected_eap == EAP::$TLS || $this->selected_eap == EAP::$PEAP_MSCHAP2 || $this->selected_eap ==  EAP::$TTLS_PAP || $this->selected_eap == EAP::$TTLS_MSCHAP2 || $this->selected_eap == EAP::$PWD) {
-       $WindowsProfile = [];
-       $eap_config = $this->prepareEapConfig($this->attributes);
-       $i = 0;
-       foreach ($SSIDs as $ssid => $cipher) {
-          if($cipher == 'TKIP') {
-             $WindowsProfile[$i] = $this->writeWLANprofile ($ssid.' (TKIP)',$ssid,'WPA','TKIP',$eap_config,$i);
-             $i++;
-          }
-          $WindowsProfile[$i] = $this->writeWLANprofile ($ssid,$ssid,'WPA2','AES',$eap_config,$i);
-          $i++;
-       }
-       if($set_wired) {
-         $this->writeLANprofile($eap_config);
-       }
-     } else {
-       error("  this EAP type is not handled yet");
-       return;
-     }
+        $delProfiles = [];
+        foreach ($delSSIDs as $ssid => $cipher) {
+            if($cipher == 'DEL')
+            $delProfiles[] = $ssid;
+            if($cipher == 'TKIP')
+            $delProfiles[] = $ssid.' (TKIP)';
+        }
+
+
+        if ($this->selected_eap == EAP::$TLS || $this->selected_eap == EAP::$PEAP_MSCHAP2 || $this->selected_eap ==  EAP::$TTLS_PAP || $this->selected_eap == EAP::$TTLS_MSCHAP2 || $this->selected_eap == EAP::$PWD) {
+        $WindowsProfile = [];
+        $eap_config = $this->prepareEapConfig($this->attributes);
+        $i = 0;
+        foreach ($SSIDs as $ssid => $cipher) {
+            if($cipher == 'TKIP') {
+                $WindowsProfile[$i] = $this->writeWLANprofile ($ssid.' (TKIP)',$ssid,'WPA','TKIP',$eap_config,$i);
+                $i++;
+            }
+            $WindowsProfile[$i] = $this->writeWLANprofile ($ssid,$ssid,'WPA2','AES',$eap_config,$i);
+            $i++;
+        }
+        if($set_wired) {
+            $this->writeLANprofile($eap_config);
+        }
+        } else {
+        error("  this EAP type is not handled yet");
+        return;
+        }
     debug(4,"WindowsProfile"); debug(4,$WindowsProfile);
     
     $this->writeProfilesNSH($WindowsProfile, $CA_files,$set_wired);
     $this->writeAdditionalDeletes($delProfiles);
     if(isset($additional_deletes) && count($additional_deletes))
-       $this->writeAdditionalDeletes($additional_deletes);
+        $this->writeAdditionalDeletes($additional_deletes);
     $this->copyFiles($this->selected_eap);
     if(isset($this->attributes['internal:logo_file']))
-       $this->combineLogo($this->attributes['internal:logo_file']);
+        $this->combineLogo($this->attributes['internal:logo_file']);
     $this->writeMainNSH($this->selected_eap,$this->attributes);
     $this->compileNSIS();
     $installer_path = $this->signInstaller($this->attributes); 
 
     textdomain($dom);
     return($installer_path);  
-  }
+    }
 
-  public function writeDeviceInfo() {
+    public function writeDeviceInfo() {
     $ssid_ct=count($this->attributes['internal:SSID']);
-   $out = "<p>";
-   $out .= sprintf(_("%s installer will be in the form of an EXE file. It will configure %s on your device, by creating wireless network profiles.<p>When you click the download button, the installer will be saved by your browser. Copy it to the machine you want to configure and execute."),Config::$CONSORTIUM['name'],Config::$CONSORTIUM['name']);
-   $out .= "<p>";
+    $out = "<p>";
+    $out .= sprintf(_("%s installer will be in the form of an EXE file. It will configure %s on your device, by creating wireless network profiles.<p>When you click the download button, the installer will be saved by your browser. Copy it to the machine you want to configure and execute."),Config::$CONSORTIUM['name'],Config::$CONSORTIUM['name']);
+    $out .= "<p>";
     if($ssid_ct > 1) {
         if($ssid_ct > 2) {
             $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"),implode(', ',Config::$CONSORTIUM['ssid']))." ";
@@ -101,52 +101,52 @@ 
             $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"),implode(', ',Config::$CONSORTIUM['ssid']))." ";
         $i = 0;
         foreach ($this->attributes['internal:SSID'] as $ssid=>$v) {
-           if(! in_array($ssid, Config::$CONSORTIUM['ssid'])) {
-             if($i > 0)
-           $out .= ", ";
-         $i++;
-         $out .= "<strong>$ssid</strong>";
-       }
+            if(! in_array($ssid, Config::$CONSORTIUM['ssid'])) {
+                if($i > 0)
+            $out .= ", ";
+            $i++;
+            $out .= "<strong>$ssid</strong>";
+        }
     }
     $out .= "<p>";
     }
 
 if($this->eap == EAP::$TLS)
-   $out .= _("In order to connect to the network you will need an a personal certificate in the form of a p12 file. You should obtain this certificate from your home institution. Consult the support page to find out how this certificate can be obtained. Such certificate files are password protected. You should have both the file and the password available during the installation process.");
+    $out .= _("In order to connect to the network you will need an a personal certificate in the form of a p12 file. You should obtain this certificate from your home institution. Consult the support page to find out how this certificate can be obtained. Such certificate files are password protected. You should have both the file and the password available during the installation process.");
 else {
-   $out .= _("In order to connect to the network you will need an account from your home institution. You should consult the support page to find out how this account can be obtained. It is very likely that your account is already activated.");
-   $out .= "<p>";
-   $out .= _("When you are connecting to the network for the first time, Windows will pop up a login box, where you should enter your user name and password. This information will be saved so that you will reconnect to the network automatically each time you are in the range.");
+    $out .= _("In order to connect to the network you will need an account from your home institution. You should consult the support page to find out how this account can be obtained. It is very likely that your account is already activated.");
+    $out .= "<p>";
+    $out .= _("When you are connecting to the network for the first time, Windows will pop up a login box, where you should enter your user name and password. This information will be saved so that you will reconnect to the network automatically each time you are in the range.");
         if($ssid_ct > 1) {
-             $out .= "<p>";
-             $out .= _("You will be required to enter the same credentials for each of the configured notworks:")." ";
-             $i = 0;
+                $out .= "<p>";
+                $out .= _("You will be required to enter the same credentials for each of the configured notworks:")." ";
+                $i = 0;
             foreach ($this->attributes['internal:SSID'] as $ssid=>$v) {
-                 if($i > 0)
-                   $out .= ", ";
-                 $i++;
-                 $out .= "<strong>$ssid</strong>";
+                    if($i > 0)
+                    $out .= ", ";
+                    $i++;
+                    $out .= "<strong>$ssid</strong>";
             }
     }
 
 
 }
     return $out;
-  }
+    }
 
 
 private function prepareEapConfig($attr) {
-   $eap = $this->selected_eap;
-   $w8_ext = '';
-   $use_anon = $attr['internal:use_anon_outer'] [0];
-   if ($use_anon) {
-     $outer_user = $attr['internal:anon_local_value'][0];
-     $outer_id = $outer_user.'@'.$attr['internal:realm'][0];
-   }
+    $eap = $this->selected_eap;
+    $w8_ext = '';
+    $use_anon = $attr['internal:use_anon_outer'] [0];
+    if ($use_anon) {
+        $outer_user = $attr['internal:anon_local_value'][0];
+        $outer_id = $outer_user.'@'.$attr['internal:realm'][0];
+    }
 //   $servers = preg_quote(implode(';',$attr['eap:server_name']));
-   $servers = implode(';',$attr['eap:server_name']);
+    $servers = implode(';',$attr['eap:server_name']);
    
-   $ca_array = $attr['internal:CAs'][0];
+    $ca_array = $attr['internal:CAs'][0];
 
 
 $profile_file_contents = '<EAPConfig><EapHostConfig xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
@@ -162,7 +162,7 @@ 
 $profile_file_contents .= '<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</AuthorId>
 </EapMethod>
 ';
-  $profile_file_contents .= '
+    $profile_file_contents .= '
 
 <Config xmlns:baseEap="http://www.microsoft.com/provisioning/BaseEapConnectionPropertiesV1" 
   xmlns:eapTls="http://www.microsoft.com/provisioning/EapTlsConnectionPropertiesV1">
@@ -178,14 +178,14 @@ 
 if($ca_array) {
 foreach ($ca_array as $CA)
     if($CA['root'])
-       $profile_file_contents .= "<eapTls:TrustedRootCA>".$CA['sha1']."</eapTls:TrustedRootCA>\n";
+        $profile_file_contents .= "<eapTls:TrustedRootCA>".$CA['sha1']."</eapTls:TrustedRootCA>\n";
 }
 $profile_file_contents .= '</eapTls:ServerValidation>
 ';
 if(isset($attr['eap-specific:tls_use_other_id']) && $attr['eap-specific:tls_use_other_id'][0] == 'on')
-   $profile_file_contents .= '<eapTls:DifferentUsername>true</eapTls:DifferentUsername>';
+    $profile_file_contents .= '<eapTls:DifferentUsername>true</eapTls:DifferentUsername>';
 else
-   $profile_file_contents .= '<eapTls:DifferentUsername>false</eapTls:DifferentUsername>';
+    $profile_file_contents .= '<eapTls:DifferentUsername>false</eapTls:DifferentUsername>';
 $profile_file_contents .= '
 </eapTls:EapType>
 </baseEap:Eap>
@@ -193,9 +193,9 @@ 
 ';
 } elseif ( $eap == EAP::$PEAP_MSCHAP2) {
 if(isset($attr['eap:enable_nea']) && $attr['eap:enable_nea'][0] == 'on')
-   $nea = 'true';
+    $nea = 'true';
 else
-   $nea = 'false';
+    $nea = 'false';
 $profile_file_contents .= '<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</AuthorId>
 </EapMethod>
 ';
@@ -260,10 +260,10 @@ 
 <Phase2Authentication>
 ';
 if ( $eap == EAP::$TTLS_PAP) {
-   $w8_ext .='<PAPAuthentication /> ';
+    $w8_ext .='<PAPAuthentication /> ';
 }
 if ( $eap == EAP::$TTLS_MSCHAP2)  {
-   $w8_ext .='<MSCHAPv2Authentication>
+    $w8_ext .='<MSCHAPv2Authentication>
 <UseWinlogonCredentials>false</UseWinlogonCredentials>
 </MSCHAPv2Authentication>
 ';
@@ -272,16 +272,16 @@ 
 <Phase1Identity>
 ';
 if($use_anon == 1) {
-  $w8_ext .= '<IdentityPrivacy>true</IdentityPrivacy> 
+    $w8_ext .= '<IdentityPrivacy>true</IdentityPrivacy> 
 ';
-  if(isset($outer_id) && $outer_id) 
+    if(isset($outer_id) && $outer_id) 
     $w8_ext .='<AnonymousIdentity>'.$outer_id.'</AnonymousIdentity>
 ';
-  else
+    else
     $w8_ext .='<AnonymousIdentity/>
 ';
 } else {
-  $w8_ext .= '<IdentityPrivacy>false</IdentityPrivacy>
+    $w8_ext .= '<IdentityPrivacy>false</IdentityPrivacy>
 ';
 }
 $w8_ext .='</Phase1Identity>
@@ -292,7 +292,7 @@ 
 $profile_file_contents .= '<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</AuthorId>
 </EapMethod>
 ';
-   $profile_file_contents .= '<ConfigBlob></ConfigBlob>';
+    $profile_file_contents .= '<ConfigBlob></ConfigBlob>';
 }
 
 $profile_file_contents_end = '</EapHostConfig></EAPConfig>';
@@ -309,7 +309,7 @@ 
 /**
  * produce PEAP, TLS and TTLS configuration files for Windows 8
  */
-  private function writeWLANprofile($wlan_profile_name,$ssid,$auth,$encryption,$eap_config,$i) {
+    private function writeWLANprofile($wlan_profile_name,$ssid,$auth,$encryption,$eap_config,$i) {
 $profile_file_contents = '<?xml version="1.0"?>
 <WLANProfile xmlns="http://www.microsoft.com/networking/WLAN/profile/v1">
 <name>'.$wlan_profile_name.'</name>
@@ -349,7 +349,7 @@ 
 ';
 
 if(! is_dir('w8'))
-  mkdir('w8');
+    mkdir('w8');
 $xml_f_name = "w8/wlan_prof-$i.xml";
 $xml_f = fopen($xml_f_name,'w');
 fwrite($xml_f,$profile_file_contents. $eap_config['w8']. $closing) ;
@@ -376,7 +376,7 @@ 
 ';
 
 if(! is_dir('w8'))
-  mkdir('w8');
+    mkdir('w8');
 $xml_f_name = "w8/lan_prof.xml";
 $xml_f = fopen($xml_f_name,'w');
 fwrite($xml_f,$profile_file_contents. $eap_config['w8']. $closing) ;
@@ -435,7 +435,7 @@ 
 ';
 
 if(isset($this->attributes['media:wired'][0]) && $attr['media:wired'][0] == 'on')
-  $fcontents .= '!define WIRED
+    $fcontents .= '!define WIRED
 ';
 
 $f = fopen('main.nsh','w');
@@ -448,7 +448,7 @@ 
 debug(4,"writeProfilesNSH");
 debug(4,$P);
 $fcontents = '';
-  foreach($P as $p) 
+    foreach($P as $p) 
     $fcontents .= "!insertmacro define_wlan_profile $p\n";
 
 $f = fopen('profiles.nsh','w');
@@ -459,8 +459,8 @@ 
 $f = fopen('certs.nsh','w');
 if($ca_array) {
 foreach ($ca_array as $CA) {
-      $store = $CA['root'] ? "root" : "ca";
-      $fcontents .= '!insertmacro install_ca_cert "'.$CA['file'].'" "'.$CA['sha1'].'" "'.$store."\"\n";
+        $store = $CA['root'] ? "root" : "ca";
+        $fcontents .= '!insertmacro install_ca_cert "'.$CA['file'].'" "'.$CA['sha1'].'" "'.$store."\"\n";
     }
 fwrite($f, $fcontents);
 }
@@ -471,26 +471,26 @@ 
 
 private function copyFiles ($eap) {
 debug(4,"copyFiles start\n");
-   $result;
-   $result = $this->copyFile('wlan_test.exe');
-   $result = $this->copyFile('check_wired.cmd');
-   $result = $this->copyFile('install_wired.cmd');
-   $result = $this->copyFile('setEAPCred.exe');
-   $result = $this->copyFile('cat_bg.bmp');
-   $result = $this->copyFile('base64.nsh');
-   $result = $result && $this->copyFile('cat32.ico');
-   $result = $result && $this->copyFile('cat_150.bmp');
-   $this->translateFile('common.inc','common.nsh',$this->code_page);
-   if($eap["OUTER"] == PWD) {
-     $this->translateFile('pwd.inc','cat.NSI',$this->code_page);
-     $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x32.msi');
-     $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x64.msi');
-   } else {
-   $this->translateFile('eap_w8.inc','cat.NSI',$this->code_page);
-   $result = 1;
-   }
+    $result;
+    $result = $this->copyFile('wlan_test.exe');
+    $result = $this->copyFile('check_wired.cmd');
+    $result = $this->copyFile('install_wired.cmd');
+    $result = $this->copyFile('setEAPCred.exe');
+    $result = $this->copyFile('cat_bg.bmp');
+    $result = $this->copyFile('base64.nsh');
+    $result = $result && $this->copyFile('cat32.ico');
+    $result = $result && $this->copyFile('cat_150.bmp');
+    $this->translateFile('common.inc','common.nsh',$this->code_page);
+    if($eap["OUTER"] == PWD) {
+        $this->translateFile('pwd.inc','cat.NSI',$this->code_page);
+        $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x32.msi');
+        $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x64.msi');
+    } else {
+    $this->translateFile('eap_w8.inc','cat.NSI',$this->code_page);
+    $result = 1;
+    }
 debug(4,"copyFiles end\n");
-   return($result);
+    return($result);
 }
 
 }
\ No newline at end of file