GEANT / CAT

devices/ms/Vista7.php

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

devices/ms/WindowsCommon.php

Braces +28 added lines, -23 removed lines

@@ -58,10 +58,11 @@ 
  debug(4,"Logo size: "); debug(4,$logo_size); debug(4,"max=$max\n");
 // resize logo if necessary
  if($max > $max_size) {
-   if($max == $logo_size['width'])
-      $logo->scaleImage($max_size,0);
-   else
-      $logo->scaleImage(0,$max_size);
+   if($max == $logo_size['width']) {
+         $logo->scaleImage($max_size,0);
+   } else {
+         $logo->scaleImage(0,$max_size);
+   }
  }
  $logo_size = $logo->getImageGeometry();
  debug(4,"New logo size: "); debug(4,$logo_size);
@@ -80,17 +81,18 @@ 
    $e = $this->installerBasename.'.exe';
    if($this->sign) {
       $o = system($this->sign." installer.exe '$e' > /dev/null");
+   } else {
+         rename("installer.exe",$e);
    }
-   else
-      rename("installer.exe",$e);
    return $e;
 }
 
 protected function compileNSIS() {
-   if(Config::$NSIS_VERSION >= 3)
-      $makensis = Config::$PATHS['makensis'] . " -INPUTCHARSET UTF8";
-   else
-      $makensis = Config::$PATHS['makensis']; 
+   if(Config::$NSIS_VERSION >= 3) {
+         $makensis = Config::$PATHS['makensis'] . " -INPUTCHARSET UTF8";
+   } else {
+         $makensis = Config::$PATHS['makensis'];
+   }
    $o = $makensis.' -V4 cat.NSI > nsis.log';
    system($o);
    debug(4,"compileNSIS:$o\n");
@@ -101,21 +103,22 @@ 
 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') {
+  if ($attr['internal:info_file'][0]['mime'] == 'rtf') {
+       $out = '!define LICENSE_FILE "'. $attr['internal:info_file'][0]['name'];
+  } elseif( $attr['internal:info_file'][0]['mime'] == 'txt') {
      $in_txt = file_get_contents($attr['internal:info_file'][0]['name']);
-     if(Config::$NSIS_VERSION >= 3)
-        $out_txt = $in_txt;
-     else
-        $out_txt = iconv('UTF-8',$this->code_page.'//TRANSLIT',$in_txt);
+     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 = '!define LICENSE_FILE " info_f.txt';
      }
+  } else {
+       $out = '!define EXTERNAL_INFO "'. $attr['internal:info_file'][0]['name'];
   }
-  else
-     $out = '!define EXTERNAL_INFO "'. $attr['internal:info_file'][0]['name'];
 
   $out .= "\"\n";
 }
@@ -125,12 +128,14 @@ 
 
 
 protected function writeAdditionalDeletes($P) {
-  if(count($P) == 0 )
-    return;
+  if(count($P) == 0 ) {
+      return;
+  }
   $f = fopen('profiles.nsh','a');
   fwrite($f,"!define AdditionalDeletes\n");
-  foreach ($P as $p)
-    fwrite($f,"!insertmacro define_delete_profile \"$p\"\n");
+  foreach ($P as $p) {
+      fwrite($f,"!insertmacro define_delete_profile \"$p\"\n");
+  }
   fclose($f);
 }
 

devices/xml/XML.inc.php

Braces +29 added lines, -19 removed lines

@@ -70,8 +70,9 @@ 
     return empty($this->attributes)?0:1;
   }
   public function setAttribute($attribute,$value) {
-    if( ! isset($this->attributes))
-       $this->attributes = [];
+    if( ! isset($this->attributes)) {
+           $this->attributes = [];
+    }
     $this->attributes[$attribute] = $value;
   }
   public function setProperty($property,$value) {
@@ -80,9 +81,10 @@ 
   public function getAll() {
     $elems = get_object_vars($this);
     $objvars = [];
-    foreach ($elems as $key=>$val) 
-      if ( ($key!='attributes') && ($key!='value') ) 
+    foreach ($elems as $key=>$val) {
+          if ( ($key!='attributes') && ($key!='value') ) 
         $objvars[$key] = $val;
+    }
     return $objvars;
   }
 }
@@ -134,8 +136,9 @@ 
     $out = get_object_vars($this);
     $OUT = [];
     foreach ($out as $o => $v) {
-       if(in_array($o, $E)) 
-         $OUT[$o] = $v;
+       if(in_array($o, $E)) {
+                $OUT[$o] = $v;
+       }
     }
     return($OUT);
   }
@@ -161,8 +164,9 @@ 
 debug(4,"EEE:".$this->EAPType.":\n");
 debug(4,$E);
     foreach ($out as $o => $v) {
-       if(in_array($o, $E)) 
-          $OUT[$o] = $v;
+       if(in_array($o, $E)) {
+                 $OUT[$o] = $v;
+       }
     }
     return($OUT);
     }
@@ -259,24 +263,29 @@ 
 
   $name = get_class($object);
   $name = preg_replace("/_/", "-", $name);
-  if ($object->getValue()) $val = $object->getValue();
-  else $val = '';
+  if ($object->getValue()) {
+      $val = $object->getValue();
+  } else {
+      $val = '';
+  }
   $simplexmlelement = '';
   if ($val instanceof SimpleXMLElement) {
     $simplexmlelement = $val;
     $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 
-    $node = $node->addChild($name);
+  } else {
+      $node = $node->addChild($name);
+  }
   if ($object->areAttributes()) {
     $attrs = $object->getAttributes();
-    foreach ($attrs as $attrt=>$attrv)
-      $node->addAttribute($attrt, $attrv);
+    foreach ($attrs as $attrt=>$attrv) {
+          $node->addAttribute($attrt, $attrv);
+    }
   }
   if ($simplexmlelement == '') {
     $fields = $object->getAll();
@@ -286,9 +295,10 @@ 
           $node->addChild($name, $value);
         } else {
           if (getType($value)=='array') {
-            foreach ($value as $v)
-              if (is_object($v))
+            foreach ($value as $v) {
+                          if (is_object($v))
                 marshalObject($node, $v);
+            }
           } else if (getType($value)=='object')  {
             marshalObject($node, $value);
           }

devices/xml/XML.php

Braces +34 added lines, -25 removed lines

@@ -64,11 +64,13 @@ 
     if($this->all_eaps) {
       $EAPs = [];
       foreach ($attr['all_eaps'] as $eap) {
-         if(in_array($eap, $this->supportedEapMethods))
-            $EAPs[] = $eap;
+         if(in_array($eap, $this->supportedEapMethods)) {
+                     $EAPs[] = $eap;
+         }
       }
-    } else
-      $EAPs = [ $this->selected_eap];
+    } else {
+          $EAPs = [ $this->selected_eap];
+    }
 
     foreach ($EAPs as $eap) {
        $authmethods[] = $this->getAuthMethod($eap);
@@ -83,8 +85,9 @@ 
        $eap_idp->setAttribute('ID',$attr['internal:realm'][0]);
        $eap_idp->setAttribute('namespace',$NAMESPACE);
     }
-    if($this->lang_scope === 'single')
-       $eap_idp->setAttribute('lang',$this->lang_index);
+    if($this->lang_scope === 'single') {
+           $eap_idp->setAttribute('lang',$this->lang_index);
+    }
     $eap_idp->setAttribute('version','1');
     
 
@@ -124,9 +127,10 @@ 
       $obj = new $class_name();
       $obj->setValue($a[0]);
       return($obj);   
-   } else
-     return '';
-}
+   } else {
+        return '';
+   }
+   }
 
 
 private function getSimpleMLAttribute($attr_name) {
@@ -153,17 +157,19 @@ 
       }
 
       return($objs);
-      } else
-     return '';
-}
+      } else {
+           return '';
+      }
+      }
 
 private function getDisplayName() {
    $attr = $this->attributes;
    $objs = [];
    if($this->lang_scope === 'global') {
       $I = $attr['general:instname']['langs'];
-      if($attr['internal:profile_count'][0] > 1)
-        $P = $attr['profile:name']['langs'];
+      if($attr['internal:profile_count'][0] > 1) {
+              $P = $attr['profile:name']['langs'];
+      }
       foreach( $I as $l => $v ) {
         $l = ( $l === 'C' ? 'any' : $l );
         $displayname = new DisplayName();
@@ -178,8 +184,9 @@ 
    } else {
    $displayname = new DisplayName();
    $v = $attr['general:instname'][0];
-   if($attr['internal:profile_count'][0] > 1)
-       $v .= ' - '.$attr['profile:name'][0];
+   if($attr['internal:profile_count'][0] > 1) {
+          $v .= ' - '.$attr['profile:name'][0];
+   }
    $displayname->setValue($v);
      $objs[] = $displayname;
    }
@@ -222,8 +229,7 @@ 
                $providerlocation->setProperty('Latitude',$b['lat']);
                $at1[] = $providerlocation;
           }
-         }
-         else {
+         } else {
                $providerlocation = new ProviderLocation();
                $b = unserialize($at[0]);
                $providerlocation->setProperty('Longitude',$b['lon']);
@@ -270,9 +276,10 @@ 
       $eapmethod->setProperty('Type',$eaptype);
       $innerauthmethod->setProperty($class_name,$eapmethod);
       return ['inner_method'=>$innerauthmethod,'methodID'=> $outer_id, 'inner_methodID'=>$inner['METHOD']];
-   } else
-   return ['inner_method'=>0,'methodID'=>$outer_id, 'inner_methodID'=>0];
-}
+   } else {
+      return ['inner_method'=>0,'methodID'=>$outer_id, 'inner_methodID'=>0];
+   }
+   }
 
 private function getAuthMethod($eap) {
    $attr = $this->attributes;
@@ -327,12 +334,14 @@ 
    $clientsidecredential = new ClientSideCredential();
 
 // OuterIdentity 
-   if($attr['internal:use_anon_outer'] [0])
-      $clientsidecredential->setProperty('OuterIdentity',$attr['internal:anon_local_value'][0].'@'.$attr['internal:realm'][0]);
+   if($attr['internal:use_anon_outer'] [0]) {
+         $clientsidecredential->setProperty('OuterIdentity',$attr['internal:anon_local_value'][0].'@'.$attr['internal:realm'][0]);
+   }
    $clientsidecredential->setProperty('EAPType',$eapParams['inner_methodID'] ? $eapParams['inner_methodID'] : $eapParams['methodID']);
    $authmethod->setProperty('ClientSideCredential',$clientsidecredential);
-   if($eapParams['inner_method'])
-      $authmethod->setProperty('InnerAuthenticationMethod',$eapParams['inner_method']);
+   if($eapParams['inner_method']) {
+         $authmethod->setProperty('InnerAuthenticationMethod',$eapParams['inner_method']);
+   }
    return $authmethod;
 }
 

devices/chromebook/chromebook.php

Braces +16 added lines, -12 removed lines

@@ -108,10 +108,10 @@ 
         // construct outer id, if anonymity is desired
         if (isset($this->attributes['internal:use_anon_outer']) && $this->attributes['internal:use_anon_outer'][0] == "1" && isset($this->attributes['internal:realm'])) {
             $outer_id = "@" . $this->attributes['internal:realm'][0];
-            if (isset($this->attributes['internal:anon_local_value']))
-                $outer_id = $this->attributes['internal:anon_local_value'][0] . $outer_id;
-        }
-        else {
+            if (isset($this->attributes['internal:anon_local_value'])) {
+                            $outer_id = $this->attributes['internal:anon_local_value'][0] . $outer_id;
+            }
+        } else {
             $outer_id = 0;
         }
         // define networks
@@ -119,26 +119,30 @@ 
             $network_uuid = uuid($prefix, $ssid);
             $eap_prettyprint = EAP::eapDisplayName($this->selected_eap);
             // ONC has its own enums, and guess what, they don't always match
-            if ($eap_prettyprint["OUTER"] == "PEAP" && $eap_prettyprint["INNER"] == "MSCHAPV2")
-                // the dictionary entry EAP-MSCHAPv2 does not work. Setting MSCHAPv2 does. (ChromeOS 50)
+            if ($eap_prettyprint["OUTER"] == "PEAP" && $eap_prettyprint["INNER"] == "MSCHAPV2") {
+                            // the dictionary entry EAP-MSCHAPv2 does not work. Setting MSCHAPv2 does. (ChromeOS 50)
                 $eap_prettyprint["INNER"] = "MSCHAPv2";
+            }
             if ($eap_prettyprint["OUTER"] == "TTLS" && $eap_prettyprint["INNER"] == "MSCHAPV2") {
                 $eap_prettyprint["OUTER"] = "EAP-TTLS";
                 $eap_prettyprint["INNER"] = "MSCHAPv2";
             }
-            if ($eap_prettyprint["OUTER"] == "TLS")
-                $eap_prettyprint["OUTER"] = "EAP-TLS";
+            if ($eap_prettyprint["OUTER"] == "TLS") {
+                            $eap_prettyprint["OUTER"] = "EAP-TLS";
+            }
             // define EAP properties
 
             $eaparray = array("Outer" => $eap_prettyprint["OUTER"]);
-            if ($eap_prettyprint["INNER"] == "MSCHAPv2")
-                $eaparray["Inner"] = $eap_prettyprint["INNER"];
+            if ($eap_prettyprint["INNER"] == "MSCHAPv2") {
+                            $eaparray["Inner"] = $eap_prettyprint["INNER"];
+            }
             $eaparray["SaveCredentials"] = true;
             $eaparray["ServerCARefs"] = $ca_refs; // maybe takes just one CA?
             $eaparray["UseSystemCAs"] = false;
                     
-            if ($outer_id)
-                $eaparray["AnonymousIdentity"] = "$outer_id";
+            if ($outer_id) {
+                            $eaparray["AnonymousIdentity"] = "$outer_id";
+            }
             
             $json_array["NetworkConfigurations"][] = [
                 "GUID" => $network_uuid,

devices/apple_mobileconfig/mobileconfig_superclass.php

Braces +92 added lines, -70 removed lines

@@ -68,15 +68,17 @@ 
         // remove spaces and slashes (filename!), make sure it's simple ASCII only, then lowercase it
         // also escape htmlspecialchars
         // not all names and profiles have a name, so be prepared
-        if (empty($this->attributes['general:instname'][0]))
-            $inst_name = "Unnamed Institution";
-        else
-            $inst_name = $this->attributes['general:instname'][0];
+        if (empty($this->attributes['general:instname'][0])) {
+                    $inst_name = "Unnamed Institution";
+        } else {
+                    $inst_name = $this->attributes['general:instname'][0];
+        }
 
-        if (empty($this->attributes['profile:name'][0]))
-            $profile_name = "Unnamed Profile";
-        else
-            $profile_name = $this->attributes['profile:name'][0];
+        if (empty($this->attributes['profile:name'][0])) {
+                    $profile_name = "Unnamed Profile";
+        } else {
+                    $profile_name = $this->attributes['profile:name'][0];
+        }
 
         $this->massaged_inst = htmlspecialchars(strtolower(iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace(['/ /', '/\//'], '_', $inst_name))), ENT_XML1, 'UTF-8');
         $this->massaged_profile = htmlspecialchars(strtolower(iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace(['/ /', '/\//'], '_', $profile_name))), ENT_XML1, 'UTF-8');
@@ -87,10 +89,10 @@ 
         if (isset($this->attributes['internal:use_anon_outer']) && $this->attributes['internal:use_anon_outer'][0] == "1" && isset($this->attributes['internal:realm'])) {
 
             $use_realm = "@" . $this->attributes['internal:realm'][0];
-            if (isset($this->attributes['internal:anon_local_value']))
-                $use_realm = $this->attributes['internal:anon_local_value'][0] . $use_realm;
-        }
-        else {
+            if (isset($this->attributes['internal:anon_local_value'])) {
+                            $use_realm = $this->attributes['internal:anon_local_value'][0] . $use_realm;
+            }
+        } else {
             $use_realm = 0;
         }
 
@@ -109,10 +111,11 @@ 
          <array>";
 
         // did the admin want wired config?
-        if (isset($this->attributes['media:wired']) && get_class($this) == "Device_mobileconfig_os_x")
-            $include_wired = TRUE;
-        else
-            $include_wired = FALSE;
+        if (isset($this->attributes['media:wired']) && get_class($this) == "Device_mobileconfig_os_x") {
+                    $include_wired = TRUE;
+        } else {
+                    $include_wired = FALSE;
+        }
 
         $output_xml .= $this->all_network_blocks($ssid_list, $OI_list, $server_names, $uuid_list, $eap_type, $include_wired, $use_realm);
 
@@ -134,14 +137,15 @@ 
          <string>" . uuid('', mobileconfig_superclass::$IPHONE_PAYLOAD_PREFIX . $this->massaged_consortium . $this->massaged_country . $this->massaged_inst . $this->massaged_profile) . "</string>
       <key>PayloadVersion</key>
          <integer>1</integer>";
-        if (isset($this->attributes['support:info_file']))
-            $output_xml .= "
+        if (isset($this->attributes['support:info_file'])) {
+                    $output_xml .= "
       <key>ConsentText</key>
          <dict>
             <key>default</key>
                <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//TRANSLIT", $this->attributes['support:info_file'][0]), ENT_XML1, 'UTF-8') . "</string>
          </dict>
          ";
+        }
 
         $output_xml .= "</dict></plist>";
 
@@ -152,10 +156,12 @@ 
         $e = $this->installerBasename . '.mobileconfig';
         if ($this->sign) {
             $o = system($this->sign . " installer_profile '$e' > /dev/null");
-            if ($o === FALSE)
-                debug(2, "Signing the mobileconfig installer $e FAILED!\n");
-        } else
-            rename("installer_profile", $e);
+            if ($o === FALSE) {
+                            debug(2, "Signing the mobileconfig installer $e FAILED!\n");
+            }
+        } else {
+                    rename("installer_profile", $e);
+        }
 
         textdomain($dom);
         return $e;
@@ -170,12 +176,14 @@ 
         $out .= "<ul>";
         $out .= "<li>" . _("to install the profile") . "</li>";
         $out .= "<li>" . ngettext("to accept the server certificate authority", "to accept the server certificate authorities", $cert_ct);
-        if ($cert_ct > 1)
-            $out .= " " . sprintf(_("(%d times)"), $cert_ct);
+        if ($cert_ct > 1) {
+                    $out .= " " . sprintf(_("(%d times)"), $cert_ct);
+        }
         $out .= "</li>";
         $out .= "<li>" . _("to enter the username and password of your institution");
-        if ($ssid_ct > 1)
-            $out .= " " . sprintf(_("(%d times each, because %s is installed for %d SSIDs)"), $ssid_ct, Config::$CONSORTIUM['name'], $ssid_ct);
+        if ($ssid_ct > 1) {
+                    $out .= " " . sprintf(_("(%d times each, because %s is installed for %d SSIDs)"), $ssid_ct, Config::$CONSORTIUM['name'], $ssid_ct);
+        }
         $out .= "</li>";
         $out .= "</ul>";
         $out .= "</p>";
@@ -186,8 +194,9 @@ 
 
     private function list_ca_uuids($ca_array) {
         $retval = [];
-        foreach ($ca_array as $ca)
-            $retval[] = $ca['uuid'];
+        foreach ($ca_array as $ca) {
+                    $retval[] = $ca['uuid'];
+        }
         return $retval;
     }
 
@@ -212,24 +221,27 @@ 
                       <key>OneTimeUserPassword</key>
                             <false />
 ";
-        if ($realm !== 0)
-            $retval .= "<key>OuterIdentity</key>
+        if ($realm !== 0) {
+                    $retval .= "<key>OuterIdentity</key>
                                     <string>" . htmlspecialchars($realm, ENT_XML1, 'UTF-8') . "</string>
 ";
+        }
         $retval .= "<key>PayloadCertificateAnchorUUID</key>
                          <array>";
-        foreach ($CA_UUID_list as $uuid)
-            $retval .= "
+        foreach ($CA_UUID_list as $uuid) {
+                    $retval .= "
 <string>$uuid</string>";
+        }
         $retval .= "
                          </array>
                       <key>TLSAllowTrustExceptions</key>
                          <false />
                       <key>TLSTrustedServerNames</key>
                          <array>";
-        foreach ($server_list as $cn)
-            $retval .= "
+        foreach ($server_list as $cn) {
+                    $retval .= "
 <string>$cn</string>";
+        }
         $retval .= "
                          </array>
                       <key>TTLSInnerAuthentication</key>
@@ -237,42 +249,46 @@ 
                    </dict>
                <key>EncryptionType</key>
                   <string>";
-        if ($wired)
-            $retval .= "any";
-        else if (count($oi) > 0)
-            $retval .= "WPA";
-        else
-            $retval .= "WPA";
+        if ($wired) {
+                    $retval .= "any";
+        } else if (count($oi) > 0) {
+                    $retval .= "WPA";
+        } else {
+                    $retval .= "WPA";
+        }
 
         $retval .= "</string>
                <key>HIDDEN_NETWORK</key>
                   <true />
                <key>PayloadDescription</key>
                   <string>";
-        if ($wired)
-            $retval .= sprintf(_("%s configuration for wired network"), Config::$CONSORTIUM['name']);
-        else if (count($oi) > 0)
-            $retval .= sprintf(_("%s Hotspot 2.0 configuration"), Config::$CONSORTIUM['name']);
-        else
-            $retval .= sprintf(_("%s configuration for network name %s"), Config::$CONSORTIUM['name'], $SSID);
+        if ($wired) {
+                    $retval .= sprintf(_("%s configuration for wired network"), Config::$CONSORTIUM['name']);
+        } else if (count($oi) > 0) {
+                    $retval .= sprintf(_("%s Hotspot 2.0 configuration"), Config::$CONSORTIUM['name']);
+        } else {
+                    $retval .= sprintf(_("%s configuration for network name %s"), Config::$CONSORTIUM['name'], $SSID);
+        }
         $retval .= "</string>
                <key>PayloadDisplayName</key>
                   <string>";
-        if ($wired)
-            $retval .= _("Wired Network");
-        else if (count($oi) > 0)
-            $retval .= _("Hotspot 2.0 Settings");
-        else
-            $retval .= sprintf(_("SSID %s"), $SSID);
+        if ($wired) {
+                    $retval .= _("Wired Network");
+        } else if (count($oi) > 0) {
+                    $retval .= _("Hotspot 2.0 Settings");
+        } else {
+                    $retval .= sprintf(_("SSID %s"), $SSID);
+        }
         $retval .= "</string>
                <key>PayloadIdentifier</key>
                   <string>" . mobileconfig_superclass::$IPHONE_PAYLOAD_PREFIX . ".$this->massaged_consortium.$this->massaged_country.$this->massaged_inst.$this->massaged_profile.$this->lang.";
-        if ($wired)
-            $retval .= "firstactiveethernet";
-        else if (count($oi) == 0)
-            $retval .= "wifi." . $this->serial;
-        else
-            $retval .= "hs20";
+        if ($wired) {
+                    $retval .= "firstactiveethernet";
+        } else if (count($oi) == 0) {
+                    $retval .= "wifi." . $this->serial;
+        } else {
+                    $retval .= "hs20";
+        }
         $retval .="</string>
                <key>PayloadOrganization</key>
                   <string>" . $this->massaged_consortium . ".1x-config.org</string>
@@ -284,20 +300,22 @@ 
                   <string>Auto</string>
                 ";
         }
-        if ($wired)
-            $retval .= "
+        if ($wired) {
+                    $retval .= "
                <key>SetupModes</key>
                   <array>
                      <string>System</string>
                   </array>";
+        }
         $retval .= "
                <key>PayloadUUID</key>
                   <string>" . uuid() . "</string>
                <key>PayloadVersion</key>
                   <integer>1</integer>";
-        if (!$wired && count($oi) == 0)
-            $retval .= "<key>SSID_STR</key>
+        if (!$wired && count($oi) == 0) {
+                    $retval .= "<key>SSID_STR</key>
                   <string>$SSID</string>";
+        }
         if (count($oi) > 0) {
             $retval .= "
                <key>IsHotspot</key>
@@ -316,8 +334,9 @@ 
             }
             $retval .= "                <key>RoamingConsortiumOIs</key>
                 <array>";
-            foreach ($oi as $oi_value)
-                $retval .= "<string>$oi_value</string>";
+            foreach ($oi as $oi_value) {
+                            $retval .= "<string>$oi_value</string>";
+            }
             $retval .= "</array>";
         }
         $retval .= "</dict>";
@@ -365,13 +384,16 @@ 
         foreach (array_keys($SSID_list) as $SSID) {
             $retval .= $this->network_block($SSID, NULL, $server_list, $CA_UUID_list, $eap_type, FALSE, $realm);
         }
-        if ($include_wired)
-            $retval .= $this->network_block("IRRELEVANT", NULL, $server_list, $CA_UUID_list, $eap_type, TRUE, $realm);
-        if (count($OI_list) > 0)
-            $retval .= $this->network_block("IRRELEVANT", $OI_list, $server_list, $CA_UUID_list, $eap_type, FALSE, $realm);
-        if (isset($this->attributes['media:remove_SSID']))
-            foreach ($this->attributes['media:remove_SSID'] as $index => $remove_SSID)
+        if ($include_wired) {
+                    $retval .= $this->network_block("IRRELEVANT", NULL, $server_list, $CA_UUID_list, $eap_type, TRUE, $realm);
+        }
+        if (count($OI_list) > 0) {
+                    $retval .= $this->network_block("IRRELEVANT", $OI_list, $server_list, $CA_UUID_list, $eap_type, FALSE, $realm);
+        }
+        if (isset($this->attributes['media:remove_SSID'])) {
+                    foreach ($this->attributes['media:remove_SSID'] as $index => $remove_SSID)
                 $retval .= $this->removenetwork_block($remove_SSID, $index);
+        }
         return $retval;
     }