GEANT / CAT

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,6 +676,6 @@ 
   
 }
 function profile_sort($P1,$P2) {
-   return strcasecmp($P1->name, $P2->name);
+    return strcasecmp($P1->name, $P2->name);
 } 
 ?>

core/User.php

Indentation +15 added lines, -15 removed lines

@@ -213,27 +213,27 @@
         }
     }
 
-   /**
-    * This function tests if the current user has been configured as the system superadmin, i.e. if the user is allowed
-    * to execute the 112365365321.php script
-    *
-    * @return boolean TRUE if the user is a superadmin, FALSE if not 
-    */
+    /**
+     * This function tests if the current user has been configured as the system superadmin, i.e. if the user is allowed
+     * to execute the 112365365321.php script
+     *
+     * @return boolean TRUE if the user is a superadmin, FALSE if not 
+     */
     public function isSuperadmin() {
-       return in_array($this->identifier, Config::$SUPERADMINS);
+        return in_array($this->identifier, Config::$SUPERADMINS);
     }
 
-   /**
-    *  This function tests if the current user is an ovner of a given IdP
-    *
-    * @return boolean TRUE if the user is an owner, FALSE if not 
-    */
+    /**
+     *  This function tests if the current user is an ovner of a given IdP
+     *
+     * @return boolean TRUE if the user is an owner, FALSE if not 
+     */
     public function isIdPOwner($idp) {
-       $temp = new IdP($idp);
-       foreach ($temp->owner() as $oneowner)
+        $temp = new IdP($idp);
+        foreach ($temp->owner() as $oneowner)
             if ($oneowner['ID'] == $this->identifier)
                 return TRUE;
-       return FALSE;
+        return FALSE;
     }
 
     public function sendMailToUser($subject, $content) {

devices/redirect_dev/RedirectDev.php

Indentation +13 added lines, -13 removed lines

@@ -2,20 +2,20 @@
 require_once('DeviceConfig.php');
 
 class Device_RedirectDev extends DeviceConfig {
-   /**
-    * Constructs a Device object.
-    *
-    * It is CRUTCIAL that the constructor sets $this->supportedEapMethods to an array of methods
-    * available for the particular device.
-    * {@source}
-    * @param string $device a pointer to a device module, which must
-    * be an index of one of the devices defined in the {@link Devices}
-    * array in {@link devices.php}.
-    * @final not to be redefined
-    */
+    /**
+     * Constructs a Device object.
+     *
+     * It is CRUTCIAL that the constructor sets $this->supportedEapMethods to an array of methods
+     * available for the particular device.
+     * {@source}
+     * @param string $device a pointer to a device module, which must
+     * be an index of one of the devices defined in the {@link Devices}
+     * array in {@link devices.php}.
+     * @final not to be redefined
+     */
     final public function __construct() {
-      $this->supportedEapMethods  = [EAP::$EAP_NONE];
-      debug(4,"RedirectEx called");
+        $this->supportedEapMethods  = [EAP::$EAP_NONE];
+        debug(4,"RedirectEx called");
     }
     public function writeDeviceInfo() {
         $out = "<p>";

devices/linux/Linux.php

Indentation +117 added lines, -117 removed lines

@@ -30,17 +30,17 @@ 
  */
 class Device_Linux extends DeviceConfig {
 
-      final public function __construct() {
+        final public function __construct() {
 //      $this->supportedEapMethods  = array(EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP);
-      $this->supportedEapMethods  = [ EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP, EAP::$TTLS_MSCHAP2, EAP::$TLS ];
-      $this->local_dir = '.cat_installer';
-      $this->conf_file = '$HOME/'.$this->local_dir.'/cat_installer.conf';
-      debug(4,"LINUX: This device supports the following EAP methods: ");
-      debug(4,$this->supportedEapMethods);
+        $this->supportedEapMethods  = [ EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP, EAP::$TTLS_MSCHAP2, EAP::$TLS ];
+        $this->local_dir = '.cat_installer';
+        $this->conf_file = '$HOME/'.$this->local_dir.'/cat_installer.conf';
+        debug(4,"LINUX: This device supports the following EAP methods: ");
+        debug(4,$this->supportedEapMethods);
     }
 
-   public function writeInstaller() {
-      $out_string = '#!/usr/bin/env bash
+    public function writeInstaller() {
+        $out_string = '#!/usr/bin/env bash
 if [ -z "$BASH" ] ; then
    bash  $0
    exit
@@ -48,42 +48,42 @@ 
 
 
 ';
-      $out_string .= $this->printFunctions();
-      $out_string .= $this->printStart();
-      $out_string .= $this->printProfileConfirmation();
-      $out_string .= $this->printUserConsent();
-      $out_string .= $this->printCheckDirectory();
-      $CAs = $this->attributes['internal:CAs'][0];
-      $this->server_name = $this->glueServerNames($this->attributes['eap:server_name']);
-      $this->server_alt_subject_name_list = $this->mkSubjectAltNameList($this->attributes['eap:server_name']);
-      $out_string .= "# save certificates\n";
-      $out_string .= 'echo "';
-      foreach ($CAs as $ca) {
+        $out_string .= $this->printFunctions();
+        $out_string .= $this->printStart();
+        $out_string .= $this->printProfileConfirmation();
+        $out_string .= $this->printUserConsent();
+        $out_string .= $this->printCheckDirectory();
+        $CAs = $this->attributes['internal:CAs'][0];
+        $this->server_name = $this->glueServerNames($this->attributes['eap:server_name']);
+        $this->server_alt_subject_name_list = $this->mkSubjectAltNameList($this->attributes['eap:server_name']);
+        $out_string .= "# save certificates\n";
+        $out_string .= 'echo "';
+        foreach ($CAs as $ca) {
         $out_string .= $ca['pem']."\n";
-      }
-      $out_string .= '"'." > \$HOME/$this->local_dir/ca.pem\n";
+        }
+        $out_string .= '"'." > \$HOME/$this->local_dir/ca.pem\n";
 
-     $SSIDs = $this->attributes['internal:SSID'];
-     $delSSIDs = $this->attributes['internal:remove_SSID'];
+        $SSIDs = $this->attributes['internal:SSID'];
+        $delSSIDs = $this->attributes['internal:remove_SSID'];
 
-     $out_string .= $this->printNMScript($SSIDs,$delSSIDs);
-     $out_string .= $this->writeWpaConf($SSIDs);
-     if($this->selected_eap == EAP::$TLS) 
-       $out_string .= $this->printP12Dialog();
-     else
-       $out_string .= $this->printPasswordDialog();
-     $out_string .= $this->checkNMResultAndCont();
-     $installer_path = $this->installerBasename.'.sh';
-      file_put_contents($installer_path, $out_string);
-      return($installer_path);
-   }
+        $out_string .= $this->printNMScript($SSIDs,$delSSIDs);
+        $out_string .= $this->writeWpaConf($SSIDs);
+        if($this->selected_eap == EAP::$TLS) 
+        $out_string .= $this->printP12Dialog();
+        else
+        $out_string .= $this->printPasswordDialog();
+        $out_string .= $this->checkNMResultAndCont();
+        $installer_path = $this->installerBasename.'.sh';
+        file_put_contents($installer_path, $out_string);
+        return($installer_path);
+    }
 
     public function writeDeviceInfo() {
     $ssid_ct=count($this->attributes['internal:SSID']);
     $out = '';
 
-   $out .= _("The installer is in the form of a bash script. It will try to configure eduroam under Network Manager and if this is either not appropriate for your system or your version of Network Manager is too old, a wpa_supplicant config file will be created instead.");
-   $out .= "<p>";
+    $out .= _("The installer is in the form of a bash script. It will try to configure eduroam under Network Manager and if this is either not appropriate for your system or your version of Network Manager is too old, a wpa_supplicant config file will be created instead.");
+    $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']))." ";
@@ -91,39 +91,39 @@ 
             $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>";
     }
-   $out .= _("The installer will create .cat_installer sub-directory in your home directory and will copy your server certificates there.");
+    $out .= _("The installer will create .cat_installer sub-directory in your home directory and will copy your server certificates there.");
 if($this->eap == EAP::$TLS)
-   $out .= _("In order to connect to the network you will need 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. Your p12 file will also be copied to the .cat_installer directory.");
+    $out .= _("In order to connect to the network you will need 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. Your p12 file will also be copied to the .cat_installer directory.");
 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 .= _("You will be requested to enter your account credentials during the installation. 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 .= _("You will be requested to enter your account credentials during the installation. This information will be saved so that you will reconnect to the network automatically each time you are in the range.");
 }
     $out .= "<p>";
     return $out;
-  }
+    }
 
 
-  private function printCheckDirectory() {
+    private function printCheckDirectory() {
 $out = 'if [ -d $HOME/'.$this->local_dir.' ] ; then
    if ! ask "'.sprintf(_("Directory %s exists; some of its files may be overwritten."),'$HOME/'.$this->local_dir).'" "'._("Continue").'" 1 ; then exit; fi
 else
   mkdir $HOME/'.$this->local_dir.'
 fi
 ';
- return $out;
-  }
+    return $out;
+    }
 
-  private function checkNMResultAndCont() {
+    private function checkNMResultAndCont() {
     $out = 'if run_python_script ; then
    show_info "'._("Installation successful").'"
 else
@@ -138,50 +138,50 @@ 
    show_info "'.sprintf(_("Output written to %s"),$this->conf_file).'"
 fi
 ';
-  return $out;
-  }
+    return $out;
+    }
 
 private function printStart() {
-     $out = "setup_environment\n";
-     $out .= 'show_info "'._("This installer has been prepared for \${ORGANISATION}").'\n\n'._("More information and comments:").'\n\nEMAIL: ${SUPPORT}\nWWW: ${URL}\n\n'.
+        $out = "setup_environment\n";
+        $out .= 'show_info "'._("This installer has been prepared for \${ORGANISATION}").'\n\n'._("More information and comments:").'\n\nEMAIL: ${SUPPORT}\nWWW: ${URL}\n\n'.
 _("Installer created with software from the GEANT project.").'"
 ';
-  return $out;
+    return $out;
 }
 
 
 private function printProfileConfirmation() {
- if($this->attributes['internal:profile_count'][0] > 1)
-       $out = 'if ! ask "'.sprintf(_("This installer will only work properly if you are a member of %s and the user group: %s."),'${bf}'.$this->attributes['general:instname'][0].'${n}','${bf}'.$this->attributes['profile:name'][0]).'${n}"';
+    if($this->attributes['internal:profile_count'][0] > 1)
+        $out = 'if ! ask "'.sprintf(_("This installer will only work properly if you are a member of %s and the user group: %s."),'${bf}'.$this->attributes['general:instname'][0].'${n}','${bf}'.$this->attributes['profile:name'][0]).'${n}"';
     else
-       $out = 'if ! ask "'.sprintf(_("This installer will only work properly if you are a member of %s."),'${bf}'.$this->attributes['general:instname'][0]).'${n}"';
+        $out = 'if ! ask "'.sprintf(_("This installer will only work properly if you are a member of %s."),'${bf}'.$this->attributes['general:instname'][0]).'${n}"';
     $out .= ' "'._("Continue").'" 1 ; then exit; fi
 ';
-  return $out;
+    return $out;
 
 }
 
 
-  private function printUserConsent() {
+    private function printUserConsent() {
     $out = '';
     if(isset($this->attributes['support:info_file'])) {
-      if( $this->attributes['internal:info_file'][0]['mime'] == 'txt') {
-         $handle = fopen($this->attributes['internal:info_file'][0]['name'],"r");
-         $consent = '';
-         while (($buffer = fgets($handle, 4096)) !== false) {
-           $consent .= rtrim($buffer) . '\n';
-         }
-         $out = 'if ! ask "'.$consent.'${n}" "'._("Continue").'" 1 ; then exit; fi
+        if( $this->attributes['internal:info_file'][0]['mime'] == 'txt') {
+            $handle = fopen($this->attributes['internal:info_file'][0]['name'],"r");
+            $consent = '';
+            while (($buffer = fgets($handle, 4096)) !== false) {
+            $consent .= rtrim($buffer) . '\n';
+            }
+            $out = 'if ! ask "'.$consent.'${n}" "'._("Continue").'" 1 ; then exit; fi
 ';
-      }
+        }
     }
     return $out;
-  }
+    }
 # ask user for confirmation
 # the first argument is the user prompt
 # if the second argument is 0 then the first element of yes_no array
 # will be the default value prompted to the user
-  private function printFunctions() {
+    private function printFunctions() {
 $url = (isset($this->attributes['support:url'][0]) && $this->attributes['support:url'][0] ) ? $this->attributes['support:url'][0] : $this->support_url_substitute;
 $support=(isset($this->attributes['support:email'][0]) && $this->attributes['support:email'][0] ) ? $this->attributes['support:email'][0] : $this->support_email_substitute;
 $out ='
@@ -391,11 +391,11 @@ 
 }
 
 
-  private function writeWpaConf($SSIDs) {
-     $e = EAP::eapDisplayName($this->selected_eap);
+    private function writeWpaConf($SSIDs) {
+        $e = EAP::eapDisplayName($this->selected_eap);
 $out = 'function create_wpa_conf {
 cat << EOFW >> '.$this->conf_file."\n";
-     foreach (array_keys($SSIDs) as $ssid) {
+        foreach (array_keys($SSIDs) as $ssid) {
     $out .= '
 network={
   ssid="'.$ssid.'"
@@ -405,42 +405,42 @@ 
   eap='.$e['OUTER'].'
   ca_cert="${HOME}/'.$this->local_dir.'/ca.pem"
   identity="${USER_NAME}"';
-  if($this->server_name)
+    if($this->server_name)
     $out .= '
   domain_suffix_match="'.$this->server_name.'"';
-  if($this->selected_eap == EAP::$TLS) {
+    if($this->selected_eap == EAP::$TLS) {
     $out .= '
   private_key="${HOME}/'.$this->local_dir.'/user.p12"
   private_key_passwd="${PASSWORD}"';
-  } else {
+    } else {
     $out .= '
   phase2="auth='.$e['INNER'].'"
   password="${PASSWORD}"';
-  if($this->attributes['internal:use_anon_outer'][0] == 1) 
+    if($this->attributes['internal:use_anon_outer'][0] == 1) 
     $out .= '
   anonymous_identity="'.$this->attributes['internal:anon_local_value'][0].'@'.$this->attributes['internal:realm'][0].'"';
-  }
+    }
     $out .= '
 }';
 }
-  $out .= '
+    $out .= '
 EOFW
 chmod 600 '.$this->conf_file.'
 }
 ';
-  return $out;
+    return $out;
 }
 
 
 
-  private function printPasswordDialog() {
-  $out = '#prompt user for credentials
+    private function printPasswordDialog() {
+    $out = '#prompt user for credentials
   user_cred
   ';
-  return $out;
+    return $out;
 }
-  private function printP12Dialog() {
-  $out ='function p12dialog {
+    private function printP12Dialog() {
+    $out ='function p12dialog {
   if [ ! -z $ZENITY ] ; then
     if ! cert=`$ZENITY --file-selection --file-filter="'._("personal certificate file (p12 or pfx)").' | *.p12 *.P12 *.pfx *.PFX" --file-filter="All files | *" --title="'._("personal certificate file (p12 or pfx)").'" 2>/dev/null` ; then
        exit
@@ -499,37 +499,37 @@ 
 }  
 p12dialog
 ';
- return $out;
+    return $out;
 }
 
 
 private function glueServerNames($server_list) {
-  if(! $server_list)
+    if(! $server_list)
     return '';
-  $A0 =  array_reverse(explode('.',array_shift($server_list)));
-  $B = $A0;
-  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;
+    foreach($server_list as $a) {
+        $A= array_reverse(explode('.',$a));
+        $B = array_intersect_assoc($A0,$A);
+        $A0 = $B;
+    }
+    return(implode('.',array_reverse($B)));
 }
 
 private function mkSubjectAltNameList($server_list) {
-  if(! $server_list)
+    if(! $server_list)
     return '';
-  $out = '';
-  foreach($server_list as $a) {
-     if($out)
-       $out .= ','; 
-     $out .= "'DNS:$a'";
-  }
-  return $out;
+    $out = '';
+    foreach($server_list as $a) {
+        if($out)
+        $out .= ','; 
+        $out .= "'DNS:$a'";
+    }
+    return $out;
 }
 
 private function printNMScript($SSIDs,$delSSIDs) {
-   $e = EAP::eapDisplayName($this->selected_eap);
+    $e = EAP::eapDisplayName($this->selected_eap);
 $out = 'function run_python_script {
 PASSWORD=$( echo "$PASSWORD" | sed "s/\'/\\\\\\\'/g" )
 if python << EEE1 > /dev/null 2>&1
@@ -668,20 +668,20 @@ 
             \'identity\': \'$USER_NAME\',
             \'ca-cert\': dbus.ByteArray("file://{0}\0".format(self.cacert_file).encode(\'utf8\')),';
     if($this->server_name) {
-             $out .= '
+                $out .= '
              match_key: match_value,';
     }
     if($this->selected_eap == EAP::$TLS) {
-       $out .= '
+        $out .= '
             \'client-cert\':  dbus.ByteArray("file://{0}\0".format(self.pfx_file).encode(\'utf8\')),
             \'private-key\':  dbus.ByteArray("file://{0}\0".format(self.pfx_file).encode(\'utf8\')),
             \'private-key-password\':  \'$PASSWORD\',';
     } else {
-       $out .= '
+        $out .= '
             \'password\': \'$PASSWORD\',
             \'phase2-auth\': \''.strtolower($e['INNER']).'\',';
-         if($this->attributes['internal:use_anon_outer'][0] == 1) 
-              $out .= '
+            if($this->attributes['internal:use_anon_outer'][0] == 1) 
+                $out .= '
             \'anonymous-identity\': \''.$this->attributes['internal:anon_local_value'][0].'@'.$this->attributes['internal:realm'][0].'\',';
     }
     $out .= '
@@ -701,17 +701,17 @@ 
     def main(self):
         self.check_opts()
         ver = self.connect_to_NM()';
-     foreach (array_keys($SSIDs) as $ssid) {
-           $out .='
+        foreach (array_keys($SSIDs) as $ssid) {
+            $out .='
         self.delete_existing_connections(\''.$ssid.'\')
         self.add_connection(\''.$ssid.'\')';
-     }
+        }
 //   create a list of profiles to be deleted after installation
-     foreach ($delSSIDs as $ssid => $cipher) {
-         if($cipher == 'DEL')
+        foreach ($delSSIDs as $ssid => $cipher) {
+            if($cipher == 'DEL')
             $out .='
         self.delete_existing_connections(\''.$ssid.'\')';
-     }
+        }
 
 $out .='
 

devices/devices-template.php

Indentation +149 added lines, -149 removed lines

@@ -55,10 +55,10 @@ 
  */
 
 public static $Options=[
-  'sign'=>0,
-  'no_cache'=>0,
-  'hidden'=>0,
-  'redirect'=>0,
+    'sign'=>0,
+    'no_cache'=>0,
+    'hidden'=>0,
+    'redirect'=>0,
 ];
 
 /**
@@ -96,75 +96,75 @@ 
 
 public static function listDevices() {
     return [
- 'w10'=>[
-   'group' => "microsoft",
-   'display'=>_("MS Windows 10"),
-   'match'=>'Windows NT 10',
-   'directory'=>'ms',
-   'module'=>'W8',
-   'signer'=>'ms_windows_sign',
+    'w10'=>[
+    'group' => "microsoft",
+    'display'=>_("MS Windows 10"),
+    'match'=>'Windows NT 10',
+    'directory'=>'ms',
+    'module'=>'W8',
+    'signer'=>'ms_windows_sign',
     'options'=>[
-       'sign'=>1,
-       'device_id'=>'W10',
-       'mime'=>'application/x-dosexec',
-      ],
-   ],
+        'sign'=>1,
+        'device_id'=>'W10',
+        'mime'=>'application/x-dosexec',
+        ],
+    ],
 	
- 'w8'=>[
-   'group' => "microsoft",
-   'display'=>_("MS Windows 8, 8.1"),
-   'match'=>'Windows NT 6[._][23]',
-   'directory'=>'ms',
-   'module'=>'W8',
-   'signer'=>'ms_windows_sign',
+    'w8'=>[
+    'group' => "microsoft",
+    'display'=>_("MS Windows 8, 8.1"),
+    'match'=>'Windows NT 6[._][23]',
+    'directory'=>'ms',
+    'module'=>'W8',
+    'signer'=>'ms_windows_sign',
     'options'=>[
-       'sign'=>1,
-       'device_id'=>'W8',
-       'mime'=>'application/x-dosexec',
-      ],
-   ],
+        'sign'=>1,
+        'device_id'=>'W8',
+        'mime'=>'application/x-dosexec',
+        ],
+    ],
 	
- 'w7'=>[
-   'group' => "microsoft",
-   'display'=>_("MS Windows 7"),
-   'match'=>'Windows NT 6[._]1',
-   'directory'=>'ms',
-   'module'=>'Vista7',
-   'signer'=>'ms_windows_sign',
+    'w7'=>[
+    'group' => "microsoft",
+    'display'=>_("MS Windows 7"),
+    'match'=>'Windows NT 6[._]1',
+    'directory'=>'ms',
+    'module'=>'Vista7',
+    'signer'=>'ms_windows_sign',
     'options'=>[
-       'sign'=>1,
-       'device_id'=>'W7',
-       'mime'=>'application/x-dosexec',
-      ],
-   ],
+        'sign'=>1,
+        'device_id'=>'W7',
+        'mime'=>'application/x-dosexec',
+        ],
+    ],
 	
- 'vista'=>[
-   'group' => "microsoft",
-   'display'=>_("MS Windows Vista"),
-   'match'=>'Windows NT 6[._]0',
-   'directory'=>'ms',
-   'module'=>'Vista7',
-   'signer'=>'ms_windows_sign',
+    'vista'=>[
+    'group' => "microsoft",
+    'display'=>_("MS Windows Vista"),
+    'match'=>'Windows NT 6[._]0',
+    'directory'=>'ms',
+    'module'=>'Vista7',
+    'signer'=>'ms_windows_sign',
     'options'=>[
-       'sign'=>1,
-       'device_id'=>'Vista',
-       'mime'=>'application/x-dosexec',
-      ],
-   ],
+        'sign'=>1,
+        'device_id'=>'Vista',
+        'mime'=>'application/x-dosexec',
+        ],
+    ],
 	
- 'win-rt'=>[
+    'win-rt'=>[
     'group' => "microsoft",
     'display'=>_("Windows RT"),
     'directory'=>'redirect_dev',
     'module'=>'RedirectDev',
     'options'=>[
-      'hidden'=>0,
-      'redirect'=>1,
-      ],
-   ],
+        'hidden'=>0,
+        'redirect'=>1,
+        ],
+    ],
     
 
- 'apple_el_cap'=>[
+    'apple_el_cap'=>[
     'group' => "apple",
     'display'=>_("Apple OS X El Capitan"),
     'match'=>'Mac OS X 10[._]11',
@@ -172,13 +172,13 @@ 
     'module'=>'mobileconfig_os_x',
     'signer'=>'mobileconfig_sign',
     'options'=>array(
-       'sign'=>1,
-       'device_id'=>'OS_X',
-       'mime'=>'application/x-apple-aspen-config',
-      ),
+        'sign'=>1,
+        'device_id'=>'OS_X',
+        'mime'=>'application/x-apple-aspen-config',
+        ),
     ],
 
- 'apple_yos'=>[
+    'apple_yos'=>[
     'group' => "apple",
     'display'=>_("Apple OS X Yosemite"),
     'match'=>'Mac OS X 10[._]10',
@@ -186,13 +186,13 @@ 
     'module'=>'mobileconfig_os_x',
     'signer'=>'mobileconfig_sign',
     'options'=>[
-       'sign'=>1,
-       'device_id'=>'OS_X',
-       'mime'=>'application/x-apple-aspen-config',
-      ],
+        'sign'=>1,
+        'device_id'=>'OS_X',
+        'mime'=>'application/x-apple-aspen-config',
+        ],
     ],
 
- 'apple_mav'=>[
+    'apple_mav'=>[
     'group' => "apple",
     'display'=>_("Apple OS X Mavericks"),
     'match'=>'Mac OS X 10[._]9',
@@ -200,13 +200,13 @@ 
     'module'=>'mobileconfig_os_x',
     'signer'=>'mobileconfig_sign',
     'options'=>[
-       'sign'=>1,
-       'device_id'=>'OS_X',
-       'mime'=>'application/x-apple-aspen-config',
-      ],
+        'sign'=>1,
+        'device_id'=>'OS_X',
+        'mime'=>'application/x-apple-aspen-config',
+        ],
     ],
 
- 'apple_m_lion'=>[
+    'apple_m_lion'=>[
     'group' => "apple",
     'display'=>_("Apple OS X Mountain Lion"),
     'match'=>'Mac OS X 10[._]8',
@@ -214,13 +214,13 @@ 
     'module'=>'mobileconfig_os_x',
     'signer'=>'mobileconfig_sign',
     'options'=>[
-       'sign'=>1,
-       'device_id'=>'OS_X',
-       'mime'=>'application/x-apple-aspen-config',
-      ],
+        'sign'=>1,
+        'device_id'=>'OS_X',
+        'mime'=>'application/x-apple-aspen-config',
+        ],
     ],
 	
- 'apple_lion'=>[
+    'apple_lion'=>[
     'group' => "apple",
     'display'=>_("Apple OS X Lion"),
     'match'=>'Mac OS X 10[._]7',
@@ -228,13 +228,13 @@ 
     'module'=>'mobileconfig_os_x',
     'signer'=>'mobileconfig_sign',
     'options'=>[
-       'sign'=>1,
-       'device_id'=>'OS_X',
-       'mime'=>'application/x-apple-aspen-config',
-      ],
+        'sign'=>1,
+        'device_id'=>'OS_X',
+        'mime'=>'application/x-apple-aspen-config',
+        ],
     ],
         
- 'mobileconfig'=>[
+    'mobileconfig'=>[
     'group' => "apple",     
     'display'=>_("Apple iOS mobile devices"),
     'match'=>'(iPad|iPhone|iPod);.*OS [7-9]_',
@@ -242,13 +242,13 @@ 
     'module'=>'mobileconfig_ios',
     'signer'=>'mobileconfig_sign',
     'options'=>[
-       'sign'=>1,
-       'device_id'=>'iOS',
-       'mime'=>'application/x-apple-aspen-config',
-      ],
+        'sign'=>1,
+        'device_id'=>'iOS',
+        'mime'=>'application/x-apple-aspen-config',
+        ],
     ],
 
- 'mobileconfig-56'=>[
+    'mobileconfig-56'=>[
     'group' => "apple",
     'display'=>_("Apple iOS mobile devices (iOS 5 and 6)"),
     'match'=>'(iPad|iPhone|iPod);.*OS [56]_',
@@ -256,132 +256,132 @@ 
     'module'=>'mobileconfig_ios_56',
     'signer'=>'mobileconfig_sign',
     'options'=>[
-       'sign'=>1,
-       'device_id'=>'iOS',
-       'mime'=>'application/x-apple-aspen-config',
-      ],
+        'sign'=>1,
+        'device_id'=>'iOS',
+        'mime'=>'application/x-apple-aspen-config',
+        ],
     ],
 
         
- 'linux'=>[
-     'group' => "linux",
-     'display'=>_("Linux"),
-     'match'=>'Linux(?!.*Android)',
-     'directory'=>'linux',
-     'module' => 'Linux',
-     'options'=>[
-       'mime'=>'application/x-sh',
-      ],
-   ],
+    'linux'=>[
+        'group' => "linux",
+        'display'=>_("Linux"),
+        'match'=>'Linux(?!.*Android)',
+        'directory'=>'linux',
+        'module' => 'Linux',
+        'options'=>[
+        'mime'=>'application/x-sh',
+        ],
+    ],
 
- 'chromeos'=>[
+    'chromeos'=>[
     'group' => "chrome",
     'display'=>_("Chrome OS"),
     'match'=>'CrOS',
     'directory'=>'chromebook',
     'module'=>'chromebook',
     'options'=>[
-       'mime'=>'application/x-onc',
-       'message'=>sprintf(_("After downloading the file, open the Chrome browser and browse to this URL: <a href='chrome://net-internals/#chromeos'>chrome://net-internals/#chromeos</a>. Then, use the 'Import ONC file' button. The import is silent; the new network definitions will be added to the preferred networks.")),
-      ],
-   ],
+        'mime'=>'application/x-onc',
+        'message'=>sprintf(_("After downloading the file, open the Chrome browser and browse to this URL: <a href='chrome://net-internals/#chromeos'>chrome://net-internals/#chromeos</a>. Then, use the 'Import ONC file' button. The import is silent; the new network definitions will be added to the preferred networks.")),
+        ],
+    ],
         
- 'android_marshmallow'=>[
+    'android_marshmallow'=>[
     'group' => "android",
     'display'=>_("Android 6.0 Marshmallow"),
-     'match'=>'Android 6\.[0-9]',
+        'match'=>'Android 6\.[0-9]',
     'directory'=>'xml',
     'module'=>'Lollipop',
     'options'=>[
-       'mime'=>'application/eap-config',
-       'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
+        'mime'=>'application/eap-config',
+        'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
                             "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
-      ],
-   ],
+        ],
+    ],
 
- 'android_lollipop'=>[
+    'android_lollipop'=>[
     'group' => "android",
     'display'=>_("Android 5.0 Lollipop"),
-     'match'=>'Android 5\.[0-9]',
+        'match'=>'Android 5\.[0-9]',
     'directory'=>'xml',
     'module'=>'Lollipop',
     'options'=>[
-       'mime'=>'application/eap-config',
-       'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
+        'mime'=>'application/eap-config',
+        'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
                             "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
-      ],
-   ],
+        ],
+    ],
 
- 'android_kitkat'=>[
+    'android_kitkat'=>[
     'group' => "android",
     'display'=>_("Android 4.4 KitKat"),
-     'match'=>'Android 4\.[4-9]',
+        'match'=>'Android 4\.[4-9]',
     'directory'=>'xml',
     'module'=>'KitKat',
     'options'=>[
-       'mime'=>'application/eap-config',
-       'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
+        'mime'=>'application/eap-config',
+        'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
                             "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
-      ],
-   ],
+        ],
+    ],
 
 
- 'android_43'=>[
+    'android_43'=>[
     'group' => "android",
     'display'=>_("Android 4.3"),
-     'match'=>'Android 4\.3',
+        'match'=>'Android 4\.3',
     'directory'=>'xml',
     'module'=>'KitKat',
     'options'=>[
-       'mime'=>'application/eap-config',
-       'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
+        'mime'=>'application/eap-config',
+        'message'=>sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from %s, %s and %s, and will use the configuration file downloaded from CAT to create all necessary settings."),
                             "eduroamCAT",
                             "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>",
                             "<a target='_blank' href='unbeknownst'>Amazon Appstore</a>",
                             "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
-      ],
-   ],
+        ],
+    ],
 
- 'android_legacy'=>[
-     'group' => "android",
-     'display'=>_("Android"),
-     'match'=>'Android',
-     'directory'=>'redirect_dev',
-     'module'=>'RedirectDev',
-     'options'=>[
-       'redirect'=>1,
-      ],
-   ],
+    'android_legacy'=>[
+        'group' => "android",
+        'display'=>_("Android"),
+        'match'=>'Android',
+        'directory'=>'redirect_dev',
+        'module'=>'RedirectDev',
+        'options'=>[
+        'redirect'=>1,
+        ],
+    ],
 
- 'eap-config'=>[
+    'eap-config'=>[
     'group' => "eap-config",
     'display'=>_("EAP config"),
     'directory'=>'xml',
     'module'=>'XML_ALL',
     'options'=>[
-       'mime'=>'application/eap-config',
-       'message'=>sprintf(_("This option provides a generic EAP config XML file, which can be consumed by dedicated applications like eduroamCAT for Android and Linux platforms. This is still an experimental feature.")),
-      ],
+        'mime'=>'application/eap-config',
+        'message'=>sprintf(_("This option provides a generic EAP config XML file, which can be consumed by dedicated applications like eduroamCAT for Android and Linux platforms. This is still an experimental feature.")),
+        ],
     ],
 
- 'test'=>[
+    'test'=>[
     'group' => "other",
     'display'=>_("Test"),
     'directory'=>'test_module',
     'module'=>'TestModule',
     'options'=>[
-       'hidden'=>1,
-      ],
-   ],
+        'hidden'=>1,
+        ],
+    ],
 
 
 /*    

devices/test_module/TestModule.php

Indentation +43 added lines, -43 removed lines

@@ -70,51 +70,51 @@ 
  * @package ModuleWriting
  */
 class Device_TestModule extends DeviceConfig {
-   /**
-    * Constructs a Device object.
-    *
-    * It is CRUTCIAL that the constructor sets $this->supportedEapMethods to an array of methods
-    * available for the particular device.
-    * {@source}
-    * @param string $device a pointer to a device module, which must
-    * be an index of one of the devices defined in the {@link Devices}
-    * array in {@link devices.php}.
-    * @final not to be redefined
-    */
+    /**
+     * Constructs a Device object.
+     *
+     * It is CRUTCIAL that the constructor sets $this->supportedEapMethods to an array of methods
+     * available for the particular device.
+     * {@source}
+     * @param string $device a pointer to a device module, which must
+     * be an index of one of the devices defined in the {@link Devices}
+     * array in {@link devices.php}.
+     * @final not to be redefined
+     */
     final public function __construct() {
-      $this->supportedEapMethods  = EAP::listKnownEAPTypes();
-      debug(4,"This device supports the following EAP methods: ");
-      debug(4,$this->supportedEapMethods);
+        $this->supportedEapMethods  = EAP::listKnownEAPTypes();
+        debug(4,"This device supports the following EAP methods: ");
+        debug(4,$this->supportedEapMethods);
     }
 
-  /**
-   * prepare a zip archive containing files and settings which normally would be used inside the module to produce an installer
-   *
-   * {@source}
-   * @return string installer path name
-   */
-   public function writeInstaller() {
+    /**
+     * prepare a zip archive containing files and settings which normally would be used inside the module to produce an installer
+     *
+     * {@source}
+     * @return string installer path name
+     */
+    public function writeInstaller() {
 debug(4,"Test Module Installer start\n");
-   // create certificate files and save their names in $CA_files arrary
-     $CA_files = $this->saveCertificateFiles('der');
+    // create certificate files and save their names in $CA_files arrary
+        $CA_files = $this->saveCertificateFiles('der');
   
     // copy a fixed file from the module Files directory
-       if(! $this->copyFile('Module.howto'))
-          debug(2, "copying of Module.howto failed\n");
+        if(! $this->copyFile('Module.howto'))
+            debug(2, "copying of Module.howto failed\n");
 
     // copy a fixed file from the module Files directory and saveunde a different name
-       if( ! $this->copyFile('test_file','copied_test_file'))
-          debug(2, "copying of Module.howto to copied_test_file failed\n");
-       $this->dumpAttibutes('profile_attributes');
-       $installer_path =  $this->zipInstaller($this->attributes);
-       return($installer_path);
-   }
+        if( ! $this->copyFile('test_file','copied_test_file'))
+            debug(2, "copying of Module.howto to copied_test_file failed\n");
+        $this->dumpAttibutes('profile_attributes');
+        $installer_path =  $this->zipInstaller($this->attributes);
+        return($installer_path);
+    }
 
-  /**
-    * prepare module desctiption and usage information
-    * {@source}
-    * @return string HTML text to be displayed in the information window
-    */
+    /**
+     * prepare module desctiption and usage information
+     * {@source}
+     * @return string HTML text to be displayed in the information window
+     */
     public function writeDeviceInfo() {
     $ssid_ct=count($this->attributes['internal:SSID']);
     $out = "<p>";
@@ -124,15 +124,15 @@ 
 
 
 /**
-  * zip files and return the archive name
-  *
-  * inline{@source}
-  * return string
-  */
-  private function zipInstaller($attr) {
+ * zip files and return the archive name
+ *
+ * inline{@source}
+ * return string
+ */
+    private function zipInstaller($attr) {
     $e = $this->installerBasename.'.zip';
     $o = system('zip -q '.$e.' *');
     return $e;
-  }
+    }
 
 }

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

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

devices/ms/WindowsCommon.php

Indentation +61 added lines, -61 removed lines

@@ -18,11 +18,11 @@ 
  * @param string $in input string
  */
 function echo_nsi($in) {
-  echo preg_replace('/"/','$\"',$in);
+    echo preg_replace('/"/','$\"',$in);
 }
 
 function sprint_nsi($in) {
-  return preg_replace('/"/','$\"',$in);
+    return preg_replace('/"/','$\"',$in);
 }
 
 /**
@@ -35,39 +35,39 @@ 
 
 protected function prepareInstallerLang() {
     if(isset($this->LANGS[$this->lang_index])) {
-      $L = $this->LANGS[$this->lang_index];
-      $this->lang = $L['nsis'];
-      $this->code_page = 'cp'.$L['cp'];
+        $L = $this->LANGS[$this->lang_index];
+        $this->lang = $L['nsis'];
+        $this->code_page = 'cp'.$L['cp'];
     } else {
-      $this->lang = 'English';
-      $this->code_page = 'cp1252';
+        $this->lang = 'English';
+        $this->code_page = 'cp1252';
     }
 }
 
 protected function combineLogo($Logos) {
     // maximum size to which we want to resize
- $max_size= 120;
+    $max_size= 120;
 // logo wull be shited up by this much
- $vshift = 20;
- $bg_image = new Imagick('cat_bg.bmp');
- $bg_image->setFormat('BMP3');
- $bg_image_size = $bg_image->getImageGeometry();
- $logo = new Imagick($Logos[0]['name']);
- $logo_size = $logo->getImageGeometry();
- $max = max($logo_size);
- debug(4,"Logo size: "); debug(4,$logo_size); debug(4,"max=$max\n");
+    $vshift = 20;
+    $bg_image = new Imagick('cat_bg.bmp');
+    $bg_image->setFormat('BMP3');
+    $bg_image_size = $bg_image->getImageGeometry();
+    $logo = new Imagick($Logos[0]['name']);
+    $logo_size = $logo->getImageGeometry();
+    $max = max($logo_size);
+    debug(4,"Logo size: "); debug(4,$logo_size); debug(4,"max=$max\n");
 // resize logo if necessary
- if($max > $max_size) {
-   if($max == $logo_size['width'])
-      $logo->scaleImage($max_size,0);
-   else
-      $logo->scaleImage(0,$max_size);
- }
- $logo_size = $logo->getImageGeometry();
- debug(4,"New logo size: "); debug(4,$logo_size);
+    if($max > $max_size) {
+    if($max == $logo_size['width'])
+        $logo->scaleImage($max_size,0);
+    else
+        $logo->scaleImage(0,$max_size);
+    }
+    $logo_size = $logo->getImageGeometry();
+    debug(4,"New logo size: "); debug(4,$logo_size);
 // calculate logo offsets for composition with the background
- $hoffset = round(($bg_image_size['width'] - $logo_size['width'])/2);
- $voffset = round(($bg_image_size['height'] - $logo_size['height'])/2) - $vshift;
+    $hoffset = round(($bg_image_size['width'] - $logo_size['width'])/2);
+    $voffset = round(($bg_image_size['height'] - $logo_size['height'])/2) - $vshift;
 
 //logo image is put on top of the background
 $bg_image->compositeImage($logo, $logo->getImageCompose(), $hoffset, $voffset);
@@ -77,61 +77,61 @@ 
 }
 
 protected function signInstaller($attr) {
-   $e = $this->installerBasename.'.exe';
-   if($this->sign) {
-      $o = system($this->sign." installer.exe '$e' > /dev/null");
-   }
-   else
-      rename("installer.exe",$e);
-   return $e;
+    $e = $this->installerBasename.'.exe';
+    if($this->sign) {
+        $o = system($this->sign." installer.exe '$e' > /dev/null");
+    }
+    else
+        rename("installer.exe",$e);
+    return $e;
 }
 
 protected function compileNSIS() {
-   if(Config::$NSIS_VERSION >= 3)
-      $makensis = Config::$PATHS['makensis'] . " -INPUTCHARSET UTF8";
-   else
-      $makensis = Config::$PATHS['makensis']; 
-   $o = $makensis.' -V4 cat.NSI > nsis.log';
-   system($o);
-   debug(4,"compileNSIS:$o\n");
+    if(Config::$NSIS_VERSION >= 3)
+        $makensis = Config::$PATHS['makensis'] . " -INPUTCHARSET UTF8";
+    else
+        $makensis = Config::$PATHS['makensis']; 
+    $o = $makensis.' -V4 cat.NSI > nsis.log';
+    system($o);
+    debug(4,"compileNSIS:$o\n");
 }
 
 protected function msInfoFile($attr) {
- $out = '';
+    $out = '';
 if(isset($attr['support:info_file'])) {
     $out .= '!define EXTERNAL_INFO "';
 //  debug(4,"Info file type ".$attr['support:info_file'][0]['mime']."\n");
-  if ($attr['internal:info_file'][0]['mime'] == 'rtf')
-     $out = '!define LICENSE_FILE "'. $attr['internal:info_file'][0]['name'];
-  elseif( $attr['internal:info_file'][0]['mime'] == 'txt') {
-     $in_txt = file_get_contents($attr['internal:info_file'][0]['name']);
-     if(Config::$NSIS_VERSION >= 3)
+    if ($attr['internal:info_file'][0]['mime'] == 'rtf')
+        $out = '!define LICENSE_FILE "'. $attr['internal:info_file'][0]['name'];
+    elseif( $attr['internal:info_file'][0]['mime'] == 'txt') {
+        $in_txt = file_get_contents($attr['internal:info_file'][0]['name']);
+        if(Config::$NSIS_VERSION >= 3)
         $out_txt = $in_txt;
-     else
+        else
         $out_txt = iconv('UTF-8',$this->code_page.'//TRANSLIT',$in_txt);
-     if($out_txt) {
+        if($out_txt) {
         file_put_contents('info_f.txt',$out_txt);
         $out = '!define LICENSE_FILE " info_f.txt';
-     }
-  }
-  else
-     $out = '!define EXTERNAL_INFO "'. $attr['internal:info_file'][0]['name'];
+        }
+    }
+    else
+        $out = '!define EXTERNAL_INFO "'. $attr['internal:info_file'][0]['name'];
 
-  $out .= "\"\n";
+    $out .= "\"\n";
 }
- debug(4,"Info file returned: $out");
-  return $out;
+    debug(4,"Info file returned: $out");
+    return $out;
 }
 
 
 protected function writeAdditionalDeletes($P) {
-  if(count($P) == 0 )
+    if(count($P) == 0 )
     return;
-  $f = fopen('profiles.nsh','a');
-  fwrite($f,"!define AdditionalDeletes\n");
-  foreach ($P as $p)
+    $f = fopen('profiles.nsh','a');
+    fwrite($f,"!define AdditionalDeletes\n");
+    foreach ($P as $p)
     fwrite($f,"!insertmacro define_delete_profile \"$p\"\n");
-  fclose($f);
+    fclose($f);
 }
 
 
@@ -181,7 +181,7 @@ 
 'af'=>['nsis'=>"Afrikaans",'cp'=>'1252'],
 'ast'=>['nsis'=>"Asturian",'cp'=>'1252'],
 
-  ];
+    ];
 
 public $code_page;
 public $lang;