GEANT / CAT

devices/linux/DeviceLinuxSh.php

Braces +39 added lines, -28 removed lines

@@ -67,10 +67,11 @@ 
 
      $out_string .= $this->printNMScript($SSIDs,$delSSIDs);
      $out_string .= $this->writeWpaConf($SSIDs);
-     if($this->selected_eap == \core\common\EAP::EAPTYPE_TLS) 
-       $out_string .= $this->printP12Dialog();
-     else
-       $out_string .= $this->printPasswordDialog();
+     if($this->selected_eap == \core\common\EAP::EAPTYPE_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);
@@ -86,13 +87,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\ConfAssistant::CONSORTIUM['ssid']))." ";
-        } else
-            $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"),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']))." ";
+        }
         $i = 0;
         foreach ($this->attributes['internal:SSID'] as $ssid=>$v) {
            if(! in_array($ssid, \config\ConfAssistant::CONSORTIUM['ssid'])) {
-             if($i > 0)
-           $out .= ", ";
+             if($i > 0) {
+                        $out .= ", ";
+             }
          $i++;
          $out .= "<strong>$ssid</strong>";
        }
@@ -100,9 +103,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 == \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 {
+} 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.");
@@ -150,10 +153,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;
@@ -404,9 +408,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 == \core\common\EAP::EAPTYPE_TLS) {
     $out .= '
   private_key="${HOME}/'.$this->local_dir.'/user.p12"
@@ -415,10 +420,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 .= '
 }';
 }
@@ -515,8 +521,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) {
@@ -528,12 +535,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;
@@ -691,9 +700,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 .= '
         })
@@ -719,9 +729,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 .='