GEANT / CAT

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

devices/xml/XML_TTLS_PAP.php

Indentation +4 added lines, -4 removed lines

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

devices/xml/XML_ALL.php

Indentation +9 added lines, -9 removed lines

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

devices/xml/KitKat.php

Indentation +7 added lines, -7 removed lines

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

devices/xml/XML_TLS.php

Indentation +4 added lines, -4 removed lines

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