GEANT / CAT

devices/ms/W8.php

Spacing +119 added lines, -119 removed lines

@@ -28,8 +28,8 @@ 
     final public function __construct() {
       $this->supportedEapMethods = [EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP, EAP::$TTLS_MSCHAP2, EAP::$PWD];
 #      $this->supportedEapMethods = array(EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP, EAP::$PWD);
-      debug(4,"This device supports the following EAP methods: ");
-      debug(4,$this->supportedEapMethods);
+      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.");
     }
 
@@ -46,42 +46,42 @@ 
 //   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::$TTLS_PAP || $this->selected_eap == EAP::$TTLS_MSCHAP2 || $this->selected_eap == EAP::$PWD) {
+     if ($this->selected_eap == EAP::$TLS || $this->selected_eap == EAP::$PEAP_MSCHAP2 || $this->selected_eap == EAP::$TTLS_PAP || $this->selected_eap == EAP::$TTLS_MSCHAP2 || $this->selected_eap == EAP::$PWD) {
        $WindowsProfile = [];
        $eap_config = $this->prepareEapConfig($this->attributes);
        $i = 0;
        foreach ($SSIDs as $ssid => $cipher) {
-          if($cipher == 'TKIP') {
-             $WindowsProfile[$i] = $this->writeWLANprofile ($ssid.' (TKIP)',$ssid,'WPA','TKIP',$eap_config,$i);
+          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);
-    if(isset($additional_deletes) && count($additional_deletes))
+    if (isset($additional_deletes) && count($additional_deletes))
        $this->writeAdditionalDeletes($additional_deletes);
     $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); 
 
@@ -90,19 +90,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>";
@@ -111,18 +111,18 @@ 
     $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.");
    $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>";
@@ -141,10 +141,10 @@ 
    $use_anon = $attr['internal:use_anon_outer'] [0];
    if ($use_anon) {
      $outer_user = $attr['internal:anon_local_value'][0];
-     $outer_id = $outer_user.'@'.$attr['internal:realm'][0];
+     $outer_id = $outer_user . '@' . $attr['internal:realm'][0];
    }
 //   $servers = preg_quote(implode(';',$attr['eap:server_name']));
-   $servers = implode(';',$attr['eap:server_name']);
+   $servers = implode(';', $attr['eap:server_name']);
    
    $ca_array = $attr['internal:CAs'][0];
 
@@ -153,12 +153,12 @@ 
 <EapMethod>
 ';
 
-$profile_file_contents .= '<Type xmlns="http://www.microsoft.com/provisioning/EapCommon">'.
-    $this->selected_eap["OUTER"].'</Type>
+$profile_file_contents .= '<Type xmlns="http://www.microsoft.com/provisioning/EapCommon">' .
+    $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>
 ';
-if( $eap == EAP::$TLS) {
+if ($eap == EAP::$TLS) {
 $profile_file_contents .= '<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</AuthorId>
 </EapMethod>
 ';
@@ -174,15 +174,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>';
@@ -191,8 +191,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';
@@ -205,11 +205,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'])
-        $w8_ext .= "<TrustedRootCA>".$CA['sha1']."</TrustedRootCA>\n";
+    if ($CA['root'])
+        $w8_ext .= "<TrustedRootCA>" . $CA['sha1'] . "</TrustedRootCA>\n";
 }
 $w8_ext .= '</ServerValidation>
 <FastReconnect>true</FastReconnect> 
@@ -220,50 +220,50 @@ 
 <UseWinLogonCredentials>false</UseWinLogonCredentials> 
 </EapType>
 </Eap>
-<EnableQuarantineChecks>'.$nea.'</EnableQuarantineChecks>
+<EnableQuarantineChecks>'.$nea . '</EnableQuarantineChecks>
 <RequireCryptoBinding>false</RequireCryptoBinding>
 ';
-if($use_anon == 1) {
-$w8_ext .='<PeapExtensions>
+if ($use_anon == 1) {
+$w8_ext .= '<PeapExtensions>
 <IdentityPrivacy xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV2">
 <EnableIdentityPrivacy>true</EnableIdentityPrivacy>
 ';
-if(isset($outer_user) && $outer_user) 
-$w8_ext .='<AnonymousUserName>'.$outer_user.'</AnonymousUserName>
+if (isset($outer_user) && $outer_user) 
+$w8_ext .= '<AnonymousUserName>' . $outer_user . '</AnonymousUserName>
 ';
 else
-$w8_ext .='<AnonymousUserName/>
+$w8_ext .= '<AnonymousUserName/>
 ';
-$w8_ext .='</IdentityPrivacy>
+$w8_ext .= '</IdentityPrivacy>
 </PeapExtensions>
 ';
 }
-$w8_ext .='</EapType>
+$w8_ext .= '</EapType>
 </Eap>
 </Config>
 ';
-} elseif ( $eap == EAP::$TTLS_PAP || $eap == EAP::$TTLS_MSCHAP2) {
+} elseif ($eap == EAP::$TTLS_PAP || $eap == EAP::$TTLS_MSCHAP2) {
 $profile_file_contents .= '<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">311</AuthorId>
 </EapMethod>
 ';
 $w8_ext = '<Config xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
 <EapTtls xmlns="http://www.microsoft.com/provisioning/EapTtlsConnectionPropertiesV1">
 <ServerValidation>
-<ServerNames>'.$servers.'</ServerNames> ';
-if($ca_array) {
+<ServerNames>'.$servers . '</ServerNames> ';
+if ($ca_array) {
 foreach ($ca_array as $CA)
-    if($CA['root'])
-        $w8_ext .= "<TrustedRootCAHash>".chunk_split($CA['sha1'],2,' ')."</TrustedRootCAHash>\n";
+    if ($CA['root'])
+        $w8_ext .= "<TrustedRootCAHash>" . chunk_split($CA['sha1'], 2, ' ') . "</TrustedRootCAHash>\n";
 }
-$w8_ext .='<DisablePrompt>true</DisablePrompt> 
+$w8_ext .= '<DisablePrompt>true</DisablePrompt> 
 </ServerValidation>
 <Phase2Authentication>
 ';
-if ( $eap == EAP::$TTLS_PAP) {
-   $w8_ext .='<PAPAuthentication /> ';
+if ($eap == EAP::$TTLS_PAP) {
+   $w8_ext .= '<PAPAuthentication /> ';
 }
-if ( $eap == EAP::$TTLS_MSCHAP2)  {
-   $w8_ext .='<MSCHAPv2Authentication>
+if ($eap == EAP::$TTLS_MSCHAP2) {
+   $w8_ext .= '<MSCHAPv2Authentication>
 <UseWinlogonCredentials>false</UseWinlogonCredentials>
 </MSCHAPv2Authentication>
 ';
@@ -271,24 +271,24 @@ 
 $w8_ext .= '</Phase2Authentication>
 <Phase1Identity>
 ';
-if($use_anon == 1) {
+if ($use_anon == 1) {
   $w8_ext .= '<IdentityPrivacy>true</IdentityPrivacy> 
 ';
-  if(isset($outer_id) && $outer_id) 
-    $w8_ext .='<AnonymousIdentity>'.$outer_id.'</AnonymousIdentity>
+  if (isset($outer_id) && $outer_id) 
+    $w8_ext .= '<AnonymousIdentity>' . $outer_id . '</AnonymousIdentity>
 ';
   else
-    $w8_ext .='<AnonymousIdentity/>
+    $w8_ext .= '<AnonymousIdentity/>
 ';
 } else {
   $w8_ext .= '<IdentityPrivacy>false</IdentityPrivacy>
 ';
 }
-$w8_ext .='</Phase1Identity>
+$w8_ext .= '</Phase1Identity>
 </EapTtls>
 </Config>
 ';
-} elseif ( $eap == EAP::$PWD) {
+} elseif ($eap == EAP::$PWD) {
 $profile_file_contents .= '<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</AuthorId>
 </EapMethod>
 ';
@@ -297,7 +297,7 @@ 
 
 $profile_file_contents_end = '</EapHostConfig></EAPConfig>';
 $return_array = [];
-$return_array['w8'] = $profile_file_contents.$w8_ext.$profile_file_contents_end;
+$return_array['w8'] = $profile_file_contents . $w8_ext . $profile_file_contents_end;
 return $return_array;
 }
 
@@ -309,13 +309,13 @@ 
 /**
  * produce PEAP, TLS and TTLS configuration files for Windows 8
  */
-  private function writeWLANprofile($wlan_profile_name,$ssid,$auth,$encryption,$eap_config,$i) {
+  private function writeWLANprofile($wlan_profile_name, $ssid, $auth, $encryption, $eap_config, $i) {
 $profile_file_contents = '<?xml version="1.0"?>
 <WLANProfile xmlns="http://www.microsoft.com/networking/WLAN/profile/v1">
-<name>'.$wlan_profile_name.'</name>
+<name>'.$wlan_profile_name . '</name>
 <SSIDConfig>
 <SSID>
-<name>'.$ssid.'</name>
+<name>'.$ssid . '</name>
 </SSID>
 <nonBroadcast>true</nonBroadcast>
 </SSIDConfig>
@@ -325,12 +325,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> 
@@ -348,14 +348,14 @@ 
 </WLANProfile>
 ';
 
-if(! is_dir('w8'))
+if (!is_dir('w8'))
   mkdir('w8');
 $xml_f_name = "w8/wlan_prof-$i.xml";
-$xml_f = fopen($xml_f_name,'w');
-fwrite($xml_f,$profile_file_contents. $eap_config['w8']. $closing) ;
+$xml_f = fopen($xml_f_name, 'w');
+fwrite($xml_f, $profile_file_contents . $eap_config['w8'] . $closing);
 fclose($xml_f);
-debug(2,"Installer has been written into directory $this->FPATH\n");
-debug(4,"WWWWLAN_Profile:$wlan_profile_name:$encryption\n");
+debug(2, "Installer has been written into directory $this->FPATH\n");
+debug(4, "WWWWLAN_Profile:$wlan_profile_name:$encryption\n");
 return("\"$wlan_profile_name\" \"$encryption\"");
 }
 
@@ -375,29 +375,29 @@ 
 </LANProfile>
 ';
 
-if(! is_dir('w8'))
+if (!is_dir('w8'))
   mkdir('w8');
 $xml_f_name = "w8/lan_prof.xml";
-$xml_f = fopen($xml_f_name,'w');
-fwrite($xml_f,$profile_file_contents. $eap_config['w8']. $closing) ;
+$xml_f = fopen($xml_f_name, 'w');
+fwrite($xml_f, $profile_file_contents . $eap_config['w8'] . $closing);
 fclose($xml_f);
-debug(2,"Installer has been written into directory $this->FPATH\n");
+debug(2, "Installer has been written into directory $this->FPATH\n");
 }
 
 
 
-private function writeMainNSH($eap,$attr) {
-debug(4,"writeMainNSH"); debug(4,$attr);
+private function writeMainNSH($eap, $attr) {
+debug(4, "writeMainNSH"); debug(4, $attr);
 $fcontents = "!define W8\n";
-if(Config::$NSIS_VERSION >= 3)
-    $fcontents .=  "Unicode true\n";
+if (Config::$NSIS_VERSION >= 3)
+    $fcontents .= "Unicode true\n";
 
 
 $EAP_OPTS = [
-PEAP=>['str'=>'PEAP','exec'=>'user'],
-TLS=>['str'=>'TLS','exec'=>'user'],
-TTLS=>['str'=>'TTLS','exec'=>'user'],
-PWD=>['str'=>'PWD','exec'=>'user'],
+PEAP=>['str'=>'PEAP', 'exec'=>'user'],
+TLS=>['str'=>'TLS', 'exec'=>'user'],
+TTLS=>['str'=>'TTLS', 'exec'=>'user'],
+PWD=>['str'=>'PWD', 'exec'=>'user'],
 ];
  
 // Uncomment the line below if you want this module to run under XP (only displaying a warning)
@@ -407,24 +407,24 @@ 
 $exec_level = $EAP_OPTS[$eap["OUTER"]]['exec'];
 $eap_str = $EAP_OPTS[$eap["OUTER"]]['str'];
 
-$fcontents .= '!define '.$eap_str;
-$fcontents .= "\n".'!define EXECLEVEL "'.$exec_level.'"';
+$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).'"
-!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
 ';
@@ -434,33 +434,33 @@ 
 !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);
 }
@@ -469,8 +469,8 @@ 
 
 //private function write
 
-private function copyFiles ($eap) {
-debug(4,"copyFiles start\n");
+private function copyFiles($eap) {
+debug(4, "copyFiles start\n");
    $result;
    $result = $this->copyFile('wlan_test.exe');
    $result = $this->copyFile('check_wired.cmd');
@@ -480,16 +480,16 @@ 
    $result = $this->copyFile('base64.nsh');
    $result = $result && $this->copyFile('cat32.ico');
    $result = $result && $this->copyFile('cat_150.bmp');
-   $this->translateFile('common.inc','common.nsh',$this->code_page);
-   if($eap["OUTER"] == PWD) {
-     $this->translateFile('pwd.inc','cat.NSI',$this->code_page);
+   $this->translateFile('common.inc', 'common.nsh', $this->code_page);
+   if ($eap["OUTER"] == PWD) {
+     $this->translateFile('pwd.inc', 'cat.NSI', $this->code_page);
      $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x32.msi');
      $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x64.msi');
    } else {
-   $this->translateFile('eap_w8.inc','cat.NSI',$this->code_page);
+   $this->translateFile('eap_w8.inc', 'cat.NSI', $this->code_page);
    $result = 1;
    }
-debug(4,"copyFiles end\n");
+debug(4, "copyFiles end\n");
    return($result);
 }
 

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

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/ms/WindowsCommon.php

Spacing +78 added lines, -78 removed lines

@@ -18,11 +18,11 @@ 
  * @param string $in input string
  */
 function echo_nsi($in) {
-  echo preg_replace('/"/','$\"',$in);
+  echo preg_replace('/"/', '$\"', $in);
 }
 
 function sprint_nsi($in) {
-  return preg_replace('/"/','$\"',$in);
+  return preg_replace('/"/', '$\"', $in);
 }
 
 /**
@@ -34,10 +34,10 @@ 
 class WindowsCommon extends DeviceConfig {
 
 protected function prepareInstallerLang() {
-    if(isset($this->LANGS[$this->lang_index])) {
+    if (isset($this->LANGS[$this->lang_index])) {
       $L = $this->LANGS[$this->lang_index];
       $this->lang = $L['nsis'];
-      $this->code_page = 'cp'.$L['cp'];
+      $this->code_page = 'cp' . $L['cp'];
     } else {
       $this->lang = 'English';
       $this->code_page = 'cp1252';
@@ -46,7 +46,7 @@ 
 
 protected function combineLogo($Logos) {
     // maximum size to which we want to resize
- $max_size= 120;
+ $max_size = 120;
 // logo wull be shited up by this much
  $vshift = 20;
  $bg_image = new Imagick('cat_bg.bmp');
@@ -55,19 +55,19 @@ 
  $logo = new Imagick($Logos[0]['name']);
  $logo_size = $logo->getImageGeometry();
  $max = max($logo_size);
- debug(4,"Logo size: "); debug(4,$logo_size); debug(4,"max=$max\n");
+ debug(4, "Logo size: "); debug(4, $logo_size); debug(4, "max=$max\n");
 // resize logo if necessary
- if($max > $max_size) {
-   if($max == $logo_size['width'])
-      $logo->scaleImage($max_size,0);
+ if ($max > $max_size) {
+   if ($max == $logo_size['width'])
+      $logo->scaleImage($max_size, 0);
    else
-      $logo->scaleImage(0,$max_size);
+      $logo->scaleImage(0, $max_size);
  }
  $logo_size = $logo->getImageGeometry();
- debug(4,"New logo size: "); debug(4,$logo_size);
+ debug(4, "New logo size: "); debug(4, $logo_size);
 // calculate logo offsets for composition with the background
- $hoffset = round(($bg_image_size['width'] - $logo_size['width'])/2);
- $voffset = round(($bg_image_size['height'] - $logo_size['height'])/2) - $vshift;
+ $hoffset = round(($bg_image_size['width'] - $logo_size['width']) / 2);
+ $voffset = round(($bg_image_size['height'] - $logo_size['height']) / 2) - $vshift;
 
 //logo image is put on top of the background
 $bg_image->compositeImage($logo, $logo->getImageCompose(), $hoffset, $voffset);
@@ -77,109 +77,109 @@ 
 }
 
 protected function signInstaller($attr) {
-   $e = $this->installerBasename.'.exe';
-   if($this->sign) {
-      $o = system($this->sign." installer.exe '$e' > /dev/null");
+   $e = $this->installerBasename . '.exe';
+   if ($this->sign) {
+      $o = system($this->sign . " installer.exe '$e' > /dev/null");
    }
    else
-      rename("installer.exe",$e);
+      rename("installer.exe", $e);
    return $e;
 }
 
 protected function compileNSIS() {
-   if(Config::$NSIS_VERSION >= 3)
+   if (Config::$NSIS_VERSION >= 3)
       $makensis = Config::$PATHS['makensis'] . " -INPUTCHARSET UTF8";
    else
       $makensis = Config::$PATHS['makensis']; 
-   $o = $makensis.' -V4 cat.NSI > nsis.log';
+   $o = $makensis . ' -V4 cat.NSI > nsis.log';
    system($o);
-   debug(4,"compileNSIS:$o\n");
+   debug(4, "compileNSIS:$o\n");
 }
 
 protected function msInfoFile($attr) {
  $out = '';
-if(isset($attr['support:info_file'])) {
+if (isset($attr['support:info_file'])) {
     $out .= '!define EXTERNAL_INFO "';
 //  debug(4,"Info file type ".$attr['support:info_file'][0]['mime']."\n");
   if ($attr['internal:info_file'][0]['mime'] == 'rtf')
-     $out = '!define LICENSE_FILE "'. $attr['internal:info_file'][0]['name'];
-  elseif( $attr['internal:info_file'][0]['mime'] == 'txt') {
+     $out = '!define LICENSE_FILE "' . $attr['internal:info_file'][0]['name'];
+  elseif ($attr['internal:info_file'][0]['mime'] == 'txt') {
      $in_txt = file_get_contents($attr['internal:info_file'][0]['name']);
-     if(Config::$NSIS_VERSION >= 3)
+     if (Config::$NSIS_VERSION >= 3)
         $out_txt = $in_txt;
      else
-        $out_txt = iconv('UTF-8',$this->code_page.'//TRANSLIT',$in_txt);
-     if($out_txt) {
-        file_put_contents('info_f.txt',$out_txt);
+        $out_txt = iconv('UTF-8', $this->code_page . '//TRANSLIT', $in_txt);
+     if ($out_txt) {
+        file_put_contents('info_f.txt', $out_txt);
         $out = '!define LICENSE_FILE " info_f.txt';
      }
   }
   else
-     $out = '!define EXTERNAL_INFO "'. $attr['internal:info_file'][0]['name'];
+     $out = '!define EXTERNAL_INFO "' . $attr['internal:info_file'][0]['name'];
 
   $out .= "\"\n";
 }
- debug(4,"Info file returned: $out");
+ debug(4, "Info file returned: $out");
   return $out;
 }
 
 
 protected function writeAdditionalDeletes($P) {
-  if(count($P) == 0 )
+  if (count($P) == 0)
     return;
-  $f = fopen('profiles.nsh','a');
-  fwrite($f,"!define AdditionalDeletes\n");
+  $f = fopen('profiles.nsh', 'a');
+  fwrite($f, "!define AdditionalDeletes\n");
   foreach ($P as $p)
-    fwrite($f,"!insertmacro define_delete_profile \"$p\"\n");
+    fwrite($f, "!insertmacro define_delete_profile \"$p\"\n");
   fclose($f);
 }
 
 
-public $LANGS=[
-'fr'=>['nsis'=>"French",'cp'=>'1252'],
-'de'=>['nsis'=>"German",'cp'=>'1252'],
-'es'=>['nsis'=>"SpanishInternational",'cp'=>'1252'],
-'it'=>['nsis'=>"Italian",'cp'=>'1252'],
-'nl'=>['nsis'=>"Dutch",'cp'=>'1252'],
-'sv'=>['nsis'=>"Swedish",'cp'=>'1252'],
-'fi'=>['nsis'=>"Finnish",'cp'=>'1252'],
-'pl'=>['nsis'=>"Polish",'cp'=>'1250'],
-'ca'=>['nsis'=>"Catalan",'cp'=>'1252'],
-'sr'=>['nsis'=>"SerbianLatin",'cp'=>'1250'],
-'hr'=>['nsis'=>"Croatian",'cp'=>'1250'],
-'sl'=>['nsis'=>"Slovenian",'cp'=>'1250'],
-'da'=>['nsis'=>"Danish",'cp'=>'1252'],
-'nb'=>['nsis'=>"Norwegian",'cp'=>'1252'],
-'nn'=>['nsis'=>"NorwegianNynorsk",'cp'=>'1252'],
-'el'=>['nsis'=>"Greek",'cp'=>'1253'],
-'ru'=>['nsis'=>"Russian",'cp'=>'1251'],
-'pt'=>['nsis'=>"Portuguese",'cp'=>'1252'],
-'uk'=>['nsis'=>"Ukrainian",'cp'=>'1251'],
-'cs'=>['nsis'=>"Czech",'cp'=>'1250'],
-'sk'=>['nsis'=>"Slovak",'cp'=>'1250'],
-'bg'=>['nsis'=>"Bulgarian",'cp'=>'1251'],
-'hu'=>['nsis'=>"Hungarian",'cp'=>'1250'],
-'ro'=>['nsis'=>"Romanian",'cp'=>'1250'],
-'lv'=>['nsis'=>"Latvian",'cp'=>'1257'],
-'mk'=>['nsis'=>"Macedonian",'cp'=>'1251'],
-'et'=>['nsis'=>"Estonian",'cp'=>'1257'],
-'tr'=>['nsis'=>"Turkish",'cp'=>'1254'],
-'lt'=>['nsis'=>"Lithuanian",'cp'=>'1257'],
-'ar'=>['nsis'=>"Arabic",'cp'=>'1256'],
-'he'=>['nsis'=>"Hebrew",'cp'=>'1255'],
-'id'=>['nsis'=>"Indonesian",'cp'=>'1252'],
-'mn'=>['nsis'=>"Mongolian",'cp'=>'1251'],
-'sq'=>['nsis'=>"Albanian",'cp'=>'1252'],
-'br'=>['nsis'=>"Breton",'cp'=>'1252'],
-'be'=>['nsis'=>"Belarusian",'cp'=>'1251'],
-'is'=>['nsis'=>"Icelandic",'cp'=>'1252'],
-'ms'=>['nsis'=>"Malay",'cp'=>'1252'],
-'bs'=>['nsis'=>"Bosnian",'cp'=>'1250'],
-'ga'=>['nsis'=>"Irish",'cp'=>'1250'],
-'uz'=>['nsis'=>"Uzbek",'cp'=>'1251'],
-'gl'=>['nsis'=>"Galician",'cp'=>'1252'],
-'af'=>['nsis'=>"Afrikaans",'cp'=>'1252'],
-'ast'=>['nsis'=>"Asturian",'cp'=>'1252'],
+public $LANGS = [
+'fr'=>['nsis'=>"French", 'cp'=>'1252'],
+'de'=>['nsis'=>"German", 'cp'=>'1252'],
+'es'=>['nsis'=>"SpanishInternational", 'cp'=>'1252'],
+'it'=>['nsis'=>"Italian", 'cp'=>'1252'],
+'nl'=>['nsis'=>"Dutch", 'cp'=>'1252'],
+'sv'=>['nsis'=>"Swedish", 'cp'=>'1252'],
+'fi'=>['nsis'=>"Finnish", 'cp'=>'1252'],
+'pl'=>['nsis'=>"Polish", 'cp'=>'1250'],
+'ca'=>['nsis'=>"Catalan", 'cp'=>'1252'],
+'sr'=>['nsis'=>"SerbianLatin", 'cp'=>'1250'],
+'hr'=>['nsis'=>"Croatian", 'cp'=>'1250'],
+'sl'=>['nsis'=>"Slovenian", 'cp'=>'1250'],
+'da'=>['nsis'=>"Danish", 'cp'=>'1252'],
+'nb'=>['nsis'=>"Norwegian", 'cp'=>'1252'],
+'nn'=>['nsis'=>"NorwegianNynorsk", 'cp'=>'1252'],
+'el'=>['nsis'=>"Greek", 'cp'=>'1253'],
+'ru'=>['nsis'=>"Russian", 'cp'=>'1251'],
+'pt'=>['nsis'=>"Portuguese", 'cp'=>'1252'],
+'uk'=>['nsis'=>"Ukrainian", 'cp'=>'1251'],
+'cs'=>['nsis'=>"Czech", 'cp'=>'1250'],
+'sk'=>['nsis'=>"Slovak", 'cp'=>'1250'],
+'bg'=>['nsis'=>"Bulgarian", 'cp'=>'1251'],
+'hu'=>['nsis'=>"Hungarian", 'cp'=>'1250'],
+'ro'=>['nsis'=>"Romanian", 'cp'=>'1250'],
+'lv'=>['nsis'=>"Latvian", 'cp'=>'1257'],
+'mk'=>['nsis'=>"Macedonian", 'cp'=>'1251'],
+'et'=>['nsis'=>"Estonian", 'cp'=>'1257'],
+'tr'=>['nsis'=>"Turkish", 'cp'=>'1254'],
+'lt'=>['nsis'=>"Lithuanian", 'cp'=>'1257'],
+'ar'=>['nsis'=>"Arabic", 'cp'=>'1256'],
+'he'=>['nsis'=>"Hebrew", 'cp'=>'1255'],
+'id'=>['nsis'=>"Indonesian", 'cp'=>'1252'],
+'mn'=>['nsis'=>"Mongolian", 'cp'=>'1251'],
+'sq'=>['nsis'=>"Albanian", 'cp'=>'1252'],
+'br'=>['nsis'=>"Breton", 'cp'=>'1252'],
+'be'=>['nsis'=>"Belarusian", 'cp'=>'1251'],
+'is'=>['nsis'=>"Icelandic", 'cp'=>'1252'],
+'ms'=>['nsis'=>"Malay", 'cp'=>'1252'],
+'bs'=>['nsis'=>"Bosnian", 'cp'=>'1250'],
+'ga'=>['nsis'=>"Irish", 'cp'=>'1250'],
+'uz'=>['nsis'=>"Uzbek", 'cp'=>'1251'],
+'gl'=>['nsis'=>"Galician", 'cp'=>'1252'],
+'af'=>['nsis'=>"Afrikaans", 'cp'=>'1252'],
+'ast'=>['nsis'=>"Asturian", 'cp'=>'1252'],
 
   ];
 

devices/xml/XML_TTLS_PAP.php

Spacing +1 added lines, -1 removed lines

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

devices/xml/XML_ALL.php

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

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

Spacing +1 added lines, -1 removed lines

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

devices/xml/XML.inc.php

Spacing +24 added lines, -24 removed lines

@@ -34,19 +34,19 @@ 
  *  @var array of XLM element names which are allowed
  *  EAP method names are defined in core/EAP.php
  */
-  public static $AuthMethodElements =  [
+  public static $AuthMethodElements = [
      'server' => [
         TLS => ['CA', 'ServerID'],
-        FAST => ['CA','ServerID'],
-        PEAP => ['CA','ServerID'],
-        TTLS => ['CA','ServerID'],
+        FAST => ['CA', 'ServerID'],
+        PEAP => ['CA', 'ServerID'],
+        TTLS => ['CA', 'ServerID'],
         PWD => [],
      ],
      'client' => [
-       TLS => ['UserName','Password','ClientCertificate'], 
-       MSCHAP2 => ['UserName','Password','OuterIdentity'], 
-       GTC => ['UserName','OneTimeToken'], 
-       NE_PAP => ['UserName','Password','OuterIdentity'], 
+       TLS => ['UserName', 'Password', 'ClientCertificate'], 
+       MSCHAP2 => ['UserName', 'Password', 'OuterIdentity'], 
+       GTC => ['UserName', 'OneTimeToken'], 
+       NE_PAP => ['UserName', 'Password', 'OuterIdentity'], 
      ]
   ];
 
@@ -67,21 +67,21 @@ 
     return $this->value;
   }
   public function areAttributes() {
-    return empty($this->attributes)?0:1;
+    return empty($this->attributes) ? 0 : 1;
   }
-  public function setAttribute($attribute,$value) {
-    if( ! isset($this->attributes))
+  public function setAttribute($attribute, $value) {
+    if (!isset($this->attributes))
        $this->attributes = [];
     $this->attributes[$attribute] = $value;
   }
-  public function setProperty($property,$value) {
+  public function setProperty($property, $value) {
     $this->$property = $value;
   }
   public function getAll() {
     $elems = get_object_vars($this);
     $objvars = [];
     foreach ($elems as $key=>$val) 
-      if ( ($key!='attributes') && ($key!='value') ) 
+      if (($key != 'attributes') && ($key != 'value')) 
         $objvars[$key] = $val;
     return $objvars;
   }
@@ -129,12 +129,12 @@ 
   protected $CA; // multi
   protected $ServerID; //multi
   public function getAll() {
-    if(isset(XMLElement::$AuthMethodElements['server'][$this->EAPType]) && XMLElement::$AuthMethodElements['server'][$this->EAPType]) {
+    if (isset(XMLElement::$AuthMethodElements['server'][$this->EAPType]) && XMLElement::$AuthMethodElements['server'][$this->EAPType]) {
     $E = XMLElement::$AuthMethodElements['server'][$this->EAPType];
     $out = get_object_vars($this);
     $OUT = [];
     foreach ($out as $o => $v) {
-       if(in_array($o, $E)) 
+       if (in_array($o, $E)) 
          $OUT[$o] = $v;
     }
     return($OUT);
@@ -154,14 +154,14 @@ 
   protected $PAC;
   protected $ProvisionPAC;
   public function getAll() {
-    if(isset(XMLElement::$AuthMethodElements['client'][$this->EAPType]) && XMLElement::$AuthMethodElements['client'][$this->EAPType]) {
+    if (isset(XMLElement::$AuthMethodElements['client'][$this->EAPType]) && XMLElement::$AuthMethodElements['client'][$this->EAPType]) {
     $E = XMLElement::$AuthMethodElements['client'][$this->EAPType];
     $out = get_object_vars($this);
     $OUT = [];
-debug(4,"EEE:".$this->EAPType.":\n");
-debug(4,$E);
+debug(4, "EEE:" . $this->EAPType . ":\n");
+debug(4, $E);
     foreach ($out as $o => $v) {
-       if(in_array($o, $E)) 
+       if (in_array($o, $E)) 
           $OUT[$o] = $v;
     }
     return($OUT);
@@ -267,8 +267,8 @@ 
     $val = '';
   }
   if ($val) { 
-    if(getType($val) == 'string')
-       $val = preg_replace('/&/','&',$val);
+    if (getType($val) == 'string')
+       $val = preg_replace('/&/', '&', $val);
     $node = $node->addChild($name, $val);
   } 
   else 
@@ -282,14 +282,14 @@ 
     $fields = $object->getAll();
     if (!empty($fields)) {
       foreach ($fields as $name=>$value) {
-        if (getType($value)=='string' || getType($value)=='integer' || getType($value)=='double') {
+        if (getType($value) == 'string' || getType($value) == 'integer' || getType($value) == 'double') {
           $node->addChild($name, $value);
         } else {
-          if (getType($value)=='array') {
+          if (getType($value) == 'array') {
             foreach ($value as $v)
               if (is_object($v))
                 marshalObject($node, $v);
-          } else if (getType($value)=='object')  {
+          } else if (getType($value) == 'object') {
             marshalObject($node, $value);
           }
         }