GEANT / CAT

core/Options.php

Braces +3 added lines, -2 removed lines

@@ -79,8 +79,9 @@
         $this->type_db = [];
         debug(3,"--- BEGIN constructing Options instance ---\n");
         $options = DBConnection::exec(Options::$DB_TYPE, "SELECT name,type,flag from profile_option_dict ORDER BY name");
-        while($a = mysqli_fetch_object($options))
-            $this->type_db[$a->name]       =  ["type" => $a->type, "flag" => $a->flag];
+        while($a = mysqli_fetch_object($options)) {
+                    $this->type_db[$a->name]       =  ["type" => $a->type, "flag" => $a->flag];
+        }
         $this->type_db["general:logo_url"] =  ["type" => "string", "flag" => NULL];
         $this->type_db["eap:ca_url"]       =  ["type" => "string", "flag" => NULL];
         $this->type_db["internal:country"] =  ["type" => "string", "flag" => NULL];

core/Profile.php

Braces +120 added lines, -88 removed lines

@@ -240,8 +240,8 @@ 
 
         $idpoptions = $idp->getAttributes();
 
-        foreach ($idpoptions as $the_attr)
-            $temparray[] = [
+        foreach ($idpoptions as $the_attr) {
+                    $temparray[] = [
                 "name" => $the_attr["name"],
                 "value" => $the_attr["value"],
                 "level" => $the_attr["level"],
@@ -250,30 +250,35 @@ 
                 "device" => NULL,
                 "eapmethod" => NULL,
             ];
+        }
 
         $this->priv_attributes = [];
 
         // check sanity (device and eapmethod are mutually exclusive) and first batch of adding (method level)
 
         foreach ($temparray as $attrib) {
-            if ($attrib["device"] != NULL && $attrib["eapmethod"] != NULL)
-                debug(2, "Sanity check failed - device and eapmethod are set!\n");
+            if ($attrib["device"] != NULL && $attrib["eapmethod"] != NULL) {
+                            debug(2, "Sanity check failed - device and eapmethod are set!\n");
+            }
         }
 
         foreach ($temparray as $attrib) {
-            if ($attrib["device"] != NULL || $attrib["eapmethod"] != NULL)
-                $this->priv_attributes[] = $attrib;
+            if ($attrib["device"] != NULL || $attrib["eapmethod"] != NULL) {
+                            $this->priv_attributes[] = $attrib;
+            }
         }
         // pick all attributes which are profile specific and place into final array if no eap/device-specific exists
 
         foreach ($temparray as $attrib) {
             if ($attrib["level"] == "Profile") {
                 $ignore = "";
-                foreach ($this->priv_attributes as $approved_attrib)
-                    if ($attrib["name"] == $approved_attrib["name"] && $approved_attrib["level"] != "IdP" && $approved_attrib["level"] != "Profile")
+                foreach ($this->priv_attributes as $approved_attrib) {
+                                    if ($attrib["name"] == $approved_attrib["name"] && $approved_attrib["level"] != "IdP" && $approved_attrib["level"] != "Profile")
                         $ignore = "YES";
-                if ($ignore != "YES")
-                    $this->priv_attributes[] = $attrib;
+                }
+                if ($ignore != "YES") {
+                                    $this->priv_attributes[] = $attrib;
+                }
             }
         }
 
@@ -282,11 +287,13 @@ 
         foreach ($temparray as $attrib) {
             if ($attrib["level"] == "IdP") {
                 $ignore = "";
-                foreach ($this->priv_attributes as $approved_attrib)
-                    if ($attrib["name"] == $approved_attrib["name"] && $approved_attrib["level"] != "IdP")
+                foreach ($this->priv_attributes as $approved_attrib) {
+                                    if ($attrib["name"] == $approved_attrib["name"] && $approved_attrib["level"] != "IdP")
                         $ignore = "YES";
-                if ($ignore != "YES")
-                    $this->priv_attributes[] = $attrib;
+                }
+                if ($ignore != "YES") {
+                                    $this->priv_attributes[] = $attrib;
+                }
             }
         }
 
@@ -315,8 +322,9 @@ 
         $exec_query = DBConnection::exec(Profile::$DB_TYPE, "SELECT profile_id FROM profile WHERE realm LIKE '%@$realm'");
         if ($a = mysqli_fetch_object($exec_query)) {
             return $a->profile_id;
-        } else
-            return FALSE;
+        } else {
+                    return FALSE;
+        }
     }
     
     /**
@@ -356,15 +364,15 @@ 
                 if ($lc < $cache->tm) {
                     debug(4, "Installer cached:$cache->download_path\n");
                     return(['cache'=>$cache->download_path,'mime'=>$cache->mime]);
+                } else {
+                                    return NULL;
                 }
-                else
-                    return NULL;
+            } else {
+                            return NULL;
             }
-            else
-                return NULL;
+        } else {
+                    return NULL;
         }
-        else
-            return NULL;
     }
 
     /**
@@ -405,20 +413,23 @@ 
     public function getUserDownloadStats($device = 0) {
         $returnarray = [];
         $numbers_q = DBConnection::exec(Profile::$DB_TYPE, "SELECT device_id, SUM(downloads_user) AS downloads_user FROM downloads WHERE profile_id = $this->identifier GROUP BY device_id");
-        while ($a = mysqli_fetch_object($numbers_q))
-            $returnarray[$a->device_id] = $a->downloads_user;
+        while ($a = mysqli_fetch_object($numbers_q)) {
+                    $returnarray[$a->device_id] = $a->downloads_user;
+        }
         if ($device !== 0) {
-            if (isset($returnarray[$device]))
-                return $returnarray[$device];
-            else
-                return 0;
+            if (isset($returnarray[$device])) {
+                            return $returnarray[$device];
+            } else {
+                            return 0;
+            }
         }
         // we should pretty-print the device names
         $finalarray = [];
         $devlist = Devices::listDevices();
-        foreach ($returnarray as $dev_id => $count)
-            if (isset($devlist[$dev_id]))
+        foreach ($returnarray as $dev_id => $count) {
+                    if (isset($devlist[$dev_id]))
                     $finalarray[$devlist[$dev_id]['display']] = $count;
+        }
         return $finalarray;
     }
 
@@ -434,15 +445,16 @@ 
         if ($device !== 0) {
             $device = DBConnection::escape_value(Profile::$DB_TYPE, $device);
             $devicetext = "AND device_id = '$device'";
+        } else {
+                    $devicetext = "";
         }
-        else
-            $devicetext = "";
         DBConnection::exec(Profile::$DB_TYPE, "DELETE FROM profile_option WHERE profile_id = $this->identifier $devicetext AND eap_method_id = $eap_type_id AND option_name NOT LIKE '%_file'");
         $this->updateFreshness();
         $exec_q = DBConnection::exec(Profile::$DB_TYPE, "SELECT row FROM profile_option WHERE profile_id = $this->identifier $devicetext AND eap_method_id = $eap_type_id");
         $return_array = [];
-        while ($a = mysqli_fetch_object($exec_q))
-            $return_array[$a->row] = "KILLME";
+        while ($a = mysqli_fetch_object($exec_q)) {
+                    $return_array[$a->row] = "KILLME";
+        }
         return $return_array;
     }
 
@@ -564,9 +576,10 @@ 
         if ($complete_only == 0) {
             return $this->priv_eaptypes;
         } else {
-            foreach ($this->priv_eaptypes as $type)
-                if ($this->isEapTypeDefinitionComplete($type) === true)
+            foreach ($this->priv_eaptypes as $type) {
+                            if ($this->isEapTypeDefinitionComplete($type) === true)
                     $temparray[] = $type;
+            }
             return($temparray);
         }
     }
@@ -583,27 +596,31 @@ 
         $outarray = [];
         $temparray = [];
         if ($eapmethod) {
-            foreach ($this->priv_attributes as $the_attr) 
-                if ($the_attr["eapmethod"] == $eapmethod)
+            foreach ($this->priv_attributes as $the_attr) {
+                            if ($the_attr["eapmethod"] == $eapmethod)
                     $temparray[] = $the_attr;
+            }
         } else
         if ($device) {
-            foreach ($this->priv_attributes as $the_attr)
-                if ($the_attr["device"] == $device)
+            foreach ($this->priv_attributes as $the_attr) {
+                            if ($the_attr["device"] == $device)
                     $temparray[] = $the_attr;
+            }
         };
 
-        foreach ($this->priv_attributes as $the_attr)
-            if ($the_attr["device"] == NULL && $the_attr["eapmethod"] == NULL)
+        foreach ($this->priv_attributes as $the_attr) {
+                    if ($the_attr["device"] == NULL && $the_attr["eapmethod"] == NULL)
                 $temparray[] = $the_attr;
+        }
 
 
         // return only options by one name, if asked for
 
         if ($option_name) {
-            foreach ($temparray as $the_attr)
-                if ($the_attr["name"] == $option_name)
+            foreach ($temparray as $the_attr) {
+                            if ($the_attr["name"] == $option_name)
                     $outarray[] = $the_attr;
+            }
         } else {
             $outarray = $temparray;
         }
@@ -631,15 +648,18 @@ 
                 foreach ($ca_option as $one_ca) {
                     $x509 = new X509();
                     $ca_parsed = $x509->processCertificate($one_ca['value']);
-                    if ($ca_parsed['root'] == 1)
-                        return true;
+                    if ($ca_parsed['root'] == 1) {
+                                            return true;
+                    }
                 }
                 $missing[] = "eap:ca_file";
             }
-            if (count($ca_option) == 0)
-                $missing[] = "eap:ca_file";
-            if (count($cn_option) == 0)
-                $missing[] = "eap:server_name";
+            if (count($ca_option) == 0) {
+                            $missing[] = "eap:ca_file";
+            }
+            if (count($cn_option) == 0) {
+                            $missing[] = "eap:server_name";
+            }
             return $missing;
         } elseif ($eaptype["OUTER"] == PWD) {
             /*
@@ -662,8 +682,9 @@ 
      * @return array of device ids display names and their status
      */
     public function listDevices($locale = 0) {
-        if ($locale == 0)
-            $locale = $this->lang_index;
+        if ($locale == 0) {
+                    $locale = $this->lang_index;
+        }
         $redirect_url = 0;
         $message = 0;
         $returnarray = [];
@@ -679,20 +700,21 @@ 
             $dev = $factory->device;
             $redirect_url = getLocalisedValue($this->getAttributes("device-specific:redirect", 0, $d), $locale);
             $dev_status = AVAILABLE;
-            if(isset($D['options']) && isset($D['options']['message']) && $D['options']['message']) 
-               $message = $D['options']['message'];
-            else
-               $message = 0;
+            if(isset($D['options']) && isset($D['options']['message']) && $D['options']['message']) {
+                           $message = $D['options']['message'];
+            } else {
+                           $message = 0;
+            }
 
             if ($redirect_url === 0) {
                 if(isset($D['options']) && isset($D['options']['redirect']) && $D['options']['redirect']) {
                    $dev_status = HIDDEN;
-                }  else {
+                } else {
                    $eap = $dev->getPreferredEapType($preferred_eap);
                    if ($eap) {
-                       if (isset($EAP_options["eap-specific:customtext"][serialize($eap)]))
-                           $eap_customtext = $EAP_options["eap-specific:customtext"][serialize($eap)];
-                       else {
+                       if (isset($EAP_options["eap-specific:customtext"][serialize($eap)])) {
+                                                  $eap_customtext = $EAP_options["eap-specific:customtext"][serialize($eap)];
+                       } else {
                            $eap_customtext = getLocalisedValue($this->getAttributes("eap-specific:customtext", $eap, 0), $locale);
                            $EAP_options["eap-specific:customtext"][serialize($eap)] = $eap_customtext;
                        }
@@ -725,8 +747,9 @@ 
             $level = $b['level'];
 //            $S[$l] = $z[$l];
             $value = $b['value'];
-            if (!isset($temp[$name][$level]))
-                $temp[$name][$level] = [];
+            if (!isset($temp[$name][$level])) {
+                            $temp[$name][$level] = [];
+            }
             if ($b['flag'] == 'ML') {
                 $v = unserialize($value);
                 $value = [$v['lang'] => $v['content']];
@@ -738,25 +761,29 @@ 
             if ($flags[$name] == 'ML') {
                 $S = [];
                 if (isset($temp[$name]['Profile'])) {
-                    foreach ($temp[$name]['Profile'] as $z)
-                        foreach ($z as $l => $w)
+                    foreach ($temp[$name]['Profile'] as $z) {
+                                            foreach ($z as $l => $w)
                             $S[$l] = $w;
+                    }
                 }
                 if (!$S && isset($temp[$name]['IdP'])) {
-                    foreach ($temp[$name]['IdP'] as $z)
-                        foreach ($z as $l => $w)
+                    foreach ($temp[$name]['IdP'] as $z) {
+                                            foreach ($z as $l => $w)
                             $S[$l] = $w;
+                    }
                 }
                 $out[$name]['langs'] = $S;
-                if (isset($S[$this->lang_index]) || isset($S['C']))
-                    $out[$name][0] = (isset($S[$this->lang_index])) ? $S[$this->lang_index] : $S['C'];
+                if (isset($S[$this->lang_index]) || isset($S['C'])) {
+                                    $out[$name][0] = (isset($S[$this->lang_index])) ? $S[$this->lang_index] : $S['C'];
+                }
             } else {
-                if (isset($temp[$name]['Method']))
-                    $out[$name] = $temp[$name]['Method'];
-                elseif (isset($temp[$name]['Profile']))
-                    $out[$name] = $temp[$name]['Profile'];
-                else
-                    $out[$name] = $temp[$name]['IdP'];
+                if (isset($temp[$name]['Method'])) {
+                                    $out[$name] = $temp[$name]['Method'];
+                } elseif (isset($temp[$name]['Profile'])) {
+                                    $out[$name] = $temp[$name]['Profile'];
+                } else {
+                                    $out[$name] = $temp[$name]['IdP'];
+                }
             }
         }
         return($out);
@@ -794,20 +821,23 @@ 
         $proper_config = FALSE;
         $attribs = $this->getCollapsedAttributes();
         // do we have enough to go live? Check if any of the configured EAP methods is completely configured ...
-        if (sizeof($this->getEapMethodsinOrderOfPreference(1)) > 0)
-            $proper_config = TRUE;
+        if (sizeof($this->getEapMethodsinOrderOfPreference(1)) > 0) {
+                    $proper_config = TRUE;
+        }
         // if not, it could still be that general redirect has been set
         if (!$proper_config) {
-            if (isset($attribs['device-specific:redirect']))
-                $proper_config = TRUE;
+            if (isset($attribs['device-specific:redirect'])) {
+                            $proper_config = TRUE;
+            }
             // TODO: or maybe just a per-device redirect? would be good enough...
         }
         // do we know at least one SSID to configure, or work with wired? If not, it's not ready...
         if (!isset($attribs['media:SSID']) &&
                 !isset($attribs['media:SSID_with_legacy']) &&
                 (!isset(Config::$CONSORTIUM['ssid']) || count(Config::$CONSORTIUM['ssid']) == 0) &&
-                !isset($attribs['media:wired']))
-            $proper_config = FALSE;
+                !isset($attribs['media:wired'])) {
+                    $proper_config = FALSE;
+        }
         return $proper_config;
     }
 
@@ -816,10 +846,11 @@ 
      */
     public function prepShowtime() {
         $proper_config = $this->readyForShowtime();
-        if ($proper_config)
-            DBConnection::exec(Profile::$DB_TYPE, "UPDATE profile SET sufficient_config = TRUE WHERE profile_id = " . $this->identifier);
-        else
-            DBConnection::exec(Profile::$DB_TYPE, "UPDATE profile SET sufficient_config = FALSE WHERE profile_id = " . $this->identifier);
+        if ($proper_config) {
+                    DBConnection::exec(Profile::$DB_TYPE, "UPDATE profile SET sufficient_config = TRUE WHERE profile_id = " . $this->identifier);
+        } else {
+                    DBConnection::exec(Profile::$DB_TYPE, "UPDATE profile SET sufficient_config = FALSE WHERE profile_id = " . $this->identifier);
+        }
         $attribs = $this->getCollapsedAttributes();
         // if not enough info to go live, set FALSE
         // even if enough info is there, admin has the ultimate say: 
@@ -843,10 +874,11 @@ 
         /* echo "<pre>";
           print_r($r);
           echo "</pre>"; */
-        if ($r[0] == "0")
-            return FALSE;
-        else
-            return TRUE;
+        if ($r[0] == "0") {
+                    return FALSE;
+        } else {
+                    return TRUE;
+        }
     }
 
     /**

core/X509.php

Braces +25 added lines, -18 removed lines

@@ -81,11 +81,13 @@ 
     # check that the certificate is OK
 //print "<pre>CA:\n$ca_pem</pre>\n";
     $myca = openssl_x509_read($ca_pem);
-    if ($myca == FALSE) 
-        return FALSE;
+    if ($myca == FALSE) {
+            return FALSE;
+    }
     $mydetails = openssl_x509_parse($myca);
-    if (!isset($mydetails['subject']))
-        return FALSE;
+    if (!isset($mydetails['subject'])) {
+            return FALSE;
+    }
     $md5 = openssl_digest($ca_der,'MD5');
     $sha1 = openssl_digest($ca_der,'SHA1');
     $out =  ["uuid" => uuid(), "pem" => $ca_pem, "der" => $ca_der, "md5"=>$md5, "sha1"=>$sha1, "name"=>$mydetails['name']];
@@ -106,10 +108,12 @@ 
        $out['basicconstraints_set'] = 0;
     }
     
-    if( $out['ca'] > 0 && $out['root'] == 0 )
-     $mydetails['type'] = 'interm_ca';
-    if( $out['ca'] == 0 && $out['root'] == 0 )
-     $mydetails['type'] = 'server';
+    if( $out['ca'] > 0 && $out['root'] == 0 ) {
+         $mydetails['type'] = 'interm_ca';
+    }
+    if( $out['ca'] == 0 && $out['root'] == 0 ) {
+         $mydetails['type'] = 'server';
+    }
     $mydetails['sha1'] = $sha1;
     $out['full_details'] = $mydetails;
     
@@ -118,15 +122,17 @@ 
     
     
     openssl_x509_export($myca, $output, FALSE);
-    if(preg_match('/^\s+Signature Algorithm:\s*(.*)\s*$/m', $output, $match)) 
-      $out['full_details']['signature_algorithm'] = $match[1];
-    else
-      $out['full_details']['signature_algorithm'] = $output;
+    if(preg_match('/^\s+Signature Algorithm:\s*(.*)\s*$/m', $output, $match)) {
+          $out['full_details']['signature_algorithm'] = $match[1];
+    } else {
+          $out['full_details']['signature_algorithm'] = $output;
+    }
  
-    if((preg_match('/^\s+Public-Key:\s*\((.*) bit\)\s*$/m', $output, $match)) && is_numeric($match[1])) 
-      $out['full_details']['public_key_length'] = $match[1];
-    else
-      $out['full_details']['public_key_length'] = $output;
+    if((preg_match('/^\s+Public-Key:\s*\((.*) bit\)\s*$/m', $output, $match)) && is_numeric($match[1])) {
+          $out['full_details']['public_key_length'] = $match[1];
+    } else {
+          $out['full_details']['public_key_length'] = $output;
+    }
     
     return $out;
 }
@@ -146,8 +152,9 @@ 
   // maybe we got no real cert data at all? The code is hardened, but will
   // produce ugly WARNING level output in the logfiles, so let's avoid at least
   // the trivial case: if the file is empty, there's no cert in it
-  if ($cadata == "")
-      return $returnarray;
+  if ($cadata == "") {
+        return $returnarray;
+  }
   $start_c = strpos($cadata,"-----BEGIN CERTIFICATE-----" );
   if( $start_c !== FALSE) {
         $cadata = substr($cadata,$start_c);

core/EAP.php

Braces +6 added lines, -4 removed lines

@@ -159,10 +159,12 @@
             $out['METHOD'] = $eap["INNER"];
         } else {
             $out['EAP'] = 0;
-            if ($eap == EAP::$TTLS_PAP)
-                $out['METHOD'] = NE_PAP;
-            if ($eap == EAP::$TTLS_MSCHAP2)
-                $out['METHOD'] = NE_MSCHAP2;
+            if ($eap == EAP::$TTLS_PAP) {
+                            $out['METHOD'] = NE_PAP;
+            }
+            if ($eap == EAP::$TTLS_MSCHAP2) {
+                            $out['METHOD'] = NE_MSCHAP2;
+            }
         }
         return $out;
     }

core/Helper.php

Braces +40 added lines, -30 removed lines

@@ -56,10 +56,11 @@ 
 
 function rrmdir($dir) {
     foreach (glob($dir . '/*') as $file) {
-        if (is_dir($file))
-            rrmdir($file);
-        else
-            unlink($file);
+        if (is_dir($file)) {
+                    rrmdir($file);
+        } else {
+                    unlink($file);
+        }
     }
     rmdir($dir);
 }
@@ -73,36 +74,42 @@ 
  */
 function calculateCommonHostSuffix(array $hosts) {
     // massage names. A trailing dot can be omitted
-    foreach ($hosts as $index => $host)
-        if (substr($host, -1) == '.') {
+    foreach ($hosts as $index => $host) {
+            if (substr($host, -1) == '.') {
             $hosts[$index] = substr($host, 0, -1);
+    }
             echo "Changed host to " . $hosts[$index] . "\n";
         }
     // easy :-)
-    if (count($hosts) == 1)
-        return $hosts[0];
+    if (count($hosts) == 1) {
+            return $hosts[0];
+    }
     // not so easy :-(
     else {
         // look for the last dot from the end; if the corresponding substring is
         // different, no common match!
         $explodednames = [];
-        foreach ($hosts as $host)
-            $explodednames[] = explode('.', $host);
+        foreach ($hosts as $host) {
+                    $explodednames[] = explode('.', $host);
+        }
         $commonsuffix = [];
         while (count($explodednames[0]) > 0) {
             $match = TRUE;
             $testname = array_pop($explodednames[0]);
             for ($i = 1; $i < count($explodednames); $i = $i + 1) {
-                if (count($explodednames[$i]) == 0)
-                    $match = FALSE;
+                if (count($explodednames[$i]) == 0) {
+                                    $match = FALSE;
+                }
                 $bla = array_pop($explodednames[$i]);
-                if ($bla != $testname)
-                    $match = FALSE;
+                if ($bla != $testname) {
+                                    $match = FALSE;
+                }
+            }
+            if ($match == TRUE) {
+                            $commonsuffix[] = $testname;
+            } else {
+                            break;
             }
-            if ($match == TRUE)
-                $commonsuffix[] = $testname;
-            else
-                break;
         }
         $finalsuffix = array_reverse($commonsuffix);
         return implode('.', $finalsuffix);
@@ -133,10 +140,11 @@ 
  * @return UUID (possibly prefixed)
  */
 function uuid($prefix = '', $deterministic_source = NULL) {
-    if ($deterministic_source === NULL) 
-        $chars = md5(uniqid(mt_rand(), true));
-    else
-        $chars = md5($deterministic_source);
+    if ($deterministic_source === NULL) {
+            $chars = md5(uniqid(mt_rand(), true));
+    } else {
+            $chars = md5($deterministic_source);
+    }
     $uuid = substr($chars, 0, 8) . '-';
     $uuid .= substr($chars, 8, 4) . '-';
     $uuid .= substr($chars, 12, 4) . '-';
@@ -159,12 +167,13 @@ 
             $try = unserialize($val['value']);
             $r_val[$try['lang']] = $try['content'];
         }
-        if (isset($r_val[$locale]))
-            $out = $r_val[$locale];
-        elseif (isset($r_val['C']))
-            $out = $r_val['C'];
-        else
-            $out = 0;
+        if (isset($r_val[$locale])) {
+                    $out = $r_val[$locale];
+        } elseif (isset($r_val['C'])) {
+                    $out = $r_val['C'];
+        } else {
+                    $out = 0;
+        }
     } else {
         $out = 0;
     }
@@ -203,8 +212,9 @@ 
             debug(4, "Directory creation failed for $tmp_dir\n");
             return ['base'=>$path,'dir'=>'',$name=>''];
           }
-        } else
-         debug(4, "Directory created: $tmp_dir\n");
+        } else {
+                 debug(4, "Directory created: $tmp_dir\n");
+        }
      return ['base'=>$path,'dir'=>$tmp_dir,'name'=>$name];
 }
 

core/UserAPI.php

Braces +139 added lines, -107 removed lines

@@ -82,9 +82,9 @@ 
     $a = [];
     $a['profile'] = $prof_id;
     $a['device'] = $device;
-    if( (isset(Devices::$Options['no_cache']) && Devices::$Options['no_cache'] ) || ( isset($Config['options']['no_cache']) && $Config['options']['no_cache'] ))
-      $this->i_path = FALSE;
-    else {
+    if( (isset(Devices::$Options['no_cache']) && Devices::$Options['no_cache'] ) || ( isset($Config['options']['no_cache']) && $Config['options']['no_cache'] )) {
+          $this->i_path = FALSE;
+    } else {
       $cache = $profile->testCache($device);
       $this->i_path = $cache['cache'];
     }
@@ -100,9 +100,9 @@ 
          $installer = $dev->writeInstaller();
          $i_path = $dev->FPATH.'/tmp/'.$installer;
          if($i_path && is_file($i_path)) {
-         if(isset($dev->options['mime']))
-               $a['mime'] = $dev->options['mime'];
-         else {
+         if(isset($dev->options['mime'])) {
+                        $a['mime'] = $dev->options['mime'];
+         } else {
            $info = new finfo();
            $a['mime'] = $info->file($i_path, FILEINFO_MIME_TYPE);
          }
@@ -129,19 +129,23 @@ 
     $Dev = Devices::listDevices();
     $R = [];
     $ct = 0;
-    if($show_hidden !== 0 && $show_hidden != 1)
-      return;
+    if($show_hidden !== 0 && $show_hidden != 1) {
+          return;
+    }
     foreach ($Dev as $device => $D) {
-      if(isset($D['options']['hidden']) && $D['options']['hidden'] && $show_hidden == 0)
-         continue;
+      if(isset($D['options']['hidden']) && $D['options']['hidden'] && $show_hidden == 0) {
+               continue;
+      }
       $ct ++;
-      if($this->version == 1)
-         $D['device'] = $device;
-      else
-         $D['device'] = $device;
+      if($this->version == 1) {
+               $D['device'] = $device;
+      } else {
+               $D['device'] = $device;
+      }
       $group = isset($D['group']) ? $D['group'] : 'other';
-      if (! isset($R[$group]))
-         $R[$group] = [];
+      if (! isset($R[$group])) {
+               $R[$group] = [];
+      }
       $R[$group][$device] = $D;
     }
    return $R;
@@ -178,14 +182,18 @@ 
       $profile = new Profile($prof_id);
       $attr = $profile->getCollapsedAttributes();
       $a = [];
-      if(isset($attr['support:email']))
-         $a['local_email'] = $attr['support:email'][0];
-      if(isset($attr['support:phone']))
-         $a['local_phone'] = $attr['support:phone'][0];
-      if(isset($attr['support:url']))
-         $a['local_url'] = $attr['support:url'][0];
-      if(isset($attr['profile:description']))
-         $a['description'] = $attr['profile:description'][0];
+      if(isset($attr['support:email'])) {
+               $a['local_email'] = $attr['support:email'][0];
+      }
+      if(isset($attr['support:phone'])) {
+               $a['local_phone'] = $attr['support:phone'][0];
+      }
+      if(isset($attr['support:url'])) {
+               $a['local_url'] = $attr['support:url'][0];
+      }
+      if(isset($attr['profile:description'])) {
+               $a['description'] = $attr['profile:description'][0];
+      }
       $a['devices'] = $profile->listDevices();
       $this->set_locale("web_user");
       return($a);
@@ -200,14 +208,17 @@ 
     $F = array_pop($backtrace);
     $file= $F['file'];
     $file = substr($file,strlen(dirname(__DIR__)));
-    while(substr($file,0,1) == '/')
-       $file = substr($file,1);
+    while(substr($file,0,1) == '/') {
+           $file = substr($file,1);
+    }
     $n = count(explode('/',$file));
     $out = $_SERVER['SCRIPT_NAME'];
-    for ($i= 0; $i < $n; $i++)
-      $out = dirname($out);
-    if ($out == '/')
-      $out = '';
+    for ($i= 0; $i < $n; $i++) {
+          $out = dirname($out);
+    }
+    if ($out == '/') {
+          $out = '';
+    }
     $s = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] ? 'https' : 'http';
     $s .= '://'.$_SERVER['HTTP_HOST'] . $out;
     return $s;
@@ -231,10 +242,11 @@ 
   public function JSON_listLanguages() {
      $return_array = [];
      foreach(Config::$LANGUAGES as $id => $val){
-       if($this->version == 1)
-          $return_array[] = ['id'=>$id,'display'=>$val['display'],'locale'=>$val['locale']];
-       else
-          $return_array[] = ['lang'=>$id,'display'=>$val['display'],'locale'=>$val['locale']];
+       if($this->version == 1) {
+                 $return_array[] = ['id'=>$id,'display'=>$val['display'],'locale'=>$val['locale']];
+       } else {
+                 $return_array[] = ['lang'=>$id,'display'=>$val['display'],'locale'=>$val['locale']];
+       }
      }
      echo $this->return_json($return_array);
   }
@@ -249,10 +261,11 @@ 
      $FED = $this->printCountryList(1);
      $return_array = [];
      foreach ($FED as $id => $val) {
-       if($this->version == 1)
-          $return_array[] = ['id'=>$id,'display'=>$val];
-       else
-          $return_array[] = ['federation'=>$id,'display'=>$val];
+       if($this->version == 1) {
+                 $return_array[] = ['id'=>$id,'display'=>$val];
+       } else {
+                 $return_array[] = ['federation'=>$id,'display'=>$val];
+       }
      }
      echo $this->return_json($return_array);
   }
@@ -268,10 +281,11 @@ 
      $idps = Federation::listAllIdentityProviders(1,$country);
      $return_array = [];
      foreach ($idps as $idp) {
-        if($this->version == 1)
-           $return_array[] = ['id'=>$idp['entityID'],'display'=>$idp['title']];
-        else
-           $return_array[] = ['idp'=>$idp['entityID'],'display'=>$idp['title']];
+        if($this->version == 1) {
+                   $return_array[] = ['id'=>$idp['entityID'],'display'=>$idp['title']];
+        } else {
+                   $return_array[] = ['idp'=>$idp['entityID'],'display'=>$idp['title']];
+        }
      }
      echo $this->return_json($return_array);
   }
@@ -287,10 +301,11 @@ 
      $idps = Federation::listAllIdentityProviders(1);
      $return_array = [];
      foreach ($idps as $idp) {
-        if($this->version == 1)
-           $idp['id'] = $idp['entityID'];
-         else
-           $idp['idp'] = $idp['entityID'];
+        if($this->version == 1) {
+                   $idp['id'] = $idp['entityID'];
+        } else {
+                    $idp['idp'] = $idp['entityID'];
+         }
         $return_array[] = $idp;
       }
      echo json_encode($return_array);
@@ -310,10 +325,11 @@ 
      $idps = $this->orderIdentityProviders($country,$L);
      $return_array = [];
      foreach ($idps as $idp) {
-        if($this->version == 1)
-           $return_array[] = ['id'=>$idp['id'],'display'=>$idp['title']];
-        else
-           $return_array[] = ['idp'=>$idp['id'],'display'=>$idp['title']];
+        if($this->version == 1) {
+                   $return_array[] = ['id'=>$idp['id'],'display'=>$idp['title']];
+        } else {
+                   $return_array[] = ['idp'=>$idp['id'],'display'=>$idp['title']];
+        }
      }
      echo $this->return_json($return_array);
   }
@@ -329,23 +345,25 @@ 
      $return_array = [];
      try {     
          $idp = new IdP($idp_id);
-     }
-     catch (Exception $fail) {
+     } catch (Exception $fail) {
         echo $this->return_json($return_array,0);
         return;
      }
      $l = 0;
      $logo = $idp->getAttributes('general:logo_file');
-     if($logo)
-       $l = 1;
+     if($logo) {
+            $l = 1;
+     }
      $profiles = $idp->listProfiles(1);
-     if($sort == 1)
-        usort($profiles,"profile_sort");
+     if($sort == 1) {
+             usort($profiles,"profile_sort");
+     }
      foreach ($profiles as $P) {
-       if($this->version == 1)
-          $return_array[] = ['id'=>$P->identifier,'display'=>$P->name, 'idp_name'=>$P->inst_name,'logo'=>$l]; 
-       else
-          $return_array[] = ['profile'=>$P->identifier,'display'=>$P->name, 'idp_name'=>$P->inst_name,'logo'=>$l]; 
+       if($this->version == 1) {
+                 $return_array[] = ['id'=>$P->identifier,'display'=>$P->name, 'idp_name'=>$P->inst_name,'logo'=>$l];
+       } else {
+                 $return_array[] = ['profile'=>$P->identifier,'display'=>$P->name, 'idp_name'=>$P->inst_name,'logo'=>$l];
+       }
      }
      echo $this->return_json($return_array);
   }
@@ -364,8 +382,9 @@ 
      if(!isset($profile_redirect) || ! $profile_redirect) {
          $profile_redirect = 0;
          foreach ($thedevices as $D) {
-              if(isset($D['options']) && isset($D['options']['hidden']) &&  $D['options']['hidden'])
-                   continue;
+              if(isset($D['options']) && isset($D['options']['hidden']) &&  $D['options']['hidden']) {
+                                 continue;
+              }
               $disp = $D['display'];
               if($this->version == 1) {
                  if($D['id'] === '0') {
@@ -449,10 +468,12 @@ 
    $resize = 0;
    if(($width || $height) && is_numeric($width) && is_numeric($height)) {
        $resize = 1;
-       if($height == 0)
-          $height = 10000;
-       if($width == 0)
-          $width = 10000;
+       if($height == 0) {
+                 $height = 10000;
+       }
+       if($width == 0) {
+                 $width = 10000;
+       }
        $logo_file = CAT::$root.'/web/downloads/logos/'.$idp_id.'_'.$width.'_'.$height.'.png';
    } elseif($disco == 1) {
        $width = 120;
@@ -465,8 +486,7 @@ 
       debug(4,"Using cached logo $logo_file for: $idp_id\n");
       $blob = file_get_contents($logo_file);
       $filetype = 'image/png';
-   }
-   else {
+   } else {
       $idp = new IdP($idp_id);
       $at = $idp->getAttributes('general:logo_file');
       $blob =  $at[0]['value'];
@@ -483,9 +503,9 @@ 
            $blob = $image->getImageBlob();
            debug(4,"Writing cached logo $logo_file for: $idp_id\n");
            file_put_contents($logo_file,$blob);
+         } else {
+                    $blob = "XXXXXX";
          }
-         else
-           $blob = "XXXXXX";
       }
    }
    header( "Content-type: ".$filetype );
@@ -501,8 +521,9 @@ 
      $result = ['status' => 'ok'];
      $result['country'] = $record['country_code'];
 //  the two lines below are a dirty hack to take of the error in naming the UK federation
-     if($result['country'] == 'GB')
-         $result['country'] = 'UK';
+     if($result['country'] == 'GB') {
+              $result['country'] = 'UK';
+     }
      $result['region'] = $record['region'];
      $result['geo'] = ['lat' => (float)$record['latitude'] , 'lon' => (float)$record['longitude']];
    } else {
@@ -525,8 +546,9 @@ 
    $result = ['status' => 'ok'];
    $result['country'] = $record->country->isoCode;
 //  the two lines below are a dirty hack to take of the error in naming the UK federation
-   if($result['country'] == 'GB')
-       $result['country'] = 'UK';
+   if($result['country'] == 'GB') {
+          $result['country'] = 'UK';
+   }
    $result['region'] = $record->continent->name;
 
    $result['geo'] = ['lat' => (float)$record->location->latitude , 'lon' => (float)$record->location->longitude];
@@ -536,13 +558,16 @@ 
 public function JSON_locateUser() {
     header('Content-type: application/json; utf-8');
    
-    if(empty(Config::$GEOIP['version']) || Config::$GEOIP['version'] == 0)
-      echo json_encode(['status' => 'error', 'error' =>'Geolocation not supported']);
-    if(Config::$GEOIP['version'] == 1)
-      echo json_encode($this->locateUser());
-    if(Config::$GEOIP['version'] == 2)
-      echo json_encode($this->locateUser2());
-}
+    if(empty(Config::$GEOIP['version']) || Config::$GEOIP['version'] == 0) {
+          echo json_encode(['status' => 'error', 'error' =>'Geolocation not supported']);
+    }
+    if(Config::$GEOIP['version'] == 1) {
+          echo json_encode($this->locateUser());
+    }
+    if(Config::$GEOIP['version'] == 2) {
+          echo json_encode($this->locateUser2());
+    }
+    }
 
 /**
  * Produce support data prepared within {@link GUI::profileAttributes()}
@@ -594,27 +619,31 @@ 
           $G=$idp['geo'];
           if(isset($G['lon'])) {
              $d1 = $this->geoDistance($L,$G); 
-             if( $d1 < $dist)
-                $dist = $d1;
+             if( $d1 < $dist) {
+                             $dist = $d1;
+             }
           } else {
             foreach ($G as $g) {
              $d1 = $this->geoDistance($L,$g); 
-             if( $d1 < $dist)
-                $dist = $d1;
+             if( $d1 < $dist) {
+                             $dist = $d1;
+             }
             }
           }
         }
-       if($dist > 100)
-         $dist=10000;
+       if($dist > 100) {
+                $dist=10000;
+       }
       $d = sprintf("%06d",$dist);
       $R[$idp['entityID']] = $d." ".$idp['title'];
      }
      asort($R);
      foreach (array_keys($R) as $r) {
-      if($this->version == 1)
-         $outarray[] = ['id'=>$r, 'title'=>$T[$r]];
-      else
-         $outarray[] = ['idp'=>$r, 'title'=>$T[$r]];
+      if($this->version == 1) {
+               $outarray[] = ['id'=>$r, 'title'=>$T[$r]];
+      } else {
+               $outarray[] = ['idp'=>$r, 'title'=>$T[$r]];
+      }
       }
      return($outarray);
 }
@@ -632,25 +661,27 @@ 
    if( isset($_REQUEST['device']) && isset($Dev[$_REQUEST['device']]) && (!isset($device['options']['hidden']) || $device['options']['hidden'] == 0)) {
       $dev_id = $_REQUEST['device'];
       $device = $Dev[$dev_id];
-      if($this->version == 1)
-         return(['id'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
-      else
-         return(['device'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
+      if($this->version == 1) {
+               return(['id'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
+      } else {
+               return(['device'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
+      }
    }
    $browser = $_SERVER['HTTP_USER_AGENT'];
    debug(4,"HTTP_USER_AGENT=$browser\n");
    foreach ($Dev as $dev_id => $device) {
-     if(!isset($device['match']))
-        continue;
+     if(!isset($device['match'])) {
+             continue;
+     }
      if(preg_match('/'.$device['match'].'/',$browser)) {
        if(!isset($device['options']['hidden']) || $device['options']['hidden'] == 0) {
           debug(4,"Browser_id: $dev_id\n");
-          if($this->version == 1)
-             return(['id'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
-          else
-             return(['device'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
-       }
-       else {
+          if($this->version == 1) {
+                       return(['id'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
+          } else {
+                       return(['device'=>$dev_id,'display'=>$device['display'], 'group'=>$device['group']]);
+          }
+       } else {
          debug(2, "Unrecognised system: ".$_SERVER['HTTP_USER_AGENT']."\n");
          return(false);
        }
@@ -662,10 +693,11 @@ 
 
 public function JSON_detectOS() {
      $return_array=$this->detectOS();
-     if($return_array)
-        $status = 1;
-     else
-        $status = 0;
+     if($return_array) {
+             $status = 1;
+     } else {
+             $status = 0;
+     }
      echo $this->return_json($return_array,$status);
 }
 

core/User.php

Braces +27 added lines, -19 removed lines

@@ -130,12 +130,12 @@ 
     public function getAttributes($option_name = 0) {
         if ($option_name) {
             $returnarray = [];
-            foreach ($this->priv_attributes as $the_attr)
-                if ($the_attr['name'] == $option_name)
+            foreach ($this->priv_attributes as $the_attr) {
+                            if ($the_attr['name'] == $option_name)
                     $returnarray[] = $the_attr;
+            }
             return $returnarray;
-        }
-        else {
+        } else {
             return $this->priv_attributes;
         }
     }
@@ -151,12 +151,13 @@ 
         $escaped_name = DBConnection::escape_value(User::$DB_TYPE, $this->identifier);
         $attr_name = DBConnection::escape_value(User::$DB_TYPE, $attr_name);
         $attr_value = DBConnection::escape_value(User::$DB_TYPE, $attr_value);
-        if (!Config::$DB['userdb-readonly'])
-            DBConnection::exec(User::$DB_TYPE, "INSERT INTO user_options (user_id, option_name, option_value) VALUES('"
+        if (!Config::$DB['userdb-readonly']) {
+                    DBConnection::exec(User::$DB_TYPE, "INSERT INTO user_options (user_id, option_name, option_value) VALUES('"
                     . $escaped_name . "', '"
                     . $attr_name . "', '"
                     . $attr_value
                     . "')");
+        }
     }
 
     /**
@@ -171,8 +172,9 @@ 
         DBConnection::exec(User::$DB_TYPE, "DELETE FROM user_options WHERE user_id = '$this->identifier' AND option_name NOT LIKE '%_file' AND option_name NOT LIKE 'user:fedadmin'");
         $exec_q = DBConnection::exec(User::$DB_TYPE, "SELECT id FROM user_options WHERE user_id = '$this->identifier' AND option_name NOT LIKE 'user:fedadmin'");
         $return_array = [];
-        while ($a = mysqli_fetch_object($exec_q))
-            $return_array[$a->row] = "KILLME";
+        while ($a = mysqli_fetch_object($exec_q)) {
+                    $return_array[$a->row] = "KILLME";
+        }
         return $return_array;
     }
 
@@ -200,14 +202,16 @@ 
     public function isFederationAdmin($federation = 0) {
         $feds = $this->getAttributes("user:fedadmin");
         if ($federation === 0) {
-            if (count($feds) == 0)
-                return FALSE;
-            else
-                return TRUE;
+            if (count($feds) == 0) {
+                            return FALSE;
+            } else {
+                            return TRUE;
+            }
         } else {
             foreach ($feds as $fed) {
-                if (strtoupper($fed['value']) == strtoupper($federation))
-                    return TRUE;
+                if (strtoupper($fed['value']) == strtoupper($federation)) {
+                                    return TRUE;
+                }
             }
             return FALSE;
         }
@@ -230,9 +234,10 @@ 
     */
     public function isIdPOwner($idp) {
        $temp = new IdP($idp);
-       foreach ($temp->owner() as $oneowner)
-            if ($oneowner['ID'] == $this->identifier)
+       foreach ($temp->owner() as $oneowner) {
+                   if ($oneowner['ID'] == $this->identifier)
                 return TRUE;
+       }
        return FALSE;
     }
 
@@ -256,8 +261,10 @@ 
         $mail->addReplyTo(Config::$APPEARANCE['support-contact']['mail'], Config::$APPEARANCE['productname'] . " " ._("Feedback"));
         
         $mailaddr = $this->getAttributes("user:email");
-        if (count($mailaddr) == 0) // we don't know his mail address
+        if (count($mailaddr) == 0) {
+            // we don't know his mail address
             return FALSE;
+        }
         
         $mail->addAddress($mailaddr[0]["value"]);
         
@@ -268,8 +275,9 @@ 
         // what do we want to say?
         $mail->Subject = $subject;
         $mail->Body = $content;
-        if (isset(Config::$CONSORTIUM['certfilename'], Config::$CONSORTIUM['keyfilename'], Config::$CONSORTIUM['keypass']))
-            $mail->sign(Config::$CONSORTIUM['certfilename'], Config::$CONSORTIUM['keyfilename'], Config::$CONSORTIUM['keypass']);
+        if (isset(Config::$CONSORTIUM['certfilename'], Config::$CONSORTIUM['keyfilename'], Config::$CONSORTIUM['keypass'])) {
+                    $mail->sign(Config::$CONSORTIUM['certfilename'], Config::$CONSORTIUM['keyfilename'], Config::$CONSORTIUM['keypass']);
+        }
 
 
         $sent = $mail->send();

devices/linux/Linux.php

Braces +39 added lines, -28 removed lines

@@ -68,10 +68,11 @@ 
 
      $out_string .= $this->printNMScript($SSIDs,$delSSIDs);
      $out_string .= $this->writeWpaConf($SSIDs);
-     if($this->selected_eap == EAP::$TLS) 
-       $out_string .= $this->printP12Dialog();
-     else
-       $out_string .= $this->printPasswordDialog();
+     if($this->selected_eap == EAP::$TLS) {
+            $out_string .= $this->printP12Dialog();
+     } else {
+            $out_string .= $this->printPasswordDialog();
+     }
      $out_string .= $this->checkNMResultAndCont();
      $installer_path = $this->installerBasename.'.sh';
       file_put_contents($installer_path, $out_string);
@@ -87,13 +88,15 @@ 
     if($ssid_ct > 1) {
         if($ssid_ct > 2) {
             $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"),implode(', ',Config::$CONSORTIUM['ssid']))." ";
-        } else
-            $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"),implode(', ',Config::$CONSORTIUM['ssid']))." ";
+        } else {
+                    $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"),implode(', ',Config::$CONSORTIUM['ssid']))." ";
+        }
         $i = 0;
         foreach ($this->attributes['internal:SSID'] as $ssid=>$v) {
            if(! in_array($ssid, Config::$CONSORTIUM['ssid'])) {
-             if($i > 0)
-           $out .= ", ";
+             if($i > 0) {
+                        $out .= ", ";
+             }
          $i++;
          $out .= "<strong>$ssid</strong>";
        }
@@ -101,9 +104,9 @@ 
     $out .= "<p>";
     }
    $out .= _("The installer will create .cat_installer sub-directory in your home directory and will copy your server certificates there.");
-if($this->eap == EAP::$TLS)
+if($this->eap == EAP::$TLS) {
    $out .= _("In order to connect to the network you will need a personal certificate in the form of a p12 file. You should obtain this certificate from your home institution. Consult the support page to find out how this certificate can be obtained. Such certificate files are password protected. You should have both the file and the password available during the installation process. Your p12 file will also be copied to the .cat_installer directory.");
-else {
+} else {
    $out .= _("In order to connect to the network you will need an account from your home institution. You should consult the support page to find out how this account can be obtained. It is very likely that your account is already activated.");
    $out .= "<p>";
    $out .= _("You will be requested to enter your account credentials during the installation. This information will be saved so that you will reconnect to the network automatically each time you are in the range.");
@@ -151,10 +154,11 @@ 
 
 
 private function printProfileConfirmation() {
- if($this->attributes['internal:profile_count'][0] > 1)
-       $out = 'if ! ask "'.sprintf(_("This installer will only work properly if you are a member of %s and the user group: %s."),'${bf}'.$this->attributes['general:instname'][0].'${n}','${bf}'.$this->attributes['profile:name'][0]).'${n}"';
-    else
-       $out = 'if ! ask "'.sprintf(_("This installer will only work properly if you are a member of %s."),'${bf}'.$this->attributes['general:instname'][0]).'${n}"';
+ if($this->attributes['internal:profile_count'][0] > 1) {
+        $out = 'if ! ask "'.sprintf(_("This installer will only work properly if you are a member of %s and the user group: %s."),'${bf}'.$this->attributes['general:instname'][0].'${n}','${bf}'.$this->attributes['profile:name'][0]).'${n}"';
+ } else {
+           $out = 'if ! ask "'.sprintf(_("This installer will only work properly if you are a member of %s."),'${bf}'.$this->attributes['general:instname'][0]).'${n}"';
+    }
     $out .= ' "'._("Continue").'" 1 ; then exit; fi
 ';
   return $out;
@@ -405,9 +409,10 @@ 
   eap='.$e['OUTER'].'
   ca_cert="${HOME}/'.$this->local_dir.'/ca.pem"
   identity="${USER_NAME}"';
-  if($this->server_name)
-    $out .= '
+  if($this->server_name) {
+      $out .= '
   domain_suffix_match="'.$this->server_name.'"';
+  }
   if($this->selected_eap == EAP::$TLS) {
     $out .= '
   private_key="${HOME}/'.$this->local_dir.'/user.p12"
@@ -416,10 +421,11 @@ 
     $out .= '
   phase2="auth='.$e['INNER'].'"
   password="${PASSWORD}"';
-  if($this->attributes['internal:use_anon_outer'][0] == 1) 
-    $out .= '
+  if($this->attributes['internal:use_anon_outer'][0] == 1) {
+      $out .= '
   anonymous_identity="'.$this->attributes['internal:anon_local_value'][0].'@'.$this->attributes['internal:realm'][0].'"';
   }
+  }
     $out .= '
 }';
 }
@@ -504,8 +510,9 @@ 
 
 
 private function glueServerNames($server_list) {
-  if(! $server_list)
-    return '';
+  if(! $server_list) {
+      return '';
+  }
   $A0 =  array_reverse(explode('.',array_shift($server_list)));
   $B = $A0;
   foreach($server_list as $a) {
@@ -517,12 +524,14 @@ 
 }
 
 private function mkSubjectAltNameList($server_list) {
-  if(! $server_list)
-    return '';
+  if(! $server_list) {
+      return '';
+  }
   $out = '';
   foreach($server_list as $a) {
-     if($out)
-       $out .= ','; 
+     if($out) {
+            $out .= ',';
+     }
      $out .= "'DNS:$a'";
   }
   return $out;
@@ -680,9 +689,10 @@ 
        $out .= '
             \'password\': \'$PASSWORD\',
             \'phase2-auth\': \''.strtolower($e['INNER']).'\',';
-         if($this->attributes['internal:use_anon_outer'][0] == 1) 
-              $out .= '
+         if($this->attributes['internal:use_anon_outer'][0] == 1) {
+                       $out .= '
             \'anonymous-identity\': \''.$this->attributes['internal:anon_local_value'][0].'@'.$this->attributes['internal:realm'][0].'\',';
+         }
     }
     $out .= '
         })
@@ -708,9 +718,10 @@ 
      }
 //   create a list of profiles to be deleted after installation
      foreach ($delSSIDs as $ssid => $cipher) {
-         if($cipher == 'DEL')
-            $out .='
+         if($cipher == 'DEL') {
+                     $out .='
         self.delete_existing_connections(\''.$ssid.'\')';
+         }
      }
 
 $out .='

devices/test_module/TestModule.php

Braces +6 added lines, -4 removed lines

@@ -99,12 +99,14 @@
      $CA_files = $this->saveCertificateFiles('der');
   
     // copy a fixed file from the module Files directory
-       if(! $this->copyFile('Module.howto'))
-          debug(2, "copying of Module.howto failed\n");
+       if(! $this->copyFile('Module.howto')) {
+                 debug(2, "copying of Module.howto failed\n");
+       }
 
     // copy a fixed file from the module Files directory and saveunde a different name
-       if( ! $this->copyFile('test_file','copied_test_file'))
-          debug(2, "copying of Module.howto to copied_test_file failed\n");
+       if( ! $this->copyFile('test_file','copied_test_file')) {
+                 debug(2, "copying of Module.howto to copied_test_file failed\n");
+       }
        $this->dumpAttibutes('profile_attributes');
        $installer_path =  $this->zipInstaller($this->attributes);
        return($installer_path);