GEANT / CAT

core/CAT.php

Doc Comments +1 added lines, -1 removed lines

@@ -230,7 +230,7 @@
      * @param string $user persistent identifier of the user who triggered the action
      * @param string $category type of modification, from the fixed vocabulary: "NEW", "OWN", "MOD", "DEL"
      * @param string $message message to log into the audit log
-     * @return boolean TRUE if successful. Will terminate script execution on failure. 
+     * @return boolean|null TRUE if successful. Will terminate script execution on failure. 
      */
     public static function writeAudit($user, $category, $message) {
         switch ($category) {

Braces +17 added lines, -12 removed lines

@@ -74,14 +74,16 @@ 
 
         if (CAT::$RELEASE_VERSION) {
             $temp_version = "CAT-".CAT::$VERSION_MAJOR.".".CAT::$VERSION_MINOR;
-            if (CAT::$VERSION_PATCH != 0)
-                    $temp_version .= ".".CAT::$VERSION_PATCH;
-            if (CAT::$VERSION_EXTRA != "")
-                $temp_version .= "-".CAT::$VERSION_EXTRA;
+            if (CAT::$VERSION_PATCH != 0) {
+                                $temp_version .= ".".CAT::$VERSION_PATCH;
+            }
+            if (CAT::$VERSION_EXTRA != "") {
+                            $temp_version .= "-".CAT::$VERSION_EXTRA;
+            }
             CAT::$VERSION = sprintf(_("Release %s"), $temp_version );
+        } else {
+                    CAT::$VERSION = _("Unreleased SVN Revision");
         }
-        else
-            CAT::$VERSION = _("Unreleased SVN Revision");
     }
 
     /** 
@@ -170,16 +172,18 @@ 
             // we need to map stuff manually
             $thelang = $try_lang;
 
-            foreach (Config::$LANGUAGES as $language => $value)
-                if (preg_match("/^" . $language . ".*/", $try_lang)) {
+            foreach (Config::$LANGUAGES as $language => $value) {
+                            if (preg_match("/^" . $language . ".*/", $try_lang)) {
                     $thelang = $value['locale'];
+            }
                     $lang_index = $language;
                 }
 
             // echo "Trying to set language to $thelang...";
 //        putenv("LC_ALL=$thelang");
-            if (setlocale(LC_ALL, $thelang))
-                break;
+            if (setlocale(LC_ALL, $thelang)) {
+                            break;
+            }
         }
         putenv("LC_ALL=" . $thelang);
         debug(4, "selected lang:$lang_index:$thelang\n");
@@ -191,8 +195,9 @@ 
      * gets the language setting in CAT
      */
     static public function get_lang() {
-       if(self::$LANG === '')
-         list(self::$LANG, $xx) = self::set_lang();
+       if(self::$LANG === '') {
+                list(self::$LANG, $xx) = self::set_lang();
+       }
        return self::$LANG;
     }
 

core/DeviceConfig.php

Doc Comments +2 added lines, -5 removed lines

@@ -172,7 +172,7 @@ 
     * named the same as device_id. The second option takes precedence.
     *
     * @param string $source_name The source file name
-    * @param string $output_name The destination file name
+    * @param integer $output_name The destination file name
     *
     * @return bool result of the copy operation
     * @final not to be redefined
@@ -216,8 +216,7 @@ 
     * named the same as device_id. The second option takes precedence.
     *
     * @param string $source_name The source file name
-    * @param string $output_name The destination file name
-    * @param int $use_win_cp Set Windows charset if non-zero
+    * @param integer $output_name The destination file name
     *
     * @final not to be redefined
     */
@@ -262,8 +261,6 @@ 
     * The second optional parameter, if nonzero, should be the character set understood by iconv
     * This is required by the Windows installer and is expected to go away in the future.
     *
-    * @param string $source_name The source file name
-    * @param int $use_win_cp Set Windows charset if non-zero
     *
     * @final not to be redefined
     */

Braces +93 added lines, -66 removed lines

@@ -107,8 +107,9 @@ 
        $CAs = [];
        if(isset($this->attributes['eap:ca_file'])) {
        foreach ($this->attributes['eap:ca_file'] as $ca) {
-          if($c = X509::processCertificate($ca))
-             $CAs[] = $c;
+          if($c = X509::processCertificate($ca)) {
+                       $CAs[] = $c;
+          }
           }
           $this->attributes['internal:CAs'][0]=$CAs;
        }
@@ -116,9 +117,10 @@ 
           $this->attributes['internal:info_file'][0] = 
              $this->saveInfoFile($this->attributes['support:info_file'][0]);
        }
-       if(isset($this->attributes['general:logo_file']))
-          $this->attributes['internal:logo_file'] = 
+       if(isset($this->attributes['general:logo_file'])) {
+                 $this->attributes['internal:logo_file'] = 
              $this->saveLogoFile($this->attributes['general:logo_file']);
+       }
        $this->attributes['internal:SSID'] = $this->getSSIDs()['add'];;
        $this->attributes['internal:remove_SSID'] = $this->getSSIDs()['del'];;
        $this->attributes['internal:consortia'] = $this->getConsortia();
@@ -130,8 +132,9 @@ 
        $this->support_url_substitute = sprintf(_("your local %s support page"),Config::$CONSORTIUM['name']);
        CAT::set_locale($olddomain);
 
-       if($this->signer && $this->options['sign'])
-         $this->sign = CAT::$root . '/signer/'. $this->signer;
+       if($this->signer && $this->options['sign']) {
+                $this->sign = CAT::$root . '/signer/'. $this->signer;
+       }
        $this->installerBasename = $this->getInstallerBasename();
     }
 
@@ -178,22 +181,24 @@ 
     * @final not to be redefined
     */
    final protected function copyFile($source_name, $output_name = 0) {
-      if  ( $output_name === 0)
-        $output_name = $source_name;
+      if  ( $output_name === 0) {
+              $output_name = $source_name;
+      }
 
       debug(4,"fileCopy($source_name, $output_name)\n");
-      if(is_file($this->module_path.'/Files/'.$this->device_id.'/'.$source_name))
-         $source = $this->module_path.'/Files/'.$this->device_id.'/'.$source_name;
-      elseif(is_file($this->module_path.'/Files/'.$source_name))
-         $source = $this->module_path.'/Files/'.$source_name;
-      else {
+      if(is_file($this->module_path.'/Files/'.$this->device_id.'/'.$source_name)) {
+               $source = $this->module_path.'/Files/'.$this->device_id.'/'.$source_name;
+      } elseif(is_file($this->module_path.'/Files/'.$source_name)) {
+               $source = $this->module_path.'/Files/'.$source_name;
+      } else {
         debug(2,"fileCopy:reqested file $source_name does not exist\n");
         return(FALSE);
       }
       debug(4,"Copying $source to $output_name\n");
       $result = copy($source,"$output_name");
-      if(! $result )
-        debug(2,"fileCopy($source_name, $output_name) failed\n");
+      if(! $result ) {
+              debug(2,"fileCopy($source_name, $output_name) failed\n");
+      }
       return($result); 
    }
 
@@ -223,28 +228,33 @@ 
     */
 
    final protected function translateFile($source_name, $output_name = 0, $encoding = 0) {
-      if(Config::$NSIS_VERSION >= 3)
-        $encoding = 0;
-      if  ( $output_name === 0)
-        $output_name = $source_name;
+      if(Config::$NSIS_VERSION >= 3) {
+              $encoding = 0;
+      }
+      if  ( $output_name === 0) {
+              $output_name = $source_name;
+      }
 
       debug(4,"translateFile($source_name, $output_name, $encoding)\n");
       ob_start();
       debug(4,$this->module_path.'/Files/'.$this->device_id.'/'.$source_name."\n");
-      if(is_file($this->module_path.'/Files/'.$this->device_id.'/'.$source_name))
-         $source = $this->module_path.'/Files/'.$this->device_id.'/'.$source_name;
-      elseif(is_file($this->module_path.'/Files/'.$source_name))
-         $source = $this->module_path.'/Files/'.$source_name;
+      if(is_file($this->module_path.'/Files/'.$this->device_id.'/'.$source_name)) {
+               $source = $this->module_path.'/Files/'.$this->device_id.'/'.$source_name;
+      } elseif(is_file($this->module_path.'/Files/'.$source_name)) {
+               $source = $this->module_path.'/Files/'.$source_name;
+      }
       include($source);
       $output = ob_get_clean();
       if($encoding) {
         $output_c = iconv('UTF-8',$encoding.'//TRANSLIT',$output);
-        if($output_c)
-           $output = $output_c;
+        if($output_c) {
+                   $output = $output_c;
+        }
       }
       $f = fopen("$output_name","w");
-      if(! $f)
-         debug(2,"translateFile($source, $output_name, $encoding) failed\n");
+      if(! $f) {
+               debug(2,"translateFile($source, $output_name, $encoding) failed\n");
+      }
       fwrite($f,$output);
       fclose($f);
       debug(4,"translateFile($source, $output_name, $encoding) end\n");
@@ -269,16 +279,19 @@ 
     */
 
    final protected function translateString($source_string,$encoding = 0) {
-      if(Config::$NSIS_VERSION >= 3)
-        $encoding = 0;
-      if($encoding)
-        $output_c = iconv('UTF-8',$encoding.'//TRANSLIT',$source_string);
-      else
-        $output_c = $source_string;
-      if($output_c) 
-         $source_string  = str_replace('"','$\\"',$output_c);
-      else
-         debug(2,"Failed to convert string $source_string\n");
+      if(Config::$NSIS_VERSION >= 3) {
+              $encoding = 0;
+      }
+      if($encoding) {
+              $output_c = iconv('UTF-8',$encoding.'//TRANSLIT',$source_string);
+      } else {
+              $output_c = $source_string;
+      }
+      if($output_c) {
+               $source_string  = str_replace('"','$\\"',$output_c);
+      } else {
+               debug(2,"Failed to convert string $source_string\n");
+      }
       return $source_string;
    }
 
@@ -299,15 +312,19 @@ 
        $i = 0;
        $CA_files = [];
        $ca_array = $this->attributes['internal:CAs'][0];
-       if(! $ca_array)
-         return(FALSE);
+       if(! $ca_array) {
+                return(FALSE);
+       }
        foreach ($ca_array as $CA) {
          $f = fopen("cert-$i.crt","w");
-         if(! $f) die("problem opening the file\n");
-         if($format == "pem")
-            fwrite($f,$CA['pem']);
-         else
-            fwrite($f,$CA['der']);
+         if(! $f) {
+             die("problem opening the file\n");
+         }
+         if($format == "pem") {
+                     fwrite($f,$CA['pem']);
+         } else {
+                     fwrite($f,$CA['der']);
+         }
          fclose($f);
          $C = [];
          $C['file'] = "cert-$i.crt";
@@ -340,8 +357,9 @@ 
       $Inst_a = explode('_',$inst);
       if(count($Inst_a) > 2) {
          $inst = '';
-         foreach($Inst_a as $i)
-           $inst .= $i[0];
+         foreach($Inst_a as $i) {
+                    $inst .= $i[0];
+         }
       }   
       $c_name = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', Config::$CONSORTIUM['name']));
       if($this->attributes['internal:profile_count'][0] > 1) {
@@ -356,10 +374,12 @@ 
 
   private function getDeviceId() {
     $d_id = $this->device_id;
-    if(isset($this->options['device_id'])) 
-      $d_id = $this->options['device_id'];
-    if($d_id !== '')
-      $d_id .= '-';
+    if(isset($this->options['device_id'])) {
+          $d_id = $this->options['device_id'];
+    }
+    if($d_id !== '') {
+          $d_id .= '-';
+    }
     return $d_id;
   }
 
@@ -369,9 +389,9 @@ 
     $S['del']=[];
     if (isset(Config::$CONSORTIUM['ssid'])) {
        foreach (Config::$CONSORTIUM['ssid'] as $ssid) {
-        if(isset(Config::$CONSORTIUM['tkipsupport']) && Config::$CONSORTIUM['tkipsupport'] == TRUE)
-          $S['add'][$ssid] = 'TKIP';
-        else {
+        if(isset(Config::$CONSORTIUM['tkipsupport']) && Config::$CONSORTIUM['tkipsupport'] == TRUE) {
+                  $S['add'][$ssid] = 'TKIP';
+        } else {
           $S['add'][$ssid] = 'AES';
           $S['del'][$ssid] = 'TKIP';
         }
@@ -380,18 +400,21 @@ 
     if(isset($this->attributes['media:SSID'])) {
       $SSID = $this->attributes['media:SSID'];
 
-      foreach($SSID as $ssid)
-         $S['add'][$ssid] = 'AES';
+      foreach($SSID as $ssid) {
+               $S['add'][$ssid] = 'AES';
+      }
       }
     if(isset($this->attributes['media:SSID_with_legacy'])) {
       $SSID = $this->attributes['media:SSID_with_legacy'];
-      foreach($SSID as $ssid)
-         $S['add'][$ssid] = 'TKIP';
+      foreach($SSID as $ssid) {
+               $S['add'][$ssid] = 'TKIP';
+      }
     }
     if(isset($this->attributes['media:remove_SSID'])) {
       $SSID = $this->attributes['media:remove_SSID'];
-      foreach($SSID as $ssid)
-         $S['del'][$ssid] = 'DEL';
+      foreach($SSID as $ssid) {
+               $S['del'][$ssid] = 'DEL';
+      }
     }
     return $S;
   }
@@ -399,9 +422,10 @@ 
   private function getConsortia() {
       $OIs = [];
       $OIs = array_merge($OIs, Config::$CONSORTIUM['interworking-consortium-oi']);
-      if (isset($this->attributes['media:consortium_OI']))
-          foreach ($this->attributes['media:consortium_OI'] as $new_oi)
+      if (isset($this->attributes['media:consortium_OI'])) {
+                foreach ($this->attributes['media:consortium_OI'] as $new_oi)
             $OIs[] = $new_oi;
+      }
       return $OIs;
   }
   
@@ -421,10 +445,11 @@ 
     foreach ($Logos as $blob) {
       $finfo = new finfo(FILEINFO_MIME_TYPE);
       $mime = $finfo->buffer($blob);
-      if(preg_match('/^image\/(.*)/',$mime,$m))
-        $ext = $m[1];
-      else
-        $ext = 'unsupported';
+      if(preg_match('/^image\/(.*)/',$mime,$m)) {
+              $ext = $m[1];
+      } else {
+              $ext = 'unsupported';
+      }
       debug(4,"saveLogoFile: $mime : $ext\n");
       $f_name = 'logo-'.$i.'.'.$ext;
       $f = fopen($f_name,"w");
@@ -447,7 +472,9 @@ 
     $ext = isset($this->mime_extensions[$mime]) ? $this->mime_extensions[$mime] : 'usupported';
     debug(4,"saveInfoFile: $mime : $ext\n");
     $f = fopen('local-info.'.$ext,"w");
-    if(! $f) die("problem opening the file\n");
+    if(! $f) {
+        die("problem opening the file\n");
+    }
     fwrite($f,$blob);
     fclose($f);
     return(['name'=>'local-info.'.$ext,'mime'=>$ext]);

core/Helper.php

Doc Comments +2 added lines, -1 removed lines

@@ -32,6 +32,7 @@ 
 /**
  * write debug messages to the log
  *
+ * @param integer $level
  */
 function debug($level, $t) {
     if (Config::$DEBUG_LEVEL >= $level) {
@@ -130,7 +131,7 @@ 
  * generates a UUID
  *
  * @param string $prefix an extra prefix to set before the UUID
- * @return UUID (possibly prefixed)
+ * @return string (possibly prefixed)
  */
 function uuid($prefix = '', $deterministic_source = NULL) {
     if ($deterministic_source === NULL) 

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/phpqrcode.php

Doc Comments +108 added lines

@@ -96,6 +96,10 @@ 
 	define('QR_FORMAT_PNG',  1);

 	

 	class qrstr {

+
+		/**
+		 * @param string $repl
+		 */
 		public static function set(&$srctab, $x, $y, $repl, $replLen = false) {

 			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));

 		}

@@ -231,6 +235,11 @@ 
         }

 

         //----------------------------------------------------------------------

+
+        /**
+         * @param boolean $outfile
+         * @param string $err
+         */
         public static function log($outfile, $err)

         {

             if (QR_LOG_DIR !== false) {

@@ -256,6 +265,10 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param string $markerId
+         */
         public static function markTime($markerId)

         {

             list($usec, $sec) = explode(" ", microtime());

@@ -410,18 +423,30 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $version
+         */
         public static function getWidth($version)

         {

             return self::$capacity[$version][QRCAP_WIDTH];

         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $version
+         */
         public static function getRemainder($version)

         {

             return self::$capacity[$version][QRCAP_REMINDER];

         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $size
+         */
         public static function getMinimumVersion($size, $level)

         {

 

@@ -535,6 +560,9 @@ 
         //----------------------------------------------------------------------

         // CACHEABLE!!!

         

+        /**
+         * @param integer $version
+         */
         public static function getEccSpec($version, $level, array &$spec)

         {

             if (count($spec) < 5) {

@@ -857,12 +885,20 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param string $code
+         */
         public static function unserial($code)

         {

             return explode("\n", gzuncompress($code));

         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $version
+         */
         public static function newFrame($version)

         {

             if($version < 1 || $version > QRSPEC_VERSION_MAX) 

@@ -1236,6 +1272,10 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $version
+         */
         public function encodeBitStream($version)

         {

             try {

@@ -1313,6 +1353,10 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $version
+         */
         public function setVersion($version)

         {

             if($version < 0 || $version > QRSPEC_VERSION_MAX) {

@@ -1351,6 +1395,12 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param QRinput $mode
+         * @param integer $size
+         * @param integer $data
+         */
         public function append($mode, $size, $data)

         {

             try {

@@ -1446,6 +1496,10 @@ 
         ];

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $c
+         */
         public static function lookAnTable($c)

         {

             return (($c > 127)?-1:self::$anTable[$c]);

@@ -1531,6 +1585,10 @@ 
         

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $version
+         */
         public function estimateBitStreamSize($version)

         {

             $bits = 0;

@@ -1648,6 +1706,10 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param QRbitstream $bstream
+         */
         public function appendPaddingBit(&$bstream)

         {

             $bits = $bstream->size();

@@ -1977,6 +2039,10 @@ 
         public $modeHint;

 

         //----------------------------------------------------------------------

+
+        /**
+         * @param QRinput $input
+         */
         public function __construct($dataStr, $input, $modeHint) 

         {

             $this->dataStr  = $dataStr;

@@ -1985,6 +2051,10 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param string $str
+         */
         public static function isdigitat($str, $pos)

         {    

             if ($pos >= strlen($str))

@@ -1994,6 +2064,10 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param string $str
+         */
         public static function isalnumat($str, $pos)

         {

             if ($pos >= strlen($str))

@@ -2114,6 +2188,10 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @return integer
+         */
         public function eatKanji()

         {

             $p = 0;

@@ -2447,6 +2525,13 @@ 
         public static $items = [];

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $symsize
+         * @param integer $gfpoly
+         * @param integer $fcr
+         * @param integer $prim
+         */
         public static function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad)

         {

             foreach(self::$items as $rs) {

@@ -2601,6 +2686,10 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param string $code
+         */
         public static function unserial($code)

         {

             $codeArr = [];

@@ -2661,6 +2750,10 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $length
+         */
         public function calcN1N3($length)

         {

             $demerit = 0;

@@ -2971,6 +3064,10 @@ 
         public $data; 

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $mask
+         */
         public function encodeMask(QRinput $input, $mask)

         {

             if($input->getVersion() < 0 || $input->getVersion() > QRSPEC_VERSION_MAX) {

@@ -3052,6 +3149,11 @@ 
         }

         

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $version
+         * @param integer $level
+         */
         public function encodeString8bit($string, $version, $level)

         {

             if(string == NULL) {

@@ -3071,6 +3173,12 @@ 
         }

 

         //----------------------------------------------------------------------

+
+        /**
+         * @param integer $version
+         * @param integer $level
+         * @param boolean $casesensitive
+         */
         public function encodeString($string, $version, $level, $hint, $casesensitive)

         {

 

Braces +194 added lines, -109 removed lines

@@ -176,8 +176,9 @@ 
         {

             $barcode_array = [];

             

-            if (!is_array($mode))

-                $mode = explode(',', $mode);

+            if (!is_array($mode)) {
+                            $mode = explode(',', $mode);
+            }
                 

             $eccLevel = 'L';

                 

@@ -194,8 +195,9 @@ 
                 

             foreach ($qrTab as $line) {

                 $arrAdd = [];

-                foreach(str_split($line) as $char)

-                    $arrAdd[] = ($char=='1')?1:0;

+                foreach(str_split($line) as $char) {
+                                    $arrAdd[] = ($char=='1')?1:0;
+                }
                 $barcode_array['bcode'][] = $arrAdd;

             }

                     

@@ -223,8 +225,9 @@ 
 				

 				$width = count($frame);

 				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));

-				for ($maskNo=0; $maskNo<8; $maskNo++)

-					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);

+				for ($maskNo=0; $maskNo<8; $maskNo++) {
+									$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
+				}
             }

 			

 			QRtools::markTime('after_build_cache');

@@ -261,8 +264,9 @@ 
             list($usec, $sec) = explode(" ", microtime());

             $time = ((float)$usec + (float)$sec);

             

-            if (!isset($GLOBALS['qr_time_bench']))

-                $GLOBALS['qr_time_bench'] = [];

+            if (!isset($GLOBALS['qr_time_bench'])) {
+                            $GLOBALS['qr_time_bench'] = [];
+            }
             

             $GLOBALS['qr_time_bench'][$markerId] = $time;

         }

@@ -427,8 +431,9 @@ 
 

             for($i=1; $i<= QRSPEC_VERSION_MAX; $i++) {

                 $words  = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level];

-                if($words >= $size) 

-                    return $i;

+                if($words >= $size) {
+                                    return $i;
+                }
             }

 

             return -1;

@@ -446,8 +451,9 @@ 
         //----------------------------------------------------------------------

         public static function lengthIndicator($mode, $version)

         {

-            if ($mode == QR_MODE_STRUCTURE)

-                return 0;

+            if ($mode == QR_MODE_STRUCTURE) {
+                            return 0;
+            }
                 

             if ($version <= 9) {

                 $l = 0;

@@ -463,8 +469,9 @@ 
         //----------------------------------------------------------------------

         public static function maximumWords($mode, $version)

         {

-            if($mode == QR_MODE_STRUCTURE) 

-                return 3;

+            if($mode == QR_MODE_STRUCTURE) {
+                            return 3;
+            }
                 

             if($version <= 9) {

                 $l = 0;

@@ -610,8 +617,9 @@ 
         //----------------------------------------------------------------------

         public static function putAlignmentPattern($version, &$frame, $width)

         {

-            if($version < 2)

-                return;

+            if($version < 2) {
+                            return;
+            }
 

             $d = self::$alignmentPattern[$version][1] - self::$alignmentPattern[$version][0];

             if($d < 0) {

@@ -663,8 +671,9 @@ 
         //----------------------------------------------------------------------

         public static function getVersionPattern($version)

         {

-            if($version < 7 || $version > QRSPEC_VERSION_MAX)

-                return 0;

+            if($version < 7 || $version > QRSPEC_VERSION_MAX) {
+                            return 0;
+            }
 

             return self::$versionPattern[$version -7];

         }

@@ -681,11 +690,13 @@ 
 

         public static function getFormatInfo($mask, $level)

         {

-            if($mask < 0 || $mask > 7)

-                return 0;

+            if($mask < 0 || $mask > 7) {
+                            return 0;
+            }
                 

-            if($level < 0 || $level > 3)

-                return 0;                

+            if($level < 0 || $level > 3) {
+                            return 0;
+            }
 

             return self::$formatInfo[$level][$mask];

         }

@@ -865,8 +876,9 @@ 
         //----------------------------------------------------------------------

         public static function newFrame($version)

         {

-            if($version < 1 || $version > QRSPEC_VERSION_MAX) 

-                return null;

+            if($version < 1 || $version > QRSPEC_VERSION_MAX) {
+                            return null;
+            }
 

             if(!isset(self::$frames[$version])) {

                 

@@ -884,8 +896,9 @@ 
                 }

             }

             

-            if(is_null(self::$frames[$version]))

-                return null;

+            if(is_null(self::$frames[$version])) {
+                            return null;
+            }
 

             return self::$frames[$version];

         }

@@ -953,7 +966,7 @@ 
                     ImagePng($image, $filename);

                     header("Content-type: image/png");

                     ImagePng($image);

-                }else{

+                } else{

                     ImagePng($image, $filename);

                 }

             }

@@ -1213,8 +1226,9 @@ 
         {

             $bits = 0;

 

-            if($version == 0) 

-                $version = 1;

+            if($version == 0) {
+                            $version = 1;
+            }
 

             switch($this->mode) {

                 case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;

@@ -1273,8 +1287,9 @@ 
                             break;

                     }

                     

-                    if($ret < 0)

-                        return -1;

+                    if($ret < 0) {
+                                            return -1;
+                    }
                 }

 

                 return $this->bstream->size();

@@ -1491,8 +1506,9 @@ 
         //----------------------------------------------------------------------

         public static function checkModeKanji($size, $data)

         {

-            if($size & 1)

-                return false;

+            if($size & 1) {
+                            return false;
+            }
 

             for($i=0; $i<$size; $i+=2) {

                 $val = (ord($data[$i]) << 8) | ord($data[$i+1]);

@@ -1512,8 +1528,9 @@ 
 

         public static function check($mode, $size, $data)

         {

-            if($size <= 0) 

-                return false;

+            if($size <= 0) {
+                            return false;
+            }
 

             switch($mode) {

                 case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;

@@ -1578,8 +1595,9 @@ 
                     $chunks = (int)($payload / 11);

                     $remain = $payload - $chunks * 11;

                     $size = $chunks * 2;

-                    if($remain >= 6) 

-                        $size++;

+                    if($remain >= 6) {
+                                            $size++;
+                    }
                     break;

                 case QR_MODE_8:

                     $size = (int)($payload / 8);

@@ -1596,8 +1614,12 @@ 
             }

             

             $maxsize = QRspec::maximumWords($mode, $version);

-            if($size < 0) $size = 0;

-            if($size > $maxsize) $size = $maxsize;

+            if($size < 0) {
+                $size = 0;
+            }
+            if($size > $maxsize) {
+                $size = $maxsize;
+            }
 

             return $size;

         }

@@ -1610,8 +1632,9 @@ 
             foreach($this->items as $item) {

                 $bits = $item->encodeBitStream($this->version);

                 

-                if($bits < 0) 

-                    return -1;

+                if($bits < 0) {
+                                    return -1;
+                }
                     

                 $total += $bits;

             }

@@ -1630,8 +1653,9 @@ 
             for(;;) {

                 $bits = $this->createBitStream();

                 

-                if($bits < 0) 

-                    return -1;

+                if($bits < 0) {
+                                    return -1;
+                }
                     

                 $ver = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);

                 if($ver < 0) {

@@ -1668,8 +1692,9 @@ 
             $padding = new QRbitstream();

             $ret = $padding->appendNum($words * 8 - $bits + 4, 0);

             

-            if($ret < 0) 

-                return $ret;

+            if($ret < 0) {
+                            return $ret;
+            }
 

             $padlen = $maxwords - $words;

             

@@ -1682,8 +1707,9 @@ 
                 

                 $ret = $padding->appendBytes($padlen, $padbuf);

                 

-                if($ret < 0)

-                    return $ret;

+                if($ret < 0) {
+                                    return $ret;
+                }
                 

             }

 

@@ -1860,13 +1886,15 @@ 
         //----------------------------------------------------------------------

         public function appendNum($bits, $num)

         {

-            if ($bits == 0) 

-                return 0;

+            if ($bits == 0) {
+                            return 0;
+            }
 

             $b = QRbitstream::newFromNum($bits, $num);

             

-            if(is_null($b))

-                return -1;

+            if(is_null($b)) {
+                            return -1;
+            }
 

             $ret = $this->append($b);

             unset($b);

@@ -1877,13 +1905,15 @@ 
         //----------------------------------------------------------------------

         public function appendBytes($size, $data)

         {

-            if ($size == 0) 

-                return 0;

+            if ($size == 0) {
+                            return 0;
+            }
 

             $b = QRbitstream::newFromBytes($size, $data);

             

-            if(is_null($b))

-                return -1;

+            if(is_null($b)) {
+                            return -1;
+            }
 

             $ret = $this->append($b);

             unset($b);

@@ -1987,8 +2017,9 @@ 
         //----------------------------------------------------------------------

         public static function isdigitat($str, $pos)

         {    

-            if ($pos >= strlen($str))

-                return false;

+            if ($pos >= strlen($str)) {
+                            return false;
+            }
             

             return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));

         }

@@ -1996,8 +2027,9 @@ 
         //----------------------------------------------------------------------

         public static function isalnumat($str, $pos)

         {

-            if ($pos >= strlen($str))

-                return false;

+            if ($pos >= strlen($str)) {
+                            return false;
+            }
                 

             return (QRinput::lookAnTable(ord($str[$pos])) >= 0);

         }

@@ -2005,8 +2037,9 @@ 
         //----------------------------------------------------------------------

         public function identifyMode($pos)

         {

-            if ($pos >= strlen($this->dataStr)) 

-                return QR_MODE_NUL;

+            if ($pos >= strlen($this->dataStr)) {
+                            return QR_MODE_NUL;
+            }
                 

             $c = $this->dataStr[$pos];

             

@@ -2060,8 +2093,9 @@ 
             }

             

             $ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr));

-            if($ret < 0)

-                return -1;

+            if($ret < 0) {
+                            return -1;
+            }
 

             return $run;

         }

@@ -2107,8 +2141,9 @@ 
             }

 

             $ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr));

-            if($ret < 0)

-                return -1;

+            if($ret < 0) {
+                            return -1;
+            }
 

             return $run;

         }

@@ -2123,8 +2158,9 @@ 
             }

             

             $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr));

-            if($ret < 0)

-                return -1;

+            if($ret < 0) {
+                            return -1;
+            }
 

             return $run;

         }

@@ -2178,8 +2214,9 @@ 
             $run = $p;

             $ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr));

             

-            if($ret < 0)

-                return -1;

+            if($ret < 0) {
+                            return -1;
+            }
 

             return $run;

         }

@@ -2189,8 +2226,9 @@ 
         {

             while (strlen($this->dataStr) > 0)

             {

-                if($this->dataStr == '')

-                    return 0;

+                if($this->dataStr == '') {
+                                    return 0;
+                }
 

                 $mode = $this->identifyMode(0);

                 

@@ -2198,16 +2236,22 @@ 
                     case QR_MODE_NUM: $length = $this->eatNum(); break;

                     case QR_MODE_AN:  $length = $this->eatAn(); break;

                     case QR_MODE_KANJI:

-                        if ($hint == QR_MODE_KANJI)

-                                $length = $this->eatKanji();

-                        else    $length = $this->eat8();

+                        if ($hint == QR_MODE_KANJI) {
+                                                        $length = $this->eatKanji();
+                        } else {
+                            $length = $this->eat8();
+                        }
                         break;

                     default: $length = $this->eat8(); break;

                 

                 }

 

-                if($length == 0) return 0;

-                if($length < 0)  return -1;

+                if($length == 0) {
+                    return 0;
+                }
+                if($length < 0) {
+                    return -1;
+                }
                 

                 $this->dataStr = substr($this->dataStr, $length);

             }

@@ -2243,8 +2287,9 @@ 
 

             $split = new QRsplit($string, $input, $modeHint);

             

-            if(!$casesensitive)

-                $split->toUpper();

+            if(!$casesensitive) {
+                            $split->toUpper();
+            }
                 

             return $split->splitString();

         }

@@ -2321,11 +2366,23 @@ 
             $rs = null;

             

             // Check parameter ranges

-            if($symsize < 0 || $symsize > 8)                     return $rs;

-            if($fcr < 0 || $fcr >= (1<<$symsize))                return $rs;

-            if($prim <= 0 || $prim >= (1<<$symsize))             return $rs;

-            if($nroots < 0 || $nroots >= (1<<$symsize))          return $rs; // Can't have more roots than symbol values!

-            if($pad < 0 || $pad >= ((1<<$symsize) -1 - $nroots)) return $rs; // Too much padding

+            if($symsize < 0 || $symsize > 8) {
+                return $rs;
+            }
+            if($fcr < 0 || $fcr >= (1<<$symsize)) {
+                return $rs;
+            }
+            if($prim <= 0 || $prim >= (1<<$symsize)) {
+                return $rs;
+            }
+            if($nroots < 0 || $nroots >= (1<<$symsize)) {
+                return $rs;
+            }
+            // Can't have more roots than symbol values!

+            if($pad < 0 || $pad >= ((1<<$symsize) -1 - $nroots)) {
+                return $rs;
+            }
+            // Too much padding

 

             $rs = new QRrsItem();

             $rs->mm = $symsize;

@@ -2391,8 +2448,9 @@ 
             }

             

             // convert rs->genpoly[] to index form for quicker encoding

-            for ($i = 0; $i <= $nroots; $i++)

-                $rs->genpoly[$i] = $rs->index_of[$rs->genpoly[$i]];

+            for ($i = 0; $i <= $nroots; $i++) {
+                            $rs->genpoly[$i] = $rs->index_of[$rs->genpoly[$i]];
+            }
 

             return $rs;

         }

@@ -2450,12 +2508,24 @@ 
         public static function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad)

         {

             foreach(self::$items as $rs) {

-                if($rs->pad != $pad)       continue;

-                if($rs->nroots != $nroots) continue;

-                if($rs->mm != $symsize)    continue;

-                if($rs->gfpoly != $gfpoly) continue;

-                if($rs->fcr != $fcr)       continue;

-                if($rs->prim != $prim)     continue;

+                if($rs->pad != $pad) {
+                    continue;
+                }
+                if($rs->nroots != $nroots) {
+                    continue;
+                }
+                if($rs->mm != $symsize) {
+                    continue;
+                }
+                if($rs->gfpoly != $gfpoly) {
+                    continue;
+                }
+                if($rs->fcr != $fcr) {
+                    continue;
+                }
+                if($rs->prim != $prim) {
+                    continue;
+                }
 

                 return $rs;

             }

@@ -2594,8 +2664,9 @@ 
         {

             $codeArr = [];

             

-            foreach ($bitFrame as $line)

-                $codeArr[] = join('', $line);

+            foreach ($bitFrame as $line) {
+                            $codeArr[] = join('', $line);
+            }
                 

             return gzcompress(join("\n", $codeArr), 9);

         }

@@ -2606,8 +2677,9 @@ 
             $codeArr = [];

             

             $codeLines = explode("\n", gzuncompress($code));

-            foreach ($codeLines as $line)

-                $codeArr[] = str_split($line);

+            foreach ($codeLines as $line) {
+                            $codeArr[] = str_split($line);
+            }
             

             return $codeArr;

         }

@@ -2625,16 +2697,18 @@ 
                     $bitMask = self::unserial(file_get_contents($fileName));

                 } else {

                     $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);

-                    if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo))

-                        mkdir(QR_CACHE_DIR.'mask_'.$maskNo);

+                    if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo)) {
+                                            mkdir(QR_CACHE_DIR.'mask_'.$maskNo);
+                    }
                     file_put_contents($fileName, self::serial($bitMask));

                 }

             } else {

                 $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);

             }

 

-            if ($maskGenOnly)

-                return;

+            if ($maskGenOnly) {
+                            return;
+            }
                 

             $d = $s;

 

@@ -2701,8 +2775,9 @@ 
                 

                 $frameY = $frame[$y];

                 

-                if ($y>0)

-                    $frameYM = $frame[$y-1];

+                if ($y>0) {
+                                    $frameYM = $frame[$y-1];
+                }
                 

                 for($x=0; $x<$width; $x++) {

                     if(($x > 0) && ($y > 0)) {

@@ -2915,14 +2990,17 @@ 
                 $blockNo++;

             }

 

-            if(QRspec::rsBlockNum2($spec) == 0)

-                return 0;

+            if(QRspec::rsBlockNum2($spec) == 0) {
+                            return 0;
+            }
 

             $dl = QRspec::rsDataCodes2($spec);

             $el = QRspec::rsEccCodes2($spec);

             $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);

             

-            if($rs == NULL) return -1;

+            if($rs == NULL) {
+                return -1;
+            }
             

             for($i=0; $i<QRspec::rsBlockNum2($spec); $i++) {

                 $ecc = array_slice($this->ecccode,$eccPos);

@@ -3060,7 +3138,9 @@ 
             }

 

             $input = new QRinput($version, $level);

-            if($input == NULL) return NULL;

+            if($input == NULL) {
+                return NULL;
+            }
 

             $ret = $input->append($input, QR_MODE_8, strlen($string), str_split($string));

             if($ret < 0) {

@@ -3080,7 +3160,9 @@ 
             }

 

             $input = new QRinput($version, $level);

-            if($input == NULL) return NULL;

+            if($input == NULL) {
+                return NULL;
+            }
 

             $ret = QRsplit::splitStringToQRinput($string, $input, $hint, $casesensitive);

             if($ret < 0) {

@@ -3190,7 +3272,9 @@ 
                         }

                     }

                 }

-                if($x < 0 || $y < 0) return null;

+                if($x < 0 || $y < 0) {
+                    return null;
+                }
 

                 $this->x = $x;

                 $this->y = $y;

@@ -3297,8 +3381,9 @@ 
                 $err = ob_get_contents();

                 ob_end_clean();

                 

-                if ($err != '')

-                    QRtools::log($outfile, $err);

+                if ($err != '') {
+                                    QRtools::log($outfile, $err);
+                }
                 

                 $maxSize = (int)(QR_PNG_MAXIMUM_SIZE / (count($tab)+2*$this->margin));

                 

core/RADIUSTests.php

Doc Comments +7 added lines, -4 removed lines

@@ -957,6 +957,11 @@ 
         return $anon_id;
     }
 
+    /**
+     * @param string $inner_user
+     * @param string $password
+     * @param string $clientcertdata
+     */
     public function UDP_login($probeindex, $eaptype, $inner_user, $password, $outer_user = '', $opname_check = TRUE, $frag = TRUE, $clientcertdata = NULL) {
         if (!isset(Config::$RADIUSTESTS['UDP-hosts'][$probeindex])) {
             $this->UDP_reachability_executed = RETVAL_NOTCONFIGURED;
@@ -1478,10 +1483,8 @@ 
     /**
      * This function executes openssl s_client command
      * 
-     * @param string $key points NAPTR_hostname_records
-     * @param string $bracketaddr IP address
-     * @param int $port
-     * @param string $arg arguments to add to the openssl command 
+     * @param string $arg arguments to add to the openssl command
+     * @param string $host 
      * @return string result of oenssl s_client ...
      */
     function openssl_s_client($host, $arg, &$testresults) {

Braces +142 added lines, -100 removed lines

@@ -274,10 +274,11 @@ 
         ];
         $this->errorlist = [];
         $this->initialise_errors();
-        if ($profile_id !== 0)
-            $this->profile = new Profile($profile_id);
-        else
-            $this->profile = FALSE;
+        if ($profile_id !== 0) {
+                    $this->profile = new Profile($profile_id);
+        } else {
+                    $this->profile = FALSE;
+        }
 
         CAT::set_locale($oldlocale);
     }
@@ -303,8 +304,9 @@ 
         if ($NAPTRs !== FALSE && count($NAPTRs) > 0) {
             $NAPTRs_consortium = [];
             foreach ($NAPTRs as $naptr) {
-                if ($naptr["services"] == Config::$RADIUSTESTS['TLS-discoverytag'])
-                    $NAPTRs_consortium[] = $naptr;
+                if ($naptr["services"] == Config::$RADIUSTESTS['TLS-discoverytag']) {
+                                    $NAPTRs_consortium[] = $naptr;
+                }
             }
 
             if (count($NAPTRs_consortium) > 0) {
@@ -333,8 +335,9 @@ 
      */
     public function NAPTR_compliance() {
         // did we query DNS for the NAPTRs yet? If not, do so now.
-        if ($this->NAPTR_executed === FALSE)
-            $this->NAPTR();
+        if ($this->NAPTR_executed === FALSE) {
+                    $this->NAPTR();
+        }
         // if the NAPTR checks aren't configured, tell the caller
         if ($this->NAPTR_executed === RETVAL_NOTCONFIGURED) {
             $this->NAPTR_compliance_executed = RETVAL_NOTCONFIGURED;
@@ -351,11 +354,13 @@ 
         if (Config::$CONSORTIUM['name'] == "eduroam") { // SW: APPROVED
             foreach ($this->NAPTR_records as $edupointer) {
                 // must be "s" type for SRV
-                if ($edupointer["flags"] != "s" && $edupointer["flags"] != "S")
-                    $format_errors[] = ["TYPE" => "NAPTR-FLAG", "TARGET" => $edupointer['flag']];
+                if ($edupointer["flags"] != "s" && $edupointer["flags"] != "S") {
+                                    $format_errors[] = ["TYPE" => "NAPTR-FLAG", "TARGET" => $edupointer['flag']];
+                }
                 // no regex
-                if ($edupointer["regex"] != "")
-                    $format_errors[] = ["TYPE" => "NAPTR-REGEX", "TARGET" => $edupointer['regex']];
+                if ($edupointer["regex"] != "") {
+                                    $format_errors[] = ["TYPE" => "NAPTR-REGEX", "TARGET" => $edupointer['regex']];
+                }
             }
         }
         if (count($format_errors) > 0) {
@@ -665,8 +670,9 @@ 
     function NAPTR_SRV() {
         // see if preceding checks have been run, and run them if not
         // compliance check will cascade NAPTR check on its own
-        if ($this->NAPTR_compliance_executed === FALSE)
-            $this->NAPTR_compliance();
+        if ($this->NAPTR_compliance_executed === FALSE) {
+                    $this->NAPTR_compliance();
+        }
         // we only run the SRV checks if all records are compliant and more than one relevant NAPTR exists
         if ($this->NAPTR_executed <= 0 || $this->NAPTR_compliance_executed == RETVAL_INVALID) {
             $this->NAPTR_SRV_executed = RETVAL_SKIPPED;
@@ -680,9 +686,10 @@ 
             $temp_result = dns_get_record($edupointer["replacement"], DNS_SRV);
             if ($temp_result === FALSE || count($temp_result) == 0) {
                 $SRV_errors[] = ["TYPE" => "SRV_NOT_RESOLVING", "TARGET" => $edupointer['replacement']];
-            } else
-                foreach ($temp_result as $res)
+            } else {
+                            foreach ($temp_result as $res)
                     $SRV_targets[] = ["hostname" => $res["target"], "port" => $res["port"]];
+            }
         }
         $this->NAPTR_SRV_records = $SRV_targets;
         if (count($SRV_errors) > 0) {
@@ -697,8 +704,9 @@ 
     function NAPTR_hostnames() {
         // make sure the previous tests have been run before we go on
         // preceeding tests will cascade automatically if needed
-        if ($this->NAPTR_SRV_executed === FALSE)
-            $this->NAPTR_SRV();
+        if ($this->NAPTR_SRV_executed === FALSE) {
+                    $this->NAPTR_SRV();
+        }
         // if previous are SKIPPED, skip this one, too
         if ($this->NAPTR_SRV_executed == RETVAL_SKIPPED) {
             $this->NAPTR_hostname_executed = RETVAL_SKIPPED;
@@ -717,12 +725,14 @@ 
             $host_resolution = array_merge($host_resolution_6, $host_resolution_4);
             if ($host_resolution === FALSE || count($host_resolution) == 0) {
                 $resolution_errors[] = ["TYPE" => "HOST_NO_ADDRESS", "TARGET" => $server['hostname']];
-            } else
-                foreach ($host_resolution as $address)
+            } else {
+                            foreach ($host_resolution as $address)
                     if (isset($address["ip"]))
                         $ip_addresses[] = ["family" => "IPv4", "IP" => $address["ip"], "port" => $server["port"], "status" => ""];
-                    else
-                        $ip_addresses[] = ["family" => "IPv6", "IP" => $address["ipv6"], "port" => $server["port"], "status" => ""];
+            }
+                    else {
+                                            $ip_addresses[] = ["family" => "IPv6", "IP" => $address["ipv6"], "port" => $server["port"], "status" => ""];
+                    }
         }
 
         $this->NAPTR_hostname_records = $ip_addresses;
@@ -761,38 +771,43 @@ 
         // check for wildcards
 
         if (isset($servercert['full_details']['subject']['CN'])) {
-            if (is_array($servercert['full_details']['subject']['CN']))
-                $CN = $servercert['full_details']['subject']['CN'];
-            else
-                $CN = [$servercert['full_details']['subject']['CN']];
-        }
-        else {
+            if (is_array($servercert['full_details']['subject']['CN'])) {
+                            $CN = $servercert['full_details']['subject']['CN'];
+            } else {
+                            $CN = [$servercert['full_details']['subject']['CN']];
+            }
+        } else {
             $CN = [""];
         }
 
-        if (isset($servercert['full_details']['extensions']) && isset($servercert['full_details']['extensions']['subjectAltName']))
-            $sAN_list = explode(", ", $servercert['full_details']['extensions']['subjectAltName']);
-        else
-            $sAN_list = [];
+        if (isset($servercert['full_details']['extensions']) && isset($servercert['full_details']['extensions']['subjectAltName'])) {
+                    $sAN_list = explode(", ", $servercert['full_details']['extensions']['subjectAltName']);
+        } else {
+                    $sAN_list = [];
+        }
 
         $sAN_DNS = [];
-        foreach ($sAN_list as $san_name)
-            if (preg_match("/^DNS:/", $san_name))
+        foreach ($sAN_list as $san_name) {
+                    if (preg_match("/^DNS:/", $san_name))
                 $sAN_DNS[] = substr($san_name, 4);
+        }
 
         $allnames = array_unique(array_merge($CN, $sAN_DNS));
 
-        if (preg_match("/\*/", implode($allnames)))
-            $returnarray[] = CERTPROB_WILDCARD_IN_NAME;
+        if (preg_match("/\*/", implode($allnames))) {
+                    $returnarray[] = CERTPROB_WILDCARD_IN_NAME;
+        }
 
         // is there more than one CN? None or one is okay, more is asking for trouble.
-        if (count($CN) > 1)
-            $returnarray[] = CERTPROB_MULTIPLE_CN;
+        if (count($CN) > 1) {
+                    $returnarray[] = CERTPROB_MULTIPLE_CN;
+        }
 
         // check for real hostname
         foreach ($allnames as $onename) {
-            if ($onename != "" && filter_var("foo@" . idn_to_ascii($onename), FILTER_VALIDATE_EMAIL) === FALSE)
-                $returnarray[] = CERTPROB_NOT_A_HOSTNAME;
+            if ($onename != "" && filter_var("foo@" . idn_to_ascii($onename), FILTER_VALIDATE_EMAIL) === FALSE) {
+                            $returnarray[] = CERTPROB_NOT_A_HOSTNAME;
+            }
         }
         $servercert['incoming_server_names'] = $allnames;
         $servercert['sAN_DNS'] = $sAN_DNS;
@@ -816,16 +831,19 @@ 
         if ($intermediate_ca['basicconstraints_set'] == 0) {
             $returnarray[] = CERTPROB_NO_BASICCONSTRAINTS;
         }
-        if ($intermediate_ca['full_details']['public_key_length'] < 1024)
-            $returnarray[] = CERTPROB_LOW_KEY_LENGTH;
+        if ($intermediate_ca['full_details']['public_key_length'] < 1024) {
+                    $returnarray[] = CERTPROB_LOW_KEY_LENGTH;
+        }
         $from = $intermediate_ca['full_details']['validFrom_time_t'];
         $now = time();
         $to = $intermediate_ca['full_details']['validTo_time_t'];
-        if ($from > $now || $to < $now)
-            $returnarray[] = CERTPROB_OUTSIDE_VALIDITY_PERIOD;
+        if ($from > $now || $to < $now) {
+                    $returnarray[] = CERTPROB_OUTSIDE_VALIDITY_PERIOD;
+        }
         $add_cert_crl_result = $this->add_cert_crl($intermediate_ca);
-        if ($add_cert_crl_result !== 0 && $server_cert)
-            $returnarray[] = $add_cert_crl_result;
+        if ($add_cert_crl_result !== 0 && $server_cert) {
+                    $returnarray[] = $add_cert_crl_result;
+        }
 
         return $returnarray;
     }
@@ -869,8 +887,9 @@ 
             $returnresult = CERTPROB_NO_CDP_HTTP;
         } else { // first and second sub-match is the full URL... check it
             $crlcontent = downloadFile($crl_url[1] . $crl_url[2]);
-            if ($crlcontent === FALSE)
-                $returnresult = CERTPROB_NO_CRL_AT_CDP_URL;
+            if ($crlcontent === FALSE) {
+                            $returnresult = CERTPROB_NO_CRL_AT_CDP_URL;
+            }
             $begin_crl = strpos($crlcontent, "-----BEGIN X509 CRL-----");
             if ($begin_crl === FALSE) {
                 $pem = chunk_split(base64_encode($crlcontent), 64, "\n");
@@ -1074,11 +1093,16 @@ 
                 " -c ./udp_login_test.conf" .
                 " -M 22:44:66:CA:20:" . sprintf("%02d", $probeindex) . " " .
                 " -t " . Config::$RADIUSTESTS['UDP-hosts'][$probeindex]['timeout'] . " ";
-        if ($opname_check)
-            $cmdline .= '-N126:s:"1cat.eduroam.org" ';
-        if ($frag)
-            for ($i = 0; $i < 6; $i++) // 6 x 250 bytes means UDP fragmentation will occur - good!
+        if ($opname_check) {
+                    $cmdline .= '-N126:s:"1cat.eduroam.org" ';
+        }
+        if ($frag) {
+                    for ($i = 0;
+        }
+        $i < 6; $i++) {
+                // 6 x 250 bytes means UDP fragmentation will occur - good!
                 $cmdline .= '-N26:x:0000625A0BF961616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 ';
+            }
 
         debug(4, "Shallow reachability check cmdline: $cmdline\n");
         debug(4, "Shallow reachability check config: $tmp_dir\n$log_config\n");
@@ -1087,8 +1111,9 @@ 
         $time_stop = microtime(true);
         debug(5, print_r($this->redact($password, $packetflow_orig), TRUE));
         $packetflow = $this->filter_packettype($packetflow_orig);
-        if ($packetflow[count($packetflow) - 1] == 11 && $this->check_mschap_691_r($packetflow_orig))
-            $packetflow[count($packetflow) - 1] = 3;
+        if ($packetflow[count($packetflow) - 1] == 11 && $this->check_mschap_691_r($packetflow_orig)) {
+                    $packetflow[count($packetflow) - 1] = 3;
+        }
         debug(5, "Packetflow: " . print_r($packetflow, TRUE));
         $testresults['time_millisec'] = ($time_stop - $time_start) * 1000;
         $packetcount = array_count_values($packetflow);
@@ -1099,10 +1124,11 @@ 
         $accepts = (isset($packetcount[2]) ? $packetcount[2] : 0);
         $rejects = (isset($packetcount[3]) ? $packetcount[3] : 0);
         $challenges = (isset($packetcount[11]) ? $packetcount[11] : 0);
-        if ($reqs - $accepts - $rejects - $challenges != 0 || $accepts > 1 || $rejects > 1)
-            $testresults['packetflow_sane'] = FALSE;
-        else
-            $testresults['packetflow_sane'] = TRUE;
+        if ($reqs - $accepts - $rejects - $challenges != 0 || $accepts > 1 || $rejects > 1) {
+                    $testresults['packetflow_sane'] = FALSE;
+        } else {
+                    $testresults['packetflow_sane'] = TRUE;
+        }
 
         // calculate the main return values that this test yielded
 
@@ -1127,8 +1153,9 @@ 
 
         if ($finalretval == RETVAL_CONVERSATION_REJECT) {
             $ackedmethod = $this->check_conversation_eap_method_ack($packetflow_orig);
-            if (!$ackedmethod)
-                $testresults['cert_oddities'][] = CERTPROB_NO_COMMON_EAP_METHOD;
+            if (!$ackedmethod) {
+                            $testresults['cert_oddities'][] = CERTPROB_NO_COMMON_EAP_METHOD;
+            }
         };
 
 
@@ -1189,8 +1216,9 @@ 
 
             foreach ($eap_certarray as $cert_pem) {
                 $cert = $x509->processCertificate($cert_pem);
-                if ($cert == FALSE)
-                    continue;
+                if ($cert == FALSE) {
+                                    continue;
+                }
                 // consider the certificate a server cert 
                 // a) if it is not a CA and is not a self-signed root
                 // b) if it is a CA, and self-signed, and it is the only cert in
@@ -1236,12 +1264,15 @@ 
                 $testresults['certdata'][] = $cert['full_details'];
             }
             fclose($server_file);
-            if ($number_root > 0 && !$totally_selfsigned)
-                $testresults['cert_oddities'][] = CERTPROB_ROOT_INCLUDED;
-            if ($number_server > 1)
-                $testresults['cert_oddities'][] = CERTPROB_TOO_MANY_SERVER_CERTS;
-            if ($number_server == 0)
-                $testresults['cert_oddities'][] = CERTPROB_NO_SERVER_CERT;
+            if ($number_root > 0 && !$totally_selfsigned) {
+                            $testresults['cert_oddities'][] = CERTPROB_ROOT_INCLUDED;
+            }
+            if ($number_server > 1) {
+                            $testresults['cert_oddities'][] = CERTPROB_TOO_MANY_SERVER_CERTS;
+            }
+            if ($number_server == 0) {
+                            $testresults['cert_oddities'][] = CERTPROB_NO_SERVER_CERT;
+            }
             // check server cert properties
             if ($number_server > 0) {
                 $testresults['cert_oddities'] = array_merge($testresults['cert_oddities'], $this->property_check_servercert($servercert));
@@ -1287,8 +1318,9 @@ 
                         }
                     }
                 }
-                if ($number_server > 0)
-                    debug(4, "This is the server certificate, with CRL content if applicable: " . print_r($servercert, true));
+                if ($number_server > 0) {
+                                    debug(4, "This is the server certificate, with CRL content if applicable: " . print_r($servercert, true));
+                }
                 $checkstring = "";
                 if (isset($servercert['CRL']) && isset($servercert['CRL'][0])) {
                     debug(4, "got a server CRL; adding them to the chain checks. (Remember: checking end-entity cert only, not the whole chain");
@@ -1365,8 +1397,9 @@ 
                 // WARN if the configured name is only in either CN or sAN:DNS
                 $confnames = $my_profile->getAttributes("eap:server_name");
                 $expected_names = [];
-                foreach ($confnames as $tuple)
-                    $expected_names[] = $tuple['value'];
+                foreach ($confnames as $tuple) {
+                                    $expected_names[] = $tuple['value'];
+                }
 
                 // Strategy for checks: we are TOTALLY happy if any one of the
                 // configured names shows up in both the CN and a sAN
@@ -1437,9 +1470,10 @@ 
     function property_check_policy($cert) {
         $oids = [];
         if ($cert['extensions']['certificatePolicies']) {
-            foreach (Config::$RADIUSTESTS['TLS-acceptableOIDs'] as $key => $oid)
-                if (preg_match("/Policy: $oid/", $cert['extensions']['certificatePolicies']))
+            foreach (Config::$RADIUSTESTS['TLS-acceptableOIDs'] as $key => $oid) {
+                            if (preg_match("/Policy: $oid/", $cert['extensions']['certificatePolicies']))
                     $oids[$key] = $oid;
+            }
         }
         return $oids;
     }
@@ -1452,12 +1486,14 @@ 
      */
     function property_certificate_get_issuer($cert) {
         $issuer = '';
-        foreach ($cert['issuer'] as $key => $val)
-            if (is_array($val))
+        foreach ($cert['issuer'] as $key => $val) {
+                    if (is_array($val))
                 foreach ($val as $v)
                     $issuer .= "/$key=$v";
-            else
-                $issuer .= "/$key=$val";
+        }
+            else {
+                            $issuer .= "/$key=$val";
+            }
         return $issuer;
     }
 
@@ -1532,8 +1568,9 @@ 
                     }
                     $oids = $this->property_check_policy($data);
                     if (!empty($oids)) {
-                        foreach ($oids as $k => $o)
-                            $testresults[$host]['certdata']['extensions']['policyoid'][] = " $o ($k)";
+                        foreach ($oids as $k => $o) {
+                                                    $testresults[$host]['certdata']['extensions']['policyoid'][] = " $o ($k)";
+                        }
                     }
                     if (($crl = $this->property_certificate_get_field($data, 'crlDistributionPoints'))) {
                         $testresults[$host]['certdata']['extensions']['crlDistributionPoint'] = $crl;
@@ -1547,23 +1584,24 @@ 
                 $ret = $testresults[$host]['ca'][$type]['certificate'][$k]['returncode'];
                 $output = implode($opensslbabble);
                 $unknownca = 0;
-                if ($ret == 0)
-                    $testresults[$host]['ca'][$type]['certificate'][$k]['connected'] = 1;
-                else {
+                if ($ret == 0) {
+                                    $testresults[$host]['ca'][$type]['certificate'][$k]['connected'] = 1;
+                } else {
                     $testresults[$host]['ca'][$type]['certificate'][$k]['connected'] = 0;
                     if (preg_match('/connect: Connection refused/', implode($opensslbabble))) {
                         $testresults[$host]['ca'][$type]['certificate'][$k]['returncode'] = RETVAL_CONNECTION_REFUSED;
-                    } elseif (preg_match('/sslv3 alert certificate expired/', $output))
-                        $res_comment = _("certificate expired");
-                    elseif (preg_match('/sslv3 alert certificate revoked/', $output))
-                        $res_comment = _("certificate was revoked");
-                    elseif (preg_match('/SSL alert number 46/', $output))
-                        $res_comment = _("bad policy");
-                    elseif (preg_match('/tlsv1 alert unknown ca/', $output)) {
+                    } elseif (preg_match('/sslv3 alert certificate expired/', $output)) {
+                                            $res_comment = _("certificate expired");
+                    } elseif (preg_match('/sslv3 alert certificate revoked/', $output)) {
+                                            $res_comment = _("certificate was revoked");
+                    } elseif (preg_match('/SSL alert number 46/', $output)) {
+                                            $res_comment = _("bad policy");
+                    } elseif (preg_match('/tlsv1 alert unknown ca/', $output)) {
                         $res_comment = _("unknown authority");
                         $testresults[$host]['ca'][$type]['certificate'][$k]['reason'] = CERTPROB_UNKNOWN_CA;
-                    } else
-                        $res_comment = _("unknown authority or no certificate policy or another problem");
+                    } else {
+                                            $res_comment = _("unknown authority or no certificate policy or another problem");
+                    }
                     $testresults[$host]['ca'][$type]['certificate'][$k]['resultcomment'] = $res_comment;
                 }
                 break;
@@ -1583,8 +1621,9 @@ 
         $res = RETVAL_OK;
         /*        if (preg_match("/\[/", $host))
           return RETVAL_INVALID; */
-        if (!isset($this->TLS_CA_checks_result[$host]))
-            $this->TLS_CA_checks_result[$host] = [];
+        if (!isset($this->TLS_CA_checks_result[$host])) {
+                    $this->TLS_CA_checks_result[$host] = [];
+        }
         $opensslbabble = $this->openssl_s_client($host, '', $this->TLS_CA_checks_result[$host]);
         fputs($f, serialize($this->TLS_CA_checks_result) . "\n");
         $res = $this->openssl_result($host, 'capath', $opensslbabble, $this->TLS_CA_checks_result);
@@ -1600,8 +1639,9 @@ 
     public function TLS_clients_side_check($host) {
         $res = RETVAL_OK;
         if (is_array(Config::$RADIUSTESTS['TLS-clientcerts']) && count(Config::$RADIUSTESTS['TLS-clientcerts']) > 0) {
-            if (preg_match("/\[/", $host))
-                return RETVAL_INVALID;
+            if (preg_match("/\[/", $host)) {
+                            return RETVAL_INVALID;
+            }
             foreach (Config::$RADIUSTESTS['TLS-clientcerts'] as $type => $tlsclient) {
                 $this->TLS_clients_checks_result[$host]['ca'][$type]['clientcertinfo']['from'] = $type;
                 $this->TLS_clients_checks_result[$host]['ca'][$type]['clientcertinfo']['status'] = $tlsclient['status'];
@@ -1612,8 +1652,9 @@ 
                     $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['message'] = $this->TLS_certkeys[$cert['status']];
                     $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['expected'] = $cert['expected'];
                     $add = ' -cert ' . CAT::$root . '/config/cli-certs/' . $cert['public'] . ' -key ' . CAT::$root . '/config/cli-certs/' . $cert['private'];
-                    if (!isset($this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]))
-                        $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k] = [];
+                    if (!isset($this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k])) {
+                                            $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k] = [];
+                    }
                     $opensslbabble = $this->openssl_s_client($host, $add, $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]);
                     $res = $this->openssl_result($host, 'clients', $opensslbabble, $this->TLS_clients_checks_result, $type, $k);
                     if ($cert['expected'] == 'PASS') {
@@ -1625,8 +1666,9 @@ 
                             }
                         }
                     } else {
-                        if ($this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['connected'])
-                            $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['returncode'] = CERTPROB_WRONGLY_ACCEPTED;
+                        if ($this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['connected']) {
+                                                    $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['returncode'] = CERTPROB_WRONGLY_ACCEPTED;
+                        }
 
                         if (($this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['reason'] == CERTPROB_UNKNOWN_CA) && ($tlsclient['status'] == 'ACCREDITED') && ($cert['status'] == 'CORRECT')) {
                             $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['finalerror'] = 1;

core/SanityTests.php

Doc Comments +3 added lines

@@ -138,6 +138,9 @@
         $this->test_result['global'] = max($this->test_result['global'],$level);
     }
 
+    /**
+     * @param string $s
+     */
     private function get_exec_path($s) {
         $the_path = "";
         $exec_is = "UNDEFINED";

Braces +209 added lines, -159 removed lines

@@ -100,11 +100,12 @@ 
          if(preg_match('/(.+)=>(.+)/',$t,$m)) {
             $tst = $m[1];
             $subtst=$m[2];
-            if($this->test_result[$tst]  < L_ERROR)
-               $this->test($subtst);
+            if($this->test_result[$tst]  < L_ERROR) {
+                           $this->test($subtst);
+            }
+         } else {
+                     $this->test($t);
          }
-         else
-            $this->test($t);
        }
     }
 
@@ -145,10 +146,11 @@ 
              preg_match('/([^ ]+) ?/',Config::$PATHS[$s],$m);
              $exe = $m[1];
              $the_path = exec("which " . Config::$PATHS[$s]);
-             if ($the_path == $exe)
-                 $exec_is = "EXPLICIT";
-             else
-                 $exec_is = "IMPLICIT";
+             if ($the_path == $exe) {
+                              $exec_is = "EXPLICIT";
+             } else {
+                              $exec_is = "IMPLICIT";
+             }
          } 
         return(['exec'=>$the_path,'exec_is'=>$exec_is]);
     }
@@ -157,38 +159,42 @@ 
       *  Test for php version
       */
     private function php_test() {
-         if (version_compare(phpversion(), $this->php_needversion, '>='))
-            $this->test_return(L_OK,"<strong>PHP</strong> is sufficiently recent. You are running " . phpversion() . ".");
-         else
-            $this->test_return(L_ERROR,"<strong>PHP</strong> is too old. We need at least $this->php_needversion, but you only have ".phpversion(). ".");
+         if (version_compare(phpversion(), $this->php_needversion, '>=')) {
+                     $this->test_return(L_OK,"<strong>PHP</strong> is sufficiently recent. You are running " . phpversion() . ".");
+         } else {
+                     $this->test_return(L_ERROR,"<strong>PHP</strong> is too old. We need at least $this->php_needversion, but you only have ".phpversion(). ".");
+         }
     }
 
     /**
       * test for simpleSAMLphp
       */
     private function ssp_test() {
-         if (!is_file(CONFIG::$AUTHENTICATION['ssp-path-to-autoloader']))
-             $this->test_return(L_ERROR,"<strong>simpleSAMLphp</strong> not found!");
-         else
-             $this->test_return(L_OK,"<strong>simpleSAMLphp</strong> autoloader found.");
+         if (!is_file(CONFIG::$AUTHENTICATION['ssp-path-to-autoloader'])) {
+                      $this->test_return(L_ERROR,"<strong>simpleSAMLphp</strong> not found!");
+         } else {
+                      $this->test_return(L_OK,"<strong>simpleSAMLphp</strong> autoloader found.");
+         }
     }
 
     /**
       * test for security setting
       */
     private function security_test() {
-         if (in_array("I do not care about security!", Config::$SUPERADMINS))
-             $this->test_return(L_WARN,"You do not care about security. This page should be made accessible to the CAT admin only! See config.php 'Superadmins'!");
+         if (in_array("I do not care about security!", Config::$SUPERADMINS)) {
+                      $this->test_return(L_WARN,"You do not care about security. This page should be made accessible to the CAT admin only! See config.php 'Superadmins'!");
+         }
     }
 
     /**
       * test if zip is available
       */
     private function zip_test() {
-         if (exec("which zip") != "")
-             $this->test_return(L_OK,"<strong>zip</strong> binary found.");
-         else
-             $this->test_return(L_ERROR,"<strong>zip</strong> not found in your \$PATH!");
+         if (exec("which zip") != "") {
+                      $this->test_return(L_OK,"<strong>zip</strong> binary found.");
+         } else {
+                      $this->test_return(L_ERROR,"<strong>zip</strong> not found in your \$PATH!");
+         }
     }
 
     /**
@@ -198,59 +204,67 @@ 
          exec(Config::$PATHS['eapol_test'], $out, $retval);
          if($retval == 255 ) {
             $o = preg_grep('/-o<server cert/',$out);
-               if(count($o) > 0)
-                   $this->test_return(L_OK,"<strong>eapol_test</strong> script found.");
-               else
-                   $this->test_return(L_ERROR,"<strong>eapol_test</strong> found, but is too old!");
+               if(count($o) > 0) {
+                                  $this->test_return(L_OK,"<strong>eapol_test</strong> script found.");
+               } else {
+                                  $this->test_return(L_ERROR,"<strong>eapol_test</strong> found, but is too old!");
+               }
+         } else {
+                     $this->test_return(L_ERROR,"<strong>eapol_test</strong> not found!");
          }
-         else
-            $this->test_return(L_ERROR,"<strong>eapol_test</strong> not found!");
     }
 
     /**
       * test if logdir exists and is writable
       */
     private function logdir_test() {
-         if (fopen(Config::$PATHS['logdir'] . "/debug.log", "a") == FALSE)
-             $this->test_return(L_WARN,"Log files in <strong>" . Config::$PATHS['logdir'] . "</strong> are not writable!");
-         else
-             $this->test_return(L_OK,"Log directory is writable.");
+         if (fopen(Config::$PATHS['logdir'] . "/debug.log", "a") == FALSE) {
+                      $this->test_return(L_WARN,"Log files in <strong>" . Config::$PATHS['logdir'] . "</strong> are not writable!");
+         } else {
+                      $this->test_return(L_OK,"Log directory is writable.");
+         }
     }
 
     /**
       * test for required PHP modules
       */
     private function phpModules_test() {
-        if (function_exists('idn_to_ascii'))
-            $this->test_return(L_OK,"PHP can handle internationalisation.");
-        else
-            $this->test_return(L_ERROR,"PHP can <strongNOT</strong> handle internationalisation (idn_to_ascii() from php5-intl).");
+        if (function_exists('idn_to_ascii')) {
+                    $this->test_return(L_OK,"PHP can handle internationalisation.");
+        } else {
+                    $this->test_return(L_ERROR,"PHP can <strongNOT</strong> handle internationalisation (idn_to_ascii() from php5-intl).");
+        }
 
-        if (function_exists('gettext'))
-            $this->test_return(L_OK,"PHP extension <strong>GNU Gettext</strong> is installed.");
-        else
-           $this->test_return(L_ERROR,"PHP extension <strong>GNU Gettext</strong> not found!");
+        if (function_exists('gettext')) {
+                    $this->test_return(L_OK,"PHP extension <strong>GNU Gettext</strong> is installed.");
+        } else {
+                   $this->test_return(L_ERROR,"PHP extension <strong>GNU Gettext</strong> not found!");
+        }
 
-        if (function_exists('openssl_sign'))
-            $this->test_return(L_OK,"PHP extension <strong>OpenSSL</strong> is installed.");
-        else
-            $this->test_return(L_ERROR,"PHP extension <strong>OpenSSL</strong> not found!");
+        if (function_exists('openssl_sign')) {
+                    $this->test_return(L_OK,"PHP extension <strong>OpenSSL</strong> is installed.");
+        } else {
+                    $this->test_return(L_ERROR,"PHP extension <strong>OpenSSL</strong> not found!");
+        }
 
-        if (class_exists('Imagick'))
-            $this->test_return(L_OK,"PHP extension <strong>Imagick</strong> is installed.");
-        else
-            $this->test_return(L_ERROR,"PHP extension <strong>Imagick</strong> not found! Get it from your distribution or <a href='http://pecl.php.net/package/imagick'>here</a>.");
+        if (class_exists('Imagick')) {
+                    $this->test_return(L_OK,"PHP extension <strong>Imagick</strong> is installed.");
+        } else {
+                    $this->test_return(L_ERROR,"PHP extension <strong>Imagick</strong> not found! Get it from your distribution or <a href='http://pecl.php.net/package/imagick'>here</a>.");
+        }
 
-        if (function_exists('ImageCreate'))
-            $this->test_return(L_OK,"PHP extension <strong>GD</strong> is installed.");
-        else
-            $this->test_return(L_ERROR,"PHP extension <strong>GD</strong> not found!</a>.");
+        if (function_exists('ImageCreate')) {
+                    $this->test_return(L_OK,"PHP extension <strong>GD</strong> is installed.");
+        } else {
+                    $this->test_return(L_ERROR,"PHP extension <strong>GD</strong> not found!</a>.");
+        }
 
-        if (function_exists('mysqli_connect'))
-            $this->test_return(L_OK,"PHP extension <strong>MySQL</strong> is installed.");
-        else
-            $this->test_return(L_ERROR,"PHP extension <strong>MySQL</strong> not found!");
-/*
+        if (function_exists('mysqli_connect')) {
+                    $this->test_return(L_OK,"PHP extension <strong>MySQL</strong> is installed.");
+        } else {
+                    $this->test_return(L_ERROR,"PHP extension <strong>MySQL</strong> not found!");
+        }
+        /*
         if (function_exists('geoip_record_by_name')) {
            $host = '158.75.1.10';
            $record = geoip_record_by_name($host);
@@ -339,12 +353,14 @@ 
          $A = $this->get_exec_path('openssl');    
          if($A['exec'] != "") {
              $t = exec($A['exec'] . ' version');
-             if($A['exec_is'] == "EXPLICIT")
-                $this->test_return(L_OK,"<strong>$t</strong> was found and is configured explicitly in your config.");
-             else
-                $this->test_return(L_WARN,"<strong>$t</strong> was found, but is not configured with an absolute path in your config.");
-         } else
-            $this->test_return(L_ERROR,"<strong>openssl</strong> was not found on your system!");
+             if($A['exec_is'] == "EXPLICIT") {
+                             $this->test_return(L_OK,"<strong>$t</strong> was found and is configured explicitly in your config.");
+             } else {
+                             $this->test_return(L_WARN,"<strong>$t</strong> was found, but is not configured with an absolute path in your config.");
+             }
+         } else {
+                     $this->test_return(L_ERROR,"<strong>openssl</strong> was not found on your system!");
+         }
     }
 
     /**
@@ -362,18 +378,22 @@ 
          $A = $this->get_exec_path('makensis');    
          if($A['exec'] != "") {
              $t = exec($A['exec'] . ' -VERSION');
-             if($A['exec_is'] == "EXPLICIT") 
-                $this->test_return(L_OK,"<strong>makensis $t</strong> was found and is configured explicitly in your config.");
-             else
-                $this->test_return(L_WARN,"<strong>makensis $t</strong> was found, but is not configured with an absolute path in your config.");
+             if($A['exec_is'] == "EXPLICIT") {
+                             $this->test_return(L_OK,"<strong>makensis $t</strong> was found and is configured explicitly in your config.");
+             } else {
+                             $this->test_return(L_WARN,"<strong>makensis $t</strong> was found, but is not configured with an absolute path in your config.");
+             }
              exec($A['exec'] . ' -HELP',$t);
              $t1 = count(preg_grep('/INPUTCHARSET/',$t));
-             if($t1 == 1 && Config::$NSIS_VERSION == 2)
-                $this->test_return(L_ERROR,"Declared NSIS_VERSION does not seem to match the file pointed to by PATHS['makensis']!");
-             if($t1 == 0 && Config::$NSIS_VERSION >= 3)
-                $this->test_return(L_ERROR,"Declared NSIS_VERSION does not seem to match the file pointed to by PATHS['makensis']!");
-         } else
-            $this->test_return(L_ERROR,"<strong>makensis</strong> was not found on your system!");
+             if($t1 == 1 && Config::$NSIS_VERSION == 2) {
+                             $this->test_return(L_ERROR,"Declared NSIS_VERSION does not seem to match the file pointed to by PATHS['makensis']!");
+             }
+             if($t1 == 0 && Config::$NSIS_VERSION >= 3) {
+                             $this->test_return(L_ERROR,"Declared NSIS_VERSION does not seem to match the file pointed to by PATHS['makensis']!");
+             }
+         } else {
+                     $this->test_return(L_ERROR,"<strong>makensis</strong> was not found on your system!");
+         }
     }
 
     /**
@@ -391,18 +411,21 @@ 
          foreach ($this->NSIS_Modules as $module) {
             unset($out);
             exec(Config::$PATHS['makensis']." -V1 '-X!include $module' '-XOutFile $exe' '-XSection X' '-XSectionEnd'", $out, $retval);
-            if($retval > 0) 
-               $NSIS_Module_status[$module] = 0;
-            else
-               $NSIS_Module_status[$module] = 1;
+            if($retval > 0) {
+                           $NSIS_Module_status[$module] = 0;
+            } else {
+                           $NSIS_Module_status[$module] = 1;
+            }
+         }
+         if(is_file($exe)) {
+                     unlink($exe);
          }
-         if(is_file($exe))
-            unlink($exe);
          foreach ($NSIS_Module_status as $module => $status) {
-            if($status == 1)
-               $this->test_return(L_OK,"NSIS module <strong>$module</strong> was found.");
-            else
-               $this->test_return(L_ERROR,"NSIS module <strong>$module</strong> was not found or is not working correctly.");
+            if($status == 1) {
+                           $this->test_return(L_OK,"NSIS module <strong>$module</strong> was found.");
+            } else {
+                           $this->test_return(L_ERROR,"NSIS module <strong>$module</strong> was not found or is not working correctly.");
+            }
          }
     }
     private function NSIS_GetVersion_test() {
@@ -414,12 +437,14 @@ 
          }
          $exe= 'tt.exe';
          exec(Config::$PATHS['makensis']." -V1 '-XOutFile $exe' '-XSection X' '-XGetVersion::WindowsName' '-XSectionEnd'", $out, $retval);
-         if($retval > 0)
-            $this->test_return(L_ERROR,"NSIS module <strong>GetVersion</strong> was not found or is not working correctly.");
-         else
-            $this->test_return(L_OK,"NSIS module <strong>GetVersion</strong> was found.");
-         if(is_file($exe))
-            unlink($exe);
+         if($retval > 0) {
+                     $this->test_return(L_ERROR,"NSIS module <strong>GetVersion</strong> was not found or is not working correctly.");
+         } else {
+                     $this->test_return(L_OK,"NSIS module <strong>GetVersion</strong> was found.");
+         }
+         if(is_file($exe)) {
+                     unlink($exe);
+         }
     }
 
     /**
@@ -461,21 +486,24 @@ 
     private function locales_test() {
                 $locales = shell_exec("locale -a");
                 $allthere = "";
-                foreach (Config::$LANGUAGES as $onelanguage)
-                    if (preg_match("/" . $onelanguage['locale'] . "/", $locales) == 0)
+                foreach (Config::$LANGUAGES as $onelanguage) {
+                                    if (preg_match("/" . $onelanguage['locale'] . "/", $locales) == 0)
                         $allthere .= $onelanguage['locale'] . " ";
+                }
 
-                if ($allthere == "")
-                    $this->test_return(L_OK,"All of your configured locales are available on your system.");
-                else
-                    $this->test_return(L_WARN,"Some of your configured locales (<strong>$allthere</strong>) are not installed and will not be displayed correctly!");
+                if ($allthere == "") {
+                                    $this->test_return(L_OK,"All of your configured locales are available on your system.");
+                } else {
+                                    $this->test_return(L_WARN,"Some of your configured locales (<strong>$allthere</strong>) are not installed and will not be displayed correctly!");
+                }
     }
 
     private function check_config_default($type,$key,$value) {
-                if (empty(Config::$type[$key]))
-                    $missingvalues .="type/webcert_OCSP ";
-                elseif (Config::$type['webcert_OCSP'] == $value)
-                    $defaultvalues .="type/$key ";
+                if (empty(Config::$type[$key])) {
+                                    $missingvalues .="type/webcert_OCSP ";
+                } elseif (Config::$type['webcert_OCSP'] == $value) {
+                                    $defaultvalues .="type/$key ";
+                }
     }
 
 
@@ -485,32 +513,44 @@ 
     private function defaults_test() {
                 $defaultvalues = "";
                 $missingvalues = "";
-                if (Config::$APPEARANCE['from-mail'] == "cat-invite@your-cat-installation.example")
-                    $defaultvalues .="APPEARANCE/from-mail ";
-                if (Config::$APPEARANCE['support-contact']['url'] == "cat-support@our-cat-installation.example?body=Only%20English%20language%20please!")
-                    $defaultvalues .="APPEARANCE/support-contact/url ";
-                if (Config::$APPEARANCE['support-contact']['display'] == "cat-support@our-cat-installation.example")
-                    $defaultvalues .="APPEARANCE/support-contact/display ";
-                if (Config::$APPEARANCE['support-contact']['developer-mail'] == "cat-develop@our-cat-installation.example")
-                    $defaultvalues .="APPEARANCE/support-contact/mail ";
-                if (Config::$APPEARANCE['abuse-mail'] == "my-abuse-contact@your-cat-installation.example")
-                    $defaultvalues .="APPEARANCE/abuse-mail ";
-                if (Config::$APPEARANCE['MOTD'] == "Release Candidate. All bugs to be shot on sight!")
-                    $defaultvalues .="APPEARANCE/MOTD ";
-                if (Config::$APPEARANCE['webcert_CRLDP'] == ['list', 'of', 'CRL', 'pointers'])
-                    $defaultvalues .="APPEARANCE/webcert_CRLDP ";
-                if (empty(Config::$APPEARANCE['webcert_OCSP']))
-                    $missingvalues .="APPEARANCE/webcert_OCSP ";
-                elseif (Config::$APPEARANCE['webcert_OCSP'] == ['list', 'of', 'OCSP', 'pointers'])
-                    $defaultvalues .="APPEARANCE/webcert_OCSP ";
-                if (isset(Config::$RADIUSTESTS['UDP-hosts'][0]) && Config::$RADIUSTESTS['UDP-hosts'][0]['ip'] == "192.0.2.1")
-                    $defaultvalues .="RADIUSTESTS/UDP-hosts ";
-                if (Config::$DB['INST']['host'] == "db.host.example")
-                    $defaultvalues .="DB/INST ";
-                if (Config::$DB['INST']['host'] == "db.host.example")
-                    $defaultvalues .="DB/USER ";
-                if(!empty(Config::$DB['EXTERNAL']) && Config::$DB['EXTERNAL']['host'] == "customerdb.otherhost.example")
-                    $defaultvalues .="DB/EXTERNAL ";
+                if (Config::$APPEARANCE['from-mail'] == "cat-invite@your-cat-installation.example") {
+                                    $defaultvalues .="APPEARANCE/from-mail ";
+                }
+                if (Config::$APPEARANCE['support-contact']['url'] == "cat-support@our-cat-installation.example?body=Only%20English%20language%20please!") {
+                                    $defaultvalues .="APPEARANCE/support-contact/url ";
+                }
+                if (Config::$APPEARANCE['support-contact']['display'] == "cat-support@our-cat-installation.example") {
+                                    $defaultvalues .="APPEARANCE/support-contact/display ";
+                }
+                if (Config::$APPEARANCE['support-contact']['developer-mail'] == "cat-develop@our-cat-installation.example") {
+                                    $defaultvalues .="APPEARANCE/support-contact/mail ";
+                }
+                if (Config::$APPEARANCE['abuse-mail'] == "my-abuse-contact@your-cat-installation.example") {
+                                    $defaultvalues .="APPEARANCE/abuse-mail ";
+                }
+                if (Config::$APPEARANCE['MOTD'] == "Release Candidate. All bugs to be shot on sight!") {
+                                    $defaultvalues .="APPEARANCE/MOTD ";
+                }
+                if (Config::$APPEARANCE['webcert_CRLDP'] == ['list', 'of', 'CRL', 'pointers']) {
+                                    $defaultvalues .="APPEARANCE/webcert_CRLDP ";
+                }
+                if (empty(Config::$APPEARANCE['webcert_OCSP'])) {
+                                    $missingvalues .="APPEARANCE/webcert_OCSP ";
+                } elseif (Config::$APPEARANCE['webcert_OCSP'] == ['list', 'of', 'OCSP', 'pointers']) {
+                                    $defaultvalues .="APPEARANCE/webcert_OCSP ";
+                }
+                if (isset(Config::$RADIUSTESTS['UDP-hosts'][0]) && Config::$RADIUSTESTS['UDP-hosts'][0]['ip'] == "192.0.2.1") {
+                                    $defaultvalues .="RADIUSTESTS/UDP-hosts ";
+                }
+                if (Config::$DB['INST']['host'] == "db.host.example") {
+                                    $defaultvalues .="DB/INST ";
+                }
+                if (Config::$DB['INST']['host'] == "db.host.example") {
+                                    $defaultvalues .="DB/USER ";
+                }
+                if(!empty(Config::$DB['EXTERNAL']) && Config::$DB['EXTERNAL']['host'] == "customerdb.otherhost.example") {
+                                    $defaultvalues .="DB/EXTERNAL ";
+                }
                 $files = [];
                 foreach (Config::$RADIUSTESTS['TLS-clientcerts'] as $cadata) {
                     foreach ($cadata['certificates'] as $cert_files) {
@@ -521,15 +561,17 @@ 
 
                 foreach ($files as $file) {
                     $handle = fopen(CAT::$root . "/config/cli-certs/" . $file, 'r');
-                    if (!$handle)
-                        $defaultvalues .="CERTIFICATE/$file ";
-                    else
-                        fclose($handle);
+                    if (!$handle) {
+                                            $defaultvalues .="CERTIFICATE/$file ";
+                    } else {
+                                            fclose($handle);
+                    }
+                }
+                if ($defaultvalues != "") {
+                                    $this->test_return(L_WARN,"Your configuration in config/config.php contains unchanged default values or links to inexistent files: <strong>$defaultvalues</strong>!");
+                } else {
+                                    $this->test_return(L_OK,"Your configuration does not contain any unchanged defaults, which is a good sign.");
                 }
-                if ($defaultvalues != "")
-                    $this->test_return(L_WARN,"Your configuration in config/config.php contains unchanged default values or links to inexistent files: <strong>$defaultvalues</strong>!");
-                else
-                    $this->test_return(L_OK,"Your configuration does not contain any unchanged defaults, which is a good sign.");
     }
 
    /**
@@ -542,10 +584,11 @@ 
            $this->test_return(L_ERROR,"Connection to the  $DB database failed");
         } else {
            $r = mysqli_query($db,'select * from profile_option_dict');
-           if($r->num_rows == $this->profile_option_ct)
-              $this->test_return(L_OK,"The $DB database appears to be OK.");
-           else
-              $this->test_return(L_ERROR,"The $DB database is reacheable but probably not updated to this version of CAT.");
+           if($r->num_rows == $this->profile_option_ct) {
+                         $this->test_return(L_OK,"The $DB database appears to be OK.");
+           } else {
+                         $this->test_return(L_ERROR,"The $DB database is reacheable but probably not updated to this version of CAT.");
+           }
         }
         $DB = 'USER';
         $db = mysqli_connect(Config::$DB[$DB]['host'], Config::$DB[$DB]['user'], Config::$DB[$DB]['pass'], Config::$DB[$DB]['db']);
@@ -553,10 +596,11 @@ 
            $this->test_return(L_ERROR,"Connection to the  $DB database failed");
         } else {
            $r = mysqli_query($db,'desc view_admin');
-           if($r->num_rows == $this->view_admin_ct)
-              $this->test_return(L_OK,"The $DB database appears to be OK.");
-           else
-              $this->test_return(L_ERROR,"The $DB is reacheable but there is something wrong with the schema");
+           if($r->num_rows == $this->view_admin_ct) {
+                         $this->test_return(L_OK,"The $DB database appears to be OK.");
+           } else {
+                         $this->test_return(L_ERROR,"The $DB is reacheable but there is something wrong with the schema");
+           }
         }
         $DB = 'EXTERNAL';
         if(! empty(Config::$DB[$DB])) {
@@ -565,10 +609,11 @@ 
            $this->test_return(L_ERROR,"Connection to the  $DB database failed");
         } else {
            $r = mysqli_query($db,'desc view_admin');
-           if($r->num_rows == $this->view_admin_ct)
-              $this->test_return(L_OK,"The $DB database appears to be OK.");
-           else
-              $this->test_return(L_ERROR,"The $DB is reacheable but there is something wrong with the schema");
+           if($r->num_rows == $this->view_admin_ct) {
+                         $this->test_return(L_OK,"The $DB database appears to be OK.");
+           } else {
+                         $this->test_return(L_ERROR,"The $DB is reacheable but there is something wrong with the schema");
+           }
         }
         }
    }
@@ -578,13 +623,15 @@ 
      * test devices.php for the no_cache option
      */
    private function device_cache_test() {
-       if((! empty(Devices::$Options['no_cache'])) && Devices::$Options['no_cache'])
-          $global_no_cache = 1;
-       else
-          $global_no_cache = 0;
+       if((! empty(Devices::$Options['no_cache'])) && Devices::$Options['no_cache']) {
+                 $global_no_cache = 1;
+       } else {
+                 $global_no_cache = 0;
+       }
 
-       if($global_no_cache == 1)
-          $this->test_return(L_WARN,"Devices no_cache global option is set, this is not a good idea in a production setting\n");
+       if($global_no_cache == 1) {
+                 $this->test_return(L_WARN,"Devices no_cache global option is set, this is not a good idea in a production setting\n");
+       }
        $Devs = Devices::listDevices();
        $no_cache_dev = '';
        $no_cache_dev_count = 0;
@@ -605,10 +652,12 @@ 
        }
 
 
-       if($no_cache_dev_count > 1 ) 
-          $this->test_return(L_WARN,"The following devices will not be cached: $no_cache_dev");
-       if($no_cache_dev_count == 1 ) 
-          $this->test_return(L_WARN,"The following device will not be cached: $no_cache_dev");
+       if($no_cache_dev_count > 1 ) {
+                 $this->test_return(L_WARN,"The following devices will not be cached: $no_cache_dev");
+       }
+       if($no_cache_dev_count == 1 ) {
+                 $this->test_return(L_WARN,"The following device will not be cached: $no_cache_dev");
+       }
 
    }
 
@@ -637,10 +686,11 @@ 
       $mail->Subject = "testing CAT configuration mail";
       $mail->Body = "Testing CAT mailing\n";
       $sent = $mail->send();
-      if($sent)
-          $this->test_return(L_OK,"mailer settings appear to be working, check ".Config::$APPEARANCE['abuse-mail']." mailbox if the message was receiced.");
-      else
-          $this->test_return(L_ERROR,"mailer settings failed, check the Config::MAILSETTINGS");
+      if($sent) {
+                $this->test_return(L_OK,"mailer settings appear to be working, check ".Config::$APPEARANCE['abuse-mail']." mailbox if the message was receiced.");
+      } else {
+                $this->test_return(L_ERROR,"mailer settings failed, check the Config::MAILSETTINGS");
+      }
 
    }
 

core/UserAPI.php

Doc Comments -2 removed lines

@@ -260,7 +260,6 @@ 
 /**
  * Return the list of IdPs in a given country
  *
- * @param int $idp_id the IdP identifier
  * @return string JSON encoded data
  */
 
@@ -301,7 +300,6 @@ 
 /**
  * Return the list of IdPs in a given country ordered with respect to the user location
  *
- * @param int $idp_id the IdP identifier
  * @return string JSON encoded data
  */
 

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

devices/chromebook/chromebook.php

Doc Comments -3 removed lines

@@ -78,9 +78,6 @@
      * It is CRUTCIAL that the constructor sets $this->supportedEapMethods to an array of methods
      * available for the particular device.
      * {@source}
-     * @param string $device a pointer to a device module, which must
-     * be an index of one of the devices defined in the {@link Devices}
-     * array in {@link devices.php}.
      * @final not to be redefined
      */
     final public function __construct() {

Braces +15 added lines, -10 removed lines

@@ -108,8 +108,9 @@ 
         $outerId = 0;
         if (isset($this->attributes['internal:use_anon_outer']) && $this->attributes['internal:use_anon_outer'][0] == "1" && isset($this->attributes['internal:realm'])) {
             $outerId = "@" . $this->attributes['internal:realm'][0];
-            if (isset($this->attributes['internal:anon_local_value']))
-                $outerId = $this->attributes['internal:anon_local_value'][0] . $outerId;
+            if (isset($this->attributes['internal:anon_local_value'])) {
+                            $outerId = $this->attributes['internal:anon_local_value'][0] . $outerId;
+            }
         }
         
         // define networks
@@ -117,26 +118,30 @@ 
             $networkUuid = uuid($prefix, $ssid);
             $eapPrettyprint = EAP::eapDisplayName($this->selected_eap);
             // ONC has its own enums, and guess what, they don't always match
-            if ($eapPrettyprint["OUTER"] == "PEAP" && $eapPrettyprint["INNER"] == "MSCHAPV2")
-                // the dictionary entry EAP-MSCHAPv2 does not work. Setting MSCHAPv2 does. (ChromeOS 50)
+            if ($eapPrettyprint["OUTER"] == "PEAP" && $eapPrettyprint["INNER"] == "MSCHAPV2") {
+                            // the dictionary entry EAP-MSCHAPv2 does not work. Setting MSCHAPv2 does. (ChromeOS 50)
                 $eapPrettyprint["INNER"] = "MSCHAPv2";
+            }
             if ($eapPrettyprint["OUTER"] == "TTLS" && $eapPrettyprint["INNER"] == "MSCHAPV2") {
                 $eapPrettyprint["OUTER"] = "EAP-TTLS";
                 $eapPrettyprint["INNER"] = "MSCHAPv2";
             }
-            if ($eapPrettyprint["OUTER"] == "TLS")
-                $eapPrettyprint["OUTER"] = "EAP-TLS";
+            if ($eapPrettyprint["OUTER"] == "TLS") {
+                            $eapPrettyprint["OUTER"] = "EAP-TLS";
+            }
             // define EAP properties
 
             $eaparray = array("Outer" => $eapPrettyprint["OUTER"]);
-            if ($eapPrettyprint["INNER"] == "MSCHAPv2")
-                $eaparray["Inner"] = $eapPrettyprint["INNER"];
+            if ($eapPrettyprint["INNER"] == "MSCHAPv2") {
+                            $eaparray["Inner"] = $eapPrettyprint["INNER"];
+            }
             $eaparray["SaveCredentials"] = true;
             $eaparray["ServerCARefs"] = $caRefs; // maybe takes just one CA?
             $eaparray["UseSystemCAs"] = false;
                     
-            if ($outerId)
-                $eaparray["AnonymousIdentity"] = "$outerId";
+            if ($outerId) {
+                            $eaparray["AnonymousIdentity"] = "$outerId";
+            }
             
             $jsonArray["NetworkConfigurations"][] = [
                 "GUID" => $networkUuid,

devices/ms/W8.php

Doc Comments +3 added lines

@@ -308,6 +308,9 @@
 
 /**
  * produce PEAP, TLS and TTLS configuration files for Windows 8
+ * @param string $auth
+ * @param string $encryption
+ * @param integer $i
  */
   private function writeWLANprofile($wlan_profile_name,$ssid,$auth,$encryption,$eap_config,$i) {
 $profile_file_contents = '<?xml version="1.0"?>

Braces +63 added lines, -42 removed lines

@@ -46,10 +46,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)';
+         }
      }
 
 
@@ -76,11 +78,13 @@ 
     
     $this->writeProfilesNSH($WindowsProfile, $CA_files,$set_wired);
     $this->writeAdditionalDeletes($delProfiles);
-    if(isset($additional_deletes) && count($additional_deletes))
-       $this->writeAdditionalDeletes($additional_deletes);
+    if(isset($additional_deletes) && count($additional_deletes)) {
+           $this->writeAdditionalDeletes($additional_deletes);
+    }
     $this->copyFiles($this->selected_eap);
-    if(isset($this->attributes['internal:logo_file']))
-       $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); 
@@ -97,13 +101,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>";
        }
@@ -111,9 +117,9 @@ 
     $out .= "<p>";
     }
 
-if($this->eap == EAP::$TLS)
+if($this->eap == EAP::$TLS) {
    $out .= _("In order to connect to the network you will need an a personal certificate in the form of a p12 file. You should obtain this certificate from your home institution. Consult the support page to find out how this certificate can be obtained. Such certificate files are password protected. You should have both the file and the password available during the installation process.");
-else {
+} else {
    $out .= _("In order to connect to the network you will need an account from your home institution. You should consult the support page to find out how this account can be obtained. It is very likely that your account is already activated.");
    $out .= "<p>";
    $out .= _("When you are connecting to the network for the first time, Windows will pop up a login box, where you should enter your user name and password. This information will be saved so that you will reconnect to the network automatically each time you are in the range.");
@@ -122,8 +128,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>";
             }
@@ -176,26 +183,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';
+}
 $profile_file_contents .= '<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</AuthorId>
 </EapMethod>
 ';
@@ -207,10 +217,11 @@ 
 <DisableUserPromptForServerValidation>true</DisableUserPromptForServerValidation>
 <ServerNames>'.$servers.'</ServerNames>';
 if($ca_array) {
-foreach ($ca_array as $CA)
+foreach ($ca_array as $CA) {
     if($CA['root'])
         $w8_ext .= "<TrustedRootCA>".$CA['sha1']."</TrustedRootCA>\n";
 }
+}
 $w8_ext .= '</ServerValidation>
 <FastReconnect>true</FastReconnect> 
 <InnerEapOptional>false</InnerEapOptional> 
@@ -228,12 +239,13 @@ 
 <IdentityPrivacy xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV2">
 <EnableIdentityPrivacy>true</EnableIdentityPrivacy>
 ';
-if(isset($outer_user) && $outer_user) 
-$w8_ext .='<AnonymousUserName>'.$outer_user.'</AnonymousUserName>
+if(isset($outer_user) && $outer_user) {
+    $w8_ext .='<AnonymousUserName>'.$outer_user.'</AnonymousUserName>
 ';
-else
-$w8_ext .='<AnonymousUserName/>
+} else {
+    $w8_ext .='<AnonymousUserName/>
 ';
+}
 $w8_ext .='</IdentityPrivacy>
 </PeapExtensions>
 ';
@@ -251,10 +263,11 @@ 
 <ServerValidation>
 <ServerNames>'.$servers.'</ServerNames> ';
 if($ca_array) {
-foreach ($ca_array as $CA)
+foreach ($ca_array as $CA) {
     if($CA['root'])
         $w8_ext .= "<TrustedRootCAHash>".chunk_split($CA['sha1'],2,' ')."</TrustedRootCAHash>\n";
 }
+}
 $w8_ext .='<DisablePrompt>true</DisablePrompt> 
 </ServerValidation>
 <Phase2Authentication>
@@ -274,13 +287,14 @@ 
 if($use_anon == 1) {
   $w8_ext .= '<IdentityPrivacy>true</IdentityPrivacy> 
 ';
-  if(isset($outer_id) && $outer_id) 
-    $w8_ext .='<AnonymousIdentity>'.$outer_id.'</AnonymousIdentity>
+  if(isset($outer_id) && $outer_id) {
+      $w8_ext .='<AnonymousIdentity>'.$outer_id.'</AnonymousIdentity>
 ';
-  else
-    $w8_ext .='<AnonymousIdentity/>
+  } else {
+      $w8_ext .='<AnonymousIdentity/>
 ';
-} else {
+  }
+  } else {
   $w8_ext .= '<IdentityPrivacy>false</IdentityPrivacy>
 ';
 }
@@ -330,12 +344,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>
@@ -348,8 +363,9 @@ 
 </WLANProfile>
 ';
 
-if(! is_dir('w8'))
+if(! is_dir('w8')) {
   mkdir('w8');
+}
 $xml_f_name = "w8/wlan_prof-$i.xml";
 $xml_f = fopen($xml_f_name,'w');
 fwrite($xml_f,$profile_file_contents. $eap_config['w8']. $closing) ;
@@ -375,8 +391,9 @@ 
 </LANProfile>
 ';
 
-if(! is_dir('w8'))
+if(! is_dir('w8')) {
   mkdir('w8');
+}
 $xml_f_name = "w8/lan_prof.xml";
 $xml_f = fopen($xml_f_name,'w');
 fwrite($xml_f,$profile_file_contents. $eap_config['w8']. $closing) ;
@@ -389,8 +406,9 @@ 
 private function writeMainNSH($eap,$attr) {
 debug(4,"writeMainNSH"); debug(4,$attr);
 $fcontents = "!define W8\n";
-if(Config::$NSIS_VERSION >= 3)
+if(Config::$NSIS_VERSION >= 3) {
     $fcontents .=  "Unicode true\n";
+}
 
 
 $EAP_OPTS = [
@@ -410,8 +428,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).'"
@@ -434,9 +453,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);
@@ -448,8 +468,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);