GEANT / CAT

devices/linux/DeviceLinuxSh.php

Spacing +45 added lines, -45 removed lines

@@ -65,9 +65,9 @@ 
      $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 == \core\common\EAP::EAPTYPE_TLS) 
+     if ($this->selected_eap == \core\common\EAP::EAPTYPE_TLS) 
        $out_string .= $this->printP12Dialog();
      else
        $out_string .= $this->printPasswordDialog();
@@ -78,20 +78,20 @@ 
    }
 
     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\ConfAssistant::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\ConfAssistant::CONSORTIUM['ssid']))." ";
         } else
-            $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"),implode(', ',\config\ConfAssistant::CONSORTIUM['ssid']))." ";
+            $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"), implode(', ', \config\ConfAssistant::CONSORTIUM['ssid']))." ";
         $i = 0;
         foreach ($this->attributes['internal:SSID'] as $ssid=>$v) {
-           if(! in_array($ssid, \config\ConfAssistant::CONSORTIUM['ssid'])) {
-             if($i > 0)
+           if (!in_array($ssid, \config\ConfAssistant::CONSORTIUM['ssid'])) {
+             if ($i > 0)
            $out .= ", ";
          $i++;
          $out .= "<strong>$ssid</strong>";
@@ -100,7 +100,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 == \core\common\EAP::EAPTYPE_TLS)
+if ($this->eap == \core\common\EAP::EAPTYPE_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,7 +114,7 @@ 
 
   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
+   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
@@ -130,11 +130,11 @@ 
    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
+  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;
@@ -150,10 +150,10 @@ 
 
 
 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;
@@ -163,12 +163,12 @@ 
 
   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';
+           $consent .= rtrim($buffer).'\n';
          }
          $out = 'if ! ask "'.$consent.'${n}" "'._("Continue").'" 1 ; then exit; fi
 ';
@@ -181,9 +181,9 @@ 
 # 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
 
 
@@ -404,10 +404,10 @@ 
   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 == \core\common\EAP::EAPTYPE_TLS) {
+  if ($this->selected_eap == \core\common\EAP::EAPTYPE_TLS) {
     $out .= '
   private_key="${HOME}/'.$this->local_dir.'/user.p12"
   private_key_passwd="${PASSWORD}"';
@@ -415,7 +415,7 @@ 
     $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].'"';
   }
@@ -439,7 +439,7 @@ 
   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
        exit
@@ -500,7 +500,7 @@ 
 ';
         } else {
             $out .= '      if [ -z "$USER_NAME" ] ; then
-             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
       fi
@@ -515,31 +515,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 = \core\common\EAP::eapDisplayName($this->selectedEap);
 $out = 'function run_python_script {
 PASSWORD=$( echo "$PASSWORD" | sed "s/\'/\\\\\\\'/g" )
@@ -678,11 +678,11 @@ 
             \'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 == \core\common\EAP::EAPTYPE_TLS) {
+    if ($this->selected_eap == \core\common\EAP::EAPTYPE_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\')),
@@ -691,7 +691,7 @@ 
        $out .= '
             \'password\': \'$PASSWORD\',
             \'phase2-auth\': \''.strtolower($e['INNER']).'\',';
-         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].'\',';
     }
@@ -713,18 +713,18 @@ 
         self.check_opts()
         ver = self.connect_to_NM()';
      foreach (array_keys($SSIDs) as $ssid) {
-           $out .='
+           $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 .='
+         if ($cipher == 'DEL')
+            $out .= '
         self.delete_existing_connections(\''.$ssid.'\')';
      }
 
-$out .='
+$out .= '
 
 if __name__ == "__main__":
     ENMCT = EduroamNMConfigTool()