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

Spacing +2 added lines, -2 removed lines

@@ -14,8 +14,8 @@
     * @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>";

Doc Comments -3 removed lines

@@ -76,9 +76,6 @@
     * 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() {

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 .='
 

Spacing +101 added lines, -101 removed lines

@@ -32,11 +32,11 @@ 
 
       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->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->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() {
@@ -59,40 +59,40 @@ 
       $out_string .= "# save certificates\n";
       $out_string .= 'echo "';
       foreach ($CAs as $ca) {
-        $out_string .= $ca['pem']."\n";
+        $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'];
 
-     $out_string .= $this->printNMScript($SSIDs,$delSSIDs);
+     $out_string .= $this->printNMScript($SSIDs, $delSSIDs);
      $out_string .= $this->writeWpaConf($SSIDs);
-     if($this->selected_eap == EAP::$TLS) 
+     if ($this->selected_eap == EAP::$TLS) 
        $out_string .= $this->printP12Dialog();
      else
        $out_string .= $this->printPasswordDialog();
      $out_string .= $this->checkNMResultAndCont();
-     $installer_path = $this->installerBasename.'.sh';
+     $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']);
+    $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>";
-    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']))." ";
+    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'])) . " ";
         } else
-            $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"),implode(', ',Config::$CONSORTIUM['ssid']))." ";
+            $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)
+           if (!in_array($ssid, Config::$CONSORTIUM['ssid'])) {
+             if ($i > 0)
            $out .= ", ";
          $i++;
          $out .= "<strong>$ssid</strong>";
@@ -101,7 +101,7 @@ 
     $out .= "<p>";
     }
    $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)
+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.");
 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.");
@@ -114,10 +114,10 @@ 
 
 
   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
+$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.'
+  mkdir $HOME/'.$this->local_dir . '
 fi
 ';
  return $out;
@@ -125,17 +125,17 @@ 
 
   private function checkNMResultAndCont() {
     $out = 'if run_python_script ; then
-   show_info "'._("Installation successful").'"
+   show_info "'._("Installation successful") . '"
 else
-   show_info "'._("Network Manager configuration failed, generating wpa_supplicant.conf").'"
-   if ! ask "'.("Network Manager configuration failed, but we may generate a wpa_supplicant configuration file if you wish. Be warned that your connection password will be saved in this file as clear text.").'" "'._("Write the file").'" 1 ; then exit ; fi
+   show_info "'._("Network Manager configuration failed, generating wpa_supplicant.conf") . '"
+   if ! ask "'.("Network Manager configuration failed, but we may generate a wpa_supplicant configuration file if you wish. Be warned that your connection password will be saved in this file as clear text.") . '" "' . _("Write the file") . '" 1 ; then exit ; fi
 
-if [ -f '.$this->conf_file.' ] ; then
-  if ! ask "'.sprintf(_("File %s exists; it will be overwritten."),$this->conf_file).'" "'._("Continue").'" 1 ; then confirm_exit; fi
-  rm '.$this->conf_file.'
+if [ -f '.$this->conf_file . ' ] ; then
+  if ! ask "'.sprintf(_("File %s exists; it will be overwritten."), $this->conf_file) . '" "' . _("Continue") . '" 1 ; then confirm_exit; fi
+  rm '.$this->conf_file . '
   fi
    create_wpa_conf
-   show_info "'.sprintf(_("Output written to %s"),$this->conf_file).'"
+   show_info "'.sprintf(_("Output written to %s"), $this->conf_file) . '"
 fi
 ';
   return $out;
@@ -143,19 +143,19 @@ 
 
 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'.
-_("Installer created with software from the GEANT project.").'"
+     $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;
 }
 
 
 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 .= ' "'._("Continue").'" 1 ; then exit; fi
+       $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;
 
@@ -164,14 +164,14 @@ 
 
   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");
+    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
+         $out = 'if ! ask "' . $consent . '${n}" "' . _("Continue") . '" 1 ; then exit; fi
 ';
       }
     }
@@ -182,18 +182,18 @@ 
 # 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() {
-$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 ='
+$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 = '
 my_name=$0
 
 
 function setup_environment {
   bf=""
   n=""
-  ORGANISATION="'.$this->attributes['general:instname'][0].'"
-  URL="'.$url.'"
-  SUPPORT="'.$support.'"
+  ORGANISATION="'.$this->attributes['general:instname'][0] . '"
+  URL="'.$url . '"
+  SUPPORT="'.$support . '"
 if [ ! -z "$DISPLAY" ] ; then
   if which zenity 1>/dev/null 2>&1 ; then
     ZENITY=`which zenity`
@@ -232,7 +232,7 @@ 
 
 
 function ask {
-     T="'.Config::$APPEARANCE['productname'].'"
+     T="'.Config::$APPEARANCE['productname'] . '"
 #  if ! [ -z "$3" ] ; then
 #     T="$T: $3"
 #  fi
@@ -252,8 +252,8 @@ 
      fi
   fi
 
-  yes='._("Y").'
-  no='._("N").'
+  yes='._("Y") . '
+  no='._("N") . '
   yes1=`echo $yes | awk \'{ print toupper($0) }\'`
   no1=`echo $no | awk \'{ print toupper($0) }\'`
 
@@ -310,12 +310,12 @@ 
 
 function confirm_exit {
   if [ ! -z $KDIALOG ] ; then
-     if $KDIALOG --yesno "'._("Really quit?").'"  ; then
+     if $KDIALOG --yesno "'._("Really quit?") . '"  ; then
      exit 1
      fi
   fi
   if [ ! -z $ZENITY ] ; then
-     if $ZENITY --question --text="'._("Really quit?").'" 2>/dev/null ; then
+     if $ZENITY --question --text="'._("Really quit?") . '" 2>/dev/null ; then
         exit 1
      fi
   fi
@@ -368,20 +368,20 @@ 
   PASSWORD="a"
   PASSWORD1="b"
 
-  if ! USER_NAME=`prompt_nonempty_string 1 "'._("enter your userid").'"` ; then
+  if ! USER_NAME=`prompt_nonempty_string 1 "'._("enter your userid") . '"` ; then
     exit 1
   fi
 
   while [ "$PASSWORD" != "$PASSWORD1" ]
   do
-    if ! PASSWORD=`prompt_nonempty_string 0 "'._("enter your password").'"` ; then
+    if ! PASSWORD=`prompt_nonempty_string 0 "'._("enter your password") . '"` ; then
       exit 1
     fi
-    if ! PASSWORD1=`prompt_nonempty_string 0 "'._("repeat your password").'"` ; then
+    if ! PASSWORD1=`prompt_nonempty_string 0 "'._("repeat your password") . '"` ; then
       exit 1
     fi
     if [ "$PASSWORD" != "$PASSWORD1" ] ; then
-      alert "'._("passwords do not match").'"
+      alert "'._("passwords do not match") . '"
     fi
   done
 }
@@ -394,38 +394,38 @@ 
   private function writeWpaConf($SSIDs) {
      $e = EAP::eapDisplayName($this->selected_eap);
 $out = 'function create_wpa_conf {
-cat << EOFW >> '.$this->conf_file."\n";
+cat << EOFW >> '.$this->conf_file . "\n";
      foreach (array_keys($SSIDs) as $ssid) {
     $out .= '
 network={
-  ssid="'.$ssid.'"
+  ssid="'.$ssid . '"
   key_mgmt=WPA-EAP
   pairwise=CCMP
   group=CCMP TKIP
-  eap='.$e['OUTER'].'
-  ca_cert="${HOME}/'.$this->local_dir.'/ca.pem"
+  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) {
+  domain_suffix_match="'.$this->server_name . '"';
+  if ($this->selected_eap == EAP::$TLS) {
     $out .= '
-  private_key="${HOME}/'.$this->local_dir.'/user.p12"
+  private_key="${HOME}/'.$this->local_dir . '/user.p12"
   private_key_passwd="${PASSWORD}"';
   } else {
     $out .= '
-  phase2="auth='.$e['INNER'].'"
+  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].'"';
+  anonymous_identity="'.$this->attributes['internal:anon_local_value'][0] . '@' . $this->attributes['internal:realm'][0] . '"';
   }
     $out .= '
 }';
 }
   $out .= '
 EOFW
-chmod 600 '.$this->conf_file.'
+chmod 600 '.$this->conf_file . '
 }
 ';
   return $out;
@@ -440,13 +440,13 @@ 
   return $out;
 }
   private function printP12Dialog() {
-  $out ='function p12dialog {
+  $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
+    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
     fi
   elif [ ! -z $KDIALOG ] ; then
-    if ! cert=`$KDIALOG --getopenfilename . "*.p12 *.P12 *.pfx *.PFX | '._("personal certificate file (p12 or pfx)").'" --title "'._("personal certificate file (p12 or pfx)").'"` ; then
+    if ! cert=`$KDIALOG --getopenfilename . "*.p12 *.P12 *.pfx *.PFX | '._("personal certificate file (p12 or pfx)") . '" --title "' . _("personal certificate file (p12 or pfx)") . '"` ; then
        exit
     fi
   
@@ -458,7 +458,7 @@ 
     fi
 
     while true ; do
-      prompt="'._("personal certificate file (p12 or pfx)").'"
+      prompt="'._("personal certificate file (p12 or pfx)") . '"
       read -p "${prompt} [$bf$cert${n}]" cert_f
       if [ "$cert" -a -z "$cert_f" ] ; then
          break
@@ -467,20 +467,20 @@ 
           cert=$cert_f
           break
         else
-          echo "'._("file not found").'"
+          echo "'._("file not found") . '"
           cert=""
         fi
       fi
     done
 fi
-    cp "$cert" $HOME/'.$this->local_dir.'/user.p12
-    cert=$HOME/'.$this->local_dir.'/user.p12
+    cp "$cert" $HOME/'.$this->local_dir . '/user.p12
+    cert=$HOME/'.$this->local_dir . '/user.p12
 
     PASSWORD=""
-    prompt="'._("enter the password for the certificate file").'"
+    prompt="'._("enter the password for the certificate file") . '"
     while [ ! "$PASSWORD" ]
     do
-      if ! PASSWORD=`prompt_nonempty_string 0 "'._("enter the password for the certificate file").'"` ; then
+      if ! PASSWORD=`prompt_nonempty_string 0 "'._("enter the password for the certificate file") . '"` ; then
         exit 1
       fi
       if openssl pkcs12 -in $cert -passin pass:"$PASSWORD" -noout 2>/dev/null; then
@@ -493,7 +493,7 @@ 
         PASSWORD=""
       fi
     done
-      if ! USERNAME=`prompt_nonempty_string 1 "'._("enter your userid").'" "$USER_NAME"` ; then
+      if ! USERNAME=`prompt_nonempty_string 1 "'._("enter your userid") . '" "$USER_NAME"` ; then
        exit 1
     fi
 }  
@@ -504,31 +504,31 @@ 
 
 
 private function glueServerNames($server_list) {
-  if(! $server_list)
+  if (!$server_list)
     return '';
-  $A0 =  array_reverse(explode('.',array_shift($server_list)));
+  $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);
+  foreach ($server_list as $a) {
+     $A = array_reverse(explode('.', $a));
+     $B = array_intersect_assoc($A0, $A);
      $A0 = $B;
    }
-  return(implode('.',array_reverse($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)
+  foreach ($server_list as $a) {
+     if ($out)
        $out .= ','; 
      $out .= "'DNS:$a'";
   }
   return $out;
 }
 
-private function printNMScript($SSIDs,$delSSIDs) {
+private function printNMScript($SSIDs, $delSSIDs) {
    $e = EAP::eapDisplayName($this->selected_eap);
 $out = 'function run_python_script {
 PASSWORD=$( echo "$PASSWORD" | sed "s/\'/\\\\\\\'/g" )
@@ -588,8 +588,8 @@ 
             sys.exit(2)
 
     def check_opts(self):
-        self.cacert_file = \'${HOME}/'.$this->local_dir.'/ca.pem\'
-        self.pfx_file = \'${HOME}/'.$this->local_dir.'/user.p12\'
+        self.cacert_file = \'${HOME}/'.$this->local_dir . '/ca.pem\'
+        self.pfx_file = \'${HOME}/'.$this->local_dir . '/user.p12\'
         if not os.path.isfile(self.cacert_file):
             print("Certificate file not found, looks like a CAT error")
             sys.exit(2)
@@ -638,8 +638,8 @@ 
                pass
 
     def add_connection(self,ssid):
-        server_alt_subject_name_list = dbus.Array({'.$this->server_alt_subject_name_list.'})
-        server_name = \''.$this->server_name.'\'
+        server_alt_subject_name_list = dbus.Array({'.$this->server_alt_subject_name_list . '})
+        server_name = \''.$this->server_name . '\'
         if self.nm_version == "0.9" or self.nm_version == "1.0":
              match_key = \'altsubject-matches\'
              match_value = server_alt_subject_name_list
@@ -664,14 +664,14 @@ 
             \'group\': [\'ccmp\', \'tkip\']
         })
         s_8021x = dbus.Dictionary({
-            \'eap\': [\''.strtolower($e['OUTER']).'\'],
+            \'eap\': [\''.strtolower($e['OUTER']) . '\'],
             \'identity\': \'$USER_NAME\',
             \'ca-cert\': dbus.ByteArray("file://{0}\0".format(self.cacert_file).encode(\'utf8\')),';
-    if($this->server_name) {
+    if ($this->server_name) {
              $out .= '
              match_key: match_value,';
     }
-    if($this->selected_eap == EAP::$TLS) {
+    if ($this->selected_eap == EAP::$TLS) {
        $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\')),
@@ -679,10 +679,10 @@ 
     } else {
        $out .= '
             \'password\': \'$PASSWORD\',
-            \'phase2-auth\': \''.strtolower($e['INNER']).'\',';
-         if($this->attributes['internal:use_anon_outer'][0] == 1) 
+            \'phase2-auth\': \''.strtolower($e['INNER']) . '\',';
+         if ($this->attributes['internal:use_anon_outer'][0] == 1) 
               $out .= '
-            \'anonymous-identity\': \''.$this->attributes['internal:anon_local_value'][0].'@'.$this->attributes['internal:realm'][0].'\',';
+            \'anonymous-identity\': \''.$this->attributes['internal:anon_local_value'][0] . '@' . $this->attributes['internal:realm'][0] . '\',';
     }
     $out .= '
         })
@@ -702,18 +702,18 @@ 
         self.check_opts()
         ver = self.connect_to_NM()';
      foreach (array_keys($SSIDs) as $ssid) {
-           $out .='
-        self.delete_existing_connections(\''.$ssid.'\')
-        self.add_connection(\''.$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')
-            $out .='
-        self.delete_existing_connections(\''.$ssid.'\')';
+         if ($cipher == 'DEL')
+            $out .= '
+        self.delete_existing_connections(\''.$ssid . '\')';
      }
 
-$out .='
+$out .= '
 
 if __name__ == "__main__":
     ENMCT = EduroamNMConfigTool()

Braces +39 added lines, -28 removed lines

@@ -68,10 +68,11 @@ 
 
      $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();
+     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);
@@ -87,13 +88,15 @@ 
     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']))." ";
-        } else
-            $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"),implode(', ',Config::$CONSORTIUM['ssid']))." ";
+        } else {
+                    $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 .= ", ";
+             if($i > 0) {
+                        $out .= ", ";
+             }
          $i++;
          $out .= "<strong>$ssid</strong>";
        }
@@ -101,9 +104,9 @@ 
     $out .= "<p>";
     }
    $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)
+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.");
-else {
+} 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.");
@@ -151,10 +154,11 @@ 
 
 
 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}"';
-    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}"';
+ 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 .= ' "'._("Continue").'" 1 ; then exit; fi
 ';
   return $out;
@@ -405,9 +409,10 @@ 
   eap='.$e['OUTER'].'
   ca_cert="${HOME}/'.$this->local_dir.'/ca.pem"
   identity="${USER_NAME}"';
-  if($this->server_name)
-    $out .= '
+  if($this->server_name) {
+      $out .= '
   domain_suffix_match="'.$this->server_name.'"';
+  }
   if($this->selected_eap == EAP::$TLS) {
     $out .= '
   private_key="${HOME}/'.$this->local_dir.'/user.p12"
@@ -416,10 +421,11 @@ 
     $out .= '
   phase2="auth='.$e['INNER'].'"
   password="${PASSWORD}"';
-  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 .= '
 }';
 }
@@ -504,8 +510,9 @@ 
 
 
 private function glueServerNames($server_list) {
-  if(! $server_list)
-    return '';
+  if(! $server_list) {
+      return '';
+  }
   $A0 =  array_reverse(explode('.',array_shift($server_list)));
   $B = $A0;
   foreach($server_list as $a) {
@@ -517,12 +524,14 @@ 
 }
 
 private function mkSubjectAltNameList($server_list) {
-  if(! $server_list)
-    return '';
+  if(! $server_list) {
+      return '';
+  }
   $out = '';
   foreach($server_list as $a) {
-     if($out)
-       $out .= ','; 
+     if($out) {
+            $out .= ',';
+     }
      $out .= "'DNS:$a'";
   }
   return $out;
@@ -680,9 +689,10 @@ 
        $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 .= '
         })
@@ -708,9 +718,10 @@ 
      }
 //   create a list of profiles to be deleted after installation
      foreach ($delSSIDs as $ssid => $cipher) {
-         if($cipher == 'DEL')
-            $out .='
+         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,
+        ],
+    ],
 
 
 /*    

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
  * 
  * @package ModuleWriting
  */
-class Devices{
+class Devices {
 
 /**
  * This array lists available configuration options for local device management.
@@ -54,7 +54,7 @@ 
  *         The default is unset, so it is not listed in the Options array.
  */
 
-public static $Options=[
+public static $Options = [
   'sign'=>0,
   'no_cache'=>0,
   'hidden'=>0,
@@ -298,7 +298,7 @@ 
                             "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>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
       ],
    ],
 
@@ -314,7 +314,7 @@ 
                             "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>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
       ],
    ],
 
@@ -330,7 +330,7 @@ 
                             "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>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
       ],
    ],
 
@@ -347,7 +347,7 @@ 
                             "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>"),
+                            "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
       ],
    ],
 

devices/ms/Vista7.php

Spacing +130 added lines, -130 removed lines

@@ -27,8 +27,8 @@ 
 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);
+      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.");
     }
 
@@ -45,10 +45,10 @@ 
 //   create a list of profiles to be deleted after installation
      $delProfiles = [];
      foreach ($delSSIDs as $ssid => $cipher) {
-         if($cipher == 'DEL') 
+         if ($cipher == 'DEL') 
           $delProfiles[] = $ssid;
-         if($cipher == 'TKIP') 
-          $delProfiles[] = $ssid.' (TKIP)';
+         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) {
@@ -56,28 +56,28 @@ 
        $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);
+          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);
+          $WindowsProfile[$i] = $this->writeWLANprofile($ssid, $ssid, 'WPA2', 'AES', $eap_config, $i);
           $i++;
        }
-       if($set_wired) {
+       if ($set_wired) {
          $this->writeLANprofile($eap_config);
        }
      } else {
        error("  this EAP type is not handled yet");
        return;
      }
-    debug(4,"WindowsProfile"); debug(4,$WindowsProfile);
+    debug(4, "WindowsProfile"); debug(4, $WindowsProfile);
     
-    $this->writeProfilesNSH($WindowsProfile, $CA_files,$set_wired);
+    $this->writeProfilesNSH($WindowsProfile, $CA_files, $set_wired);
     $this->writeAdditionalDeletes($delProfiles);
     $this->copyFiles($this->selected_eap);
-    if(isset($this->attributes['internal:logo_file']))
+    if (isset($this->attributes['internal:logo_file']))
        $this->combineLogo($this->attributes['internal:logo_file']);
-    $this->writeMainNSH($this->selected_eap,$this->attributes);
+    $this->writeMainNSH($this->selected_eap, $this->attributes);
     $this->compileNSIS();
     $installer_path = $this->signInstaller($this->attributes); 
 
@@ -86,19 +86,19 @@ 
   }
 
   public function writeDeviceInfo() {
-    $ssid_ct=count($this->attributes['internal:SSID']);
+    $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 .= 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']))." ";
+    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'])) . " ";
         } else
-            $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"),implode(', ',Config::$CONSORTIUM['ssid']))." ";
+            $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)
+           if (!in_array($ssid, Config::$CONSORTIUM['ssid'])) {
+             if ($i > 0)
            $out .= ", ";
          $i++;
          $out .= "<strong>$ssid</strong>";
@@ -106,20 +106,20 @@ 
     }
     $out .= "<p>";
     }
-    if($this->eap == EAP::$TLS)
+    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.");
     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.");
 
-    if($this->eap == EAP::$PEAP_MSCHAP2) {
+    if ($this->eap == EAP::$PEAP_MSCHAP2) {
         $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) {
+        if ($ssid_ct > 1) {
              $out .= "<p>";
-             $out .= _("You will be required to enter the same credentials for each of the configured notworks:")." ";
+             $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)
+                 if ($i > 0)
                    $out .= ", ";
                  $i++;
                  $out .= "<strong>$ssid</strong>";
@@ -137,7 +137,7 @@ 
     $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");
+      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;
     }
@@ -147,26 +147,26 @@ 
      $outer_user = $attr['internal:anon_local_value'][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];
    $author_id = "0";
-   if( $eap == EAP::$TTLS_PAP) {
+   if ($eap == EAP::$TTLS_PAP) {
       $author_id = "17236";
-      $servers = implode('</ServerName><ServerName>',$attr['eap:server_name']);
+      $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>
+    $this->selected_eap["OUTER"] . '</Type>
 <VendorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorId>
 <VendorType xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorType>
-<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">'.$author_id.'</AuthorId>
+<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">'.$author_id . '</AuthorId>
 </EapMethod>
 ';
 
 
-   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">
@@ -174,7 +174,7 @@ 
 <ID>eduroam.si</ID>
 <ProviderInfo>
 <CredentialPrompt>
-<localized-text><lang>en</lang><text>'._("Please provide your user ID and password.").'</text></localized-text>
+<localized-text><lang>en</lang><text>'._("Please provide your user ID and password.") . '</text></localized-text>
 </CredentialPrompt>
 <UserNameLabel>
 <localized-text><lang>en</lang><text>Username@domain:</text></localized-text>
@@ -187,13 +187,13 @@ 
 <AuthenticationMethod>
 <EAPMethod>21</EAPMethod>
 ';
-if($use_anon == 1) {
+if ($use_anon == 1) {
     $profile_file_contents .= '<ClientSideCredential>
 ';
-    if($outer_user == '')
+    if ($outer_user == '')
         $profile_file_contents .= '<AnonymousIdentity>@</AnonymousIdentity>';
     else
-        $profile_file_contents .= '<AnonymousIdentity>'.$outer_user.'@'.$realm.'</AnonymousIdentity>';
+        $profile_file_contents .= '<AnonymousIdentity>' . $outer_user . '@' . $realm . '</AnonymousIdentity>';
 $profile_file_contents .= '
 </ClientSideCredential>
 ';
@@ -227,7 +227,7 @@ 
 
 }
 
-elseif( $eap == EAP::$TLS) {
+elseif ($eap == EAP::$TLS) {
   $profile_file_contents .= '
 
 <Config xmlns:baseEap="http://www.microsoft.com/provisioning/BaseEapConnectionPropertiesV1" 
@@ -240,15 +240,15 @@ 
 </eapTls:CredentialsSource>
 <eapTls:ServerValidation>
 <eapTls:DisableUserPromptForServerValidation>true</eapTls:DisableUserPromptForServerValidation>
-<eapTls:ServerNames>'.$servers.'</eapTls:ServerNames>';
-if($ca_array) {
+<eapTls:ServerNames>'.$servers . '</eapTls:ServerNames>';
+if ($ca_array) {
 foreach ($ca_array as $CA)
-    if($CA['root'])
-       $profile_file_contents .= "<eapTls:TrustedRootCA>".$CA['sha1']."</eapTls:TrustedRootCA>\n";
+    if ($CA['root'])
+       $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')
+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>';
 else
    $profile_file_contents .= '<eapTls:DifferentUsername>false</eapTls:DifferentUsername>';
@@ -257,8 +257,8 @@ 
 </baseEap:Eap>
 </Config>
 ';
-} elseif ( $eap == EAP::$PEAP_MSCHAP2) {
-if(isset($attr['eap:enable_nea']) && $attr['eap:enable_nea'][0] == 'on')
+} elseif ($eap == EAP::$PEAP_MSCHAP2) {
+if (isset($attr['eap:enable_nea']) && $attr['eap:enable_nea'][0] == 'on')
    $nea = 'true';
 else
    $nea = 'false';
@@ -271,11 +271,11 @@ 
 <msPeap:EapType>
 <msPeap:ServerValidation>
 <msPeap:DisableUserPromptForServerValidation>true</msPeap:DisableUserPromptForServerValidation> 
-<msPeap:ServerNames>'.$servers.'</msPeap:ServerNames>';
-if($ca_array) {
+<msPeap:ServerNames>'.$servers . '</msPeap:ServerNames>';
+if ($ca_array) {
 foreach ($ca_array as $CA)
-    if($CA['root'])
-       $vista_ext .= "<msPeap:TrustedRootCA>".$CA['sha1']."</msPeap:TrustedRootCA>\n";
+    if ($CA['root'])
+       $vista_ext .= "<msPeap:TrustedRootCA>" . $CA['sha1'] . "</msPeap:TrustedRootCA>\n";
 }
 $vista_ext .= '</msPeap:ServerValidation>
 <msPeap:FastReconnect>true</msPeap:FastReconnect> 
@@ -286,7 +286,7 @@ 
 <msChapV2:UseWinLogonCredentials>false</msChapV2:UseWinLogonCredentials> 
 </msChapV2:EapType>
 </baseEap:Eap>
-<msPeap:EnableQuarantineChecks>'.$nea.'</msPeap:EnableQuarantineChecks>
+<msPeap:EnableQuarantineChecks>'.$nea . '</msPeap:EnableQuarantineChecks>
 <msPeap:RequireCryptoBinding>false</msPeap:RequireCryptoBinding>
 </msPeap:EapType>
 </baseEap:Eap>
@@ -298,11 +298,11 @@ 
 <EapType xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV1">
 <ServerValidation>
 <DisableUserPromptForServerValidation>true</DisableUserPromptForServerValidation>
-<ServerNames>'.$servers.'</ServerNames>';
-if($ca_array) {
+<ServerNames>'.$servers . '</ServerNames>';
+if ($ca_array) {
 foreach ($ca_array as $CA)
-    if($CA['root'])
-        $w7_ext .= "<TrustedRootCA>".$CA['sha1']."</TrustedRootCA>\n";
+    if ($CA['root'])
+        $w7_ext .= "<TrustedRootCA>" . $CA['sha1'] . "</TrustedRootCA>\n";
 }
 $w7_ext .= '</ServerValidation>
 <FastReconnect>true</FastReconnect> 
@@ -313,22 +313,22 @@ 
 <UseWinLogonCredentials>false</UseWinLogonCredentials> 
 </EapType>
 </Eap>
-<EnableQuarantineChecks>'.$nea.'</EnableQuarantineChecks>
+<EnableQuarantineChecks>'.$nea . '</EnableQuarantineChecks>
 <RequireCryptoBinding>false</RequireCryptoBinding>
 ';
-if($use_anon == 1)
-$w7_ext .='<PeapExtensions>
+if ($use_anon == 1)
+$w7_ext .= '<PeapExtensions>
 <IdentityPrivacy xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV2">
 <EnableIdentityPrivacy>true</EnableIdentityPrivacy>
-<AnonymousUserName>'.$outer_user.'</AnonymousUserName>
+<AnonymousUserName>'.$outer_user . '</AnonymousUserName>
 </IdentityPrivacy>
 </PeapExtensions>
 ';
-$w7_ext .='</EapType>
+$w7_ext .= '</EapType>
 </Eap>
 </Config>
 ';
-} elseif ( $eap == EAP::$PWD) {
+} elseif ($eap == EAP::$PWD) {
    $profile_file_contents .= '<ConfigBlob></ConfigBlob>';
 } 
 
@@ -337,8 +337,8 @@ 
 $profile_file_contents_end = '</EapHostConfig></EAPConfig>
 ';
 $return_array = [];
-$return_array['vista']= $profile_file_contents.$vista_ext.$profile_file_contents_end;
-$return_array['w7']= $profile_file_contents.$w7_ext.$profile_file_contents_end;
+$return_array['vista'] = $profile_file_contents . $vista_ext . $profile_file_contents_end;
+$return_array['w7'] = $profile_file_contents . $w7_ext . $profile_file_contents_end;
 return $return_array;
 }
 
@@ -351,13 +351,13 @@ 
 /**
  * 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>
+<name>'.$wlan_profile_name . '</name>
 <SSIDConfig>
 <SSID>
-<name>'.$ssid.'</name>
+<name>'.$ssid . '</name>
 </SSID>
 <nonBroadcast>true</nonBroadcast>
 </SSIDConfig>
@@ -367,12 +367,12 @@ 
 <MSM>
 <security>
 <authEncryption>
-<authentication>'.$auth.'</authentication>
-<encryption>'.$encryption.'</encryption>
+<authentication>'.$auth . '</authentication>
+<encryption>'.$encryption . '</encryption>
 <useOneX>true</useOneX>
 </authEncryption>
 ';
-if($auth == 'WPA2')
+if ($auth == 'WPA2')
 $profile_file_contents .= '<PMKCacheMode>enabled</PMKCacheMode>
 <PMKCacheTTL>720</PMKCacheTTL>
 <PMKCacheSize>128</PMKCacheSize>
@@ -390,20 +390,20 @@ 
 </WLANProfile>
 ';
 
-if(! is_dir('w7'))
+if (!is_dir('w7'))
   mkdir('w7');
-if(! is_dir('vista'))
+if (!is_dir('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) ;
+$xml_f = fopen($xml_f_name, 'w');
+fwrite($xml_f, $profile_file_contents . $eap_config['vista'] . $closing);
 fclose($xml_f);
 $xml_f_name = "w7/wlan_prof-$i.xml";
-$xml_f = fopen($xml_f_name,'w');
-fwrite($xml_f,$profile_file_contents. $eap_config['w7']. $closing) ;
+$xml_f = fopen($xml_f_name, 'w');
+fwrite($xml_f, $profile_file_contents . $eap_config['w7'] . $closing);
 fclose($xml_f);
-debug(2,"Installer has been written into directory $this->FPATH\n");
-debug(4,"WLAN_Profile:$wlan_profile_name:$encryption\n");
+debug(2, "Installer has been written into directory $this->FPATH\n");
+debug(4, "WLAN_Profile:$wlan_profile_name:$encryption\n");
 return("\"$wlan_profile_name\" \"$encryption\"");
 }
 
@@ -422,48 +422,48 @@ 
 </MSM>
 </LANProfile>
 ';
-if(! is_dir('w7'))
+if (!is_dir('w7'))
   mkdir('w7');
-if(! is_dir('vista'))
+if (!is_dir('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) ;
+$xml_f = fopen($xml_f_name, 'w');
+fwrite($xml_f, $profile_file_contents . $eap_config['vista'] . $closing);
 fclose($xml_f);
 $xml_f_name = "w7/lan_prof.xml";
-$xml_f = fopen($xml_f_name,'w');
-fwrite($xml_f,$profile_file_contents. $eap_config['w7']. $closing) ;
+$xml_f = fopen($xml_f_name, 'w');
+fwrite($xml_f, $profile_file_contents . $eap_config['w7'] . $closing);
 fclose($xml_f);
 }
 
 private function glueServerNames($server_list) {
 //print_r($server_list);
- $A0 =  array_reverse(explode('.',array_shift($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);
+ 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)));
+  return(implode('.', array_reverse($B)));
 }
 
 
-private function writeMainNSH($eap,$attr) {
-debug(4,"writeMainNSH"); debug(4,$attr);
-debug(4,"MYLANG=".$this->lang."\n");
+private function writeMainNSH($eap, $attr) {
+debug(4, "writeMainNSH"); debug(4, $attr);
+debug(4, "MYLANG=" . $this->lang . "\n");
 
 $EAP_OPTS = [
-PEAP=>['str'=>'PEAP','exec'=>'user'],
-TLS=>['str'=>'TLS','exec'=>'user'],
-TTLS=>['str'=>'ArnesLink','exec'=>'user'],
-PWD=>['str'=>'PWD','exec'=>'user'],
+PEAP=>['str'=>'PEAP', 'exec'=>'user'],
+TLS=>['str'=>'TLS', 'exec'=>'user'],
+TTLS=>['str'=>'ArnesLink', 'exec'=>'user'],
+PWD=>['str'=>'PWD', 'exec'=>'user'],
 ];
 $fcontents = '';
-if(Config::$NSIS_VERSION >= 3)
-    $fcontents .=  "Unicode true\n";
+if (Config::$NSIS_VERSION >= 3)
+    $fcontents .= "Unicode true\n";
  
 // Uncomment the line below if you want this module to run under XP (only displaying a warning)
 // $fcontents .= "!define ALLOW_XP\n";
@@ -471,27 +471,27 @@ 
 // $fcontents .= "!define DEBUG_CAT\n";
 $exec_level = $EAP_OPTS[$eap["OUTER"]]['exec'];
 $eap_str = $EAP_OPTS[$eap["OUTER"]]['str'];
-debug(4,"EAP_STR=$eap_str\n");
-debug(4,$eap);
+debug(4, "EAP_STR=$eap_str\n");
+debug(4, $eap);
 
-$fcontents .= '!define '.$eap_str;
-$fcontents .= "\n".'!define EXECLEVEL "'.$exec_level.'"';
-if($attr['internal:profile_count'][0] > 1)
-$fcontents .= "\n".'!define USER_GROUP "'.$this->translateString(str_replace('"','$\\"',$attr['profile:name'][0]), $this->code_page).'"';
+$fcontents .= '!define ' . $eap_str;
+$fcontents .= "\n" . '!define EXECLEVEL "' . $exec_level . '"';
+if ($attr['internal:profile_count'][0] > 1)
+$fcontents .= "\n" . '!define USER_GROUP "' . $this->translateString(str_replace('"', '$\\"', $attr['profile:name'][0]), $this->code_page) . '"';
 $fcontents .= '
-Caption "'. $this->translateString(sprintf(sprint_nsi(_("%s installer for %s")),Config::$CONSORTIUM['name'],$attr['general:instname'][0]), $this->code_page).'"
-!define APPLICATION "'. $this->translateString(sprintf(sprint_nsi(_("%s installer for %s")),Config::$CONSORTIUM['name'],$attr['general:instname'][0]), $this->code_page).'"
-!define VERSION "'.CAT::$VERSION_MAJOR.'.'.CAT::$VERSION_MINOR.'"
+Caption "'. $this->translateString(sprintf(sprint_nsi(_("%s installer for %s")), Config::$CONSORTIUM['name'], $attr['general:instname'][0]), $this->code_page) . '"
+!define APPLICATION "'. $this->translateString(sprintf(sprint_nsi(_("%s installer for %s")), Config::$CONSORTIUM['name'], $attr['general:instname'][0]), $this->code_page) . '"
+!define VERSION "'.CAT::$VERSION_MAJOR . '.' . CAT::$VERSION_MINOR . '"
 !define INSTALLER_NAME "installer.exe"
-!define LANG "'.$this->lang.'"
+!define LANG "'.$this->lang . '"
 ';
 $fcontents .= $this->msInfoFile($attr);
 
 
 $fcontents .= ';--------------------------------
-!define ORGANISATION "'.$this->translateString($attr['general:instname'][0], $this->code_page).'"
-!define SUPPORT "'. ((isset($attr['support:email'][0]) && $attr['support:email'][0] ) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute , $this->code_page)) .'"
-!define URL "'. ((isset($attr['support:url'][0]) && $attr['support:url'][0] ) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->code_page)) .'"
+!define ORGANISATION "'.$this->translateString($attr['general:instname'][0], $this->code_page) . '"
+!define SUPPORT "'. ((isset($attr['support:email'][0]) && $attr['support:email'][0]) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->code_page)) . '"
+!define URL "'. ((isset($attr['support:url'][0]) && $attr['support:url'][0]) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->code_page)) . '"
 
 !ifdef TLS
 ';
@@ -501,42 +501,42 @@ 
 !endif
 ';
 
-if(isset($this->attributes['media:wired'][0]) && $attr['media:wired'][0] == 'on')
+if (isset($this->attributes['media:wired'][0]) && $attr['media:wired'][0] == 'on')
   $fcontents .= '!define WIRED
 ';
 
-$f = fopen('main.nsh','w');
+$f = fopen('main.nsh', 'w');
 fwrite($f, $fcontents);
 fclose($f);
 
 }
 
-private function writeProfilesNSH($P,$ca_array,$wired=0) {
-debug(4,"writeProfilesNSH");
-debug(4,$P);
+private function writeProfilesNSH($P, $ca_array, $wired = 0) {
+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');
+$f = fopen('profiles.nsh', 'w');
 fwrite($f, $fcontents);
 fclose($f);
 
 $fcontents = '';
-$f = fopen('certs.nsh','w');
-if($ca_array) {
+$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";
+      $fcontents .= '!insertmacro install_ca_cert "' . $CA['file'] . '" "' . $CA['sha1'] . '" "' . $store . "\"\n";
     }
 fwrite($f, $fcontents);
 }
 fclose($f);
 }
 
-private function copyFiles ($eap) {
-debug(4,"copyFiles start\n");
-debug(4,"code_page=".$this->code_page."\n");
+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');
@@ -546,23 +546,23 @@ 
    $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)  {
+   $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);
+     $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);
+     $this->translateFile('peap_tls.inc', 'cat.NSI', $this->code_page);
      $result = 1;
     }
-debug(4,"copyFiles end\n");
+debug(4, "copyFiles end\n");
    return($result);
 }
 

Braces +64 added lines, -44 removed lines

@@ -45,10 +45,12 @@ 
 //   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($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) {
@@ -75,8 +77,9 @@ 
     $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']);
+    if(isset($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); 
@@ -93,22 +96,24 @@ 
     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']))." ";
-        } else
-            $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"),implode(', ',Config::$CONSORTIUM['ssid']))." ";
+        } else {
+                    $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 .= ", ";
+             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.");
-    else {
+    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.");
+    } 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.");
 
     if($this->eap == EAP::$PEAP_MSCHAP2) {
@@ -119,8 +124,9 @@ 
              $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 .= ", ";
+                 if($i > 0) {
+                                    $out .= ", ";
+                 }
                  $i++;
                  $out .= "<strong>$ssid</strong>";
             }
@@ -190,11 +196,12 @@ 
 if($use_anon == 1) {
     $profile_file_contents .= '<ClientSideCredential>
 ';
-    if($outer_user == '')
-        $profile_file_contents .= '<AnonymousIdentity>@</AnonymousIdentity>';
-    else
-        $profile_file_contents .= '<AnonymousIdentity>'.$outer_user.'@'.$realm.'</AnonymousIdentity>';
-$profile_file_contents .= '
+    if($outer_user == '') {
+            $profile_file_contents .= '<AnonymousIdentity>@</AnonymousIdentity>';
+    } else {
+            $profile_file_contents .= '<AnonymousIdentity>'.$outer_user.'@'.$realm.'</AnonymousIdentity>';
+    }
+    $profile_file_contents .= '
 </ClientSideCredential>
 ';
 }
@@ -225,9 +232,7 @@ 
 </Config>
 ';
 
-}
-
-elseif( $eap == EAP::$TLS) {
+} elseif( $eap == EAP::$TLS) {
   $profile_file_contents .= '
 
 <Config xmlns:baseEap="http://www.microsoft.com/provisioning/BaseEapConnectionPropertiesV1" 
@@ -242,26 +247,29 @@ 
 <eapTls:DisableUserPromptForServerValidation>true</eapTls:DisableUserPromptForServerValidation>
 <eapTls:ServerNames>'.$servers.'</eapTls:ServerNames>';
 if($ca_array) {
-foreach ($ca_array as $CA)
+foreach ($ca_array as $CA) {
     if($CA['root'])
        $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')
+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>';
-else
+} else {
    $profile_file_contents .= '<eapTls:DifferentUsername>false</eapTls:DifferentUsername>';
+}
 $profile_file_contents .= '
 </eapTls:EapType>
 </baseEap:Eap>
 </Config>
 ';
 } elseif ( $eap == EAP::$PEAP_MSCHAP2) {
-if(isset($attr['eap:enable_nea']) && $attr['eap:enable_nea'][0] == 'on')
+if(isset($attr['eap:enable_nea']) && $attr['eap:enable_nea'][0] == 'on') {
    $nea = 'true';
-else
+} else {
    $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" 
@@ -273,10 +281,11 @@ 
 <msPeap:DisableUserPromptForServerValidation>true</msPeap:DisableUserPromptForServerValidation> 
 <msPeap:ServerNames>'.$servers.'</msPeap:ServerNames>';
 if($ca_array) {
-foreach ($ca_array as $CA)
+foreach ($ca_array as $CA) {
     if($CA['root'])
        $vista_ext .= "<msPeap:TrustedRootCA>".$CA['sha1']."</msPeap:TrustedRootCA>\n";
 }
+}
 $vista_ext .= '</msPeap:ServerValidation>
 <msPeap:FastReconnect>true</msPeap:FastReconnect> 
 <msPeap:InnerEapOptional>0</msPeap:InnerEapOptional> 
@@ -300,10 +309,11 @@ 
 <DisableUserPromptForServerValidation>true</DisableUserPromptForServerValidation>
 <ServerNames>'.$servers.'</ServerNames>';
 if($ca_array) {
-foreach ($ca_array as $CA)
+foreach ($ca_array as $CA) {
     if($CA['root'])
         $w7_ext .= "<TrustedRootCA>".$CA['sha1']."</TrustedRootCA>\n";
 }
+}
 $w7_ext .= '</ServerValidation>
 <FastReconnect>true</FastReconnect> 
 <InnerEapOptional>false</InnerEapOptional> 
@@ -316,14 +326,15 @@ 
 <EnableQuarantineChecks>'.$nea.'</EnableQuarantineChecks>
 <RequireCryptoBinding>false</RequireCryptoBinding>
 ';
-if($use_anon == 1)
-$w7_ext .='<PeapExtensions>
+if($use_anon == 1) {
+    $w7_ext .='<PeapExtensions>
 <IdentityPrivacy xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV2">
 <EnableIdentityPrivacy>true</EnableIdentityPrivacy>
 <AnonymousUserName>'.$outer_user.'</AnonymousUserName>
 </IdentityPrivacy>
 </PeapExtensions>
 ';
+}
 $w7_ext .='</EapType>
 </Eap>
 </Config>
@@ -372,12 +383,13 @@ 
 <useOneX>true</useOneX>
 </authEncryption>
 ';
-if($auth == 'WPA2')
-$profile_file_contents .= '<PMKCacheMode>enabled</PMKCacheMode>
+if($auth == 'WPA2') {
+    $profile_file_contents .= '<PMKCacheMode>enabled</PMKCacheMode>
 <PMKCacheTTL>720</PMKCacheTTL>
 <PMKCacheSize>128</PMKCacheSize>
 <preAuthMode>disabled</preAuthMode>
 ';
+}
 $profile_file_contents .= '<OneX xmlns="http://www.microsoft.com/networking/OneX/v1">
 <cacheUserData>true</cacheUserData>
 <authMode>user</authMode>
@@ -390,10 +402,12 @@ 
 </WLANProfile>
 ';
 
-if(! is_dir('w7'))
+if(! is_dir('w7')) {
   mkdir('w7');
-if(! is_dir('vista'))
+}
+if(! is_dir('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) ;
@@ -422,10 +436,12 @@ 
 </MSM>
 </LANProfile>
 ';
-if(! is_dir('w7'))
+if(! is_dir('w7')) {
   mkdir('w7');
-if(! is_dir('vista'))
+}
+if(! is_dir('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) ;
@@ -462,8 +478,9 @@ 
 PWD=>['str'=>'PWD','exec'=>'user'],
 ];
 $fcontents = '';
-if(Config::$NSIS_VERSION >= 3)
+if(Config::$NSIS_VERSION >= 3) {
     $fcontents .=  "Unicode true\n";
+}
  
 // Uncomment the line below if you want this module to run under XP (only displaying a warning)
 // $fcontents .= "!define ALLOW_XP\n";
@@ -476,8 +493,9 @@ 
 
 $fcontents .= '!define '.$eap_str;
 $fcontents .= "\n".'!define EXECLEVEL "'.$exec_level.'"';
-if($attr['internal:profile_count'][0] > 1)
-$fcontents .= "\n".'!define USER_GROUP "'.$this->translateString(str_replace('"','$\\"',$attr['profile:name'][0]), $this->code_page).'"';
+if($attr['internal:profile_count'][0] > 1) {
+    $fcontents .= "\n".'!define USER_GROUP "'.$this->translateString(str_replace('"','$\\"',$attr['profile:name'][0]), $this->code_page).'"';
+}
 $fcontents .= '
 Caption "'. $this->translateString(sprintf(sprint_nsi(_("%s installer for %s")),Config::$CONSORTIUM['name'],$attr['general:instname'][0]), $this->code_page).'"
 !define APPLICATION "'. $this->translateString(sprintf(sprint_nsi(_("%s installer for %s")),Config::$CONSORTIUM['name'],$attr['general:instname'][0]), $this->code_page).'"
@@ -501,9 +519,10 @@ 
 !endif
 ';
 
-if(isset($this->attributes['media:wired'][0]) && $attr['media:wired'][0] == 'on')
+if(isset($this->attributes['media:wired'][0]) && $attr['media:wired'][0] == 'on') {
   $fcontents .= '!define WIRED
 ';
+}
 
 $f = fopen('main.nsh','w');
 fwrite($f, $fcontents);
@@ -515,8 +534,9 @@ 
 debug(4,"writeProfilesNSH");
 debug(4,$P);
   $fcontents = '';
-  foreach($P as $p) 
-    $fcontents .= "!insertmacro define_wlan_profile $p\n";
+  foreach($P as $p) {
+      $fcontents .= "!insertmacro define_wlan_profile $p\n";
+  }
   
 $f = fopen('profiles.nsh','w');
 fwrite($f, $fcontents);

Doc Comments +3 added lines

@@ -308,6 +308,9 @@
 
 /**
  * produce PEAP, TLS and TTLS configuration files for Windows 8
+ * @param string $auth
+ * @param string $encryption
+ * @param integer $i
  */
   private function writeWLANprofile($wlan_profile_name,$ssid,$auth,$encryption,$eap_config,$i) {
 $profile_file_contents = '<?xml version="1.0"?>

Indentation +135 added lines, -135 removed lines

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

devices/ms/Files/common.inc

Spacing +29 added lines, -29 removed lines

@@ -107,10 +107,10 @@ 
 !define MUI_HEADERIMAGE_BITMAP "cat_150.bmp"
 !define MUI_COMPONENTSPAGE_SMALLDESC
 
-!define WELCOME_HEADER "<?php printf(sprint_nsi(_("Welcome to the %s installer")),Config::$CONSORTIUM['name'])?>"
-!define FAREWELL_HEADER "<?php echo_nsi( _("Installation complete"))?>"
-!define FAREWELL_TEXT	"<?php echo_nsi( _("Network profiles have been installed."))?>$\r$\n$\n <?php echo_nsi(  _("Your system is ready."))?>"
-!define FAREWELL_FAIL	"<?php echo_nsi( _("Network installation had errors."))?>$\r$\n$\n <?php echo_nsi( _("Please contact \${SUPPORT}."))?>"
+!define WELCOME_HEADER "<?php printf(sprint_nsi(_("Welcome to the %s installer")), Config::$CONSORTIUM['name'])?>"
+!define FAREWELL_HEADER "<?php echo_nsi(_("Installation complete"))?>"
+!define FAREWELL_TEXT	"<?php echo_nsi(_("Network profiles have been installed."))?>$\r$\n$\n <?php echo_nsi(_("Your system is ready."))?>"
+!define FAREWELL_FAIL	"<?php echo_nsi(_("Network installation had errors."))?>$\r$\n$\n <?php echo_nsi(_("Please contact \${SUPPORT}."))?>"
 ;--------------------------------
 ;Languages
 !insertmacro MUI_LANGUAGE "${LANG}"
@@ -118,14 +118,14 @@ 
 ;--------------------------------
 ; License file
 !ifdef LICENSE_FILE
-LicenseForceSelection checkbox "<?php echo_nsi( _("Accept"))?>"
+LicenseForceSelection checkbox "<?php echo_nsi(_("Accept"))?>"
 LicenseText "<?php echo_nsi(_("If you accept the conditions then select Accept and then click Install to continue."))?>"
 LicenseData ${LICENSE_FILE}
 !endif
 
 ;-----------------------------------
 
-MiscButtonText "" "" "" "<?php echo_nsi( _("Finish"))?>"
+MiscButtonText "" "" "" "<?php echo_nsi(_("Finish"))?>"
 ;----------------------------------
 ;  FUNCTIONS
 
@@ -158,7 +158,7 @@ 
 
 !macro install_ca_cert ca_file ca_fingerprint level
    !insertmacro debug_cat 2 "locating certificate  SHA=${ca_fingerprint} Level=${level}"
-   DetailPrint "<?php echo_nsi( _("searching for certificate"))?> ${ca_file}"
+   DetailPrint "<?php echo_nsi(_("searching for certificate"))?> ${ca_file}"
    File "${ca_file}"
    nsArray::Set Delete_files "${ca_file}"
    !insertmacro debug_cat 2 "Testing machine store root"
@@ -220,13 +220,13 @@ 
    ${EndIf}
    !insertmacro debug_cat 2 "installing certificate $TEMP\${ca_file}"
    !insertmacro debug_cat 3 "Execute: certutil -addstore -user ${level} $TEMP\${ca_file}"
-   DetailPrint "<?php echo_nsi( _("installing certificate"))?> ${ca_file}"
+   DetailPrint "<?php echo_nsi(_("installing certificate"))?> ${ca_file}"
    nsExec::Exec '"certutil" -addstore -user ${level} $TEMP\${ca_file}'
    Pop $0
    !insertmacro debug_cat 3 "certutil returned $0"
    ${If} $0 != 0
      IfSilent +2
-     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php echo_nsi( _("could not install certificate"))?>  ${ca_file}"
+     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php echo_nsi(_("could not install certificate"))?>  ${ca_file}"
      !insertmacro debug_cat 1 "could not install certificate ${ca_file}"
    ${EndIf}
 no_install_${ca_file}:
@@ -417,26 +417,26 @@ 
   pop $R0
   ${If} $tkip_count > 0
     ${If} $aes_count > 1
-      StrCpy $R1 "$\r$\n$\n<?php echo_nsi( _("The non TKIP profiles are preferred. Always use them if you have a choice."))?>"
+      StrCpy $R1 "$\r$\n$\n<?php echo_nsi(_("The non TKIP profiles are preferred. Always use them if you have a choice."))?>"
     ${Else}
-     StrCpy $R1 "$\r$\n$\n<?php echo_nsi( _("The non TKIP profile is preferred. Always use it if you have a choice."))?>"
+     StrCpy $R1 "$\r$\n$\n<?php echo_nsi(_("The non TKIP profile is preferred. Always use it if you have a choice."))?>"
     ${EndIf}
   ${Else}
     StrCpy $R1 ""
   ${EndIf}
   ${If} $profile_count > 0
-    StrCpy $welcome_message "<?php echo_nsi( _("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
-<?php echo_nsi( _("The installer will create the following wireless profiles:"))?>$\r$\n\
+    StrCpy $welcome_message "<?php echo_nsi(_("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
+<?php echo_nsi(_("The installer will create the following wireless profiles:"))?>$\r$\n\
 $R0.\
 $R1$\r$\n$\n\
-<?php echo_nsi( _("More information and comments:"))?>$\r$\n\
+<?php echo_nsi(_("More information and comments:"))?>$\r$\n\
    EMAIL: ${SUPPORT}$\r$\n\
    WWW: ${URL}"
 ${Else}
-StrCpy $welcome_message "<?php echo_nsi( _("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
-<?php echo_nsi( _("The installer will create the wireless profile:"))?> $R0.\
+StrCpy $welcome_message "<?php echo_nsi(_("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\
+<?php echo_nsi(_("The installer will create the wireless profile:"))?> $R0.\
 $R1$\r$\n$\n\
-<?php echo_nsi( _("More information and comments:"))?>$\r$\n\
+<?php echo_nsi(_("More information and comments:"))?>$\r$\n\
    EMAIL: ${SUPPORT}$\r$\n\
    WWW: ${URL}"
 ${EndIf}
@@ -462,7 +462,7 @@ 
   SendMessage $HEADLINE ${WM_SETFONT} $HEADLINE_FONT 0
 ;TRANSLATION
   nsDialogs::CreateControl STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 120u 46u -130u -32u "$welcome_message\
-$\r$\n$\r$\n<?php echo_nsi( _("Installer created with software from the GEANT project."))?>"
+$\r$\n$\r$\n<?php echo_nsi(_("Installer created with software from the GEANT project."))?>"
   Pop $TEXT
 
   SetCtlColors $DIALOG "" 0xffffff
@@ -573,18 +573,18 @@ 
     ${If} $wireless_result == 1
       !insertmacro debug_cat 1 "wlan_test.exe did not find wireless configuration service"
       IfSilent +2
-      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php echo_nsi( _("Windows wireless configuration service is not enabled. The installer cannot continue."))?>"
+      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php echo_nsi(_("Windows wireless configuration service is not enabled. The installer cannot continue."))?>"
       Call Cleanup
     ${EndIf}
     ${If} $wireless_result == 2
       IfSilent +2
-      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php echo_nsi( _("No wireless interfaces found. The installer cannot continue."))?>"
+      MessageBox MB_OK|MB_ICONEXCLAMATION "<?php echo_nsi(_("No wireless interfaces found. The installer cannot continue."))?>"
       Call Cleanup
     ${EndIf}
   ${Else}
     ${If} $wireless_result > 0
        IfSilent +3
-       MessageBox MB_YESNO "<?php echo_nsi( _("No wireless interfaces found. Wireless access will not be configured. Would you like to continue and configure access on the wired interface?"))?>" IDYES wired_yes
+       MessageBox MB_YESNO "<?php echo_nsi(_("No wireless interfaces found. Wireless access will not be configured. Would you like to continue and configure access on the wired interface?"))?>" IDYES wired_yes
        Call Cleanup
        wired_yes:
        Push 1
@@ -600,7 +600,7 @@ 
     ${If} $wired == 1
       ${If} $force_wired == 0
         IfSilent wired
-        MessageBox MB_YESNO "<?php echo_nsi( _("Do you want to enable access on wired interfaces?"))?>" IDYES wired
+        MessageBox MB_YESNO "<?php echo_nsi(_("Do you want to enable access on wired interfaces?"))?>" IDYES wired
         Push 0
         Pop $wired
       ${EndIf}
@@ -635,7 +635,7 @@ 
 ;================================
 
 Function ShowInstfiles
-  !insertmacro MUI_HEADER_TEXT "<?php echo_nsi( _("Profiles installation"))?>" " "
+  !insertmacro MUI_HEADER_TEXT "<?php echo_nsi(_("Profiles installation"))?>" " "
 FunctionEnd
 ;================================
 ;  Check if a wireless profile exist and put it on delete list
@@ -654,7 +654,7 @@ 
 
 Function FindProfile
   Pop $R8
-  DetailPrint "<?php echo_nsi( _("Checking for profile \$R8"))?>"
+  DetailPrint "<?php echo_nsi(_("Checking for profile \$R8"))?>"
   !insertmacro debug_cat 2 "Checking for profile $R8"
   !insertmacro debug_cat 3 "Exec: $Netsh wlan show profiles $R8"
   nsExec::Exec  '"$Netsh" wlan show profiles "$R8"'
@@ -662,7 +662,7 @@ 
   !insertmacro debug_cat 4 "netsh returned $0"
   ${If} $0 == 0
     !insertmacro debug_cat 1 "found profile $R8"
-    DetailPrint "<?php echo_nsi( _("found profile \$R8"))?>"
+    DetailPrint "<?php echo_nsi(_("found profile \$R8"))?>"
     Push 0
   ${Else}
     !insertmacro debug_cat 1 "profile $R8 not found"
@@ -754,7 +754,7 @@ 
     ${If} $Symantec_installed  != 0
      !insertmacro debug_cat 3 "Symantec problem"
      IfSilent +2
-     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php printf(sprint_nsi(_("Please READ this message it is IMPORTANT.$\\r$\\nInstallation problems may be due to the fact that Symantec Endpoint Protection is installed on your machine.$\\r$\\nWhile this is a well-known bug of the Symantec product, about which the installer can not do anything, there is a workaround.$\\r$\\nWhen you close this window the installer will exit and an explorer window will be started (it could appear underneath already opened windows). In this window you should see a script named inst_cat. Start it by double-clicking, It will install the profiles. You will need to login to %s with your username and password.")),Config::$CONSORTIUM['name']) ?>"
+     MessageBox MB_OK|MB_ICONEXCLAMATION "<?php printf(sprint_nsi(_("Please READ this message it is IMPORTANT.$\\r$\\nInstallation problems may be due to the fact that Symantec Endpoint Protection is installed on your machine.$\\r$\\nWhile this is a well-known bug of the Symantec product, about which the installer can not do anything, there is a workaround.$\\r$\\nWhen you close this window the installer will exit and an explorer window will be started (it could appear underneath already opened windows). In this window you should see a script named inst_cat. Start it by double-clicking, It will install the profiles. You will need to login to %s with your username and password.")), Config::$CONSORTIUM['name']) ?>"
     Exec '"explorer" /select,"$EXEDIR\inst_cat.cmd"'
     Quit
 
@@ -989,7 +989,7 @@ 
 !ifdef TLS
 Function PFXCertificateSelect
 ;TRANSLATION
-!insertmacro MUI_HEADER_TEXT "<?php printf(sprint_nsi(_("%s installer for")),Config::$CONSORTIUM['name'])?> " "<?php echo_nsi(_("Install personal certificate"))?>"
+!insertmacro MUI_HEADER_TEXT "<?php printf(sprint_nsi(_("%s installer for")), Config::$CONSORTIUM['name'])?> " "<?php echo_nsi(_("Install personal certificate"))?>"
   ${If} $PFX_install == 0
     Return
   ${EndIf}
@@ -1160,7 +1160,7 @@ 
 PageEx components
 PageCallbacks showComponents "" ""
 ;TRANSLATION
-ComponentText "<?php printf(sprint_nsi(_("In order to install/update %s access all selected steps need to be performed. Click Continue to proceed")),Config::$CONSORTIUM['name'])?>" "" \
+ComponentText "<?php printf(sprint_nsi(_("In order to install/update %s access all selected steps need to be performed. Click Continue to proceed")), Config::$CONSORTIUM['name'])?>" "" \
       "<?php echo_nsi(_("If an option is not selected by default, then it is either not available or optional."))?>"
 PageExEnd
 ;=============================
@@ -1180,7 +1180,7 @@ 
 Section "-start"
 SectionIn RO
 
-!insertmacro MUI_HEADER_TEXT "<?php echo_nsi( _("Installation"))?>" "<?php echo_nsi( _("Checking for existing wireless profiles"))?>"
+!insertmacro MUI_HEADER_TEXT "<?php echo_nsi(_("Installation"))?>" "<?php echo_nsi(_("Checking for existing wireless profiles"))?>"
 !ifndef PWD
 !ifndef ArnesLink
 !include "certs.nsh"

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

Spacing +1 added lines, -1 removed lines

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

devices/xml/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;
     }
 }
 

Spacing +2 added lines, -2 removed lines

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

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

Spacing +2 added lines, -2 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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