GEANT / CAT

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

Indentation +301 added lines, -301 removed lines

@@ -46,13 +46,13 @@ 
 
 /* List all required NSIS modules below */
     private $NSIS_Modules = [
-             "nsArray.nsh",
-             "FileFunc.nsh",
-             "LogicLib.nsh",
-             "WordFunc.nsh",
-             "FileFunc.nsh",
-             "x64.nsh",
-         ];
+                "nsArray.nsh",
+                "FileFunc.nsh",
+                "LogicLib.nsh",
+                "WordFunc.nsh",
+                "FileFunc.nsh",
+                "x64.nsh",
+            ];
 
 /* set $profile_option_ct to the number of rows returned by "SELECT * FROM profile_option_dict" */
     private $profile_option_ct = 28;
@@ -65,9 +65,9 @@ 
     public $name;
 
     public function __construct() {
-       parent::__construct();
-       $this->test_result = [];
-       $this->test_result['global'] = 0;
+        parent::__construct();
+        $this->test_result = [];
+        $this->test_result['global'] = 0;
     }
 
     /**
@@ -75,15 +75,15 @@ 
      * @param string $test the test name
      */
     public function test($test) {
-       $this->out[$test] =[];
-       $this->name = $test;
-       $m_name = $test.'_test';
-       $this->test_result[$test] = 0;
-       if(! method_exists($this,$m_name)) {
-           $this->test_return($test,L_ERROR,"Configuration error, no test configured for <strong>$test</strong>.");
-           return;
-       }
-       $this->$m_name();
+        $this->out[$test] =[];
+        $this->name = $test;
+        $m_name = $test.'_test';
+        $this->test_result[$test] = 0;
+        if(! method_exists($this,$m_name)) {
+            $this->test_return($test,L_ERROR,"Configuration error, no test configured for <strong>$test</strong>.");
+            return;
+        }
+        $this->$m_name();
     }
 
     /**
@@ -96,27 +96,27 @@ 
      * and returned a success.
      */
     public function run_tests($Tests) {
-       foreach ($Tests as $t) {
-         if(preg_match('/(.+)=>(.+)/',$t,$m)) {
+        foreach ($Tests as $t) {
+            if(preg_match('/(.+)=>(.+)/',$t,$m)) {
             $tst = $m[1];
             $subtst=$m[2];
             if($this->test_result[$tst]  < L_ERROR)
-               $this->test($subtst);
-         }
-         else
+                $this->test($subtst);
+            }
+            else
             $this->test($t);
-       }
+        }
     }
 
     public function get_test_names() {
-       $T = get_class_methods($this);
-       $out = [];
-       foreach($T as $t) {
-         if(preg_match('/^(.*)_test$/',$t,$m)) {
+        $T = get_class_methods($this);
+        $out = [];
+        foreach($T as $t) {
+            if(preg_match('/^(.*)_test$/',$t,$m)) {
             $out[] = $m[1];
-         } 
-       }
-       return $out;
+            } 
+        }
+        return $out;
     }
 
     /**
@@ -142,84 +142,84 @@ 
         $the_path = "";
         $exec_is = "UNDEFINED";
         if (!empty(Config::$PATHS[$s])) {
-             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";
-         } 
+                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";
+            } 
         return(['exec'=>$the_path,'exec_is'=>$exec_is]);
     }
 
     /**
-      *  Test for php version
-      */
+     *  Test for php version
+     */
     private function php_test() {
-         if (version_compare(phpversion(), $this->php_needversion, '>='))
+            if (version_compare(phpversion(), $this->php_needversion, '>='))
             $this->test_return(L_OK,"<strong>PHP</strong> is sufficiently recent. You are running " . phpversion() . ".");
-         else
+            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
-      */
+     * 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
-      */
+     * 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
-      */
+     * 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!");
     }
 
     /**
-      * test if eapol_test is availabe and reacent enough
-      */
+     * test if eapol_test is availabe and reacent enough
+     */
     private function eapol_test_test() {
-         exec(Config::$PATHS['eapol_test'], $out, $retval);
-         if($retval == 255 ) {
+            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!");
-         }
-         else
+                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!");
     }
 
     /**
-      * test if logdir exists and is writable
-      */
+     * 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
-      */
+     * test for required PHP modules
+     */
     private function phpModules_test() {
         if (function_exists('idn_to_ascii'))
             $this->test_return(L_OK,"PHP can handle internationalisation.");
@@ -229,7 +229,7 @@ 
         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!");
+            $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.");
@@ -271,193 +271,193 @@ 
      */
 
     private function geoip_test() {
-       $host_4 = '145.0.2.50';
-       $host_6 = '2001:610:188:444::50';
-       switch (Config::$GEOIP['version']) {
-           case 0:
+        $host_4 = '145.0.2.50';
+        $host_6 = '2001:610:188:444::50';
+        switch (Config::$GEOIP['version']) {
+            case 0:
               $this->test_return(L_REMARK,"As set in the config, no geolocation service will be used");
-              break;
-           case 1:
+                break;
+            case 1:
               if (!function_exists('geoip_record_by_name')) {
-                  $this->test_return(L_ERROR,"PHP extension <strong>GeoIP</strong> (legacy) not found! Get it from your distribution or <a href='http://pecl.php.net/package/geoip'>here</a> or better install GeoIP2 from <a href='https://github.com/maxmind/GeoIP2-php'>here</a>.");
-                  return;
-              }
-              $record = geoip_record_by_name($host_4);
-              if(! $record) {
-                 $this->test_return(L_ERROR,"PHP extension <strong>GeoIP</strong> (legacy) found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
-                 return;
-              }
-              if($record['city'] != 'Utrecht') {
-                 $this->test_return(L_ERROR,"PHP extension <strong>GeoIP</strong> (legacy) found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
-                 return;
-              }
-              $this->test_return(L_REMARK,"PHP extension <strong>GeoIP</strong> (legacy) is installed and working. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly. We stronly advise to replace the legacy GeoIP with GeoIP2 from <a href='https://github.com/maxmind/GeoIP2-php'>here</a>.");
-              break;
-           case 2:
+                    $this->test_return(L_ERROR,"PHP extension <strong>GeoIP</strong> (legacy) not found! Get it from your distribution or <a href='http://pecl.php.net/package/geoip'>here</a> or better install GeoIP2 from <a href='https://github.com/maxmind/GeoIP2-php'>here</a>.");
+                    return;
+                }
+                $record = geoip_record_by_name($host_4);
+                if(! $record) {
+                    $this->test_return(L_ERROR,"PHP extension <strong>GeoIP</strong> (legacy) found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+                    return;
+                }
+                if($record['city'] != 'Utrecht') {
+                    $this->test_return(L_ERROR,"PHP extension <strong>GeoIP</strong> (legacy) found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+                    return;
+                }
+                $this->test_return(L_REMARK,"PHP extension <strong>GeoIP</strong> (legacy) is installed and working. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly. We stronly advise to replace the legacy GeoIP with GeoIP2 from <a href='https://github.com/maxmind/GeoIP2-php'>here</a>.");
+                break;
+            case 2:
               if(! is_file(Config::$GEOIP['geoip2-path-to-autoloader'])) {
-                 $this->test_return(L_ERROR,"PHP extension <strong>GeoIP2</strong> not found! Get it from <a href='https://github.com/maxmind/GeoIP2-php'>here</a>.");
-                 return;
-              }
-              if(! is_file(Config::$GEOIP['geoip2-path-to-db'])) {
-                 $this->test_return(L_ERROR,"<strong>GeoIP2 database</strong> not found! See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
-                 return;
-              }
-              require_once Config::$GEOIP['geoip2-path-to-autoloader'];
-              $reader = new Reader(Config::$GEOIP['geoip2-path-to-db']);
-              try {
-                 $record = $reader->city($host_4);
-              } catch (Exception $e) {
-                 $this->test_return(L_ERROR,"PHP extension <strong>GeoIP2</strong> found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
-                 return;
-              }
-              if( $record->city->name != 'Utrecht') {
-                 $this->test_return(L_ERROR,"PHP extension <strong>GeoIP2</strong> found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
-                 return;
-              }
-              try {
-                 $record = $reader->city($host_6);
-              } catch (Exception $e) {
-                 $this->test_return(L_ERROR,"PHP extension <strong>GeoIP2</strong> found but not working properly with IPv6, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
-                 return;
-              }
-              if( $record->city->name != 'Utrecht') {
-                 $this->test_return(L_ERROR,"PHP extension <strong>GeoIP2</strong> found but not working properly with IPv6, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
-                 return;
-              }
-              $this->test_return(L_OK,"PHP extension <strong>GeoIP2</strong> is installed and working. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
-              break;
-           default:
+                    $this->test_return(L_ERROR,"PHP extension <strong>GeoIP2</strong> not found! Get it from <a href='https://github.com/maxmind/GeoIP2-php'>here</a>.");
+                    return;
+                }
+                if(! is_file(Config::$GEOIP['geoip2-path-to-db'])) {
+                    $this->test_return(L_ERROR,"<strong>GeoIP2 database</strong> not found! See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+                    return;
+                }
+                require_once Config::$GEOIP['geoip2-path-to-autoloader'];
+                $reader = new Reader(Config::$GEOIP['geoip2-path-to-db']);
+                try {
+                    $record = $reader->city($host_4);
+                } catch (Exception $e) {
+                    $this->test_return(L_ERROR,"PHP extension <strong>GeoIP2</strong> found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+                    return;
+                }
+                if( $record->city->name != 'Utrecht') {
+                    $this->test_return(L_ERROR,"PHP extension <strong>GeoIP2</strong> found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+                    return;
+                }
+                try {
+                    $record = $reader->city($host_6);
+                } catch (Exception $e) {
+                    $this->test_return(L_ERROR,"PHP extension <strong>GeoIP2</strong> found but not working properly with IPv6, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+                    return;
+                }
+                if( $record->city->name != 'Utrecht') {
+                    $this->test_return(L_ERROR,"PHP extension <strong>GeoIP2</strong> found but not working properly with IPv6, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+                    return;
+                }
+                $this->test_return(L_OK,"PHP extension <strong>GeoIP2</strong> is installed and working. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+                break;
+            default:
               $this->test_return(L_ERROR,'Check Config::$GEOIP[\'version\'], it must be set to either 1 or 2');
-              break;
-       }
+                break;
+        }
     }
 
     /**
-      * test if openssl is available
-      */
+     * test if openssl is available
+     */
     private function openssl_test() {
-         $A = $this->get_exec_path('openssl');    
-         if($A['exec'] != "") {
-             $t = exec($A['exec'] . ' version');
-             if($A['exec_is'] == "EXPLICIT")
+            $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
+                else
                 $this->test_return(L_WARN,"<strong>$t</strong> was found, but is not configured with an absolute path in your config.");
-         } else
+            } else
             $this->test_return(L_ERROR,"<strong>openssl</strong> was not found on your system!");
     }
 
     /**
-      * test if makensis is available
-      */
+     * test if makensis is available
+     */
     private function makensis_test() {
-         if(! is_numeric(Config::$NSIS_VERSION)) {
+            if(! is_numeric(Config::$NSIS_VERSION)) {
             $this->test_return(L_ERROR,"NSIS_VERSION needs to be numeric!");
             return;
-         }
-         if(Config::$NSIS_VERSION < 2) {
+            }
+            if(Config::$NSIS_VERSION < 2) {
             $this->test_return(L_ERROR,"NSIS_VERSION needs to be at least 2!");
             return;
-         }
-         $A = $this->get_exec_path('makensis');    
-         if($A['exec'] != "") {
-             $t = exec($A['exec'] . ' -VERSION');
-             if($A['exec_is'] == "EXPLICIT") 
+            }
+            $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
+                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)
+                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)
+                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
+            } else
             $this->test_return(L_ERROR,"<strong>makensis</strong> was not found on your system!");
     }
 
     /**
-      * test if all required NSIS modules are available
-      */
+     * test if all required NSIS modules are available
+     */
     private function NSISmodules_test() {
-         $tmp_dir = createTemporaryDirectory('installer',0)['dir'];
-         if(!chdir($tmp_dir)) {
-           debug(2, "Cannot chdir to $tmp_dir\n");
-           $this->test_return(L_ERROR,"NSIS modules test - problem with temporary directory permissions, cannot continue");
-           return;
-         }
-         $exe= 'tt.exe';
-         $NSIS_Module_status = [];
-         foreach ($this->NSIS_Modules as $module) {
+            $tmp_dir = createTemporaryDirectory('installer',0)['dir'];
+            if(!chdir($tmp_dir)) {
+            debug(2, "Cannot chdir to $tmp_dir\n");
+            $this->test_return(L_ERROR,"NSIS modules test - problem with temporary directory permissions, cannot continue");
+            return;
+            }
+            $exe= 'tt.exe';
+            $NSIS_Module_status = [];
+            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;
+                $NSIS_Module_status[$module] = 0;
             else
-               $NSIS_Module_status[$module] = 1;
-         }
-         if(is_file($exe))
+                $NSIS_Module_status[$module] = 1;
+            }
+            if(is_file($exe))
             unlink($exe);
-         foreach ($NSIS_Module_status as $module => $status) {
+            foreach ($NSIS_Module_status as $module => $status) {
             if($status == 1)
-               $this->test_return(L_OK,"NSIS module <strong>$module</strong> was found.");
+                $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.");
-         }
+                $this->test_return(L_ERROR,"NSIS module <strong>$module</strong> was not found or is not working correctly.");
+            }
     }
     private function NSIS_GetVersion_test() {
-         $tmp_dir = createTemporaryDirectory('installer',0)['dir'];
-         if(!chdir($tmp_dir)) {
-           debug(2, "Cannot chdir to $tmp_dir\n");
-           $this->test_return(L_ERROR,"NSIS module <strong>GetVersion</strong> - problem with temporary directory permissions, cannot continue");
-           return;
-         }
-         $exe= 'tt.exe';
-         exec(Config::$PATHS['makensis']." -V1 '-XOutFile $exe' '-XSection X' '-XGetVersion::WindowsName' '-XSectionEnd'", $out, $retval);
-         if($retval > 0)
+            $tmp_dir = createTemporaryDirectory('installer',0)['dir'];
+            if(!chdir($tmp_dir)) {
+            debug(2, "Cannot chdir to $tmp_dir\n");
+            $this->test_return(L_ERROR,"NSIS module <strong>GetVersion</strong> - problem with temporary directory permissions, cannot continue");
+            return;
+            }
+            $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
+            else
             $this->test_return(L_OK,"NSIS module <strong>GetVersion</strong> was found.");
-         if(is_file($exe))
+            if(is_file($exe))
             unlink($exe);
     }
 
     /**
-      * test access to dowloads directories
-      */
+     * test access to dowloads directories
+     */
     private function directories_test() {
-               $Dir = createTemporaryDirectory('installer',0);
-               $dir = $Dir['dir'];
-               $base = $Dir['base'];
-               if($dir) {
-                  $this->test_return(L_OK,"Installer cache directory is writable.");
-                  rrmdir($dir);
-               } else {
-                  $this->test_return(L_ERROR,"Installer cache directory $base does not exist or is not writable!");
-               }
-               $Dir = createTemporaryDirectory('test',0);
-               $dir = $Dir['dir'];
-               $base = $Dir['base'];
-               if($dir) {
-                  $this->test_return(L_OK,"Test directory is writable.");
-                  rrmdir($dir);
-               } else {
-                  $this->test_return(L_ERROR,"Test directory  $base does not exist or is not writable!");
-               }
-               $Dir = createTemporaryDirectory('logo',0);
-               $dir = $Dir['dir'];
-               $base = $Dir['base'];
-               if($dir) {
-                  $this->test_return(L_OK,"Logos cache directory is writable.");
-                  rrmdir($dir);
-               } else {
-                  $this->test_return(L_ERROR,"Logos cache directory  $base does not exist or is not writable!");
-               }
+                $Dir = createTemporaryDirectory('installer',0);
+                $dir = $Dir['dir'];
+                $base = $Dir['base'];
+                if($dir) {
+                    $this->test_return(L_OK,"Installer cache directory is writable.");
+                    rrmdir($dir);
+                } else {
+                    $this->test_return(L_ERROR,"Installer cache directory $base does not exist or is not writable!");
+                }
+                $Dir = createTemporaryDirectory('test',0);
+                $dir = $Dir['dir'];
+                $base = $Dir['base'];
+                if($dir) {
+                    $this->test_return(L_OK,"Test directory is writable.");
+                    rrmdir($dir);
+                } else {
+                    $this->test_return(L_ERROR,"Test directory  $base does not exist or is not writable!");
+                }
+                $Dir = createTemporaryDirectory('logo',0);
+                $dir = $Dir['dir'];
+                $base = $Dir['base'];
+                if($dir) {
+                    $this->test_return(L_OK,"Logos cache directory is writable.");
+                    rrmdir($dir);
+                } else {
+                    $this->test_return(L_ERROR,"Logos cache directory  $base does not exist or is not writable!");
+                }
     }
 
     /**
-      * test if all required locales are enabled
-      */
+     * test if all required locales are enabled
+     */
     private function locales_test() {
                 $locales = shell_exec("locale -a");
                 $allthere = "";
@@ -480,8 +480,8 @@ 
 
 
     /**
-      * test if detalts in the config have been replaced with some real values
-      */
+     * test if detalts in the config have been replaced with some real values
+     */
     private function defaults_test() {
                 $defaultvalues = "";
                 $missingvalues = "";
@@ -532,121 +532,121 @@ 
                     $this->test_return(L_OK,"Your configuration does not contain any unchanged defaults, which is a good sign.");
     }
 
-   /**
+    /**
      * test access to databases
      */
-   private function databases_test() {
+    private function databases_test() {
         $DB = 'INST';
         $db = mysqli_connect(Config::$DB[$DB]['host'], Config::$DB[$DB]['user'], Config::$DB[$DB]['pass'], Config::$DB[$DB]['db']);
         if(! $db) {
-           $this->test_return(L_ERROR,"Connection to the  $DB database failed");
+            $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.");
+            $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.");
         }
         $DB = 'USER';
         $db = mysqli_connect(Config::$DB[$DB]['host'], Config::$DB[$DB]['user'], Config::$DB[$DB]['pass'], Config::$DB[$DB]['db']);
         if(! $db) {
-           $this->test_return(L_ERROR,"Connection to the  $DB database failed");
+            $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");
+            $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");
         }
         $DB = 'EXTERNAL';
         if(! empty(Config::$DB[$DB])) {
         $db = mysqli_connect(Config::$DB[$DB]['host'], Config::$DB[$DB]['user'], Config::$DB[$DB]['pass'], Config::$DB[$DB]['db']);
         if(! $db) {
-           $this->test_return(L_ERROR,"Connection to the  $DB database failed");
+            $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");
+            $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");
         }
         }
-   }
+    }
 
 
-   /**
+    /**
      * 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($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;
-       if($global_no_cache) {
-          foreach ($Devs as $dev=>$D) {
-             if(empty($D['options']['no_cache']) || $D['options']['no_cache'] != 0) {
+    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($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;
+        if($global_no_cache) {
+            foreach ($Devs as $dev=>$D) {
+                if(empty($D['options']['no_cache']) || $D['options']['no_cache'] != 0) {
                 $no_cache_dev .= $dev." ";
                 $no_cache_dev_count++;
-             }
-          }
-       } else {
-          foreach ($Devs as $dev=>$D) {
-             if(!empty($D['options']['no_cache']) && $D['options']['no_cache'] != 0) {
+                }
+            }
+        } else {
+            foreach ($Devs as $dev=>$D) {
+                if(!empty($D['options']['no_cache']) && $D['options']['no_cache'] != 0) {
                 $no_cache_dev .= $dev." ";
                 $no_cache_dev_count++;
-             }
-          }
-       }
+                }
+            }
+        }
 
 
-       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");
 
-   }
+    }
 
-   /**
+    /**
      * test if mailer works
      */
-   private function mailer_test() {
-      if (empty(Config::$APPEARANCE['abuse-mail']) || Config::$APPEARANCE['abuse-mail'] == "my-abuse-contact@your-cat-installation.example") {
-         $this->test_return(L_ERROR,"Your abuse-mail has not been set, cannot continue with mailer tests.");
-         return;
-      }
-      $mail = new PHPMailer();
-      $mail->isSMTP();
-      $mail->Port = 587;
-      $mail->SMTPAuth = true;
-      $mail->SMTPSecure = 'tls';
-      $mail->Host = Config::$MAILSETTINGS['host'];
-      $mail->Username = Config::$MAILSETTINGS['user'];
-      $mail->Password = Config::$MAILSETTINGS['pass'];
-      $mail->WordWrap = 72;
-      $mail->isHTML(FALSE);
-      $mail->CharSet = 'UTF-8';
-      $mail->From = Config::$APPEARANCE['from-mail'];
-      $mail->FromName = Config::$APPEARANCE['productname'] . " Invitation System";
-      $mail->addAddress(Config::$APPEARANCE['abuse-mail']);
-      $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");
-
-   }
+    private function mailer_test() {
+        if (empty(Config::$APPEARANCE['abuse-mail']) || Config::$APPEARANCE['abuse-mail'] == "my-abuse-contact@your-cat-installation.example") {
+            $this->test_return(L_ERROR,"Your abuse-mail has not been set, cannot continue with mailer tests.");
+            return;
+        }
+        $mail = new PHPMailer();
+        $mail->isSMTP();
+        $mail->Port = 587;
+        $mail->SMTPAuth = true;
+        $mail->SMTPSecure = 'tls';
+        $mail->Host = Config::$MAILSETTINGS['host'];
+        $mail->Username = Config::$MAILSETTINGS['user'];
+        $mail->Password = Config::$MAILSETTINGS['pass'];
+        $mail->WordWrap = 72;
+        $mail->isHTML(FALSE);
+        $mail->CharSet = 'UTF-8';
+        $mail->From = Config::$APPEARANCE['from-mail'];
+        $mail->FromName = Config::$APPEARANCE['productname'] . " Invitation System";
+        $mail->addAddress(Config::$APPEARANCE['abuse-mail']);
+        $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");
+
+    }
 
     /**
-      * TODO test if RADIUS connections work
-      */
+     * TODO test if RADIUS connections work
+     */
     private function UDPhosts_test() {
 //        if(empty)
     }

Spacing +168 added lines, -168 removed lines

@@ -75,12 +75,12 @@ 
      * @param string $test the test name
      */
     public function test($test) {
-       $this->out[$test] =[];
+       $this->out[$test] = [];
        $this->name = $test;
-       $m_name = $test.'_test';
+       $m_name = $test . '_test';
        $this->test_result[$test] = 0;
-       if(! method_exists($this,$m_name)) {
-           $this->test_return($test,L_ERROR,"Configuration error, no test configured for <strong>$test</strong>.");
+       if (!method_exists($this, $m_name)) {
+           $this->test_return($test, L_ERROR, "Configuration error, no test configured for <strong>$test</strong>.");
            return;
        }
        $this->$m_name();
@@ -97,10 +97,10 @@ 
      */
     public function run_tests($Tests) {
        foreach ($Tests as $t) {
-         if(preg_match('/(.+)=>(.+)/',$t,$m)) {
+         if (preg_match('/(.+)=>(.+)/', $t, $m)) {
             $tst = $m[1];
-            $subtst=$m[2];
-            if($this->test_result[$tst]  < L_ERROR)
+            $subtst = $m[2];
+            if ($this->test_result[$tst] < L_ERROR)
                $this->test($subtst);
          }
          else
@@ -111,8 +111,8 @@ 
     public function get_test_names() {
        $T = get_class_methods($this);
        $out = [];
-       foreach($T as $t) {
-         if(preg_match('/^(.*)_test$/',$t,$m)) {
+       foreach ($T as $t) {
+         if (preg_match('/^(.*)_test$/', $t, $m)) {
             $out[] = $m[1];
          } 
        }
@@ -132,17 +132,17 @@ 
      */
     public $test_result;
 
-    private function test_return($level,$message) {
+    private function test_return($level, $message) {
         $this->out[$this->name][] = ['level'=>$level, 'message'=>$message];
-        $this->test_result[$this->name] = max($this->test_result[$this->name],$level);
-        $this->test_result['global'] = max($this->test_result['global'],$level);
+        $this->test_result[$this->name] = max($this->test_result[$this->name], $level);
+        $this->test_result['global'] = max($this->test_result['global'], $level);
     }
 
     private function get_exec_path($s) {
         $the_path = "";
         $exec_is = "UNDEFINED";
         if (!empty(Config::$PATHS[$s])) {
-             preg_match('/([^ ]+) ?/',Config::$PATHS[$s],$m);
+             preg_match('/([^ ]+) ?/', Config::$PATHS[$s], $m);
              $exe = $m[1];
              $the_path = exec("which " . Config::$PATHS[$s]);
              if ($the_path == $exe)
@@ -150,7 +150,7 @@ 
              else
                  $exec_is = "IMPLICIT";
          } 
-        return(['exec'=>$the_path,'exec_is'=>$exec_is]);
+        return(['exec'=>$the_path, 'exec_is'=>$exec_is]);
     }
 
     /**
@@ -158,9 +158,9 @@ 
       */
     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() . ".");
+            $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(). ".");
+            $this->test_return(L_ERROR, "<strong>PHP</strong> is too old. We need at least $this->php_needversion, but you only have " . phpversion() . ".");
     }
 
     /**
@@ -168,9 +168,9 @@ 
       */
     private function ssp_test() {
          if (!is_file(CONFIG::$AUTHENTICATION['ssp-path-to-autoloader']))
-             $this->test_return(L_ERROR,"<strong>simpleSAMLphp</strong> not found!");
+             $this->test_return(L_ERROR, "<strong>simpleSAMLphp</strong> not found!");
          else
-             $this->test_return(L_OK,"<strong>simpleSAMLphp</strong> autoloader found.");
+             $this->test_return(L_OK, "<strong>simpleSAMLphp</strong> autoloader found.");
     }
 
     /**
@@ -178,7 +178,7 @@ 
       */
     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'!");
+             $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'!");
     }
 
     /**
@@ -186,9 +186,9 @@ 
       */
     private function zip_test() {
          if (exec("which zip") != "")
-             $this->test_return(L_OK,"<strong>zip</strong> binary found.");
+             $this->test_return(L_OK, "<strong>zip</strong> binary found.");
          else
-             $this->test_return(L_ERROR,"<strong>zip</strong> not found in your \$PATH!");
+             $this->test_return(L_ERROR, "<strong>zip</strong> not found in your \$PATH!");
     }
 
     /**
@@ -196,15 +196,15 @@ 
       */
     private function eapol_test_test() {
          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.");
+         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!");
+                   $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!");
+            $this->test_return(L_ERROR, "<strong>eapol_test</strong> not found!");
     }
 
     /**
@@ -212,9 +212,9 @@ 
       */
     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!");
+             $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.");
+             $this->test_return(L_OK, "Log directory is writable.");
     }
 
     /**
@@ -222,34 +222,34 @@ 
       */
     private function phpModules_test() {
         if (function_exists('idn_to_ascii'))
-            $this->test_return(L_OK,"PHP can handle internationalisation.");
+            $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).");
+            $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.");
+            $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!");
+           $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.");
+            $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!");
+            $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.");
+            $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>.");
+            $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.");
+            $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>.");
+            $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.");
+            $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!");
+            $this->test_return(L_ERROR, "PHP extension <strong>MySQL</strong> not found!");
 /*
         if (function_exists('geoip_record_by_name')) {
            $host = '158.75.1.10';
@@ -275,31 +275,31 @@ 
        $host_6 = '2001:610:188:444::50';
        switch (Config::$GEOIP['version']) {
            case 0:
-              $this->test_return(L_REMARK,"As set in the config, no geolocation service will be used");
+              $this->test_return(L_REMARK, "As set in the config, no geolocation service will be used");
               break;
            case 1:
               if (!function_exists('geoip_record_by_name')) {
-                  $this->test_return(L_ERROR,"PHP extension <strong>GeoIP</strong> (legacy) not found! Get it from your distribution or <a href='http://pecl.php.net/package/geoip'>here</a> or better install GeoIP2 from <a href='https://github.com/maxmind/GeoIP2-php'>here</a>.");
+                  $this->test_return(L_ERROR, "PHP extension <strong>GeoIP</strong> (legacy) not found! Get it from your distribution or <a href='http://pecl.php.net/package/geoip'>here</a> or better install GeoIP2 from <a href='https://github.com/maxmind/GeoIP2-php'>here</a>.");
                   return;
               }
               $record = geoip_record_by_name($host_4);
-              if(! $record) {
-                 $this->test_return(L_ERROR,"PHP extension <strong>GeoIP</strong> (legacy) found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+              if (!$record) {
+                 $this->test_return(L_ERROR, "PHP extension <strong>GeoIP</strong> (legacy) found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
                  return;
               }
-              if($record['city'] != 'Utrecht') {
-                 $this->test_return(L_ERROR,"PHP extension <strong>GeoIP</strong> (legacy) found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+              if ($record['city'] != 'Utrecht') {
+                 $this->test_return(L_ERROR, "PHP extension <strong>GeoIP</strong> (legacy) found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
                  return;
               }
-              $this->test_return(L_REMARK,"PHP extension <strong>GeoIP</strong> (legacy) is installed and working. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly. We stronly advise to replace the legacy GeoIP with GeoIP2 from <a href='https://github.com/maxmind/GeoIP2-php'>here</a>.");
+              $this->test_return(L_REMARK, "PHP extension <strong>GeoIP</strong> (legacy) is installed and working. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly. We stronly advise to replace the legacy GeoIP with GeoIP2 from <a href='https://github.com/maxmind/GeoIP2-php'>here</a>.");
               break;
            case 2:
-              if(! is_file(Config::$GEOIP['geoip2-path-to-autoloader'])) {
-                 $this->test_return(L_ERROR,"PHP extension <strong>GeoIP2</strong> not found! Get it from <a href='https://github.com/maxmind/GeoIP2-php'>here</a>.");
+              if (!is_file(Config::$GEOIP['geoip2-path-to-autoloader'])) {
+                 $this->test_return(L_ERROR, "PHP extension <strong>GeoIP2</strong> not found! Get it from <a href='https://github.com/maxmind/GeoIP2-php'>here</a>.");
                  return;
               }
-              if(! is_file(Config::$GEOIP['geoip2-path-to-db'])) {
-                 $this->test_return(L_ERROR,"<strong>GeoIP2 database</strong> not found! See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+              if (!is_file(Config::$GEOIP['geoip2-path-to-db'])) {
+                 $this->test_return(L_ERROR, "<strong>GeoIP2 database</strong> not found! See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
                  return;
               }
               require_once Config::$GEOIP['geoip2-path-to-autoloader'];
@@ -307,27 +307,27 @@ 
               try {
                  $record = $reader->city($host_4);
               } catch (Exception $e) {
-                 $this->test_return(L_ERROR,"PHP extension <strong>GeoIP2</strong> found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+                 $this->test_return(L_ERROR, "PHP extension <strong>GeoIP2</strong> found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
                  return;
               }
-              if( $record->city->name != 'Utrecht') {
-                 $this->test_return(L_ERROR,"PHP extension <strong>GeoIP2</strong> found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+              if ($record->city->name != 'Utrecht') {
+                 $this->test_return(L_ERROR, "PHP extension <strong>GeoIP2</strong> found but not working properly, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
                  return;
               }
               try {
                  $record = $reader->city($host_6);
               } catch (Exception $e) {
-                 $this->test_return(L_ERROR,"PHP extension <strong>GeoIP2</strong> found but not working properly with IPv6, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+                 $this->test_return(L_ERROR, "PHP extension <strong>GeoIP2</strong> found but not working properly with IPv6, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
                  return;
               }
-              if( $record->city->name != 'Utrecht') {
-                 $this->test_return(L_ERROR,"PHP extension <strong>GeoIP2</strong> found but not working properly with IPv6, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+              if ($record->city->name != 'Utrecht') {
+                 $this->test_return(L_ERROR, "PHP extension <strong>GeoIP2</strong> found but not working properly with IPv6, perhaps you need to download the databases. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
                  return;
               }
-              $this->test_return(L_OK,"PHP extension <strong>GeoIP2</strong> is installed and working. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
+              $this->test_return(L_OK, "PHP extension <strong>GeoIP2</strong> is installed and working. See utils/GeoIP-update.sh in the CAT distribution and use it tu update the GeoIP database regularly.");
               break;
            default:
-              $this->test_return(L_ERROR,'Check Config::$GEOIP[\'version\'], it must be set to either 1 or 2');
+              $this->test_return(L_ERROR, 'Check Config::$GEOIP[\'version\'], it must be set to either 1 or 2');
               break;
        }
     }
@@ -337,88 +337,88 @@ 
       */
     private function openssl_test() {
          $A = $this->get_exec_path('openssl');    
-         if($A['exec'] != "") {
+         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.");
+             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.");
+                $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!");
+            $this->test_return(L_ERROR, "<strong>openssl</strong> was not found on your system!");
     }
 
     /**
       * test if makensis is available
       */
     private function makensis_test() {
-         if(! is_numeric(Config::$NSIS_VERSION)) {
-            $this->test_return(L_ERROR,"NSIS_VERSION needs to be numeric!");
+         if (!is_numeric(Config::$NSIS_VERSION)) {
+            $this->test_return(L_ERROR, "NSIS_VERSION needs to be numeric!");
             return;
          }
-         if(Config::$NSIS_VERSION < 2) {
-            $this->test_return(L_ERROR,"NSIS_VERSION needs to be at least 2!");
+         if (Config::$NSIS_VERSION < 2) {
+            $this->test_return(L_ERROR, "NSIS_VERSION needs to be at least 2!");
             return;
          }
          $A = $this->get_exec_path('makensis');    
-         if($A['exec'] != "") {
+         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.");
+             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']!");
+                $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!");
+            $this->test_return(L_ERROR, "<strong>makensis</strong> was not found on your system!");
     }
 
     /**
       * test if all required NSIS modules are available
       */
     private function NSISmodules_test() {
-         $tmp_dir = createTemporaryDirectory('installer',0)['dir'];
-         if(!chdir($tmp_dir)) {
+         $tmp_dir = createTemporaryDirectory('installer', 0)['dir'];
+         if (!chdir($tmp_dir)) {
            debug(2, "Cannot chdir to $tmp_dir\n");
-           $this->test_return(L_ERROR,"NSIS modules test - problem with temporary directory permissions, cannot continue");
+           $this->test_return(L_ERROR, "NSIS modules test - problem with temporary directory permissions, cannot continue");
            return;
          }
-         $exe= 'tt.exe';
+         $exe = 'tt.exe';
          $NSIS_Module_status = [];
          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) 
+            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(is_file($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.");
+            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.");
+               $this->test_return(L_ERROR, "NSIS module <strong>$module</strong> was not found or is not working correctly.");
          }
     }
     private function NSIS_GetVersion_test() {
-         $tmp_dir = createTemporaryDirectory('installer',0)['dir'];
-         if(!chdir($tmp_dir)) {
+         $tmp_dir = createTemporaryDirectory('installer', 0)['dir'];
+         if (!chdir($tmp_dir)) {
            debug(2, "Cannot chdir to $tmp_dir\n");
-           $this->test_return(L_ERROR,"NSIS module <strong>GetVersion</strong> - problem with temporary directory permissions, cannot continue");
+           $this->test_return(L_ERROR, "NSIS module <strong>GetVersion</strong> - problem with temporary directory permissions, cannot continue");
            return;
          }
-         $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.");
+         $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))
+            $this->test_return(L_OK, "NSIS module <strong>GetVersion</strong> was found.");
+         if (is_file($exe))
             unlink($exe);
     }
 
@@ -426,32 +426,32 @@ 
       * test access to dowloads directories
       */
     private function directories_test() {
-               $Dir = createTemporaryDirectory('installer',0);
+               $Dir = createTemporaryDirectory('installer', 0);
                $dir = $Dir['dir'];
                $base = $Dir['base'];
-               if($dir) {
-                  $this->test_return(L_OK,"Installer cache directory is writable.");
+               if ($dir) {
+                  $this->test_return(L_OK, "Installer cache directory is writable.");
                   rrmdir($dir);
                } else {
-                  $this->test_return(L_ERROR,"Installer cache directory $base does not exist or is not writable!");
+                  $this->test_return(L_ERROR, "Installer cache directory $base does not exist or is not writable!");
                }
-               $Dir = createTemporaryDirectory('test',0);
+               $Dir = createTemporaryDirectory('test', 0);
                $dir = $Dir['dir'];
                $base = $Dir['base'];
-               if($dir) {
-                  $this->test_return(L_OK,"Test directory is writable.");
+               if ($dir) {
+                  $this->test_return(L_OK, "Test directory is writable.");
                   rrmdir($dir);
                } else {
-                  $this->test_return(L_ERROR,"Test directory  $base does not exist or is not writable!");
+                  $this->test_return(L_ERROR, "Test directory  $base does not exist or is not writable!");
                }
-               $Dir = createTemporaryDirectory('logo',0);
+               $Dir = createTemporaryDirectory('logo', 0);
                $dir = $Dir['dir'];
                $base = $Dir['base'];
-               if($dir) {
-                  $this->test_return(L_OK,"Logos cache directory is writable.");
+               if ($dir) {
+                  $this->test_return(L_OK, "Logos cache directory is writable.");
                   rrmdir($dir);
                } else {
-                  $this->test_return(L_ERROR,"Logos cache directory  $base does not exist or is not writable!");
+                  $this->test_return(L_ERROR, "Logos cache directory  $base does not exist or is not writable!");
                }
     }
 
@@ -466,16 +466,16 @@ 
                         $allthere .= $onelanguage['locale'] . " ";
 
                 if ($allthere == "")
-                    $this->test_return(L_OK,"All of your configured locales are available on your system.");
+                    $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!");
+                    $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) {
+    private function check_config_default($type, $key, $value) {
                 if (empty(Config::$type[$key]))
-                    $missingvalues .="type/webcert_OCSP ";
+                    $missingvalues .= "type/webcert_OCSP ";
                 elseif (Config::$type['webcert_OCSP'] == $value)
-                    $defaultvalues .="type/$key ";
+                    $defaultvalues .= "type/$key ";
     }
 
 
@@ -486,31 +486,31 @@ 
                 $defaultvalues = "";
                 $missingvalues = "";
                 if (Config::$APPEARANCE['from-mail'] == "cat-invite@your-cat-installation.example")
-                    $defaultvalues .="APPEARANCE/from-mail ";
+                    $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 ";
+                    $defaultvalues .= "APPEARANCE/support-contact/url ";
                 if (Config::$APPEARANCE['support-contact']['display'] == "cat-support@our-cat-installation.example")
-                    $defaultvalues .="APPEARANCE/support-contact/display ";
+                    $defaultvalues .= "APPEARANCE/support-contact/display ";
                 if (Config::$APPEARANCE['support-contact']['developer-mail'] == "cat-develop@our-cat-installation.example")
-                    $defaultvalues .="APPEARANCE/support-contact/mail ";
+                    $defaultvalues .= "APPEARANCE/support-contact/mail ";
                 if (Config::$APPEARANCE['abuse-mail'] == "my-abuse-contact@your-cat-installation.example")
-                    $defaultvalues .="APPEARANCE/abuse-mail ";
+                    $defaultvalues .= "APPEARANCE/abuse-mail ";
                 if (Config::$APPEARANCE['MOTD'] == "Release Candidate. All bugs to be shot on sight!")
-                    $defaultvalues .="APPEARANCE/MOTD ";
+                    $defaultvalues .= "APPEARANCE/MOTD ";
                 if (Config::$APPEARANCE['webcert_CRLDP'] == ['list', 'of', 'CRL', 'pointers'])
-                    $defaultvalues .="APPEARANCE/webcert_CRLDP ";
+                    $defaultvalues .= "APPEARANCE/webcert_CRLDP ";
                 if (empty(Config::$APPEARANCE['webcert_OCSP']))
-                    $missingvalues .="APPEARANCE/webcert_OCSP ";
+                    $missingvalues .= "APPEARANCE/webcert_OCSP ";
                 elseif (Config::$APPEARANCE['webcert_OCSP'] == ['list', 'of', 'OCSP', 'pointers'])
-                    $defaultvalues .="APPEARANCE/webcert_OCSP ";
+                    $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 ";
+                    $defaultvalues .= "RADIUSTESTS/UDP-hosts ";
                 if (Config::$DB['INST']['host'] == "db.host.example")
-                    $defaultvalues .="DB/INST ";
+                    $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 ";
+                    $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) {
@@ -522,14 +522,14 @@ 
                 foreach ($files as $file) {
                     $handle = fopen(CAT::$root . "/config/cli-certs/" . $file, 'r');
                     if (!$handle)
-                        $defaultvalues .="CERTIFICATE/$file ";
+                        $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>!");
+                    $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.");
+                    $this->test_return(L_OK, "Your configuration does not contain any unchanged defaults, which is a good sign.");
     }
 
    /**
@@ -538,37 +538,37 @@ 
    private function databases_test() {
         $DB = 'INST';
         $db = mysqli_connect(Config::$DB[$DB]['host'], Config::$DB[$DB]['user'], Config::$DB[$DB]['pass'], Config::$DB[$DB]['db']);
-        if(! $db) {
-           $this->test_return(L_ERROR,"Connection to the  $DB database failed");
+        if (!$db) {
+           $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.");
+           $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.");
+              $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']);
-        if(! $db) {
-           $this->test_return(L_ERROR,"Connection to the  $DB database failed");
+        if (!$db) {
+           $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.");
+           $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");
+              $this->test_return(L_ERROR, "The $DB is reacheable but there is something wrong with the schema");
         }
         $DB = 'EXTERNAL';
-        if(! empty(Config::$DB[$DB])) {
+        if (!empty(Config::$DB[$DB])) {
         $db = mysqli_connect(Config::$DB[$DB]['host'], Config::$DB[$DB]['user'], Config::$DB[$DB]['pass'], Config::$DB[$DB]['db']);
-        if(! $db) {
-           $this->test_return(L_ERROR,"Connection to the  $DB database failed");
+        if (!$db) {
+           $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.");
+           $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");
+              $this->test_return(L_ERROR, "The $DB is reacheable but there is something wrong with the schema");
         }
         }
    }
@@ -578,37 +578,37 @@ 
      * test devices.php for the no_cache option
      */
    private function device_cache_test() {
-       if((! empty(Devices::$Options['no_cache'])) && Devices::$Options['no_cache'])
+       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;
-       if($global_no_cache) {
+       if ($global_no_cache) {
           foreach ($Devs as $dev=>$D) {
-             if(empty($D['options']['no_cache']) || $D['options']['no_cache'] != 0) {
-                $no_cache_dev .= $dev." ";
+             if (empty($D['options']['no_cache']) || $D['options']['no_cache'] != 0) {
+                $no_cache_dev .= $dev . " ";
                 $no_cache_dev_count++;
              }
           }
        } else {
           foreach ($Devs as $dev=>$D) {
-             if(!empty($D['options']['no_cache']) && $D['options']['no_cache'] != 0) {
-                $no_cache_dev .= $dev." ";
+             if (!empty($D['options']['no_cache']) && $D['options']['no_cache'] != 0) {
+                $no_cache_dev .= $dev . " ";
                 $no_cache_dev_count++;
              }
           }
        }
 
 
-       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");
 
    }
 
@@ -617,7 +617,7 @@ 
      */
    private function mailer_test() {
       if (empty(Config::$APPEARANCE['abuse-mail']) || Config::$APPEARANCE['abuse-mail'] == "my-abuse-contact@your-cat-installation.example") {
-         $this->test_return(L_ERROR,"Your abuse-mail has not been set, cannot continue with mailer tests.");
+         $this->test_return(L_ERROR, "Your abuse-mail has not been set, cannot continue with mailer tests.");
          return;
       }
       $mail = new PHPMailer();
@@ -637,10 +637,10 @@ 
       $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.");
+      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");
+          $this->test_return(L_ERROR, "mailer settings failed, check the Config::MAILSETTINGS");
 
    }
 

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

Doc Comments +6 added lines, -2 removed lines

@@ -124,7 +124,7 @@ 
      * The function's single parameter $option_name is optional - if specified, it only returns the attributes of the given type.
      * Otherwise, all known attributes are returned.
      * 
-     * @param string $option_name name of the option whose values are to be returned
+     * @param integer $option_name name of the option whose values are to be returned
      * @return array of attributes
      */
     public function getAttributes($option_name = 0) {
@@ -194,7 +194,7 @@ 
      * user is a federation administrator of *any* federation. When given a parameter (ISO shortname of federation), it checks
      * if the user administers this particular federation.
      * 
-     * @param string $federation optional: federation to be checked
+     * @param integer $federation optional: federation to be checked
      * @return boolean TRUE if the user is federation admin, FALSE if not 
      */
     public function isFederationAdmin($federation = 0) {
@@ -226,6 +226,7 @@ 
    /**
     *  This function tests if the current user is an ovner of a given IdP
     *
+    * @param integer $idp
     * @return boolean TRUE if the user is an owner, FALSE if not 
     */
     public function isIdPOwner($idp) {
@@ -236,6 +237,9 @@ 
        return FALSE;
     }
 
+    /**
+     * @param string $content
+     */
     public function sendMailToUser($subject, $content) {
         // use PHPMailer to send the mail
         $mail = new PHPMailer();

Indentation +15 added lines, -15 removed lines

@@ -213,27 +213,27 @@
         }
     }
 
-   /**
-    * This function tests if the current user has been configured as the system superadmin, i.e. if the user is allowed
-    * to execute the 112365365321.php script
-    *
-    * @return boolean TRUE if the user is a superadmin, FALSE if not 
-    */
+    /**
+     * This function tests if the current user has been configured as the system superadmin, i.e. if the user is allowed
+     * to execute the 112365365321.php script
+     *
+     * @return boolean TRUE if the user is a superadmin, FALSE if not 
+     */
     public function isSuperadmin() {
-       return in_array($this->identifier, Config::$SUPERADMINS);
+        return in_array($this->identifier, Config::$SUPERADMINS);
     }
 
-   /**
-    *  This function tests if the current user is an ovner of a given IdP
-    *
-    * @return boolean TRUE if the user is an owner, FALSE if not 
-    */
+    /**
+     *  This function tests if the current user is an ovner of a given IdP
+     *
+     * @return boolean TRUE if the user is an owner, FALSE if not 
+     */
     public function isIdPOwner($idp) {
-       $temp = new IdP($idp);
-       foreach ($temp->owner() as $oneowner)
+        $temp = new IdP($idp);
+        foreach ($temp->owner() as $oneowner)
             if ($oneowner['ID'] == $this->identifier)
                 return TRUE;
-       return FALSE;
+        return FALSE;
     }
 
     public function sendMailToUser($subject, $content) {

Spacing +1 added lines, -1 removed lines

@@ -253,7 +253,7 @@
         // who to whom?
         $mail->From = Config::$APPEARANCE['from-mail'];
         $mail->FromName = Config::$APPEARANCE['productname'] . " Notification System";
-        $mail->addReplyTo(Config::$APPEARANCE['support-contact']['mail'], Config::$APPEARANCE['productname'] . " " ._("Feedback"));
+        $mail->addReplyTo(Config::$APPEARANCE['support-contact']['mail'], Config::$APPEARANCE['productname'] . " " . _("Feedback"));
         
         $mailaddr = $this->getAttributes("user:email");
         if (count($mailaddr) == 0) // we don't know his mail address

Braces +27 added lines, -19 removed lines

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

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
  */
 

Indentation +391 added lines, -391 removed lines

@@ -52,7 +52,7 @@ 
  *  link - the path name of the resulting installer
  *  mime - the mimetype of the installer
  */
-  public function generateInstaller($device,$prof_id, $generated_for = "user") {
+    public function generateInstaller($device,$prof_id, $generated_for = "user") {
     $this->set_locale("devices");
     $Dev = Devices::listDevices();
     $Config = $Dev[$device];
@@ -61,93 +61,93 @@ 
     $attribs = $profile->getCollapsedAttributes();
     // test if the profile is production-ready and if not if the authenticated user is an owner
     if (!isset($attribs['profile:production']) || (isset($attribs['profile:production']) && $attribs['profile:production'][0] != "on")) {
-       debug(4,"Attempt to download a non-production ready installer fir profile: $prof_id\n");
-       require_once(Config::$AUTHENTICATION['ssp-path-to-autoloader']);
-       $as = new SimpleSAML_Auth_Simple(Config::$AUTHENTICATION['ssp-authsource']);
-       if($as->isAuthenticated()) {
-          $user_object = new User($_SESSION['user']);
-          if($user_object->isIdPOwner($profile->institution)) {
-              debug(4, "User is the owner - allowing access\n");
-          } else {
-             debug(2, "User not an owner of a non-production profile - access forbidden\n");
-       header("HTTP/1.0 403 Not Authorized");
-             return;
-          }
-       } else {
-          debug(2, "User NOT authenticated, rejecting request for a non-production installer\n");
-          header("HTTP/1.0 403 Not Authorized");
-          return;
-       }
+        debug(4,"Attempt to download a non-production ready installer fir profile: $prof_id\n");
+        require_once(Config::$AUTHENTICATION['ssp-path-to-autoloader']);
+        $as = new SimpleSAML_Auth_Simple(Config::$AUTHENTICATION['ssp-authsource']);
+        if($as->isAuthenticated()) {
+            $user_object = new User($_SESSION['user']);
+            if($user_object->isIdPOwner($profile->institution)) {
+                debug(4, "User is the owner - allowing access\n");
+            } else {
+                debug(2, "User not an owner of a non-production profile - access forbidden\n");
+        header("HTTP/1.0 403 Not Authorized");
+                return;
+            }
+        } else {
+            debug(2, "User NOT authenticated, rejecting request for a non-production installer\n");
+            header("HTTP/1.0 403 Not Authorized");
+            return;
+        }
     }
     $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;
+        $this->i_path = FALSE;
     else {
-      $cache = $profile->testCache($device);
-      $this->i_path = $cache['cache'];
+        $cache = $profile->testCache($device);
+        $this->i_path = $cache['cache'];
     }
     if($this->i_path && is_file($this->i_path)) { 
-      debug(4,"Using cached installer for: $device\n");
-      $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=".CAT::get_lang()."&profile=$prof_id&device=$device&generatedfor=$generated_for";
-      $a['mime'] = $cache['mime'];
+        debug(4,"Using cached installer for: $device\n");
+        $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=".CAT::get_lang()."&profile=$prof_id&device=$device&generatedfor=$generated_for";
+        $a['mime'] = $cache['mime'];
     } else {
-      $factory = new DeviceFactory($device);
-      $dev = $factory->device;
-      if(isset($dev)) {
-         $dev->setup($profile);
-         $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 {
-           $info = new finfo();
-           $a['mime'] = $info->file($i_path, FILEINFO_MIME_TYPE);
-         }
-         $this->i_path = $dev->FPATH.'/'.$installer;
-         rename($i_path, $this->i_path);
-         $profile->updateCache($device,$this->i_path,$a['mime']);
+        $factory = new DeviceFactory($device);
+        $dev = $factory->device;
+        if(isset($dev)) {
+            $dev->setup($profile);
+            $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 {
+            $info = new finfo();
+            $a['mime'] = $info->file($i_path, FILEINFO_MIME_TYPE);
+            }
+            $this->i_path = $dev->FPATH.'/'.$installer;
+            rename($i_path, $this->i_path);
+            $profile->updateCache($device,$this->i_path,$a['mime']);
 //         rrmdir($dev->FPATH.'/tmp');
-         debug(4,"Generated installer: ".$this->i_path.": for: $device\n");
-         $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=".CAT::get_lang()."&profile=$prof_id&device=$device&generatedfor=$generated_for";
-         } else {
-         debug(2,"Installer generation failed for: $prof_id:$device:".CAT::get_lang()."\n");
-         $a['link'] = 0;
-         }
-      } 
+            debug(4,"Generated installer: ".$this->i_path.": for: $device\n");
+            $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=".CAT::get_lang()."&profile=$prof_id&device=$device&generatedfor=$generated_for";
+            } else {
+            debug(2,"Installer generation failed for: $prof_id:$device:".CAT::get_lang()."\n");
+            $a['link'] = 0;
+            }
+        } 
     }
     $this->set_locale("web_user");
     return($a);
- }
+    }
 
- /**
-  * interface to Devices::listDevices() 
-  */
- public function listDevices($show_hidden = 0) {
+    /**
+     * interface to Devices::listDevices() 
+     */
+    public function listDevices($show_hidden = 0) {
     $Dev = Devices::listDevices();
     $R = [];
     $ct = 0;
     if($show_hidden !== 0 && $show_hidden != 1)
-      return;
+        return;
     foreach ($Dev as $device => $D) {
-      if(isset($D['options']['hidden']) && $D['options']['hidden'] && $show_hidden == 0)
-         continue;
-      $ct ++;
-      if($this->version == 1)
-         $D['device'] = $device;
-      else
-         $D['device'] = $device;
-      $group = isset($D['group']) ? $D['group'] : 'other';
-      if (! isset($R[$group]))
-         $R[$group] = [];
-      $R[$group][$device] = $D;
-    }
-   return $R;
- }
-
- public function deviceInfo($device,$prof_id) {
+        if(isset($D['options']['hidden']) && $D['options']['hidden'] && $show_hidden == 0)
+            continue;
+        $ct ++;
+        if($this->version == 1)
+            $D['device'] = $device;
+        else
+            $D['device'] = $device;
+        $group = isset($D['group']) ? $D['group'] : 'other';
+        if (! isset($R[$group]))
+            $R[$group] = [];
+        $R[$group][$device] = $D;
+    }
+    return $R;
+    }
+
+    public function deviceInfo($device,$prof_id) {
     $this->set_locale("devices");
     $out = 0;
     $profile = new Profile($prof_id);
@@ -155,11 +155,11 @@ 
     $dev = $factory->device;
     if(isset($dev)) {
 //       $dev->setup($profile);
-       $out = $dev->writeDeviceInfo();
-   }
+        $out = $dev->writeDeviceInfo();
+    }
     $this->set_locale("web_user");
     echo $out;
- }
+    }
 
 /**
  * Prepare the support data for a given profile
@@ -173,23 +173,23 @@ 
  * - description
  * - devices - an array of device names and their statuses (for a given profile)
  */
- public function profileAttributes($prof_id) {
+    public function profileAttributes($prof_id) {
     $this->set_locale("devices");
-      $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];
-      $a['devices'] = $profile->listDevices();
-      $this->set_locale("web_user");
-      return($a);
- }
+        $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];
+        $a['devices'] = $profile->listDevices();
+        $this->set_locale("web_user");
+        return($a);
+    }
 
 /*
    this method needs to be used with care, it could give wrong results in some
@@ -201,13 +201,13 @@ 
     $file= $F['file'];
     $file = substr($file,strlen(dirname(__DIR__)));
     while(substr($file,0,1) == '/')
-       $file = substr($file,1);
+        $file = substr($file,1);
     $n = count(explode('/',$file));
     $out = $_SERVER['SCRIPT_NAME'];
     for ($i= 0; $i < $n; $i++)
-      $out = dirname($out);
+        $out = dirname($out);
     if ($out == '/')
-      $out = '';
+        $out = '';
     $s = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] ? 'https' : 'http';
     $s .= '://'.$_SERVER['HTTP_HOST'] . $out;
     return $s;
@@ -215,29 +215,29 @@ 
 
 /* JSON functions */
 
-  public function return_json($data,$status=1) {
-     $return_array = [];
-     $return_array['status'] = $status;
-     $return_array['data'] = $data;
-     $return_array['tou'] =  "Please consult Terms of Use at: ".$this->GetRootURL()."/tou.php";
-     return(json_encode($return_array));
-  }
+    public function return_json($data,$status=1) {
+        $return_array = [];
+        $return_array['status'] = $status;
+        $return_array['data'] = $data;
+        $return_array['tou'] =  "Please consult Terms of Use at: ".$this->GetRootURL()."/tou.php";
+        return(json_encode($return_array));
+    }
 
 /**
-  * Return the list of supported languages.
-  *
-  * 
-  */
-  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']];
-     }
-     echo $this->return_json($return_array);
-  }
+ * Return the list of supported languages.
+ *
+ * 
+ */
+    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']];
+        }
+        echo $this->return_json($return_array);
+    }
 
 /**
  * Return the list of countiers with configured IdPs
@@ -245,17 +245,17 @@ 
  * @return string JSON encoded data
  */
 
-  public function JSON_listCountries() {
-     $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];
-     }
-     echo $this->return_json($return_array);
-  }
+    public function JSON_listCountries() {
+        $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];
+        }
+        echo $this->return_json($return_array);
+    }
 
 /**
  * Return the list of IdPs in a given country
@@ -264,17 +264,17 @@ 
  * @return string JSON encoded data
  */
 
-  public function JSON_listIdentityProviders($country) {
-     $idps = Federation::listAllIdentityProviders(1,$country);
-     $return_array = [];
-     foreach ($idps as $idp) {
+    public function JSON_listIdentityProviders($country) {
+        $idps = Federation::listAllIdentityProviders(1,$country);
+        $return_array = [];
+        foreach ($idps as $idp) {
         if($this->version == 1)
-           $return_array[] = ['id'=>$idp['entityID'],'display'=>$idp['title']];
+            $return_array[] = ['id'=>$idp['entityID'],'display'=>$idp['title']];
         else
-           $return_array[] = ['idp'=>$idp['entityID'],'display'=>$idp['title']];
-     }
-     echo $this->return_json($return_array);
-  }
+            $return_array[] = ['idp'=>$idp['entityID'],'display'=>$idp['title']];
+        }
+        echo $this->return_json($return_array);
+    }
 
 /**
  * return the list of all active IdPs
@@ -283,18 +283,18 @@ 
  * @return string JSON encoded data
  */
 
-  public function JSON_listIdentityProvidersForDisco() {
-     $idps = Federation::listAllIdentityProviders(1);
-     $return_array = [];
-     foreach ($idps as $idp) {
+    public function JSON_listIdentityProvidersForDisco() {
+        $idps = Federation::listAllIdentityProviders(1);
+        $return_array = [];
+        foreach ($idps as $idp) {
         if($this->version == 1)
-           $idp['id'] = $idp['entityID'];
-         else
-           $idp['idp'] = $idp['entityID'];
+            $idp['id'] = $idp['entityID'];
+            else
+            $idp['idp'] = $idp['entityID'];
         $return_array[] = $idp;
-      }
-     echo json_encode($return_array);
-  }
+        }
+        echo json_encode($return_array);
+    }
 
 
 
@@ -306,17 +306,17 @@ 
  */
 
 
-  public function JSON_orderIdentityProviders($country,$L=NULL) {
-     $idps = $this->orderIdentityProviders($country,$L);
-     $return_array = [];
-     foreach ($idps as $idp) {
+    public function JSON_orderIdentityProviders($country,$L=NULL) {
+        $idps = $this->orderIdentityProviders($country,$L);
+        $return_array = [];
+        foreach ($idps as $idp) {
         if($this->version == 1)
-           $return_array[] = ['id'=>$idp['id'],'display'=>$idp['title']];
+            $return_array[] = ['id'=>$idp['id'],'display'=>$idp['title']];
         else
-           $return_array[] = ['idp'=>$idp['id'],'display'=>$idp['title']];
-     }
-     echo $this->return_json($return_array);
-  }
+            $return_array[] = ['idp'=>$idp['id'],'display'=>$idp['title']];
+        }
+        echo $this->return_json($return_array);
+    }
 
 /**
  * Produce a list of profiles available for a given IdP
@@ -324,31 +324,31 @@ 
  * @param int $idp_id the IdP identifier
  * @return string JSON encoded data
  */
-  public function JSON_listProfiles($idp_id,$sort = 0) {
-     $this->set_locale("web_user");
-     $return_array = [];
-     try {     
-         $idp = new IdP($idp_id);
-     }
-     catch (Exception $fail) {
+    public function JSON_listProfiles($idp_id,$sort = 0) {
+        $this->set_locale("web_user");
+        $return_array = [];
+        try {     
+            $idp = new IdP($idp_id);
+        }
+        catch (Exception $fail) {
         echo $this->return_json($return_array,0);
         return;
-     }
-     $l = 0;
-     $logo = $idp->getAttributes('general:logo_file');
-     if($logo)
-       $l = 1;
-     $profiles = $idp->listProfiles(1);
-     if($sort == 1)
+        }
+        $l = 0;
+        $logo = $idp->getAttributes('general:logo_file');
+        if($logo)
+        $l = 1;
+        $profiles = $idp->listProfiles(1);
+        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]; 
-     }
-     echo $this->return_json($return_array);
-  }
+        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]; 
+        }
+        echo $this->return_json($return_array);
+    }
 
 /**
  * Return the list of devices available for the given profile
@@ -356,34 +356,34 @@ 
  * @param int $profile_id the Profile identifier
  * @return string JSON encoded data
  */
-  public function JSON_listDevices($profile_id) {
-     $this->set_locale("web_user");
-     $return_array = [];
-     $a = $this->profileAttributes($profile_id);
-     $thedevices = $a['devices'];
-     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;
-              $disp = $D['display'];
-              if($this->version == 1) {
-                 if($D['id'] === '0') {
-                     $profile_redirect = 1;
-                     $disp = $c;
-                 }
+    public function JSON_listDevices($profile_id) {
+        $this->set_locale("web_user");
+        $return_array = [];
+        $a = $this->profileAttributes($profile_id);
+        $thedevices = $a['devices'];
+        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;
+                $disp = $D['display'];
+                if($this->version == 1) {
+                    if($D['id'] === '0') {
+                        $profile_redirect = 1;
+                        $disp = $c;
+                    }
                 $return_array[] = ['id'=>$D['id'], 'display'=>$disp, 'status'=>$D['status'], 'redirect'=>$D['redirect']];
-             } else {
-                 if($D['device'] === '0') {
-                     $profile_redirect = 1;
-                     $disp = $c;
-                 }
+                } else {
+                    if($D['device'] === '0') {
+                        $profile_redirect = 1;
+                        $disp = $c;
+                    }
                 $return_array[] = ['device'=>$D['id'], 'display'=>$disp, 'status'=>$D['status'], 'redirect'=>$D['redirect']];
-             }
-         }
+                }
+            }
 
-  }
-  echo $this->return_json($return_array);
+    }
+    echo $this->return_json($return_array);
 }
   
 /**
@@ -393,7 +393,7 @@ 
  * @param int $prof_id profile identifier
  * @return string JSON encoded data
  */
-  public function JSON_generateInstaller($device,$prof_id) {
+    public function JSON_generateInstaller($device,$prof_id) {
     debug(4,"JSON::generateInstaller arguments: $device,$prof_id\n");
     $o = $this->generateInstaller($device,$prof_id);
     debug(4,"output from GUI::generateInstaller:");
@@ -401,7 +401,7 @@ 
     debug(4,json_encode($o));
 //    header('Content-type: application/json; utf-8');
     echo $this->return_json($o);
- }
+    }
 
 /**
  * Generate and send the installer
@@ -411,14 +411,14 @@ 
  * @return binary installerFile
  */
 
- public function downloadInstaller($device,$prof_id,$generated_for='user') {
+    public function downloadInstaller($device,$prof_id,$generated_for='user') {
     debug(4,"downloadInstaller arguments: $device,$prof_id,$generated_for\n");
     $o = $this->generateInstaller($device,$prof_id);
     debug(4,"output from GUI::generateInstaller:");
     debug(4,$o);
     if(! $o['link']) {
-       header("HTTP/1.0 404 Not Found");
-       return;
+        header("HTTP/1.0 404 Not Found");
+        return;
     }
     $profile = new Profile($prof_id);
     $profile->incrementDownloadStats($device, $generated_for);
@@ -431,242 +431,242 @@ 
     ob_clean();
     flush();
     readfile($file);
- }
+    }
 /**
- * Get and prepare logo file 
- *
- * When called for DiscoJuice, first check if file cache exists
- * If not then generate the file and save it in the cache
- * @param int $idp_id IdP identifier
- * @param int $disco flag turning on image generation for DiscoJuice
- * @param int $width, $height  maximum width and height of the generated image 
- * if one of these is 0 then it is treated as no upper bound
- *
- */
+     * Get and prepare logo file 
+     *
+     * When called for DiscoJuice, first check if file cache exists
+     * If not then generate the file and save it in the cache
+     * @param int $idp_id IdP identifier
+     * @param int $disco flag turning on image generation for DiscoJuice
+     * @param int $width, $height  maximum width and height of the generated image 
+     * if one of these is 0 then it is treated as no upper bound
+     *
+     */
+
+    public function sendLogo($idp_id, $disco=FALSE, $width=0, $height=0) {
+    $ExpStr = '';
+    $resize = 0;
+    if(($width || $height) && is_numeric($width) && is_numeric($height)) {
+        $resize = 1;
+        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;
+        $height = 40;
+        $resize = 1;
+        $logo_file = CAT::$root.'/web/downloads/logos/'.$idp_id.'_'.$width.'_'.$height.'.png';
+    }
 
- public function sendLogo($idp_id, $disco=FALSE, $width=0, $height=0) {
-   $ExpStr = '';
-   $resize = 0;
-   if(($width || $height) && is_numeric($width) && is_numeric($height)) {
-       $resize = 1;
-       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;
-       $height = 40;
-       $resize = 1;
-       $logo_file = CAT::$root.'/web/downloads/logos/'.$idp_id.'_'.$width.'_'.$height.'.png';
-   }
-
-   if($resize && is_file($logo_file)){
-      debug(4,"Using cached logo $logo_file for: $idp_id\n");
-      $blob = file_get_contents($logo_file);
-      $filetype = 'image/png';
-   }
-   else {
-      $idp = new IdP($idp_id);
-      $at = $idp->getAttributes('general:logo_file');
-      $blob =  $at[0]['value'];
-      $info = new finfo();
-      $filetype = $info->buffer($blob, FILEINFO_MIME_TYPE);
-      $offset = 60 * 60 * 24 * 30;
-      $ExpStr = "Expires: " . gmdate( "D, d M Y H:i:s", time() + $offset ) . " GMT";
-      if($resize) {
-         $filetype = 'image/png';
-         $image = new Imagick();
-         $image->readImageBlob($blob);
-         if( $image->setImageFormat('PNG')) {
-           $image->thumbnailImage($width,$height,1);
-           $blob = $image->getImageBlob();
-           debug(4,"Writing cached logo $logo_file for: $idp_id\n");
-           file_put_contents($logo_file,$blob);
-         }
-         else
-           $blob = "XXXXXX";
-      }
-   }
-   header( "Content-type: ".$filetype );
-   header( "Cache-Control:max-age=36000, must-revalidate" );
-   header( $ExpStr );
-   echo $blob;
- }
-
- public function locateUser() {
-   $host = $_SERVER['REMOTE_ADDR'];
-   $record = geoip_record_by_name($host);
-   if($record) {
-     $result = ['status' => 'ok'];
-     $result['country'] = $record['country_code'];
+    if($resize && is_file($logo_file)){
+        debug(4,"Using cached logo $logo_file for: $idp_id\n");
+        $blob = file_get_contents($logo_file);
+        $filetype = 'image/png';
+    }
+    else {
+        $idp = new IdP($idp_id);
+        $at = $idp->getAttributes('general:logo_file');
+        $blob =  $at[0]['value'];
+        $info = new finfo();
+        $filetype = $info->buffer($blob, FILEINFO_MIME_TYPE);
+        $offset = 60 * 60 * 24 * 30;
+        $ExpStr = "Expires: " . gmdate( "D, d M Y H:i:s", time() + $offset ) . " GMT";
+        if($resize) {
+            $filetype = 'image/png';
+            $image = new Imagick();
+            $image->readImageBlob($blob);
+            if( $image->setImageFormat('PNG')) {
+            $image->thumbnailImage($width,$height,1);
+            $blob = $image->getImageBlob();
+            debug(4,"Writing cached logo $logo_file for: $idp_id\n");
+            file_put_contents($logo_file,$blob);
+            }
+            else
+            $blob = "XXXXXX";
+        }
+    }
+    header( "Content-type: ".$filetype );
+    header( "Cache-Control:max-age=36000, must-revalidate" );
+    header( $ExpStr );
+    echo $blob;
+    }
+
+    public function locateUser() {
+    $host = $_SERVER['REMOTE_ADDR'];
+    $record = geoip_record_by_name($host);
+    if($record) {
+        $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';
-     $result['region'] = $record['region'];
-     $result['geo'] = ['lat' => (float)$record['latitude'] , 'lon' => (float)$record['longitude']];
-   } else {
-     $result = ['status' => 'error', 'error' =>'Problem listing countries']; 
-   }
-   return($result);
- }
-
-
- public function locateUser2() {
-   require_once Config::$GEOIP['geoip2-path-to-autoloader'];
-   $reader = new Reader(Config::$GEOIP['geoip2-path-to-db']);
-   $host = $_SERVER['REMOTE_ADDR'];
-   try {
-      $record = $reader->city($host);
-   } catch (Exception $e) {
-      $result = ['status' => 'error', 'error' =>'Problem listing countries']; 
-      return($result);
-   }
-   $result = ['status' => 'ok'];
-   $result['country'] = $record->country->isoCode;
+        if($result['country'] == 'GB')
+            $result['country'] = 'UK';
+        $result['region'] = $record['region'];
+        $result['geo'] = ['lat' => (float)$record['latitude'] , 'lon' => (float)$record['longitude']];
+    } else {
+        $result = ['status' => 'error', 'error' =>'Problem listing countries']; 
+    }
+    return($result);
+    }
+
+
+    public function locateUser2() {
+    require_once Config::$GEOIP['geoip2-path-to-autoloader'];
+    $reader = new Reader(Config::$GEOIP['geoip2-path-to-db']);
+    $host = $_SERVER['REMOTE_ADDR'];
+    try {
+        $record = $reader->city($host);
+    } catch (Exception $e) {
+        $result = ['status' => 'error', 'error' =>'Problem listing countries']; 
+        return($result);
+    }
+    $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';
-   $result['region'] = $record->continent->name;
+    if($result['country'] == 'GB')
+        $result['country'] = 'UK';
+    $result['region'] = $record->continent->name;
 
-   $result['geo'] = ['lat' => (float)$record->location->latitude , 'lon' => (float)$record->location->longitude];
-   return($result);
- }
+    $result['geo'] = ['lat' => (float)$record->location->latitude , 'lon' => (float)$record->location->longitude];
+    return($result);
+    }
 
 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']);
+        echo json_encode(['status' => 'error', 'error' =>'Geolocation not supported']);
     if(Config::$GEOIP['version'] == 1)
-      echo json_encode($this->locateUser());
+        echo json_encode($this->locateUser());
     if(Config::$GEOIP['version'] == 2)
-      echo json_encode($this->locateUser2());
+        echo json_encode($this->locateUser2());
 }
 
 /**
  * Produce support data prepared within {@link GUI::profileAttributes()}
  * @return string JSON encoded data
  */
-  public function JSON_profileAttributes($prof_id) {
+    public function JSON_profileAttributes($prof_id) {
 //    header('Content-type: application/json; utf-8');
     echo $this->return_json($this->profileAttributes($prof_id));
-  }
+    }
 
 /**
-  * Calculate the distence in km between two points given their
-  * geo coordinates.
-  * @param array $P1 - first point as an 'lat', 'lon' array 
-  * @param array $P2 - second point as an 'lat', 'lon' array 
-  * @return float distance in km
-  */
+ * Calculate the distence in km between two points given their
+ * geo coordinates.
+ * @param array $P1 - first point as an 'lat', 'lon' array 
+ * @param array $P2 - second point as an 'lat', 'lon' array 
+ * @return float distance in km
+ */
 private function geoDistance($P1,$P2) {
 
-  $dist = sin(deg2rad($P1['lat'])) * sin(deg2rad($P2['lat'])) +  
+    $dist = sin(deg2rad($P1['lat'])) * sin(deg2rad($P2['lat'])) +  
          cos(deg2rad($P1['lat'])) * cos(deg2rad($P2['lat'])) * cos(deg2rad($P1['lon'] - $P2['lon']));
-  $dist = rad2deg(acos($dist)) * 60 * 1.1852 ;
-  return(round($dist));
+    $dist = rad2deg(acos($dist)) * 60 * 1.1852 ;
+    return(round($dist));
 }
 
 /**
-  * Order active identity providers according to their distance and name
-  * @param array $L - current location
-  * @return array $IdPs -  list of arrays ('id', 'name');
-  */
+ * Order active identity providers according to their distance and name
+ * @param array $L - current location
+ * @return array $IdPs -  list of arrays ('id', 'name');
+ */
 
 public function orderIdentityProviders($country,$L=NULL) {
-     $idps = Federation::listAllIdentityProviders(1,$country);
-
-  if(is_null($L)) {
-     $U = $this->locateUser();
-     if($U['status'] == 'ok') {
-     $L = $U['geo'];
-     } else {
-       $L = ['lat'=>"90",'lon'=>"0"];
-     }
-  }
-  $T=[];
-  $R=[];
-     foreach ($idps as $idp) {
+        $idps = Federation::listAllIdentityProviders(1,$country);
+
+    if(is_null($L)) {
+        $U = $this->locateUser();
+        if($U['status'] == 'ok') {
+        $L = $U['geo'];
+        } else {
+        $L = ['lat'=>"90",'lon'=>"0"];
+        }
+    }
+    $T=[];
+    $R=[];
+        foreach ($idps as $idp) {
         $T[$idp['entityID']] = $idp['title'];
         $dist = 10000;
         if(isset($idp['geo'])) {
-          $G=$idp['geo'];
-          if(isset($G['lon'])) {
-             $d1 = $this->geoDistance($L,$G); 
-             if( $d1 < $dist)
+            $G=$idp['geo'];
+            if(isset($G['lon'])) {
+                $d1 = $this->geoDistance($L,$G); 
+                if( $d1 < $dist)
                 $dist = $d1;
-          } else {
+            } else {
             foreach ($G as $g) {
-             $d1 = $this->geoDistance($L,$g); 
-             if( $d1 < $dist)
+                $d1 = $this->geoDistance($L,$g); 
+                if( $d1 < $dist)
                 $dist = $d1;
             }
-          }
+            }
         }
-       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]];
-      }
-     return($outarray);
+        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]];
+        }
+        return($outarray);
 }
 
 /**
-  * Detect the best device driver form the browser
-  *
-  * Detects the operating system and returns its id 
-  * display name and group membership (as in devices.php)
-  * @return array indexed by 'id', 'display', 'group'
-  */
+ * Detect the best device driver form the browser
+ *
+ * Detects the operating system and returns its id 
+ * display name and group membership (as in devices.php)
+ * @return array indexed by 'id', 'display', 'group'
+ */
 
 public function detectOS() {
-   $Dev = Devices::listDevices();
-   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']]);
-   }
-   $browser = $_SERVER['HTTP_USER_AGENT'];
-   debug(4,"HTTP_USER_AGENT=$browser\n");
-   foreach ($Dev as $dev_id => $device) {
-     if(!isset($device['match']))
+    $Dev = Devices::listDevices();
+    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']]);
+    }
+    $browser = $_SERVER['HTTP_USER_AGENT'];
+    debug(4,"HTTP_USER_AGENT=$browser\n");
+    foreach ($Dev as $dev_id => $device) {
+        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 {
-         debug(2, "Unrecognised system: ".$_SERVER['HTTP_USER_AGENT']."\n");
-         return(false);
-       }
-     }
-   }
-   debug(2, "Unrecognised system: ".$_SERVER['HTTP_USER_AGENT']."\n");
-   return(false);
+        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 {
+            debug(2, "Unrecognised system: ".$_SERVER['HTTP_USER_AGENT']."\n");
+            return(false);
+        }
+        }
+    }
+    debug(2, "Unrecognised system: ".$_SERVER['HTTP_USER_AGENT']."\n");
+    return(false);
 }
 
 public function JSON_detectOS() {
-     $return_array=$this->detectOS();
-     if($return_array)
+        $return_array=$this->detectOS();
+        if($return_array)
         $status = 1;
-     else
+        else
         $status = 0;
-     echo $this->return_json($return_array,$status);
+        echo $this->return_json($return_array,$status);
 }
 
 
@@ -676,6 +676,6 @@ 
   
 }
 function profile_sort($P1,$P2) {
-   return strcasecmp($P1->name, $P2->name);
+    return strcasecmp($P1->name, $P2->name);
 } 
 ?>

Spacing +150 added lines, -150 removed lines

@@ -52,21 +52,21 @@ 
  *  link - the path name of the resulting installer
  *  mime - the mimetype of the installer
  */
-  public function generateInstaller($device,$prof_id, $generated_for = "user") {
+  public function generateInstaller($device, $prof_id, $generated_for = "user") {
     $this->set_locale("devices");
     $Dev = Devices::listDevices();
     $Config = $Dev[$device];
-    debug(4,"installer:$device:$prof_id\n");
+    debug(4, "installer:$device:$prof_id\n");
     $profile = new Profile($prof_id);
     $attribs = $profile->getCollapsedAttributes();
     // test if the profile is production-ready and if not if the authenticated user is an owner
     if (!isset($attribs['profile:production']) || (isset($attribs['profile:production']) && $attribs['profile:production'][0] != "on")) {
-       debug(4,"Attempt to download a non-production ready installer fir profile: $prof_id\n");
+       debug(4, "Attempt to download a non-production ready installer fir profile: $prof_id\n");
        require_once(Config::$AUTHENTICATION['ssp-path-to-autoloader']);
        $as = new SimpleSAML_Auth_Simple(Config::$AUTHENTICATION['ssp-authsource']);
-       if($as->isAuthenticated()) {
+       if ($as->isAuthenticated()) {
           $user_object = new User($_SESSION['user']);
-          if($user_object->isIdPOwner($profile->institution)) {
+          if ($user_object->isIdPOwner($profile->institution)) {
               debug(4, "User is the owner - allowing access\n");
           } else {
              debug(2, "User not an owner of a non-production profile - access forbidden\n");
@@ -82,38 +82,38 @@ 
     $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'] ))
+    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'];
     }
-    if($this->i_path && is_file($this->i_path)) { 
-      debug(4,"Using cached installer for: $device\n");
-      $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=".CAT::get_lang()."&profile=$prof_id&device=$device&generatedfor=$generated_for";
+    if ($this->i_path && is_file($this->i_path)) { 
+      debug(4, "Using cached installer for: $device\n");
+      $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=" . CAT::get_lang() . "&profile=$prof_id&device=$device&generatedfor=$generated_for";
       $a['mime'] = $cache['mime'];
     } else {
       $factory = new DeviceFactory($device);
       $dev = $factory->device;
-      if(isset($dev)) {
+      if (isset($dev)) {
          $dev->setup($profile);
          $installer = $dev->writeInstaller();
-         $i_path = $dev->FPATH.'/tmp/'.$installer;
-         if($i_path && is_file($i_path)) {
-         if(isset($dev->options['mime']))
+         $i_path = $dev->FPATH . '/tmp/' . $installer;
+         if ($i_path && is_file($i_path)) {
+         if (isset($dev->options['mime']))
                $a['mime'] = $dev->options['mime'];
          else {
            $info = new finfo();
            $a['mime'] = $info->file($i_path, FILEINFO_MIME_TYPE);
          }
-         $this->i_path = $dev->FPATH.'/'.$installer;
+         $this->i_path = $dev->FPATH . '/' . $installer;
          rename($i_path, $this->i_path);
-         $profile->updateCache($device,$this->i_path,$a['mime']);
+         $profile->updateCache($device, $this->i_path, $a['mime']);
 //         rrmdir($dev->FPATH.'/tmp');
-         debug(4,"Generated installer: ".$this->i_path.": for: $device\n");
-         $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=".CAT::get_lang()."&profile=$prof_id&device=$device&generatedfor=$generated_for";
+         debug(4, "Generated installer: " . $this->i_path . ": for: $device\n");
+         $a['link'] = "API.php?api_version=$version&action=downloadInstaller&lang=" . CAT::get_lang() . "&profile=$prof_id&device=$device&generatedfor=$generated_for";
          } else {
-         debug(2,"Installer generation failed for: $prof_id:$device:".CAT::get_lang()."\n");
+         debug(2, "Installer generation failed for: $prof_id:$device:" . CAT::get_lang() . "\n");
          $a['link'] = 0;
          }
       } 
@@ -129,31 +129,31 @@ 
     $Dev = Devices::listDevices();
     $R = [];
     $ct = 0;
-    if($show_hidden !== 0 && $show_hidden != 1)
+    if ($show_hidden !== 0 && $show_hidden != 1)
       return;
     foreach ($Dev as $device => $D) {
-      if(isset($D['options']['hidden']) && $D['options']['hidden'] && $show_hidden == 0)
+      if (isset($D['options']['hidden']) && $D['options']['hidden'] && $show_hidden == 0)
          continue;
-      $ct ++;
-      if($this->version == 1)
+      $ct++;
+      if ($this->version == 1)
          $D['device'] = $device;
       else
          $D['device'] = $device;
       $group = isset($D['group']) ? $D['group'] : 'other';
-      if (! isset($R[$group]))
+      if (!isset($R[$group]))
          $R[$group] = [];
       $R[$group][$device] = $D;
     }
    return $R;
  }
 
- public function deviceInfo($device,$prof_id) {
+ public function deviceInfo($device, $prof_id) {
     $this->set_locale("devices");
     $out = 0;
     $profile = new Profile($prof_id);
     $factory = new DeviceFactory($device);
     $dev = $factory->device;
-    if(isset($dev)) {
+    if (isset($dev)) {
 //       $dev->setup($profile);
        $out = $dev->writeDeviceInfo();
    }
@@ -178,13 +178,13 @@ 
       $profile = new Profile($prof_id);
       $attr = $profile->getCollapsedAttributes();
       $a = [];
-      if(isset($attr['support:email']))
+      if (isset($attr['support:email']))
          $a['local_email'] = $attr['support:email'][0];
-      if(isset($attr['support:phone']))
+      if (isset($attr['support:phone']))
          $a['local_phone'] = $attr['support:phone'][0];
-      if(isset($attr['support:url']))
+      if (isset($attr['support:url']))
          $a['local_url'] = $attr['support:url'][0];
-      if(isset($attr['profile:description']))
+      if (isset($attr['profile:description']))
          $a['description'] = $attr['profile:description'][0];
       $a['devices'] = $profile->listDevices();
       $this->set_locale("web_user");
@@ -196,30 +196,30 @@ 
    cicumstances
 */
 private function GetRootURL() {
-    $backtrace =  debug_backtrace();
+    $backtrace = debug_backtrace();
     $F = array_pop($backtrace);
-    $file= $F['file'];
-    $file = substr($file,strlen(dirname(__DIR__)));
-    while(substr($file,0,1) == '/')
-       $file = substr($file,1);
-    $n = count(explode('/',$file));
+    $file = $F['file'];
+    $file = substr($file, strlen(dirname(__DIR__)));
+    while (substr($file, 0, 1) == '/')
+       $file = substr($file, 1);
+    $n = count(explode('/', $file));
     $out = $_SERVER['SCRIPT_NAME'];
-    for ($i= 0; $i < $n; $i++)
+    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;
+    $s .= '://' . $_SERVER['HTTP_HOST'] . $out;
     return $s;
 }
 
 /* JSON functions */
 
-  public function return_json($data,$status=1) {
+  public function return_json($data, $status = 1) {
      $return_array = [];
      $return_array['status'] = $status;
      $return_array['data'] = $data;
-     $return_array['tou'] =  "Please consult Terms of Use at: ".$this->GetRootURL()."/tou.php";
+     $return_array['tou'] = "Please consult Terms of Use at: " . $this->GetRootURL() . "/tou.php";
      return(json_encode($return_array));
   }
 
@@ -230,11 +230,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']];
+     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']];
+          $return_array[] = ['lang'=>$id, 'display'=>$val['display'], 'locale'=>$val['locale']];
      }
      echo $this->return_json($return_array);
   }
@@ -249,10 +249,10 @@ 
      $FED = $this->printCountryList(1);
      $return_array = [];
      foreach ($FED as $id => $val) {
-       if($this->version == 1)
-          $return_array[] = ['id'=>$id,'display'=>$val];
+       if ($this->version == 1)
+          $return_array[] = ['id'=>$id, 'display'=>$val];
        else
-          $return_array[] = ['federation'=>$id,'display'=>$val];
+          $return_array[] = ['federation'=>$id, 'display'=>$val];
      }
      echo $this->return_json($return_array);
   }
@@ -265,13 +265,13 @@ 
  */
 
   public function JSON_listIdentityProviders($country) {
-     $idps = Federation::listAllIdentityProviders(1,$country);
+     $idps = Federation::listAllIdentityProviders(1, $country);
      $return_array = [];
      foreach ($idps as $idp) {
-        if($this->version == 1)
-           $return_array[] = ['id'=>$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']];
+           $return_array[] = ['idp'=>$idp['entityID'], 'display'=>$idp['title']];
      }
      echo $this->return_json($return_array);
   }
@@ -287,7 +287,7 @@ 
      $idps = Federation::listAllIdentityProviders(1);
      $return_array = [];
      foreach ($idps as $idp) {
-        if($this->version == 1)
+        if ($this->version == 1)
            $idp['id'] = $idp['entityID'];
          else
            $idp['idp'] = $idp['entityID'];
@@ -306,14 +306,14 @@ 
  */
 
 
-  public function JSON_orderIdentityProviders($country,$L=NULL) {
-     $idps = $this->orderIdentityProviders($country,$L);
+  public function JSON_orderIdentityProviders($country, $L = NULL) {
+     $idps = $this->orderIdentityProviders($country, $L);
      $return_array = [];
      foreach ($idps as $idp) {
-        if($this->version == 1)
-           $return_array[] = ['id'=>$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']];
+           $return_array[] = ['idp'=>$idp['id'], 'display'=>$idp['title']];
      }
      echo $this->return_json($return_array);
   }
@@ -324,28 +324,28 @@ 
  * @param int $idp_id the IdP identifier
  * @return string JSON encoded data
  */
-  public function JSON_listProfiles($idp_id,$sort = 0) {
+  public function JSON_listProfiles($idp_id, $sort = 0) {
      $this->set_locale("web_user");
      $return_array = [];
      try {     
          $idp = new IdP($idp_id);
      }
      catch (Exception $fail) {
-        echo $this->return_json($return_array,0);
+        echo $this->return_json($return_array, 0);
         return;
      }
      $l = 0;
      $logo = $idp->getAttributes('general:logo_file');
-     if($logo)
+     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]; 
+       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]; 
+          $return_array[] = ['profile'=>$P->identifier, 'display'=>$P->name, 'idp_name'=>$P->inst_name, 'logo'=>$l]; 
      }
      echo $this->return_json($return_array);
   }
@@ -361,20 +361,20 @@ 
      $return_array = [];
      $a = $this->profileAttributes($profile_id);
      $thedevices = $a['devices'];
-     if(!isset($profile_redirect) || ! $profile_redirect) {
+     if (!isset($profile_redirect) || !$profile_redirect) {
          $profile_redirect = 0;
          foreach ($thedevices as $D) {
-              if(isset($D['options']) && isset($D['options']['hidden']) &&  $D['options']['hidden'])
+              if (isset($D['options']) && isset($D['options']['hidden']) && $D['options']['hidden'])
                    continue;
               $disp = $D['display'];
-              if($this->version == 1) {
-                 if($D['id'] === '0') {
+              if ($this->version == 1) {
+                 if ($D['id'] === '0') {
                      $profile_redirect = 1;
                      $disp = $c;
                  }
                 $return_array[] = ['id'=>$D['id'], 'display'=>$disp, 'status'=>$D['status'], 'redirect'=>$D['redirect']];
              } else {
-                 if($D['device'] === '0') {
+                 if ($D['device'] === '0') {
                      $profile_redirect = 1;
                      $disp = $c;
                  }
@@ -393,12 +393,12 @@ 
  * @param int $prof_id profile identifier
  * @return string JSON encoded data
  */
-  public function JSON_generateInstaller($device,$prof_id) {
-    debug(4,"JSON::generateInstaller arguments: $device,$prof_id\n");
-    $o = $this->generateInstaller($device,$prof_id);
-    debug(4,"output from GUI::generateInstaller:");
-    debug(4,$o);
-    debug(4,json_encode($o));
+  public function JSON_generateInstaller($device, $prof_id) {
+    debug(4, "JSON::generateInstaller arguments: $device,$prof_id\n");
+    $o = $this->generateInstaller($device, $prof_id);
+    debug(4, "output from GUI::generateInstaller:");
+    debug(4, $o);
+    debug(4, json_encode($o));
 //    header('Content-type: application/json; utf-8');
     echo $this->return_json($o);
  }
@@ -411,12 +411,12 @@ 
  * @return binary installerFile
  */
 
- public function downloadInstaller($device,$prof_id,$generated_for='user') {
-    debug(4,"downloadInstaller arguments: $device,$prof_id,$generated_for\n");
-    $o = $this->generateInstaller($device,$prof_id);
-    debug(4,"output from GUI::generateInstaller:");
-    debug(4,$o);
-    if(! $o['link']) {
+ public function downloadInstaller($device, $prof_id, $generated_for = 'user') {
+    debug(4, "downloadInstaller arguments: $device,$prof_id,$generated_for\n");
+    $o = $this->generateInstaller($device, $prof_id);
+    debug(4, "output from GUI::generateInstaller:");
+    debug(4, $o);
+    if (!$o['link']) {
        header("HTTP/1.0 404 Not Found");
        return;
     }
@@ -424,9 +424,9 @@ 
     $profile->incrementDownloadStats($device, $generated_for);
     $file = $this->i_path;
     $filetype = $o['mime'];
-    debug(4,"installer MIME type:$filetype\n");
-    header("Content-type: ".$filetype);
-    header('Content-Disposition: inline; filename="'.basename($file).'"');
+    debug(4, "installer MIME type:$filetype\n");
+    header("Content-type: " . $filetype);
+    header('Content-Disposition: inline; filename="' . basename($file) . '"');
     header('Content-Length: ' . filesize($file));
     ob_clean();
     flush();
@@ -444,67 +444,67 @@ 
  *
  */
 
- public function sendLogo($idp_id, $disco=FALSE, $width=0, $height=0) {
+ public function sendLogo($idp_id, $disco = FALSE, $width = 0, $height = 0) {
    $ExpStr = '';
    $resize = 0;
-   if(($width || $height) && is_numeric($width) && is_numeric($height)) {
+   if (($width || $height) && is_numeric($width) && is_numeric($height)) {
        $resize = 1;
-       if($height == 0)
+       if ($height == 0)
           $height = 10000;
-       if($width == 0)
+       if ($width == 0)
           $width = 10000;
-       $logo_file = CAT::$root.'/web/downloads/logos/'.$idp_id.'_'.$width.'_'.$height.'.png';
-   } elseif($disco == 1) {
+       $logo_file = CAT::$root . '/web/downloads/logos/' . $idp_id . '_' . $width . '_' . $height . '.png';
+   } elseif ($disco == 1) {
        $width = 120;
        $height = 40;
        $resize = 1;
-       $logo_file = CAT::$root.'/web/downloads/logos/'.$idp_id.'_'.$width.'_'.$height.'.png';
+       $logo_file = CAT::$root . '/web/downloads/logos/' . $idp_id . '_' . $width . '_' . $height . '.png';
    }
 
-   if($resize && is_file($logo_file)){
-      debug(4,"Using cached logo $logo_file for: $idp_id\n");
+   if ($resize && is_file($logo_file)) {
+      debug(4, "Using cached logo $logo_file for: $idp_id\n");
       $blob = file_get_contents($logo_file);
       $filetype = 'image/png';
    }
    else {
       $idp = new IdP($idp_id);
       $at = $idp->getAttributes('general:logo_file');
-      $blob =  $at[0]['value'];
+      $blob = $at[0]['value'];
       $info = new finfo();
       $filetype = $info->buffer($blob, FILEINFO_MIME_TYPE);
       $offset = 60 * 60 * 24 * 30;
-      $ExpStr = "Expires: " . gmdate( "D, d M Y H:i:s", time() + $offset ) . " GMT";
-      if($resize) {
+      $ExpStr = "Expires: " . gmdate("D, d M Y H:i:s", time() + $offset) . " GMT";
+      if ($resize) {
          $filetype = 'image/png';
          $image = new Imagick();
          $image->readImageBlob($blob);
-         if( $image->setImageFormat('PNG')) {
-           $image->thumbnailImage($width,$height,1);
+         if ($image->setImageFormat('PNG')) {
+           $image->thumbnailImage($width, $height, 1);
            $blob = $image->getImageBlob();
-           debug(4,"Writing cached logo $logo_file for: $idp_id\n");
-           file_put_contents($logo_file,$blob);
+           debug(4, "Writing cached logo $logo_file for: $idp_id\n");
+           file_put_contents($logo_file, $blob);
          }
          else
            $blob = "XXXXXX";
       }
    }
-   header( "Content-type: ".$filetype );
-   header( "Cache-Control:max-age=36000, must-revalidate" );
-   header( $ExpStr );
+   header("Content-type: " . $filetype);
+   header("Cache-Control:max-age=36000, must-revalidate");
+   header($ExpStr);
    echo $blob;
  }
 
  public function locateUser() {
    $host = $_SERVER['REMOTE_ADDR'];
    $record = geoip_record_by_name($host);
-   if($record) {
+   if ($record) {
      $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')
+     if ($result['country'] == 'GB')
          $result['country'] = 'UK';
      $result['region'] = $record['region'];
-     $result['geo'] = ['lat' => (float)$record['latitude'] , 'lon' => (float)$record['longitude']];
+     $result['geo'] = ['lat' => (float) $record['latitude'], 'lon' => (float) $record['longitude']];
    } else {
      $result = ['status' => 'error', 'error' =>'Problem listing countries']; 
    }
@@ -525,22 +525,22 @@ 
    $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')
+   if ($result['country'] == 'GB')
        $result['country'] = 'UK';
    $result['region'] = $record->continent->name;
 
-   $result['geo'] = ['lat' => (float)$record->location->latitude , 'lon' => (float)$record->location->longitude];
+   $result['geo'] = ['lat' => (float) $record->location->latitude, 'lon' => (float) $record->location->longitude];
    return($result);
  }
 
 public function JSON_locateUser() {
     header('Content-type: application/json; utf-8');
    
-    if(empty(Config::$GEOIP['version']) || Config::$GEOIP['version'] == 0)
+    if (empty(Config::$GEOIP['version']) || Config::$GEOIP['version'] == 0)
       echo json_encode(['status' => 'error', 'error' =>'Geolocation not supported']);
-    if(Config::$GEOIP['version'] == 1)
+    if (Config::$GEOIP['version'] == 1)
       echo json_encode($this->locateUser());
-    if(Config::$GEOIP['version'] == 2)
+    if (Config::$GEOIP['version'] == 2)
       echo json_encode($this->locateUser2());
 }
 
@@ -560,11 +560,11 @@ 
   * @param array $P2 - second point as an 'lat', 'lon' array 
   * @return float distance in km
   */
-private function geoDistance($P1,$P2) {
+private function geoDistance($P1, $P2) {
 
   $dist = sin(deg2rad($P1['lat'])) * sin(deg2rad($P2['lat'])) +  
          cos(deg2rad($P1['lat'])) * cos(deg2rad($P2['lat'])) * cos(deg2rad($P1['lon'] - $P2['lon']));
-  $dist = rad2deg(acos($dist)) * 60 * 1.1852 ;
+  $dist = rad2deg(acos($dist)) * 60 * 1.1852;
   return(round($dist));
 }
 
@@ -574,44 +574,44 @@ 
   * @return array $IdPs -  list of arrays ('id', 'name');
   */
 
-public function orderIdentityProviders($country,$L=NULL) {
-     $idps = Federation::listAllIdentityProviders(1,$country);
+public function orderIdentityProviders($country, $L = NULL) {
+     $idps = Federation::listAllIdentityProviders(1, $country);
 
-  if(is_null($L)) {
+  if (is_null($L)) {
      $U = $this->locateUser();
-     if($U['status'] == 'ok') {
+     if ($U['status'] == 'ok') {
      $L = $U['geo'];
      } else {
-       $L = ['lat'=>"90",'lon'=>"0"];
+       $L = ['lat'=>"90", 'lon'=>"0"];
      }
   }
-  $T=[];
-  $R=[];
+  $T = [];
+  $R = [];
      foreach ($idps as $idp) {
         $T[$idp['entityID']] = $idp['title'];
         $dist = 10000;
-        if(isset($idp['geo'])) {
-          $G=$idp['geo'];
-          if(isset($G['lon'])) {
-             $d1 = $this->geoDistance($L,$G); 
-             if( $d1 < $dist)
+        if (isset($idp['geo'])) {
+          $G = $idp['geo'];
+          if (isset($G['lon'])) {
+             $d1 = $this->geoDistance($L, $G); 
+             if ($d1 < $dist)
                 $dist = $d1;
           } else {
             foreach ($G as $g) {
-             $d1 = $this->geoDistance($L,$g); 
-             if( $d1 < $dist)
+             $d1 = $this->geoDistance($L, $g); 
+             if ($d1 < $dist)
                 $dist = $d1;
             }
           }
         }
-       if($dist > 100)
-         $dist=10000;
-      $d = sprintf("%06d",$dist);
-      $R[$idp['entityID']] = $d." ".$idp['title'];
+       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)
+      if ($this->version == 1)
          $outarray[] = ['id'=>$r, 'title'=>$T[$r]];
       else
          $outarray[] = ['idp'=>$r, 'title'=>$T[$r]];
@@ -629,44 +629,44 @@ 
 
 public function detectOS() {
    $Dev = Devices::listDevices();
-   if( isset($_REQUEST['device']) && isset($Dev[$_REQUEST['device']]) && (!isset($device['options']['hidden']) || $device['options']['hidden'] == 0)) {
+   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']]);
+      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']]);
+         return(['device'=>$dev_id, 'display'=>$device['display'], 'group'=>$device['group']]);
    }
    $browser = $_SERVER['HTTP_USER_AGENT'];
-   debug(4,"HTTP_USER_AGENT=$browser\n");
+   debug(4, "HTTP_USER_AGENT=$browser\n");
    foreach ($Dev as $dev_id => $device) {
-     if(!isset($device['match']))
+     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']]);
+     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']]);
+             return(['device'=>$dev_id, 'display'=>$device['display'], 'group'=>$device['group']]);
        }
        else {
-         debug(2, "Unrecognised system: ".$_SERVER['HTTP_USER_AGENT']."\n");
+         debug(2, "Unrecognised system: " . $_SERVER['HTTP_USER_AGENT'] . "\n");
          return(false);
        }
      }
    }
-   debug(2, "Unrecognised system: ".$_SERVER['HTTP_USER_AGENT']."\n");
+   debug(2, "Unrecognised system: " . $_SERVER['HTTP_USER_AGENT'] . "\n");
    return(false);
 }
 
 public function JSON_detectOS() {
-     $return_array=$this->detectOS();
-     if($return_array)
+     $return_array = $this->detectOS();
+     if ($return_array)
         $status = 1;
      else
         $status = 0;
-     echo $this->return_json($return_array,$status);
+     echo $this->return_json($return_array, $status);
 }
 
 
@@ -675,7 +675,7 @@ 
 private $i_path;
   
 }
-function profile_sort($P1,$P2) {
+function profile_sort($P1, $P2) {
    return strcasecmp($P1->name, $P2->name);
 } 
 ?>

Braces +139 added lines, -107 removed lines

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

core/UserManagement.php

Doc Comments +4 added lines, -5 removed lines

@@ -211,10 +211,9 @@ 
      * 
      * @param boolean $by_fedadmin is the invitation token created for a federation admin or from an existing inst admin
      * @param type $for identifier (typically email address) for which the invitation is created
-     * @param mixed $inst either an instance of the IdP class (for existing institutions to invite new admins) or a string (new institution - this is the inst name then)
-     * @param string $external_id if the IdP to be created is related to an external DB entity, this parameter contains that ID
-     * @param type $country if the institution is new (i.e. $inst is a string) this parameter needs to specify the federation of the new inst
-     * @return mixed The function returns either the token (as string) or FALSE if something went wrong
+     * @param integer $external_id if the IdP to be created is related to an external DB entity, this parameter contains that ID
+     * @param integer $country if the institution is new (i.e. $inst is a string) this parameter needs to specify the federation of the new inst
+     * @return string|false The function returns either the token (as string) or FALSE if something went wrong
      */
     public function createToken($by_fedadmin, $for, $inst_identifier, $external_id = 0, $country = 0) {
         $for = DBConnection::escape_value(UserManagement::$DB_TYPE, $for);
@@ -245,7 +244,7 @@ 
     /**
      * Retrieves all pending invitations for an institution or for a federation.
      * 
-     * @param type $idp_identifier the identifier of the institution. If not set, returns invitations for not-yet-created insts
+     * @param integer $idp_identifier the identifier of the institution. If not set, returns invitations for not-yet-created insts
      * @return if idp_identifier is set: an array of strings (mail addresses); otherwise an array of tuples (country;name;mail)
      */
     public function listPendingInvitations($idp_identifier = 0) {

Spacing +6 added lines, -6 removed lines

@@ -158,7 +158,7 @@ 
 %s"), $bestnameguess, Config::$CONSORTIUM['name'], strtoupper($fed->identifier), Config::$APPEARANCE['productname'], Config::$APPEARANCE['productname_long']);
                     $retval = $user->sendMailToUser(_("IdP in your federation was created"), $message);
                     if ($retval == FALSE)
-                        debug (2, "Mail to federation admin was NOT sent!\n");
+                        debug(2, "Mail to federation admin was NOT sent!\n");
                 }
 
                 return $idp;
@@ -226,14 +226,14 @@ 
             return $token;
         } else if (func_num_args() == 4) { // string name, but no country - new IdP with link to external DB
             // what country are we talking about?
-            $newname = DBConnection::escape_value(UserManagement::$DB_TYPE,valid_string_db($inst_identifier));
+            $newname = DBConnection::escape_value(UserManagement::$DB_TYPE, valid_string_db($inst_identifier));
             $extinfo = Federation::getExternalDBEntityDetails($external_id);
-            $externalhandle = DBConnection::escape_value(UserManagement::$DB_TYPE,valid_string_db($external_id));
+            $externalhandle = DBConnection::escape_value(UserManagement::$DB_TYPE, valid_string_db($external_id));
             DBConnection::exec(UserManagement::$DB_TYPE, "INSERT INTO invitations (invite_issuer_level, invite_dest_mail, invite_token,name,country, external_db_uniquehandle) VALUES('$level', '$for', '$token', '" . $newname . "', '" . $extinfo['country'] . "',  '" . $externalhandle . "')");
             return $token;
         } else if (func_num_args() == 5) { // string name, and country set - whole new IdP
-            $newname = DBConnection::escape_value(UserManagement::$DB_TYPE,valid_string_db($inst_identifier));
-            $newcountry = DBConnection::escape_value(UserManagement::$DB_TYPE,valid_string_db($country));
+            $newname = DBConnection::escape_value(UserManagement::$DB_TYPE, valid_string_db($inst_identifier));
+            $newcountry = DBConnection::escape_value(UserManagement::$DB_TYPE, valid_string_db($country));
             DBConnection::exec(UserManagement::$DB_TYPE, "INSERT INTO invitations (invite_issuer_level, invite_dest_mail, invite_token,name,country) VALUES('$level', '$for', '$token', '" . $newname . "', '" . $newcountry . "')");
             return $token;
         } else {
@@ -252,7 +252,7 @@ 
         $retval = [];
         $invitations = DBConnection::exec(UserManagement::$DB_TYPE, "SELECT cat_institution_id, country, name, invite_issuer_level, invite_dest_mail, invite_token 
                                         FROM invitations 
-                                        WHERE cat_institution_id " . ( $idp_identifier != 0 ? "= $idp_identifier" : "IS NULL") . " AND invite_created >= TIMESTAMPADD(DAY, -1, NOW()) AND used = 0");
+                                        WHERE cat_institution_id " . ($idp_identifier != 0 ? "= $idp_identifier" : "IS NULL") . " AND invite_created >= TIMESTAMPADD(DAY, -1, NOW()) AND used = 0");
         if ($idp_identifier != 0) { // list invitations for existing institution, must match cat_institution_id
             while ($a = mysqli_fetch_object($invitations)) {
                 debug(4, "Retrieving pending invitations for IdP $idp_identifier.\n");

Braces +22 added lines, -16 removed lines

@@ -78,10 +78,11 @@ 
         } else { // invalid token... be a little verbose what's wrong with it
             $check_reason = DBConnection::exec(UserManagement::$DB_TYPE, "SELECT invite_token, used FROM invitations WHERE invite_token = '$token'");
             if ($a = mysqli_fetch_object($check_reason)) {
-                if ($a->used == 1)
-                    return "FAIL-ALREADYCONSUMED";
-                else
-                    return "FAIL-EXPIRED";
+                if ($a->used == 1) {
+                                    return "FAIL-ALREADYCONSUMED";
+                } else {
+                                    return "FAIL-EXPIRED";
+                }
             } else {
                 return "FAIL-NONEXISTINGTOKEN";
             }
@@ -157,8 +158,9 @@ 
 
 %s"), $bestnameguess, Config::$CONSORTIUM['name'], strtoupper($fed->identifier), Config::$APPEARANCE['productname'], Config::$APPEARANCE['productname_long']);
                     $retval = $user->sendMailToUser(_("IdP in your federation was created"), $message);
-                    if ($retval == FALSE)
-                        debug (2, "Mail to federation admin was NOT sent!\n");
+                    if ($retval == FALSE) {
+                                            debug (2, "Mail to federation admin was NOT sent!\n");
+                    }
                 }
 
                 return $idp;
@@ -256,14 +258,16 @@ 
         if ($idp_identifier != 0) { // list invitations for existing institution, must match cat_institution_id
             while ($a = mysqli_fetch_object($invitations)) {
                 debug(4, "Retrieving pending invitations for IdP $idp_identifier.\n");
-                if ($a->cat_institution_id == $idp_identifier)
-                    $retval[] = $a->invite_dest_mail;
+                if ($a->cat_institution_id == $idp_identifier) {
+                                    $retval[] = $a->invite_dest_mail;
+                }
             }
         } else { // list all invitations for *new* institutions
             while ($a = mysqli_fetch_object($invitations)) {
                 debug(4, "Retrieving pending invitations for NEW institutions.\n");
-                if ($a->cat_institution_id == NULL)
-                    $retval[] = ["country" => $a->country, "name" => $a->name, "mail" => $a->invite_dest_mail, "token" => $a->invite_token];
+                if ($a->cat_institution_id == NULL) {
+                                    $retval[] = ["country" => $a->country, "name" => $a->name, "mail" => $a->invite_dest_mail, "token" => $a->invite_token];
+                }
             }
         };
         return $retval;
@@ -280,10 +284,11 @@ 
                                         WHERE invite_created >= TIMESTAMPADD(HOUR, -25, NOW()) AND invite_created < TIMESTAMPADD(HOUR, -24, NOW()) AND used = 0");
         while ($a = mysqli_fetch_object($invitations)) {
                 debug(4, "Retrieving recently expired invitations (expired in last hour)\n");
-                if ($a->cat_institution_id == NULL)
-                    $retval[] = ["country" => $a->country, "level" => $a->invite_issuer_level, "name" => $a->name, "mail" => $a->invite_dest_mail];
-                else
-                    $retval[] = ["country" => $a->country, "level" => $a->invite_issuer_level, "name" => "Existing IdP", "mail" => $a->invite_dest_mail];
+                if ($a->cat_institution_id == NULL) {
+                                    $retval[] = ["country" => $a->country, "level" => $a->invite_issuer_level, "name" => $a->name, "mail" => $a->invite_dest_mail];
+                } else {
+                                    $retval[] = ["country" => $a->country, "level" => $a->invite_issuer_level, "name" => "Existing IdP", "mail" => $a->invite_dest_mail];
+                }
             }
         return $retval;
     }
@@ -299,8 +304,9 @@ 
         $returnarray = [];
         $userid = DBConnection::escape_value(UserManagement::$DB_TYPE, $userid);
         $institutions = DBConnection::exec(UserManagement::$DB_TYPE, "SELECT institution_id FROM ownership WHERE user_id = '$userid' ORDER BY institution_id");
-        while ($a = mysqli_fetch_object($institutions))
-            $returnarray[] = $a->institution_id;
+        while ($a = mysqli_fetch_object($institutions)) {
+                    $returnarray[] = $a->institution_id;
+        }
         return $returnarray;
     }
 

core/X509.php

Doc Comments +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 /** transform PEM formed certificate to DER format
  *
  *  @param mixed $pem_data blob of data, which is hopefully a PEM certificate
- *  @return the DER representation of the certificate
+ *  @return string DER representation of the certificate
  *
  *  @author http://php.net/manual/en/ref.openssl.php (comment from 29-Mar-2007)
  */
@@ -137,7 +137,7 @@ 
   * returns an array containing the PEM format of the certificate (s)
   * if the file contains multiple certificates it gets split into components
   *
-  * @param blob $cadata certificate in ether PEM or DER format
+  * @param string $cadata certificate in ether PEM or DER format
   * @return array
   */
 

Indentation +61 added lines, -61 removed lines

@@ -33,42 +33,42 @@ 
  *  @author http://php.net/manual/en/ref.openssl.php (comment from 29-Mar-2007)
  */
 public function pem2der($pem_data) {
-   $begin = "CERTIFICATE-----";
-   $end   = "-----END";
-   $pem_data = substr($pem_data, strpos($pem_data, $begin)+strlen($begin));
-   $pem_data = substr($pem_data, 0, strpos($pem_data, $end));
-   $der = base64_decode($pem_data);
-   return $der;
+    $begin = "CERTIFICATE-----";
+    $end   = "-----END";
+    $pem_data = substr($pem_data, strpos($pem_data, $begin)+strlen($begin));
+    $pem_data = substr($pem_data, 0, strpos($pem_data, $end));
+    $der = base64_decode($pem_data);
+    return $der;
 }
 
 public function der2pem($der_data) {
-   $pem = chunk_split(base64_encode($der_data), 64, "\n");
-   $pem = "-----BEGIN CERTIFICATE-----\n".$pem."-----END CERTIFICATE-----\n";
-   return $pem;
+    $pem = chunk_split(base64_encode($der_data), 64, "\n");
+    $pem = "-----BEGIN CERTIFICATE-----\n".$pem."-----END CERTIFICATE-----\n";
+    return $pem;
 }
 /**
-  * prepare PEM and DER formats, MD5 and SHA1 fingerprints and subject of the certificate
-  *
-  * returns an array with the following fields:
-  * <pre> uuid
-  * pem	certificate in PEM format
-  * der	certificate in DER format
-  * md5	MD5 fingerprint
-  * sha1	SHA1 fingerprint
-  * name	certificate subject
-  * root value 1 if root certificate 0 otherwise
-  * ca   value 1 if CA certificate 0 otherwise
-  *
-  * </pre>
-  * @param blob $cadata certificate in ether PEM or DER format
-  * @return array
-  */
+ * prepare PEM and DER formats, MD5 and SHA1 fingerprints and subject of the certificate
+ *
+ * returns an array with the following fields:
+ * <pre> uuid
+ * pem	certificate in PEM format
+ * der	certificate in DER format
+ * md5	MD5 fingerprint
+ * sha1	SHA1 fingerprint
+ * name	certificate subject
+ * root value 1 if root certificate 0 otherwise
+ * ca   value 1 if CA certificate 0 otherwise
+ *
+ * </pre>
+ * @param blob $cadata certificate in ether PEM or DER format
+ * @return array
+ */
 public function processCertificate ($cadata) {
     $begin_pem = strpos($cadata,"-----BEGIN CERTIFICATE-----");
-   if($begin_pem !== FALSE) {
+    if($begin_pem !== FALSE) {
         $end_c = strpos($cadata,"-----END CERTIFICATE-----") + 25;
         if($end_c !== FALSE) {
-           $cadata = substr($cadata,$begin_pem,$end_c - $begin_pem);
+            $cadata = substr($cadata,$begin_pem,$end_c - $begin_pem);
         }
         $ca_der = X509::pem2der($cadata);
         $ca_pem = X509::der2pem($ca_der);
@@ -91,25 +91,25 @@ 
     $out =  ["uuid" => uuid(), "pem" => $ca_pem, "der" => $ca_der, "md5"=>$md5, "sha1"=>$sha1, "name"=>$mydetails['name']];
     $diff_a = array_diff($mydetails['issuer'], $mydetails['subject']);
     if(count($diff_a) == 0 ) {
-     $out['root'] = 1;
-     $mydetails['type'] = 'root';
+        $out['root'] = 1;
+        $mydetails['type'] = 'root';
     } else {
-     $out['root'] = 0;
+        $out['root'] = 0;
     }
     // if no basicContraints are set at all, this is a problem in itself
     // is this a CA? or not? Treat as server, but add a warning...
     if (isset($mydetails['extensions']['basicConstraints'])) {
-       $out['ca'] = preg_match('/^CA:TRUE/',$mydetails['extensions']['basicConstraints']);
-       $out['basicconstraints_set'] = 1;
+        $out['ca'] = preg_match('/^CA:TRUE/',$mydetails['extensions']['basicConstraints']);
+        $out['basicconstraints_set'] = 1;
     } else {
-       $out['ca'] = 0; // we need to resolve this ambiguity
-       $out['basicconstraints_set'] = 0;
+        $out['ca'] = 0; // we need to resolve this ambiguity
+        $out['basicconstraints_set'] = 0;
     }
     
     if( $out['ca'] > 0 && $out['root'] == 0 )
-     $mydetails['type'] = 'interm_ca';
+        $mydetails['type'] = 'interm_ca';
     if( $out['ca'] == 0 && $out['root'] == 0 )
-     $mydetails['type'] = 'server';
+        $mydetails['type'] = 'server';
     $mydetails['sha1'] = $sha1;
     $out['full_details'] = $mydetails;
     
@@ -119,51 +119,51 @@ 
     
     openssl_x509_export($myca, $output, FALSE);
     if(preg_match('/^\s+Signature Algorithm:\s*(.*)\s*$/m', $output, $match)) 
-      $out['full_details']['signature_algorithm'] = $match[1];
+        $out['full_details']['signature_algorithm'] = $match[1];
     else
-      $out['full_details']['signature_algorithm'] = $output;
+        $out['full_details']['signature_algorithm'] = $output;
  
     if((preg_match('/^\s+Public-Key:\s*\((.*) bit\)\s*$/m', $output, $match)) && is_numeric($match[1])) 
-      $out['full_details']['public_key_length'] = $match[1];
+        $out['full_details']['public_key_length'] = $match[1];
     else
-      $out['full_details']['public_key_length'] = $output;
+        $out['full_details']['public_key_length'] = $output;
     
     return $out;
 }
 
 /**
-  * split a certificate file into components 
-  *
-  * returns an array containing the PEM format of the certificate (s)
-  * if the file contains multiple certificates it gets split into components
-  *
-  * @param blob $cadata certificate in ether PEM or DER format
-  * @return array
-  */
+ * split a certificate file into components 
+ *
+ * returns an array containing the PEM format of the certificate (s)
+ * if the file contains multiple certificates it gets split into components
+ *
+ * @param blob $cadata certificate in ether PEM or DER format
+ * @return array
+ */
 
 public function splitCertificate($cadata) {
-  $returnarray = [];
-  // maybe we got no real cert data at all? The code is hardened, but will
-  // produce ugly WARNING level output in the logfiles, so let's avoid at least
-  // the trivial case: if the file is empty, there's no cert in it
-  if ($cadata == "")
-      return $returnarray;
-  $start_c = strpos($cadata,"-----BEGIN CERTIFICATE-----" );
-  if( $start_c !== FALSE) {
+    $returnarray = [];
+    // maybe we got no real cert data at all? The code is hardened, but will
+    // produce ugly WARNING level output in the logfiles, so let's avoid at least
+    // the trivial case: if the file is empty, there's no cert in it
+    if ($cadata == "")
+        return $returnarray;
+    $start_c = strpos($cadata,"-----BEGIN CERTIFICATE-----" );
+    if( $start_c !== FALSE) {
         $cadata = substr($cadata,$start_c);
         $end_c = strpos($cadata,"-----END CERTIFICATE-----") + 25;
         $next_c = strpos($cadata,"-----BEGIN CERTIFICATE-----",30);
         while ( $next_c !== FALSE) {
-          $returnarray[] = substr($cadata,0,$end_c);
-          $cadata = substr($cadata,$next_c);
-          $end_c = strpos($cadata,"-----END CERTIFICATE-----") + 25;
-          $next_c = strpos($cadata,"-----BEGIN CERTIFICATE-----",30);
+            $returnarray[] = substr($cadata,0,$end_c);
+            $cadata = substr($cadata,$next_c);
+            $end_c = strpos($cadata,"-----END CERTIFICATE-----") + 25;
+            $next_c = strpos($cadata,"-----BEGIN CERTIFICATE-----",30);
         }
         $returnarray[] = substr($cadata,0,$end_c);
     } else {
         // TODO: before we blindly hand it over to der2pem - is this valid DER
         // data at all?
-      $returnarray[] = X509::der2pem($cadata);
+        $returnarray[] = X509::der2pem($cadata);
     }
     // print_r($returnarray);
     

Spacing +29 added lines, -29 removed lines

@@ -35,7 +35,7 @@ 
 public function pem2der($pem_data) {
    $begin = "CERTIFICATE-----";
    $end   = "-----END";
-   $pem_data = substr($pem_data, strpos($pem_data, $begin)+strlen($begin));
+   $pem_data = substr($pem_data, strpos($pem_data, $begin) + strlen($begin));
    $pem_data = substr($pem_data, 0, strpos($pem_data, $end));
    $der = base64_decode($pem_data);
    return $der;
@@ -43,7 +43,7 @@ 
 
 public function der2pem($der_data) {
    $pem = chunk_split(base64_encode($der_data), 64, "\n");
-   $pem = "-----BEGIN CERTIFICATE-----\n".$pem."-----END CERTIFICATE-----\n";
+   $pem = "-----BEGIN CERTIFICATE-----\n" . $pem . "-----END CERTIFICATE-----\n";
    return $pem;
 }
 /**
@@ -63,19 +63,19 @@ 
   * @param blob $cadata certificate in ether PEM or DER format
   * @return array
   */
-public function processCertificate ($cadata) {
-    $begin_pem = strpos($cadata,"-----BEGIN CERTIFICATE-----");
-   if($begin_pem !== FALSE) {
-        $end_c = strpos($cadata,"-----END CERTIFICATE-----") + 25;
-        if($end_c !== FALSE) {
-           $cadata = substr($cadata,$begin_pem,$end_c - $begin_pem);
+public function processCertificate($cadata) {
+    $begin_pem = strpos($cadata, "-----BEGIN CERTIFICATE-----");
+   if ($begin_pem !== FALSE) {
+        $end_c = strpos($cadata, "-----END CERTIFICATE-----") + 25;
+        if ($end_c !== FALSE) {
+           $cadata = substr($cadata, $begin_pem, $end_c - $begin_pem);
         }
         $ca_der = X509::pem2der($cadata);
         $ca_pem = X509::der2pem($ca_der);
         // echo "XXXXXXXXXXXXX".$cadata."XXXXXXXXXXXXX"; exit;
     } else {
         $ca_der = $cadata;
-        $ca_pem =  X509::der2pem($cadata);
+        $ca_pem = X509::der2pem($cadata);
     }
 
     # check that the certificate is OK
@@ -86,11 +86,11 @@ 
     $mydetails = openssl_x509_parse($myca);
     if (!isset($mydetails['subject']))
         return FALSE;
-    $md5 = openssl_digest($ca_der,'MD5');
-    $sha1 = openssl_digest($ca_der,'SHA1');
-    $out =  ["uuid" => uuid(), "pem" => $ca_pem, "der" => $ca_der, "md5"=>$md5, "sha1"=>$sha1, "name"=>$mydetails['name']];
+    $md5 = openssl_digest($ca_der, 'MD5');
+    $sha1 = openssl_digest($ca_der, 'SHA1');
+    $out = ["uuid" => uuid(), "pem" => $ca_pem, "der" => $ca_der, "md5"=>$md5, "sha1"=>$sha1, "name"=>$mydetails['name']];
     $diff_a = array_diff($mydetails['issuer'], $mydetails['subject']);
-    if(count($diff_a) == 0 ) {
+    if (count($diff_a) == 0) {
      $out['root'] = 1;
      $mydetails['type'] = 'root';
     } else {
@@ -99,16 +99,16 @@ 
     // if no basicContraints are set at all, this is a problem in itself
     // is this a CA? or not? Treat as server, but add a warning...
     if (isset($mydetails['extensions']['basicConstraints'])) {
-       $out['ca'] = preg_match('/^CA:TRUE/',$mydetails['extensions']['basicConstraints']);
+       $out['ca'] = preg_match('/^CA:TRUE/', $mydetails['extensions']['basicConstraints']);
        $out['basicconstraints_set'] = 1;
     } else {
        $out['ca'] = 0; // we need to resolve this ambiguity
        $out['basicconstraints_set'] = 0;
     }
     
-    if( $out['ca'] > 0 && $out['root'] == 0 )
+    if ($out['ca'] > 0 && $out['root'] == 0)
      $mydetails['type'] = 'interm_ca';
-    if( $out['ca'] == 0 && $out['root'] == 0 )
+    if ($out['ca'] == 0 && $out['root'] == 0)
      $mydetails['type'] = 'server';
     $mydetails['sha1'] = $sha1;
     $out['full_details'] = $mydetails;
@@ -118,12 +118,12 @@ 
     
     
     openssl_x509_export($myca, $output, FALSE);
-    if(preg_match('/^\s+Signature Algorithm:\s*(.*)\s*$/m', $output, $match)) 
+    if (preg_match('/^\s+Signature Algorithm:\s*(.*)\s*$/m', $output, $match)) 
       $out['full_details']['signature_algorithm'] = $match[1];
     else
       $out['full_details']['signature_algorithm'] = $output;
  
-    if((preg_match('/^\s+Public-Key:\s*\((.*) bit\)\s*$/m', $output, $match)) && is_numeric($match[1])) 
+    if ((preg_match('/^\s+Public-Key:\s*\((.*) bit\)\s*$/m', $output, $match)) && is_numeric($match[1])) 
       $out['full_details']['public_key_length'] = $match[1];
     else
       $out['full_details']['public_key_length'] = $output;
@@ -148,18 +148,18 @@ 
   // the trivial case: if the file is empty, there's no cert in it
   if ($cadata == "")
       return $returnarray;
-  $start_c = strpos($cadata,"-----BEGIN CERTIFICATE-----" );
-  if( $start_c !== FALSE) {
-        $cadata = substr($cadata,$start_c);
-        $end_c = strpos($cadata,"-----END CERTIFICATE-----") + 25;
-        $next_c = strpos($cadata,"-----BEGIN CERTIFICATE-----",30);
-        while ( $next_c !== FALSE) {
-          $returnarray[] = substr($cadata,0,$end_c);
-          $cadata = substr($cadata,$next_c);
-          $end_c = strpos($cadata,"-----END CERTIFICATE-----") + 25;
-          $next_c = strpos($cadata,"-----BEGIN CERTIFICATE-----",30);
+  $start_c = strpos($cadata, "-----BEGIN CERTIFICATE-----");
+  if ($start_c !== FALSE) {
+        $cadata = substr($cadata, $start_c);
+        $end_c = strpos($cadata, "-----END CERTIFICATE-----") + 25;
+        $next_c = strpos($cadata, "-----BEGIN CERTIFICATE-----", 30);
+        while ($next_c !== FALSE) {
+          $returnarray[] = substr($cadata, 0, $end_c);
+          $cadata = substr($cadata, $next_c);
+          $end_c = strpos($cadata, "-----END CERTIFICATE-----") + 25;
+          $next_c = strpos($cadata, "-----BEGIN CERTIFICATE-----", 30);
         }
-        $returnarray[] = substr($cadata,0,$end_c);
+        $returnarray[] = substr($cadata, 0, $end_c);
     } else {
         // TODO: before we blindly hand it over to der2pem - is this valid DER
         // data at all?

Braces +25 added lines, -18 removed lines

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

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() {

Spacing +3 added lines, -3 removed lines

@@ -172,13 +172,13 @@
         // define CA certificates
         foreach ($this->attributes['internal:CAs'][0] as $ca) {
             // strip -----BEGIN CERTIFICATE----- and -----END CERTIFICATE-----
-            debug(2,$ca['pem']);
+            debug(2, $ca['pem']);
             $ca_sanitized = substr($ca['pem'], 27, strlen($ca['pem']) - 27 - 25 - 1);
-            debug(2,$ca_sanitized."\n");
+            debug(2, $ca_sanitized . "\n");
             // remove \n
             $ca_sanitized = str_replace("\n", "", $ca_sanitized);
             $json_array["Certificates"][] = ["GUID" => "{" . $ca['uuid'] . "}", "Type" => "Authority", "X509" => $ca_sanitized];
-            debug(2,$ca_sanitized."\n");
+            debug(2, $ca_sanitized . "\n");
         }
                 
         $output_json = json_encode($json_array, JSON_PRETTY_PRINT);

Braces +16 added lines, -12 removed lines

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

devices/ms/Vista7.php

Doc Comments +3 added lines

@@ -350,6 +350,9 @@
 
 /**
  * produce PEAP and TLS configuration files for Vista and Windows 7
+ * @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"?>

Indentation +135 added lines, -135 removed lines

@@ -26,66 +26,66 @@ 
  */
 class Device_Vista7 extends WindowsCommon {
     final public function __construct() {
-      $this->supportedEapMethods = [EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$PWD];
-      debug(4,"This device supports the following EAP methods: ");
-      debug(4,$this->supportedEapMethods);
-      $this->specialities['anon_id'][serialize(EAP::$PEAP_MSCHAP2)] = _("Anonymous identities do not use the realm as specified in the profile - it is derived from the suffix of the user's username input instead.");
+        $this->supportedEapMethods = [EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$PWD];
+        debug(4,"This device supports the following EAP methods: ");
+        debug(4,$this->supportedEapMethods);
+        $this->specialities['anon_id'][serialize(EAP::$PEAP_MSCHAP2)] = _("Anonymous identities do not use the realm as specified in the profile - it is derived from the suffix of the user's username input instead.");
     }
 
-  public function writeInstaller() {
-      $dom = textdomain(NULL);
-      textdomain("devices");
-   // create certificate files and save their names in $CA_files arrary
-     $CA_files = $this->saveCertificateFiles('der');
+    public function writeInstaller() {
+        $dom = textdomain(NULL);
+        textdomain("devices");
+    // create certificate files and save their names in $CA_files arrary
+        $CA_files = $this->saveCertificateFiles('der');
 
-     $SSIDs = $this->attributes['internal:SSID'];
-     $delSSIDs = $this->attributes['internal:remove_SSID'];
-     $this->prepareInstallerLang();
-     $set_wired = isset($this->attributes['media:wired'][0]) && $this->attributes['media:wired'][0] == 'on' ? 1 : 0;
+        $SSIDs = $this->attributes['internal:SSID'];
+        $delSSIDs = $this->attributes['internal:remove_SSID'];
+        $this->prepareInstallerLang();
+        $set_wired = isset($this->attributes['media:wired'][0]) && $this->attributes['media:wired'][0] == 'on' ? 1 : 0;
 //   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 ($this->selected_eap == EAP::$TLS || $this->selected_eap == EAP::$PEAP_MSCHAP2 || $this->selected_eap == EAP::$PWD || $this->selected_eap == EAP::$TTLS_PAP) {
-       $WindowsProfile = [];
-       $eap_config = $this->prepareEapConfig($this->attributes);
-       $i = 0;
-       foreach ($SSIDs as $ssid => $cipher) {
-          if($cipher == 'TKIP') {
-             $WindowsProfile[$i] = $this->writeWLANprofile ($ssid.' (TKIP)',$ssid,'WPA','TKIP',$eap_config,$i);
-             $i++;
-          }
-          $WindowsProfile[$i] = $this->writeWLANprofile ($ssid,$ssid,'WPA2','AES',$eap_config,$i);
-          $i++;
-       }
-       if($set_wired) {
-         $this->writeLANprofile($eap_config);
-       }
-     } else {
-       error("  this EAP type is not handled yet");
-       return;
-     }
+        $delProfiles = [];
+        foreach ($delSSIDs as $ssid => $cipher) {
+            if($cipher == 'DEL') 
+            $delProfiles[] = $ssid;
+            if($cipher == 'TKIP') 
+            $delProfiles[] = $ssid.' (TKIP)';
+        }
+
+        if ($this->selected_eap == EAP::$TLS || $this->selected_eap == EAP::$PEAP_MSCHAP2 || $this->selected_eap == EAP::$PWD || $this->selected_eap == EAP::$TTLS_PAP) {
+        $WindowsProfile = [];
+        $eap_config = $this->prepareEapConfig($this->attributes);
+        $i = 0;
+        foreach ($SSIDs as $ssid => $cipher) {
+            if($cipher == 'TKIP') {
+                $WindowsProfile[$i] = $this->writeWLANprofile ($ssid.' (TKIP)',$ssid,'WPA','TKIP',$eap_config,$i);
+                $i++;
+            }
+            $WindowsProfile[$i] = $this->writeWLANprofile ($ssid,$ssid,'WPA2','AES',$eap_config,$i);
+            $i++;
+        }
+        if($set_wired) {
+            $this->writeLANprofile($eap_config);
+        }
+        } else {
+        error("  this EAP type is not handled yet");
+        return;
+        }
     debug(4,"WindowsProfile"); debug(4,$WindowsProfile);
     
     $this->writeProfilesNSH($WindowsProfile, $CA_files,$set_wired);
     $this->writeAdditionalDeletes($delProfiles);
     $this->copyFiles($this->selected_eap);
     if(isset($this->attributes['internal:logo_file']))
-       $this->combineLogo($this->attributes['internal:logo_file']);
+        $this->combineLogo($this->attributes['internal:logo_file']);
     $this->writeMainNSH($this->selected_eap,$this->attributes);
     $this->compileNSIS();
     $installer_path = $this->signInstaller($this->attributes); 
 
     textdomain($dom);
     return($installer_path);  
-  }
+    }
 
-  public function writeDeviceInfo() {
+    public function writeDeviceInfo() {
     $ssid_ct=count($this->attributes['internal:SSID']);
     $out = "<p>";
     $out .= sprintf(_("%s installer will be in the form of an EXE file. It will configure %s on your device, by creating wireless network profiles.<p>When you click the download button, the installer will be saved by your browser. Copy it to the machine you want to configure and execute."),Config::$CONSORTIUM['name'],Config::$CONSORTIUM['name']);
@@ -97,12 +97,12 @@ 
             $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 .= ", ";
-         $i++;
-         $out .= "<strong>$ssid</strong>";
-       }
+            if(! in_array($ssid, Config::$CONSORTIUM['ssid'])) {
+                if($i > 0)
+            $out .= ", ";
+            $i++;
+            $out .= "<strong>$ssid</strong>";
+        }
     }
     $out .= "<p>";
     }
@@ -115,21 +115,21 @@ 
         $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.");
         if($ssid_ct > 1) {
-             $out .= "<p>";
-             $out .= _("You will be required to enter the same credentials for each of the configured notworks:")." ";
-             $i = 0;
+                $out .= "<p>";
+                $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 .= ", ";
-                 $i++;
-                 $out .= "<strong>$ssid</strong>";
+                    if($i > 0)
+                    $out .= ", ";
+                    $i++;
+                    $out .= "<strong>$ssid</strong>";
             }
     }
 
-   }
+    }
 
-   }
-  return($out);
+    }
+    return($out);
 }
 
 private function prepareEapConfig($attr) {
@@ -137,25 +137,25 @@ 
     $w7_ext = '';
     $eap = $this->selected_eap;
     if ($eap != EAP::$TLS && $eap != EAP::$PEAP_MSCHAP2 && $eap != EAP::$PWD && $eap != EAP::$TTLS_PAP) {
-      debug(2,"this method only allows TLS, PEAP, TTLS-PAP or EAP-pwd");
-      error("this method only allows TLS, PEAP, TTLS-PAP or EAP-pwd");
-     return;
+        debug(2,"this method only allows TLS, PEAP, TTLS-PAP or EAP-pwd");
+        error("this method only allows TLS, PEAP, TTLS-PAP or EAP-pwd");
+        return;
+    }
+    $use_anon = $attr['internal:use_anon_outer'] [0];
+    $realm = $attr['internal:realm'] [0];
+    if ($use_anon) {
+        $outer_user = $attr['internal:anon_local_value'][0];
     }
-   $use_anon = $attr['internal:use_anon_outer'] [0];
-   $realm = $attr['internal:realm'] [0];
-   if ($use_anon) {
-     $outer_user = $attr['internal:anon_local_value'][0];
-   }
 //   $servers = preg_quote(implode(';',$attr['eap:server_name']));
-   $servers = implode(';',$attr['eap:server_name']);
-   $ca_array = $attr['internal:CAs'][0];
-   $author_id = "0";
-   if( $eap == EAP::$TTLS_PAP) {
-      $author_id = "17236";
-      $servers = implode('</ServerName><ServerName>',$attr['eap:server_name']);
-   }
-
-  $profile_file_contents = '<EAPConfig><EapHostConfig xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
+    $servers = implode(';',$attr['eap:server_name']);
+    $ca_array = $attr['internal:CAs'][0];
+    $author_id = "0";
+    if( $eap == EAP::$TTLS_PAP) {
+        $author_id = "17236";
+        $servers = implode('</ServerName><ServerName>',$attr['eap:server_name']);
+    }
+
+    $profile_file_contents = '<EAPConfig><EapHostConfig xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
 <EapMethod>
 <Type xmlns="http://www.microsoft.com/provisioning/EapCommon">'.
     $this->selected_eap["OUTER"] .'</Type>
@@ -166,7 +166,7 @@ 
 ';
 
 
-   if( $eap == EAP::$TTLS_PAP) {
+    if( $eap == EAP::$TTLS_PAP) {
 $profile_file_contents .= '
 <Config xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
 <EAPIdentityProviderList xmlns="urn:ietf:params:xml:ns:yang:ietf-eap-metadata">
@@ -201,14 +201,14 @@ 
 $profile_file_contents .= '<ServerSideCredential>
 ';
 
-   foreach ($ca_array as $ca) {
+    foreach ($ca_array as $ca) {
       
-      $profile_file_contents .= '<CA><format>PEM</format><cert-data>';
-      $profile_file_contents .= base64_encode($ca['der']);
-      $profile_file_contents .= '</cert-data></CA>
+        $profile_file_contents .= '<CA><format>PEM</format><cert-data>';
+        $profile_file_contents .= base64_encode($ca['der']);
+        $profile_file_contents .= '</cert-data></CA>
 ';
-   }
-   $profile_file_contents .= "<ServerName>$servers</ServerName>\n";
+    }
+    $profile_file_contents .= "<ServerName>$servers</ServerName>\n";
 
 $profile_file_contents .= '
 </ServerSideCredential>
@@ -228,7 +228,7 @@ 
 }
 
 elseif( $eap == EAP::$TLS) {
-  $profile_file_contents .= '
+    $profile_file_contents .= '
 
 <Config xmlns:baseEap="http://www.microsoft.com/provisioning/BaseEapConnectionPropertiesV1" 
   xmlns:eapTls="http://www.microsoft.com/provisioning/EapTlsConnectionPropertiesV1">
@@ -244,14 +244,14 @@ 
 if($ca_array) {
 foreach ($ca_array as $CA)
     if($CA['root'])
-       $profile_file_contents .= "<eapTls:TrustedRootCA>".$CA['sha1']."</eapTls:TrustedRootCA>\n";
+        $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')
-   $profile_file_contents .= '<eapTls:DifferentUsername>true</eapTls:DifferentUsername>';
+    $profile_file_contents .= '<eapTls:DifferentUsername>true</eapTls:DifferentUsername>';
 else
-   $profile_file_contents .= '<eapTls:DifferentUsername>false</eapTls:DifferentUsername>';
+    $profile_file_contents .= '<eapTls:DifferentUsername>false</eapTls:DifferentUsername>';
 $profile_file_contents .= '
 </eapTls:EapType>
 </baseEap:Eap>
@@ -259,9 +259,9 @@ 
 ';
 } elseif ( $eap == EAP::$PEAP_MSCHAP2) {
 if(isset($attr['eap:enable_nea']) && $attr['eap:enable_nea'][0] == 'on')
-   $nea = 'true';
+    $nea = 'true';
 else
-   $nea = 'false';
+    $nea = 'false';
 $vista_ext = '<Config xmlns:eapUser="http://www.microsoft.com/provisioning/EapUserPropertiesV1" 
 xmlns:baseEap="http://www.microsoft.com/provisioning/BaseEapConnectionPropertiesV1" 
   xmlns:msPeap="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV1" 
@@ -275,7 +275,7 @@ 
 if($ca_array) {
 foreach ($ca_array as $CA)
     if($CA['root'])
-       $vista_ext .= "<msPeap:TrustedRootCA>".$CA['sha1']."</msPeap:TrustedRootCA>\n";
+        $vista_ext .= "<msPeap:TrustedRootCA>".$CA['sha1']."</msPeap:TrustedRootCA>\n";
 }
 $vista_ext .= '</msPeap:ServerValidation>
 <msPeap:FastReconnect>true</msPeap:FastReconnect> 
@@ -329,7 +329,7 @@ 
 </Config>
 ';
 } elseif ( $eap == EAP::$PWD) {
-   $profile_file_contents .= '<ConfigBlob></ConfigBlob>';
+    $profile_file_contents .= '<ConfigBlob></ConfigBlob>';
 } 
 
 
@@ -351,7 +351,7 @@ 
 /**
  * produce PEAP and TLS configuration files for Vista and Windows 7
  */
-  private function writeWLANprofile($wlan_profile_name,$ssid,$auth,$encryption,$eap_config,$i) {
+    private function writeWLANprofile($wlan_profile_name,$ssid,$auth,$encryption,$eap_config,$i) {
 $profile_file_contents = '<?xml version="1.0"?>
 <WLANProfile xmlns="http://www.microsoft.com/networking/WLAN/profile/v1">
 <name>'.$wlan_profile_name.'</name>
@@ -391,9 +391,9 @@ 
 ';
 
 if(! is_dir('w7'))
-  mkdir('w7');
+    mkdir('w7');
 if(! is_dir('vista'))
-  mkdir('vista');
+    mkdir('vista');
 $xml_f_name = "vista/wlan_prof-$i.xml";
 $xml_f = fopen($xml_f_name,'w');
 fwrite($xml_f,$profile_file_contents. $eap_config['vista']. $closing) ;
@@ -423,9 +423,9 @@ 
 </LANProfile>
 ';
 if(! is_dir('w7'))
-  mkdir('w7');
+    mkdir('w7');
 if(! is_dir('vista'))
-  mkdir('vista');
+    mkdir('vista');
 $xml_f_name = "vista/lan_prof.xml";
 $xml_f = fopen($xml_f_name,'w');
 fwrite($xml_f,$profile_file_contents. $eap_config['vista']. $closing) ;
@@ -438,16 +438,16 @@ 
 
 private function glueServerNames($server_list) {
 //print_r($server_list);
- $A0 =  array_reverse(explode('.',array_shift($server_list)));
- $B = $A0;
- if($server_list) {
-   foreach($server_list as $a) {
-   $A= array_reverse(explode('.',$a));
-   $B = array_intersect_assoc($A0,$A);
-   $A0 = $B;
-   }
-  }
-  return(implode('.',array_reverse($B)));
+    $A0 =  array_reverse(explode('.',array_shift($server_list)));
+    $B = $A0;
+    if($server_list) {
+    foreach($server_list as $a) {
+    $A= array_reverse(explode('.',$a));
+    $B = array_intersect_assoc($A0,$A);
+    $A0 = $B;
+    }
+    }
+    return(implode('.',array_reverse($B)));
 }
 
 
@@ -502,7 +502,7 @@ 
 ';
 
 if(isset($this->attributes['media:wired'][0]) && $attr['media:wired'][0] == 'on')
-  $fcontents .= '!define WIRED
+    $fcontents .= '!define WIRED
 ';
 
 $f = fopen('main.nsh','w');
@@ -514,8 +514,8 @@ 
 private function writeProfilesNSH($P,$ca_array,$wired=0) {
 debug(4,"writeProfilesNSH");
 debug(4,$P);
-  $fcontents = '';
-  foreach($P as $p) 
+    $fcontents = '';
+    foreach($P as $p) 
     $fcontents .= "!insertmacro define_wlan_profile $p\n";
   
 $f = fopen('profiles.nsh','w');
@@ -526,8 +526,8 @@ 
 $f = fopen('certs.nsh','w');
 if($ca_array) {
 foreach ($ca_array as $CA) {
-      $store = $CA['root'] ? "root" : "ca";
-      $fcontents .= '!insertmacro install_ca_cert "'.$CA['file'].'" "'.$CA['sha1'].'" "'.$store."\"\n";
+        $store = $CA['root'] ? "root" : "ca";
+        $fcontents .= '!insertmacro install_ca_cert "'.$CA['file'].'" "'.$CA['sha1'].'" "'.$store."\"\n";
     }
 fwrite($f, $fcontents);
 }
@@ -537,33 +537,33 @@ 
 private function copyFiles ($eap) {
 debug(4,"copyFiles start\n");
 debug(4,"code_page=".$this->code_page."\n");
-   $result;
-   $result = $this->copyFile('wlan_test.exe');
-   $result = $this->copyFile('check_wired.cmd');
-   $result = $this->copyFile('install_wired.cmd');
-   $result = $this->copyFile('setEAPCred.exe');
-   $result = $this->copyFile('base64.nsh');
-   $result = $this->copyFile('cat_bg.bmp');
-   $result = $result && $this->copyFile('cat32.ico');
-   $result = $result && $this->copyFile('cat_150.bmp');
-   $this->translateFile('common.inc','common.nsh',$this->code_page);
-   if( $eap["OUTER"] == TTLS)  {
-     $result = $this->copyFile('GPL3.rtf');
-     $result = $result && $this->copyFile('ArnesLinkEn32.msi');
-     $result = $result && $this->copyFile('ArnesLinkEn64.msi');
-     $result = $result && $this->copyFile('dump_arneslink_profile.cmd');
-     $result = $result && $this->copyFile('install_arneslink_profile.cmd');
-     $this->translateFile('arnes_link.inc','cat.NSI',$this->code_page);
-   } elseif($eap["OUTER"] == PWD) {
-     $this->translateFile('pwd.inc','cat.NSI',$this->code_page);
-     $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x32.msi');
-     $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x64.msi');
+    $result;
+    $result = $this->copyFile('wlan_test.exe');
+    $result = $this->copyFile('check_wired.cmd');
+    $result = $this->copyFile('install_wired.cmd');
+    $result = $this->copyFile('setEAPCred.exe');
+    $result = $this->copyFile('base64.nsh');
+    $result = $this->copyFile('cat_bg.bmp');
+    $result = $result && $this->copyFile('cat32.ico');
+    $result = $result && $this->copyFile('cat_150.bmp');
+    $this->translateFile('common.inc','common.nsh',$this->code_page);
+    if( $eap["OUTER"] == TTLS)  {
+        $result = $this->copyFile('GPL3.rtf');
+        $result = $result && $this->copyFile('ArnesLinkEn32.msi');
+        $result = $result && $this->copyFile('ArnesLinkEn64.msi');
+        $result = $result && $this->copyFile('dump_arneslink_profile.cmd');
+        $result = $result && $this->copyFile('install_arneslink_profile.cmd');
+        $this->translateFile('arnes_link.inc','cat.NSI',$this->code_page);
+    } elseif($eap["OUTER"] == PWD) {
+        $this->translateFile('pwd.inc','cat.NSI',$this->code_page);
+        $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x32.msi');
+        $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x64.msi');
     } else {
-     $this->translateFile('peap_tls.inc','cat.NSI',$this->code_page);
-     $result = 1;
+        $this->translateFile('peap_tls.inc','cat.NSI',$this->code_page);
+        $result = 1;
     }
 debug(4,"copyFiles end\n");
-   return($result);
+    return($result);
 }
 
 }

Spacing +130 added lines, -130 removed lines

@@ -27,8 +27,8 @@ 
 class Device_Vista7 extends WindowsCommon {
     final public function __construct() {
       $this->supportedEapMethods = [EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$PWD];
-      debug(4,"This device supports the following EAP methods: ");
-      debug(4,$this->supportedEapMethods);
+      debug(4, "This device supports the following EAP methods: ");
+      debug(4, $this->supportedEapMethods);
       $this->specialities['anon_id'][serialize(EAP::$PEAP_MSCHAP2)] = _("Anonymous identities do not use the realm as specified in the profile - it is derived from the suffix of the user's username input instead.");
     }
 
@@ -45,10 +45,10 @@ 
 //   create a list of profiles to be deleted after installation
      $delProfiles = [];
      foreach ($delSSIDs as $ssid => $cipher) {
-         if($cipher == 'DEL') 
+         if ($cipher == 'DEL') 
           $delProfiles[] = $ssid;
-         if($cipher == 'TKIP') 
-          $delProfiles[] = $ssid.' (TKIP)';
+         if ($cipher == 'TKIP') 
+          $delProfiles[] = $ssid . ' (TKIP)';
      }
 
      if ($this->selected_eap == EAP::$TLS || $this->selected_eap == EAP::$PEAP_MSCHAP2 || $this->selected_eap == EAP::$PWD || $this->selected_eap == EAP::$TTLS_PAP) {
@@ -56,28 +56,28 @@ 
        $eap_config = $this->prepareEapConfig($this->attributes);
        $i = 0;
        foreach ($SSIDs as $ssid => $cipher) {
-          if($cipher == 'TKIP') {
-             $WindowsProfile[$i] = $this->writeWLANprofile ($ssid.' (TKIP)',$ssid,'WPA','TKIP',$eap_config,$i);
+          if ($cipher == 'TKIP') {
+             $WindowsProfile[$i] = $this->writeWLANprofile($ssid . ' (TKIP)', $ssid, 'WPA', 'TKIP', $eap_config, $i);
              $i++;
           }
-          $WindowsProfile[$i] = $this->writeWLANprofile ($ssid,$ssid,'WPA2','AES',$eap_config,$i);
+          $WindowsProfile[$i] = $this->writeWLANprofile($ssid, $ssid, 'WPA2', 'AES', $eap_config, $i);
           $i++;
        }
-       if($set_wired) {
+       if ($set_wired) {
          $this->writeLANprofile($eap_config);
        }
      } else {
        error("  this EAP type is not handled yet");
        return;
      }
-    debug(4,"WindowsProfile"); debug(4,$WindowsProfile);
+    debug(4, "WindowsProfile"); debug(4, $WindowsProfile);
     
-    $this->writeProfilesNSH($WindowsProfile, $CA_files,$set_wired);
+    $this->writeProfilesNSH($WindowsProfile, $CA_files, $set_wired);
     $this->writeAdditionalDeletes($delProfiles);
     $this->copyFiles($this->selected_eap);
-    if(isset($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->writeMainNSH($this->selected_eap, $this->attributes);
     $this->compileNSIS();
     $installer_path = $this->signInstaller($this->attributes); 
 
@@ -86,19 +86,19 @@ 
   }
 
   public function writeDeviceInfo() {
-    $ssid_ct=count($this->attributes['internal:SSID']);
+    $ssid_ct = count($this->attributes['internal:SSID']);
     $out = "<p>";
-    $out .= sprintf(_("%s installer will be in the form of an EXE file. It will configure %s on your device, by creating wireless network profiles.<p>When you click the download button, the installer will be saved by your browser. Copy it to the machine you want to configure and execute."),Config::$CONSORTIUM['name'],Config::$CONSORTIUM['name']);
+    $out .= sprintf(_("%s installer will be in the form of an EXE file. It will configure %s on your device, by creating wireless network profiles.<p>When you click the download button, the installer will be saved by your browser. Copy it to the machine you want to configure and execute."), Config::$CONSORTIUM['name'], Config::$CONSORTIUM['name']);
     $out .= "<p>";
-    if($ssid_ct > 1) {
-        if($ssid_ct > 2) {
-            $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"),implode(', ',Config::$CONSORTIUM['ssid']))." ";
+    if ($ssid_ct > 1) {
+        if ($ssid_ct > 2) {
+            $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"), implode(', ', Config::$CONSORTIUM['ssid'])) . " ";
         } else
-            $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"),implode(', ',Config::$CONSORTIUM['ssid']))." ";
+            $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)
+           if (!in_array($ssid, Config::$CONSORTIUM['ssid'])) {
+             if ($i > 0)
            $out .= ", ";
          $i++;
          $out .= "<strong>$ssid</strong>";
@@ -106,20 +106,20 @@ 
     }
     $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 {
     $out .= _("In order to connect to the network you will need an account from your home institution. You should consult the support page to find out how this account can be obtained. It is very likely that your account is already activated.");
 
-    if($this->eap == EAP::$PEAP_MSCHAP2) {
+    if ($this->eap == EAP::$PEAP_MSCHAP2) {
         $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.");
-        if($ssid_ct > 1) {
+        if ($ssid_ct > 1) {
              $out .= "<p>";
-             $out .= _("You will be required to enter the same credentials for each of the configured notworks:")." ";
+             $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)
+                 if ($i > 0)
                    $out .= ", ";
                  $i++;
                  $out .= "<strong>$ssid</strong>";
@@ -137,7 +137,7 @@ 
     $w7_ext = '';
     $eap = $this->selected_eap;
     if ($eap != EAP::$TLS && $eap != EAP::$PEAP_MSCHAP2 && $eap != EAP::$PWD && $eap != EAP::$TTLS_PAP) {
-      debug(2,"this method only allows TLS, PEAP, TTLS-PAP or EAP-pwd");
+      debug(2, "this method only allows TLS, PEAP, TTLS-PAP or EAP-pwd");
       error("this method only allows TLS, PEAP, TTLS-PAP or EAP-pwd");
      return;
     }
@@ -147,26 +147,26 @@ 
      $outer_user = $attr['internal:anon_local_value'][0];
    }
 //   $servers = preg_quote(implode(';',$attr['eap:server_name']));
-   $servers = implode(';',$attr['eap:server_name']);
+   $servers = implode(';', $attr['eap:server_name']);
    $ca_array = $attr['internal:CAs'][0];
    $author_id = "0";
-   if( $eap == EAP::$TTLS_PAP) {
+   if ($eap == EAP::$TTLS_PAP) {
       $author_id = "17236";
-      $servers = implode('</ServerName><ServerName>',$attr['eap:server_name']);
+      $servers = implode('</ServerName><ServerName>', $attr['eap:server_name']);
    }
 
   $profile_file_contents = '<EAPConfig><EapHostConfig xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
 <EapMethod>
 <Type xmlns="http://www.microsoft.com/provisioning/EapCommon">'.
-    $this->selected_eap["OUTER"] .'</Type>
+    $this->selected_eap["OUTER"] . '</Type>
 <VendorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorId>
 <VendorType xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorType>
-<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">'.$author_id.'</AuthorId>
+<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">'.$author_id . '</AuthorId>
 </EapMethod>
 ';
 
 
-   if( $eap == EAP::$TTLS_PAP) {
+   if ($eap == EAP::$TTLS_PAP) {
 $profile_file_contents .= '
 <Config xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
 <EAPIdentityProviderList xmlns="urn:ietf:params:xml:ns:yang:ietf-eap-metadata">
@@ -174,7 +174,7 @@ 
 <ID>eduroam.si</ID>
 <ProviderInfo>
 <CredentialPrompt>
-<localized-text><lang>en</lang><text>'._("Please provide your user ID and password.").'</text></localized-text>
+<localized-text><lang>en</lang><text>'._("Please provide your user ID and password.") . '</text></localized-text>
 </CredentialPrompt>
 <UserNameLabel>
 <localized-text><lang>en</lang><text>Username@domain:</text></localized-text>
@@ -187,13 +187,13 @@ 
 <AuthenticationMethod>
 <EAPMethod>21</EAPMethod>
 ';
-if($use_anon == 1) {
+if ($use_anon == 1) {
     $profile_file_contents .= '<ClientSideCredential>
 ';
-    if($outer_user == '')
+    if ($outer_user == '')
         $profile_file_contents .= '<AnonymousIdentity>@</AnonymousIdentity>';
     else
-        $profile_file_contents .= '<AnonymousIdentity>'.$outer_user.'@'.$realm.'</AnonymousIdentity>';
+        $profile_file_contents .= '<AnonymousIdentity>' . $outer_user . '@' . $realm . '</AnonymousIdentity>';
 $profile_file_contents .= '
 </ClientSideCredential>
 ';
@@ -227,7 +227,7 @@ 
 
 }
 
-elseif( $eap == EAP::$TLS) {
+elseif ($eap == EAP::$TLS) {
   $profile_file_contents .= '
 
 <Config xmlns:baseEap="http://www.microsoft.com/provisioning/BaseEapConnectionPropertiesV1" 
@@ -240,15 +240,15 @@ 
 </eapTls:CredentialsSource>
 <eapTls:ServerValidation>
 <eapTls:DisableUserPromptForServerValidation>true</eapTls:DisableUserPromptForServerValidation>
-<eapTls:ServerNames>'.$servers.'</eapTls:ServerNames>';
-if($ca_array) {
+<eapTls:ServerNames>'.$servers . '</eapTls:ServerNames>';
+if ($ca_array) {
 foreach ($ca_array as $CA)
-    if($CA['root'])
-       $profile_file_contents .= "<eapTls:TrustedRootCA>".$CA['sha1']."</eapTls:TrustedRootCA>\n";
+    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
    $profile_file_contents .= '<eapTls:DifferentUsername>false</eapTls:DifferentUsername>';
@@ -257,8 +257,8 @@ 
 </baseEap:Eap>
 </Config>
 ';
-} elseif ( $eap == EAP::$PEAP_MSCHAP2) {
-if(isset($attr['eap:enable_nea']) && $attr['eap:enable_nea'][0] == 'on')
+} elseif ($eap == EAP::$PEAP_MSCHAP2) {
+if (isset($attr['eap:enable_nea']) && $attr['eap:enable_nea'][0] == 'on')
    $nea = 'true';
 else
    $nea = 'false';
@@ -271,11 +271,11 @@ 
 <msPeap:EapType>
 <msPeap:ServerValidation>
 <msPeap:DisableUserPromptForServerValidation>true</msPeap:DisableUserPromptForServerValidation> 
-<msPeap:ServerNames>'.$servers.'</msPeap:ServerNames>';
-if($ca_array) {
+<msPeap:ServerNames>'.$servers . '</msPeap:ServerNames>';
+if ($ca_array) {
 foreach ($ca_array as $CA)
-    if($CA['root'])
-       $vista_ext .= "<msPeap:TrustedRootCA>".$CA['sha1']."</msPeap:TrustedRootCA>\n";
+    if ($CA['root'])
+       $vista_ext .= "<msPeap:TrustedRootCA>" . $CA['sha1'] . "</msPeap:TrustedRootCA>\n";
 }
 $vista_ext .= '</msPeap:ServerValidation>
 <msPeap:FastReconnect>true</msPeap:FastReconnect> 
@@ -286,7 +286,7 @@ 
 <msChapV2:UseWinLogonCredentials>false</msChapV2:UseWinLogonCredentials> 
 </msChapV2:EapType>
 </baseEap:Eap>
-<msPeap:EnableQuarantineChecks>'.$nea.'</msPeap:EnableQuarantineChecks>
+<msPeap:EnableQuarantineChecks>'.$nea . '</msPeap:EnableQuarantineChecks>
 <msPeap:RequireCryptoBinding>false</msPeap:RequireCryptoBinding>
 </msPeap:EapType>
 </baseEap:Eap>
@@ -298,11 +298,11 @@ 
 <EapType xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV1">
 <ServerValidation>
 <DisableUserPromptForServerValidation>true</DisableUserPromptForServerValidation>
-<ServerNames>'.$servers.'</ServerNames>';
-if($ca_array) {
+<ServerNames>'.$servers . '</ServerNames>';
+if ($ca_array) {
 foreach ($ca_array as $CA)
-    if($CA['root'])
-        $w7_ext .= "<TrustedRootCA>".$CA['sha1']."</TrustedRootCA>\n";
+    if ($CA['root'])
+        $w7_ext .= "<TrustedRootCA>" . $CA['sha1'] . "</TrustedRootCA>\n";
 }
 $w7_ext .= '</ServerValidation>
 <FastReconnect>true</FastReconnect> 
@@ -313,22 +313,22 @@ 
 <UseWinLogonCredentials>false</UseWinLogonCredentials> 
 </EapType>
 </Eap>
-<EnableQuarantineChecks>'.$nea.'</EnableQuarantineChecks>
+<EnableQuarantineChecks>'.$nea . '</EnableQuarantineChecks>
 <RequireCryptoBinding>false</RequireCryptoBinding>
 ';
-if($use_anon == 1)
-$w7_ext .='<PeapExtensions>
+if ($use_anon == 1)
+$w7_ext .= '<PeapExtensions>
 <IdentityPrivacy xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV2">
 <EnableIdentityPrivacy>true</EnableIdentityPrivacy>
-<AnonymousUserName>'.$outer_user.'</AnonymousUserName>
+<AnonymousUserName>'.$outer_user . '</AnonymousUserName>
 </IdentityPrivacy>
 </PeapExtensions>
 ';
-$w7_ext .='</EapType>
+$w7_ext .= '</EapType>
 </Eap>
 </Config>
 ';
-} elseif ( $eap == EAP::$PWD) {
+} elseif ($eap == EAP::$PWD) {
    $profile_file_contents .= '<ConfigBlob></ConfigBlob>';
 } 
 
@@ -337,8 +337,8 @@ 
 $profile_file_contents_end = '</EapHostConfig></EAPConfig>
 ';
 $return_array = [];
-$return_array['vista']= $profile_file_contents.$vista_ext.$profile_file_contents_end;
-$return_array['w7']= $profile_file_contents.$w7_ext.$profile_file_contents_end;
+$return_array['vista'] = $profile_file_contents . $vista_ext . $profile_file_contents_end;
+$return_array['w7'] = $profile_file_contents . $w7_ext . $profile_file_contents_end;
 return $return_array;
 }
 
@@ -351,13 +351,13 @@ 
 /**
  * produce PEAP and TLS configuration files for Vista and Windows 7
  */
-  private function writeWLANprofile($wlan_profile_name,$ssid,$auth,$encryption,$eap_config,$i) {
+  private function writeWLANprofile($wlan_profile_name, $ssid, $auth, $encryption, $eap_config, $i) {
 $profile_file_contents = '<?xml version="1.0"?>
 <WLANProfile xmlns="http://www.microsoft.com/networking/WLAN/profile/v1">
-<name>'.$wlan_profile_name.'</name>
+<name>'.$wlan_profile_name . '</name>
 <SSIDConfig>
 <SSID>
-<name>'.$ssid.'</name>
+<name>'.$ssid . '</name>
 </SSID>
 <nonBroadcast>true</nonBroadcast>
 </SSIDConfig>
@@ -367,12 +367,12 @@ 
 <MSM>
 <security>
 <authEncryption>
-<authentication>'.$auth.'</authentication>
-<encryption>'.$encryption.'</encryption>
+<authentication>'.$auth . '</authentication>
+<encryption>'.$encryption . '</encryption>
 <useOneX>true</useOneX>
 </authEncryption>
 ';
-if($auth == 'WPA2')
+if ($auth == 'WPA2')
 $profile_file_contents .= '<PMKCacheMode>enabled</PMKCacheMode>
 <PMKCacheTTL>720</PMKCacheTTL>
 <PMKCacheSize>128</PMKCacheSize>
@@ -390,20 +390,20 @@ 
 </WLANProfile>
 ';
 
-if(! is_dir('w7'))
+if (!is_dir('w7'))
   mkdir('w7');
-if(! is_dir('vista'))
+if (!is_dir('vista'))
   mkdir('vista');
 $xml_f_name = "vista/wlan_prof-$i.xml";
-$xml_f = fopen($xml_f_name,'w');
-fwrite($xml_f,$profile_file_contents. $eap_config['vista']. $closing) ;
+$xml_f = fopen($xml_f_name, 'w');
+fwrite($xml_f, $profile_file_contents . $eap_config['vista'] . $closing);
 fclose($xml_f);
 $xml_f_name = "w7/wlan_prof-$i.xml";
-$xml_f = fopen($xml_f_name,'w');
-fwrite($xml_f,$profile_file_contents. $eap_config['w7']. $closing) ;
+$xml_f = fopen($xml_f_name, 'w');
+fwrite($xml_f, $profile_file_contents . $eap_config['w7'] . $closing);
 fclose($xml_f);
-debug(2,"Installer has been written into directory $this->FPATH\n");
-debug(4,"WLAN_Profile:$wlan_profile_name:$encryption\n");
+debug(2, "Installer has been written into directory $this->FPATH\n");
+debug(4, "WLAN_Profile:$wlan_profile_name:$encryption\n");
 return("\"$wlan_profile_name\" \"$encryption\"");
 }
 
@@ -422,48 +422,48 @@ 
 </MSM>
 </LANProfile>
 ';
-if(! is_dir('w7'))
+if (!is_dir('w7'))
   mkdir('w7');
-if(! is_dir('vista'))
+if (!is_dir('vista'))
   mkdir('vista');
 $xml_f_name = "vista/lan_prof.xml";
-$xml_f = fopen($xml_f_name,'w');
-fwrite($xml_f,$profile_file_contents. $eap_config['vista']. $closing) ;
+$xml_f = fopen($xml_f_name, 'w');
+fwrite($xml_f, $profile_file_contents . $eap_config['vista'] . $closing);
 fclose($xml_f);
 $xml_f_name = "w7/lan_prof.xml";
-$xml_f = fopen($xml_f_name,'w');
-fwrite($xml_f,$profile_file_contents. $eap_config['w7']. $closing) ;
+$xml_f = fopen($xml_f_name, 'w');
+fwrite($xml_f, $profile_file_contents . $eap_config['w7'] . $closing);
 fclose($xml_f);
 }
 
 private function glueServerNames($server_list) {
 //print_r($server_list);
- $A0 =  array_reverse(explode('.',array_shift($server_list)));
+ $A0 = array_reverse(explode('.', array_shift($server_list)));
  $B = $A0;
- if($server_list) {
-   foreach($server_list as $a) {
-   $A= array_reverse(explode('.',$a));
-   $B = array_intersect_assoc($A0,$A);
+ if ($server_list) {
+   foreach ($server_list as $a) {
+   $A = array_reverse(explode('.', $a));
+   $B = array_intersect_assoc($A0, $A);
    $A0 = $B;
    }
   }
-  return(implode('.',array_reverse($B)));
+  return(implode('.', array_reverse($B)));
 }
 
 
-private function writeMainNSH($eap,$attr) {
-debug(4,"writeMainNSH"); debug(4,$attr);
-debug(4,"MYLANG=".$this->lang."\n");
+private function writeMainNSH($eap, $attr) {
+debug(4, "writeMainNSH"); debug(4, $attr);
+debug(4, "MYLANG=" . $this->lang . "\n");
 
 $EAP_OPTS = [
-PEAP=>['str'=>'PEAP','exec'=>'user'],
-TLS=>['str'=>'TLS','exec'=>'user'],
-TTLS=>['str'=>'ArnesLink','exec'=>'user'],
-PWD=>['str'=>'PWD','exec'=>'user'],
+PEAP=>['str'=>'PEAP', 'exec'=>'user'],
+TLS=>['str'=>'TLS', 'exec'=>'user'],
+TTLS=>['str'=>'ArnesLink', 'exec'=>'user'],
+PWD=>['str'=>'PWD', 'exec'=>'user'],
 ];
 $fcontents = '';
-if(Config::$NSIS_VERSION >= 3)
-    $fcontents .=  "Unicode true\n";
+if (Config::$NSIS_VERSION >= 3)
+    $fcontents .= "Unicode true\n";
  
 // Uncomment the line below if you want this module to run under XP (only displaying a warning)
 // $fcontents .= "!define ALLOW_XP\n";
@@ -471,27 +471,27 @@ 
 // $fcontents .= "!define DEBUG_CAT\n";
 $exec_level = $EAP_OPTS[$eap["OUTER"]]['exec'];
 $eap_str = $EAP_OPTS[$eap["OUTER"]]['str'];
-debug(4,"EAP_STR=$eap_str\n");
-debug(4,$eap);
+debug(4, "EAP_STR=$eap_str\n");
+debug(4, $eap);
 
-$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).'"';
+$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) . '"';
 $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).'"
-!define VERSION "'.CAT::$VERSION_MAJOR.'.'.CAT::$VERSION_MINOR.'"
+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) . '"
+!define VERSION "'.CAT::$VERSION_MAJOR . '.' . CAT::$VERSION_MINOR . '"
 !define INSTALLER_NAME "installer.exe"
-!define LANG "'.$this->lang.'"
+!define LANG "'.$this->lang . '"
 ';
 $fcontents .= $this->msInfoFile($attr);
 
 
 $fcontents .= ';--------------------------------
-!define ORGANISATION "'.$this->translateString($attr['general:instname'][0], $this->code_page).'"
-!define SUPPORT "'. ((isset($attr['support:email'][0]) && $attr['support:email'][0] ) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute , $this->code_page)) .'"
-!define URL "'. ((isset($attr['support:url'][0]) && $attr['support:url'][0] ) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->code_page)) .'"
+!define ORGANISATION "'.$this->translateString($attr['general:instname'][0], $this->code_page) . '"
+!define SUPPORT "'. ((isset($attr['support:email'][0]) && $attr['support:email'][0]) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->code_page)) . '"
+!define URL "'. ((isset($attr['support:url'][0]) && $attr['support:url'][0]) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->code_page)) . '"
 
 !ifdef TLS
 ';
@@ -501,42 +501,42 @@ 
 !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');
+$f = fopen('main.nsh', 'w');
 fwrite($f, $fcontents);
 fclose($f);
 
 }
 
-private function writeProfilesNSH($P,$ca_array,$wired=0) {
-debug(4,"writeProfilesNSH");
-debug(4,$P);
+private function writeProfilesNSH($P, $ca_array, $wired = 0) {
+debug(4, "writeProfilesNSH");
+debug(4, $P);
   $fcontents = '';
-  foreach($P as $p) 
+  foreach ($P as $p) 
     $fcontents .= "!insertmacro define_wlan_profile $p\n";
   
-$f = fopen('profiles.nsh','w');
+$f = fopen('profiles.nsh', 'w');
 fwrite($f, $fcontents);
 fclose($f);
 
 $fcontents = '';
-$f = fopen('certs.nsh','w');
-if($ca_array) {
+$f = fopen('certs.nsh', 'w');
+if ($ca_array) {
 foreach ($ca_array as $CA) {
       $store = $CA['root'] ? "root" : "ca";
-      $fcontents .= '!insertmacro install_ca_cert "'.$CA['file'].'" "'.$CA['sha1'].'" "'.$store."\"\n";
+      $fcontents .= '!insertmacro install_ca_cert "' . $CA['file'] . '" "' . $CA['sha1'] . '" "' . $store . "\"\n";
     }
 fwrite($f, $fcontents);
 }
 fclose($f);
 }
 
-private function copyFiles ($eap) {
-debug(4,"copyFiles start\n");
-debug(4,"code_page=".$this->code_page."\n");
+private function copyFiles($eap) {
+debug(4, "copyFiles start\n");
+debug(4, "code_page=" . $this->code_page . "\n");
    $result;
    $result = $this->copyFile('wlan_test.exe');
    $result = $this->copyFile('check_wired.cmd');
@@ -546,23 +546,23 @@ 
    $result = $this->copyFile('cat_bg.bmp');
    $result = $result && $this->copyFile('cat32.ico');
    $result = $result && $this->copyFile('cat_150.bmp');
-   $this->translateFile('common.inc','common.nsh',$this->code_page);
-   if( $eap["OUTER"] == TTLS)  {
+   $this->translateFile('common.inc', 'common.nsh', $this->code_page);
+   if ($eap["OUTER"] == TTLS) {
      $result = $this->copyFile('GPL3.rtf');
      $result = $result && $this->copyFile('ArnesLinkEn32.msi');
      $result = $result && $this->copyFile('ArnesLinkEn64.msi');
      $result = $result && $this->copyFile('dump_arneslink_profile.cmd');
      $result = $result && $this->copyFile('install_arneslink_profile.cmd');
-     $this->translateFile('arnes_link.inc','cat.NSI',$this->code_page);
-   } elseif($eap["OUTER"] == PWD) {
-     $this->translateFile('pwd.inc','cat.NSI',$this->code_page);
+     $this->translateFile('arnes_link.inc', 'cat.NSI', $this->code_page);
+   } elseif ($eap["OUTER"] == PWD) {
+     $this->translateFile('pwd.inc', 'cat.NSI', $this->code_page);
      $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x32.msi');
      $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x64.msi');
     } else {
-     $this->translateFile('peap_tls.inc','cat.NSI',$this->code_page);
+     $this->translateFile('peap_tls.inc', 'cat.NSI', $this->code_page);
      $result = 1;
     }
-debug(4,"copyFiles end\n");
+debug(4, "copyFiles end\n");
    return($result);
 }
 

Braces +64 added lines, -44 removed lines

@@ -45,10 +45,12 @@ 
 //   create a list of profiles to be deleted after installation
      $delProfiles = [];
      foreach ($delSSIDs as $ssid => $cipher) {
-         if($cipher == 'DEL') 
-          $delProfiles[] = $ssid;
-         if($cipher == 'TKIP') 
-          $delProfiles[] = $ssid.' (TKIP)';
+         if($cipher == 'DEL') {
+                   $delProfiles[] = $ssid;
+         }
+         if($cipher == 'TKIP') {
+                   $delProfiles[] = $ssid.' (TKIP)';
+         }
      }
 
      if ($this->selected_eap == EAP::$TLS || $this->selected_eap == EAP::$PEAP_MSCHAP2 || $this->selected_eap == EAP::$PWD || $this->selected_eap == EAP::$TTLS_PAP) {
@@ -75,8 +77,9 @@ 
     $this->writeProfilesNSH($WindowsProfile, $CA_files,$set_wired);
     $this->writeAdditionalDeletes($delProfiles);
     $this->copyFiles($this->selected_eap);
-    if(isset($this->attributes['internal:logo_file']))
-       $this->combineLogo($this->attributes['internal:logo_file']);
+    if(isset($this->attributes['internal:logo_file'])) {
+           $this->combineLogo($this->attributes['internal:logo_file']);
+    }
     $this->writeMainNSH($this->selected_eap,$this->attributes);
     $this->compileNSIS();
     $installer_path = $this->signInstaller($this->attributes); 
@@ -93,22 +96,24 @@ 
     if($ssid_ct > 1) {
         if($ssid_ct > 2) {
             $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"),implode(', ',Config::$CONSORTIUM['ssid']))." ";
-        } else
-            $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"),implode(', ',Config::$CONSORTIUM['ssid']))." ";
+        } else {
+                    $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"),implode(', ',Config::$CONSORTIUM['ssid']))." ";
+        }
         $i = 0;
         foreach ($this->attributes['internal:SSID'] as $ssid=>$v) {
            if(! in_array($ssid, Config::$CONSORTIUM['ssid'])) {
-             if($i > 0)
-           $out .= ", ";
+             if($i > 0) {
+                        $out .= ", ";
+             }
          $i++;
          $out .= "<strong>$ssid</strong>";
        }
     }
     $out .= "<p>";
     }
-    if($this->eap == EAP::$TLS)
-        $out .= _("In order to connect to the network you will need an a personal certificate in the form of a p12 file. You should obtain this certificate from your home institution. Consult the support page to find out how this certificate can be obtained. Such certificate files are password protected. You should have both the file and the password available during the installation process.");
-    else {
+    if($this->eap == EAP::$TLS) {
+            $out .= _("In order to connect to the network you will need an a personal certificate in the form of a p12 file. You should obtain this certificate from your home institution. Consult the support page to find out how this certificate can be obtained. Such certificate files are password protected. You should have both the file and the password available during the installation process.");
+    } else {
     $out .= _("In order to connect to the network you will need an account from your home institution. You should consult the support page to find out how this account can be obtained. It is very likely that your account is already activated.");
 
     if($this->eap == EAP::$PEAP_MSCHAP2) {
@@ -119,8 +124,9 @@ 
              $out .= _("You will be required to enter the same credentials for each of the configured notworks:")." ";
              $i = 0;
             foreach ($this->attributes['internal:SSID'] as $ssid=>$v) {
-                 if($i > 0)
-                   $out .= ", ";
+                 if($i > 0) {
+                                    $out .= ", ";
+                 }
                  $i++;
                  $out .= "<strong>$ssid</strong>";
             }
@@ -190,11 +196,12 @@ 
 if($use_anon == 1) {
     $profile_file_contents .= '<ClientSideCredential>
 ';
-    if($outer_user == '')
-        $profile_file_contents .= '<AnonymousIdentity>@</AnonymousIdentity>';
-    else
-        $profile_file_contents .= '<AnonymousIdentity>'.$outer_user.'@'.$realm.'</AnonymousIdentity>';
-$profile_file_contents .= '
+    if($outer_user == '') {
+            $profile_file_contents .= '<AnonymousIdentity>@</AnonymousIdentity>';
+    } else {
+            $profile_file_contents .= '<AnonymousIdentity>'.$outer_user.'@'.$realm.'</AnonymousIdentity>';
+    }
+    $profile_file_contents .= '
 </ClientSideCredential>
 ';
 }
@@ -225,9 +232,7 @@ 
 </Config>
 ';
 
-}
-
-elseif( $eap == EAP::$TLS) {
+} elseif( $eap == EAP::$TLS) {
   $profile_file_contents .= '
 
 <Config xmlns:baseEap="http://www.microsoft.com/provisioning/BaseEapConnectionPropertiesV1" 
@@ -242,26 +247,29 @@ 
 <eapTls:DisableUserPromptForServerValidation>true</eapTls:DisableUserPromptForServerValidation>
 <eapTls:ServerNames>'.$servers.'</eapTls:ServerNames>';
 if($ca_array) {
-foreach ($ca_array as $CA)
+foreach ($ca_array as $CA) {
     if($CA['root'])
        $profile_file_contents .= "<eapTls:TrustedRootCA>".$CA['sha1']."</eapTls:TrustedRootCA>\n";
 }
+}
 $profile_file_contents .= '</eapTls:ServerValidation>
 ';
-if(isset($attr['eap-specific:tls_use_other_id']) && $attr['eap-specific:tls_use_other_id'][0] == 'on')
+if(isset($attr['eap-specific:tls_use_other_id']) && $attr['eap-specific:tls_use_other_id'][0] == 'on') {
    $profile_file_contents .= '<eapTls:DifferentUsername>true</eapTls:DifferentUsername>';
-else
+} else {
    $profile_file_contents .= '<eapTls:DifferentUsername>false</eapTls:DifferentUsername>';
+}
 $profile_file_contents .= '
 </eapTls:EapType>
 </baseEap:Eap>
 </Config>
 ';
 } elseif ( $eap == EAP::$PEAP_MSCHAP2) {
-if(isset($attr['eap:enable_nea']) && $attr['eap:enable_nea'][0] == 'on')
+if(isset($attr['eap:enable_nea']) && $attr['eap:enable_nea'][0] == 'on') {
    $nea = 'true';
-else
+} else {
    $nea = 'false';
+}
 $vista_ext = '<Config xmlns:eapUser="http://www.microsoft.com/provisioning/EapUserPropertiesV1" 
 xmlns:baseEap="http://www.microsoft.com/provisioning/BaseEapConnectionPropertiesV1" 
   xmlns:msPeap="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV1" 
@@ -273,10 +281,11 @@ 
 <msPeap:DisableUserPromptForServerValidation>true</msPeap:DisableUserPromptForServerValidation> 
 <msPeap:ServerNames>'.$servers.'</msPeap:ServerNames>';
 if($ca_array) {
-foreach ($ca_array as $CA)
+foreach ($ca_array as $CA) {
     if($CA['root'])
        $vista_ext .= "<msPeap:TrustedRootCA>".$CA['sha1']."</msPeap:TrustedRootCA>\n";
 }
+}
 $vista_ext .= '</msPeap:ServerValidation>
 <msPeap:FastReconnect>true</msPeap:FastReconnect> 
 <msPeap:InnerEapOptional>0</msPeap:InnerEapOptional> 
@@ -300,10 +309,11 @@ 
 <DisableUserPromptForServerValidation>true</DisableUserPromptForServerValidation>
 <ServerNames>'.$servers.'</ServerNames>';
 if($ca_array) {
-foreach ($ca_array as $CA)
+foreach ($ca_array as $CA) {
     if($CA['root'])
         $w7_ext .= "<TrustedRootCA>".$CA['sha1']."</TrustedRootCA>\n";
 }
+}
 $w7_ext .= '</ServerValidation>
 <FastReconnect>true</FastReconnect> 
 <InnerEapOptional>false</InnerEapOptional> 
@@ -316,14 +326,15 @@ 
 <EnableQuarantineChecks>'.$nea.'</EnableQuarantineChecks>
 <RequireCryptoBinding>false</RequireCryptoBinding>
 ';
-if($use_anon == 1)
-$w7_ext .='<PeapExtensions>
+if($use_anon == 1) {
+    $w7_ext .='<PeapExtensions>
 <IdentityPrivacy xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV2">
 <EnableIdentityPrivacy>true</EnableIdentityPrivacy>
 <AnonymousUserName>'.$outer_user.'</AnonymousUserName>
 </IdentityPrivacy>
 </PeapExtensions>
 ';
+}
 $w7_ext .='</EapType>
 </Eap>
 </Config>
@@ -372,12 +383,13 @@ 
 <useOneX>true</useOneX>
 </authEncryption>
 ';
-if($auth == 'WPA2')
-$profile_file_contents .= '<PMKCacheMode>enabled</PMKCacheMode>
+if($auth == 'WPA2') {
+    $profile_file_contents .= '<PMKCacheMode>enabled</PMKCacheMode>
 <PMKCacheTTL>720</PMKCacheTTL>
 <PMKCacheSize>128</PMKCacheSize>
 <preAuthMode>disabled</preAuthMode>
 ';
+}
 $profile_file_contents .= '<OneX xmlns="http://www.microsoft.com/networking/OneX/v1">
 <cacheUserData>true</cacheUserData>
 <authMode>user</authMode>
@@ -390,10 +402,12 @@ 
 </WLANProfile>
 ';
 
-if(! is_dir('w7'))
+if(! is_dir('w7')) {
   mkdir('w7');
-if(! is_dir('vista'))
+}
+if(! is_dir('vista')) {
   mkdir('vista');
+}
 $xml_f_name = "vista/wlan_prof-$i.xml";
 $xml_f = fopen($xml_f_name,'w');
 fwrite($xml_f,$profile_file_contents. $eap_config['vista']. $closing) ;
@@ -422,10 +436,12 @@ 
 </MSM>
 </LANProfile>
 ';
-if(! is_dir('w7'))
+if(! is_dir('w7')) {
   mkdir('w7');
-if(! is_dir('vista'))
+}
+if(! is_dir('vista')) {
   mkdir('vista');
+}
 $xml_f_name = "vista/lan_prof.xml";
 $xml_f = fopen($xml_f_name,'w');
 fwrite($xml_f,$profile_file_contents. $eap_config['vista']. $closing) ;
@@ -462,8 +478,9 @@ 
 PWD=>['str'=>'PWD','exec'=>'user'],
 ];
 $fcontents = '';
-if(Config::$NSIS_VERSION >= 3)
+if(Config::$NSIS_VERSION >= 3) {
     $fcontents .=  "Unicode true\n";
+}
  
 // Uncomment the line below if you want this module to run under XP (only displaying a warning)
 // $fcontents .= "!define ALLOW_XP\n";
@@ -476,8 +493,9 @@ 
 
 $fcontents .= '!define '.$eap_str;
 $fcontents .= "\n".'!define EXECLEVEL "'.$exec_level.'"';
-if($attr['internal:profile_count'][0] > 1)
-$fcontents .= "\n".'!define USER_GROUP "'.$this->translateString(str_replace('"','$\\"',$attr['profile:name'][0]), $this->code_page).'"';
+if($attr['internal:profile_count'][0] > 1) {
+    $fcontents .= "\n".'!define USER_GROUP "'.$this->translateString(str_replace('"','$\\"',$attr['profile:name'][0]), $this->code_page).'"';
+}
 $fcontents .= '
 Caption "'. $this->translateString(sprintf(sprint_nsi(_("%s installer for %s")),Config::$CONSORTIUM['name'],$attr['general:instname'][0]), $this->code_page).'"
 !define APPLICATION "'. $this->translateString(sprintf(sprint_nsi(_("%s installer for %s")),Config::$CONSORTIUM['name'],$attr['general:instname'][0]), $this->code_page).'"
@@ -501,9 +519,10 @@ 
 !endif
 ';
 
-if(isset($this->attributes['media:wired'][0]) && $attr['media:wired'][0] == 'on')
+if(isset($this->attributes['media:wired'][0]) && $attr['media:wired'][0] == 'on') {
   $fcontents .= '!define WIRED
 ';
+}
 
 $f = fopen('main.nsh','w');
 fwrite($f, $fcontents);
@@ -515,8 +534,9 @@ 
 debug(4,"writeProfilesNSH");
 debug(4,$P);
   $fcontents = '';
-  foreach($P as $p) 
-    $fcontents .= "!insertmacro define_wlan_profile $p\n";
+  foreach($P as $p) {
+      $fcontents .= "!insertmacro define_wlan_profile $p\n";
+  }
   
 $f = fopen('profiles.nsh','w');
 fwrite($f, $fcontents);

devices/ms/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"?>

Indentation +114 added lines, -114 removed lines

@@ -26,74 +26,74 @@ 
  */
 class Device_W8 extends WindowsCommon {
     final public function __construct() {
-      $this->supportedEapMethods = [EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP, EAP::$TTLS_MSCHAP2, EAP::$PWD];
+        $this->supportedEapMethods = [EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP, EAP::$TTLS_MSCHAP2, EAP::$PWD];
 #      $this->supportedEapMethods = array(EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP, EAP::$PWD);
-      debug(4,"This device supports the following EAP methods: ");
-      debug(4,$this->supportedEapMethods);
-      $this->specialities['anon_id'][serialize(EAP::$PEAP_MSCHAP2)] = _("Anonymous identities do not use the realm as specified in the profile - it is derived from the suffix of the user's username input instead.");
+        debug(4,"This device supports the following EAP methods: ");
+        debug(4,$this->supportedEapMethods);
+        $this->specialities['anon_id'][serialize(EAP::$PEAP_MSCHAP2)] = _("Anonymous identities do not use the realm as specified in the profile - it is derived from the suffix of the user's username input instead.");
     }
 
-  public function writeInstaller() {
-      $dom = textdomain(NULL);
-      textdomain("devices");
-   // create certificate files and save their names in $CA_files arrary
-     $CA_files = $this->saveCertificateFiles('der');
+    public function writeInstaller() {
+        $dom = textdomain(NULL);
+        textdomain("devices");
+    // create certificate files and save their names in $CA_files arrary
+        $CA_files = $this->saveCertificateFiles('der');
 
-     $SSIDs = $this->attributes['internal:SSID'];
-     $delSSIDs = $this->attributes['internal:remove_SSID'];
-     $this->prepareInstallerLang();
-     $set_wired = isset($this->attributes['media:wired'][0]) && $this->attributes['media:wired'][0] == 'on' ? 1 : 0;
+        $SSIDs = $this->attributes['internal:SSID'];
+        $delSSIDs = $this->attributes['internal:remove_SSID'];
+        $this->prepareInstallerLang();
+        $set_wired = isset($this->attributes['media:wired'][0]) && $this->attributes['media:wired'][0] == 'on' ? 1 : 0;
 //   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 ($this->selected_eap == EAP::$TLS || $this->selected_eap == EAP::$PEAP_MSCHAP2 || $this->selected_eap ==  EAP::$TTLS_PAP || $this->selected_eap == EAP::$TTLS_MSCHAP2 || $this->selected_eap == EAP::$PWD) {
-       $WindowsProfile = [];
-       $eap_config = $this->prepareEapConfig($this->attributes);
-       $i = 0;
-       foreach ($SSIDs as $ssid => $cipher) {
-          if($cipher == 'TKIP') {
-             $WindowsProfile[$i] = $this->writeWLANprofile ($ssid.' (TKIP)',$ssid,'WPA','TKIP',$eap_config,$i);
-             $i++;
-          }
-          $WindowsProfile[$i] = $this->writeWLANprofile ($ssid,$ssid,'WPA2','AES',$eap_config,$i);
-          $i++;
-       }
-       if($set_wired) {
-         $this->writeLANprofile($eap_config);
-       }
-     } else {
-       error("  this EAP type is not handled yet");
-       return;
-     }
+        $delProfiles = [];
+        foreach ($delSSIDs as $ssid => $cipher) {
+            if($cipher == 'DEL')
+            $delProfiles[] = $ssid;
+            if($cipher == 'TKIP')
+            $delProfiles[] = $ssid.' (TKIP)';
+        }
+
+
+        if ($this->selected_eap == EAP::$TLS || $this->selected_eap == EAP::$PEAP_MSCHAP2 || $this->selected_eap ==  EAP::$TTLS_PAP || $this->selected_eap == EAP::$TTLS_MSCHAP2 || $this->selected_eap == EAP::$PWD) {
+        $WindowsProfile = [];
+        $eap_config = $this->prepareEapConfig($this->attributes);
+        $i = 0;
+        foreach ($SSIDs as $ssid => $cipher) {
+            if($cipher == 'TKIP') {
+                $WindowsProfile[$i] = $this->writeWLANprofile ($ssid.' (TKIP)',$ssid,'WPA','TKIP',$eap_config,$i);
+                $i++;
+            }
+            $WindowsProfile[$i] = $this->writeWLANprofile ($ssid,$ssid,'WPA2','AES',$eap_config,$i);
+            $i++;
+        }
+        if($set_wired) {
+            $this->writeLANprofile($eap_config);
+        }
+        } else {
+        error("  this EAP type is not handled yet");
+        return;
+        }
     debug(4,"WindowsProfile"); debug(4,$WindowsProfile);
     
     $this->writeProfilesNSH($WindowsProfile, $CA_files,$set_wired);
     $this->writeAdditionalDeletes($delProfiles);
     if(isset($additional_deletes) && count($additional_deletes))
-       $this->writeAdditionalDeletes($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']);
+        $this->combineLogo($this->attributes['internal:logo_file']);
     $this->writeMainNSH($this->selected_eap,$this->attributes);
     $this->compileNSIS();
     $installer_path = $this->signInstaller($this->attributes); 
 
     textdomain($dom);
     return($installer_path);  
-  }
+    }
 
-  public function writeDeviceInfo() {
+    public function writeDeviceInfo() {
     $ssid_ct=count($this->attributes['internal:SSID']);
-   $out = "<p>";
-   $out .= sprintf(_("%s installer will be in the form of an EXE file. It will configure %s on your device, by creating wireless network profiles.<p>When you click the download button, the installer will be saved by your browser. Copy it to the machine you want to configure and execute."),Config::$CONSORTIUM['name'],Config::$CONSORTIUM['name']);
-   $out .= "<p>";
+    $out = "<p>";
+    $out .= sprintf(_("%s installer will be in the form of an EXE file. It will configure %s on your device, by creating wireless network profiles.<p>When you click the download button, the installer will be saved by your browser. Copy it to the machine you want to configure and execute."),Config::$CONSORTIUM['name'],Config::$CONSORTIUM['name']);
+    $out .= "<p>";
     if($ssid_ct > 1) {
         if($ssid_ct > 2) {
             $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"),implode(', ',Config::$CONSORTIUM['ssid']))." ";
@@ -101,52 +101,52 @@ 
             $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 .= ", ";
-         $i++;
-         $out .= "<strong>$ssid</strong>";
-       }
+            if(! in_array($ssid, Config::$CONSORTIUM['ssid'])) {
+                if($i > 0)
+            $out .= ", ";
+            $i++;
+            $out .= "<strong>$ssid</strong>";
+        }
     }
     $out .= "<p>";
     }
 
 if($this->eap == EAP::$TLS)
-   $out .= _("In order to connect to the network you will need an a personal certificate in the form of a p12 file. You should obtain this certificate from your home institution. Consult the support page to find out how this certificate can be obtained. Such certificate files are password protected. You should have both the file and the password available during the installation process.");
+    $out .= _("In order to connect to the network you will need an a personal certificate in the form of a p12 file. You should obtain this certificate from your home institution. Consult the support page to find out how this certificate can be obtained. Such certificate files are password protected. You should have both the file and the password available during the installation process.");
 else {
-   $out .= _("In order to connect to the network you will need an account from your home institution. You should consult the support page to find out how this account can be obtained. It is very likely that your account is already activated.");
-   $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.");
+    $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.");
         if($ssid_ct > 1) {
-             $out .= "<p>";
-             $out .= _("You will be required to enter the same credentials for each of the configured notworks:")." ";
-             $i = 0;
+                $out .= "<p>";
+                $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 .= ", ";
-                 $i++;
-                 $out .= "<strong>$ssid</strong>";
+                    if($i > 0)
+                    $out .= ", ";
+                    $i++;
+                    $out .= "<strong>$ssid</strong>";
             }
     }
 
 
 }
     return $out;
-  }
+    }
 
 
 private function prepareEapConfig($attr) {
-   $eap = $this->selected_eap;
-   $w8_ext = '';
-   $use_anon = $attr['internal:use_anon_outer'] [0];
-   if ($use_anon) {
-     $outer_user = $attr['internal:anon_local_value'][0];
-     $outer_id = $outer_user.'@'.$attr['internal:realm'][0];
-   }
+    $eap = $this->selected_eap;
+    $w8_ext = '';
+    $use_anon = $attr['internal:use_anon_outer'] [0];
+    if ($use_anon) {
+        $outer_user = $attr['internal:anon_local_value'][0];
+        $outer_id = $outer_user.'@'.$attr['internal:realm'][0];
+    }
 //   $servers = preg_quote(implode(';',$attr['eap:server_name']));
-   $servers = implode(';',$attr['eap:server_name']);
+    $servers = implode(';',$attr['eap:server_name']);
    
-   $ca_array = $attr['internal:CAs'][0];
+    $ca_array = $attr['internal:CAs'][0];
 
 
 $profile_file_contents = '<EAPConfig><EapHostConfig xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
@@ -162,7 +162,7 @@ 
 $profile_file_contents .= '<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</AuthorId>
 </EapMethod>
 ';
-  $profile_file_contents .= '
+    $profile_file_contents .= '
 
 <Config xmlns:baseEap="http://www.microsoft.com/provisioning/BaseEapConnectionPropertiesV1" 
   xmlns:eapTls="http://www.microsoft.com/provisioning/EapTlsConnectionPropertiesV1">
@@ -178,14 +178,14 @@ 
 if($ca_array) {
 foreach ($ca_array as $CA)
     if($CA['root'])
-       $profile_file_contents .= "<eapTls:TrustedRootCA>".$CA['sha1']."</eapTls:TrustedRootCA>\n";
+        $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')
-   $profile_file_contents .= '<eapTls:DifferentUsername>true</eapTls:DifferentUsername>';
+    $profile_file_contents .= '<eapTls:DifferentUsername>true</eapTls:DifferentUsername>';
 else
-   $profile_file_contents .= '<eapTls:DifferentUsername>false</eapTls:DifferentUsername>';
+    $profile_file_contents .= '<eapTls:DifferentUsername>false</eapTls:DifferentUsername>';
 $profile_file_contents .= '
 </eapTls:EapType>
 </baseEap:Eap>
@@ -193,9 +193,9 @@ 
 ';
 } elseif ( $eap == EAP::$PEAP_MSCHAP2) {
 if(isset($attr['eap:enable_nea']) && $attr['eap:enable_nea'][0] == 'on')
-   $nea = 'true';
+    $nea = 'true';
 else
-   $nea = 'false';
+    $nea = 'false';
 $profile_file_contents .= '<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</AuthorId>
 </EapMethod>
 ';
@@ -260,10 +260,10 @@ 
 <Phase2Authentication>
 ';
 if ( $eap == EAP::$TTLS_PAP) {
-   $w8_ext .='<PAPAuthentication /> ';
+    $w8_ext .='<PAPAuthentication /> ';
 }
 if ( $eap == EAP::$TTLS_MSCHAP2)  {
-   $w8_ext .='<MSCHAPv2Authentication>
+    $w8_ext .='<MSCHAPv2Authentication>
 <UseWinlogonCredentials>false</UseWinlogonCredentials>
 </MSCHAPv2Authentication>
 ';
@@ -272,16 +272,16 @@ 
 <Phase1Identity>
 ';
 if($use_anon == 1) {
-  $w8_ext .= '<IdentityPrivacy>true</IdentityPrivacy> 
+    $w8_ext .= '<IdentityPrivacy>true</IdentityPrivacy> 
 ';
-  if(isset($outer_id) && $outer_id) 
+    if(isset($outer_id) && $outer_id) 
     $w8_ext .='<AnonymousIdentity>'.$outer_id.'</AnonymousIdentity>
 ';
-  else
+    else
     $w8_ext .='<AnonymousIdentity/>
 ';
 } else {
-  $w8_ext .= '<IdentityPrivacy>false</IdentityPrivacy>
+    $w8_ext .= '<IdentityPrivacy>false</IdentityPrivacy>
 ';
 }
 $w8_ext .='</Phase1Identity>
@@ -292,7 +292,7 @@ 
 $profile_file_contents .= '<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</AuthorId>
 </EapMethod>
 ';
-   $profile_file_contents .= '<ConfigBlob></ConfigBlob>';
+    $profile_file_contents .= '<ConfigBlob></ConfigBlob>';
 }
 
 $profile_file_contents_end = '</EapHostConfig></EAPConfig>';
@@ -309,7 +309,7 @@ 
 /**
  * produce PEAP, TLS and TTLS configuration files for Windows 8
  */
-  private function writeWLANprofile($wlan_profile_name,$ssid,$auth,$encryption,$eap_config,$i) {
+    private function writeWLANprofile($wlan_profile_name,$ssid,$auth,$encryption,$eap_config,$i) {
 $profile_file_contents = '<?xml version="1.0"?>
 <WLANProfile xmlns="http://www.microsoft.com/networking/WLAN/profile/v1">
 <name>'.$wlan_profile_name.'</name>
@@ -349,7 +349,7 @@ 
 ';
 
 if(! is_dir('w8'))
-  mkdir('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) ;
@@ -376,7 +376,7 @@ 
 ';
 
 if(! is_dir('w8'))
-  mkdir('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) ;
@@ -435,7 +435,7 @@ 
 ';
 
 if(isset($this->attributes['media:wired'][0]) && $attr['media:wired'][0] == 'on')
-  $fcontents .= '!define WIRED
+    $fcontents .= '!define WIRED
 ';
 
 $f = fopen('main.nsh','w');
@@ -448,7 +448,7 @@ 
 debug(4,"writeProfilesNSH");
 debug(4,$P);
 $fcontents = '';
-  foreach($P as $p) 
+    foreach($P as $p) 
     $fcontents .= "!insertmacro define_wlan_profile $p\n";
 
 $f = fopen('profiles.nsh','w');
@@ -459,8 +459,8 @@ 
 $f = fopen('certs.nsh','w');
 if($ca_array) {
 foreach ($ca_array as $CA) {
-      $store = $CA['root'] ? "root" : "ca";
-      $fcontents .= '!insertmacro install_ca_cert "'.$CA['file'].'" "'.$CA['sha1'].'" "'.$store."\"\n";
+        $store = $CA['root'] ? "root" : "ca";
+        $fcontents .= '!insertmacro install_ca_cert "'.$CA['file'].'" "'.$CA['sha1'].'" "'.$store."\"\n";
     }
 fwrite($f, $fcontents);
 }
@@ -471,26 +471,26 @@ 
 
 private function copyFiles ($eap) {
 debug(4,"copyFiles start\n");
-   $result;
-   $result = $this->copyFile('wlan_test.exe');
-   $result = $this->copyFile('check_wired.cmd');
-   $result = $this->copyFile('install_wired.cmd');
-   $result = $this->copyFile('setEAPCred.exe');
-   $result = $this->copyFile('cat_bg.bmp');
-   $result = $this->copyFile('base64.nsh');
-   $result = $result && $this->copyFile('cat32.ico');
-   $result = $result && $this->copyFile('cat_150.bmp');
-   $this->translateFile('common.inc','common.nsh',$this->code_page);
-   if($eap["OUTER"] == PWD) {
-     $this->translateFile('pwd.inc','cat.NSI',$this->code_page);
-     $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x32.msi');
-     $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x64.msi');
-   } else {
-   $this->translateFile('eap_w8.inc','cat.NSI',$this->code_page);
-   $result = 1;
-   }
+    $result;
+    $result = $this->copyFile('wlan_test.exe');
+    $result = $this->copyFile('check_wired.cmd');
+    $result = $this->copyFile('install_wired.cmd');
+    $result = $this->copyFile('setEAPCred.exe');
+    $result = $this->copyFile('cat_bg.bmp');
+    $result = $this->copyFile('base64.nsh');
+    $result = $result && $this->copyFile('cat32.ico');
+    $result = $result && $this->copyFile('cat_150.bmp');
+    $this->translateFile('common.inc','common.nsh',$this->code_page);
+    if($eap["OUTER"] == PWD) {
+        $this->translateFile('pwd.inc','cat.NSI',$this->code_page);
+        $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x32.msi');
+        $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x64.msi');
+    } else {
+    $this->translateFile('eap_w8.inc','cat.NSI',$this->code_page);
+    $result = 1;
+    }
 debug(4,"copyFiles end\n");
-   return($result);
+    return($result);
 }
 
 }

Spacing +119 added lines, -119 removed lines

@@ -28,8 +28,8 @@ 
     final public function __construct() {
       $this->supportedEapMethods = [EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP, EAP::$TTLS_MSCHAP2, EAP::$PWD];
 #      $this->supportedEapMethods = array(EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP, EAP::$PWD);
-      debug(4,"This device supports the following EAP methods: ");
-      debug(4,$this->supportedEapMethods);
+      debug(4, "This device supports the following EAP methods: ");
+      debug(4, $this->supportedEapMethods);
       $this->specialities['anon_id'][serialize(EAP::$PEAP_MSCHAP2)] = _("Anonymous identities do not use the realm as specified in the profile - it is derived from the suffix of the user's username input instead.");
     }
 
@@ -46,42 +46,42 @@ 
 //   create a list of profiles to be deleted after installation
      $delProfiles = [];
      foreach ($delSSIDs as $ssid => $cipher) {
-         if($cipher == 'DEL')
+         if ($cipher == 'DEL')
           $delProfiles[] = $ssid;
-         if($cipher == 'TKIP')
-          $delProfiles[] = $ssid.' (TKIP)';
+         if ($cipher == 'TKIP')
+          $delProfiles[] = $ssid . ' (TKIP)';
      }
 
 
-     if ($this->selected_eap == EAP::$TLS || $this->selected_eap == EAP::$PEAP_MSCHAP2 || $this->selected_eap ==  EAP::$TTLS_PAP || $this->selected_eap == EAP::$TTLS_MSCHAP2 || $this->selected_eap == EAP::$PWD) {
+     if ($this->selected_eap == EAP::$TLS || $this->selected_eap == EAP::$PEAP_MSCHAP2 || $this->selected_eap == EAP::$TTLS_PAP || $this->selected_eap == EAP::$TTLS_MSCHAP2 || $this->selected_eap == EAP::$PWD) {
        $WindowsProfile = [];
        $eap_config = $this->prepareEapConfig($this->attributes);
        $i = 0;
        foreach ($SSIDs as $ssid => $cipher) {
-          if($cipher == 'TKIP') {
-             $WindowsProfile[$i] = $this->writeWLANprofile ($ssid.' (TKIP)',$ssid,'WPA','TKIP',$eap_config,$i);
+          if ($cipher == 'TKIP') {
+             $WindowsProfile[$i] = $this->writeWLANprofile($ssid . ' (TKIP)', $ssid, 'WPA', 'TKIP', $eap_config, $i);
              $i++;
           }
-          $WindowsProfile[$i] = $this->writeWLANprofile ($ssid,$ssid,'WPA2','AES',$eap_config,$i);
+          $WindowsProfile[$i] = $this->writeWLANprofile($ssid, $ssid, 'WPA2', 'AES', $eap_config, $i);
           $i++;
        }
-       if($set_wired) {
+       if ($set_wired) {
          $this->writeLANprofile($eap_config);
        }
      } else {
        error("  this EAP type is not handled yet");
        return;
      }
-    debug(4,"WindowsProfile"); debug(4,$WindowsProfile);
+    debug(4, "WindowsProfile"); debug(4, $WindowsProfile);
     
-    $this->writeProfilesNSH($WindowsProfile, $CA_files,$set_wired);
+    $this->writeProfilesNSH($WindowsProfile, $CA_files, $set_wired);
     $this->writeAdditionalDeletes($delProfiles);
-    if(isset($additional_deletes) && count($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']))
+    if (isset($this->attributes['internal:logo_file']))
        $this->combineLogo($this->attributes['internal:logo_file']);
-    $this->writeMainNSH($this->selected_eap,$this->attributes);
+    $this->writeMainNSH($this->selected_eap, $this->attributes);
     $this->compileNSIS();
     $installer_path = $this->signInstaller($this->attributes); 
 
@@ -90,19 +90,19 @@ 
   }
 
   public function writeDeviceInfo() {
-    $ssid_ct=count($this->attributes['internal:SSID']);
+    $ssid_ct = count($this->attributes['internal:SSID']);
    $out = "<p>";
-   $out .= sprintf(_("%s installer will be in the form of an EXE file. It will configure %s on your device, by creating wireless network profiles.<p>When you click the download button, the installer will be saved by your browser. Copy it to the machine you want to configure and execute."),Config::$CONSORTIUM['name'],Config::$CONSORTIUM['name']);
+   $out .= sprintf(_("%s installer will be in the form of an EXE file. It will configure %s on your device, by creating wireless network profiles.<p>When you click the download button, the installer will be saved by your browser. Copy it to the machine you want to configure and execute."), Config::$CONSORTIUM['name'], Config::$CONSORTIUM['name']);
    $out .= "<p>";
-    if($ssid_ct > 1) {
-        if($ssid_ct > 2) {
-            $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"),implode(', ',Config::$CONSORTIUM['ssid']))." ";
+    if ($ssid_ct > 1) {
+        if ($ssid_ct > 2) {
+            $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"), implode(', ', Config::$CONSORTIUM['ssid'])) . " ";
         } else
-            $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"),implode(', ',Config::$CONSORTIUM['ssid']))." ";
+            $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)
+           if (!in_array($ssid, Config::$CONSORTIUM['ssid'])) {
+             if ($i > 0)
            $out .= ", ";
          $i++;
          $out .= "<strong>$ssid</strong>";
@@ -111,18 +111,18 @@ 
     $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 {
    $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.");
-        if($ssid_ct > 1) {
+        if ($ssid_ct > 1) {
              $out .= "<p>";
-             $out .= _("You will be required to enter the same credentials for each of the configured notworks:")." ";
+             $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)
+                 if ($i > 0)
                    $out .= ", ";
                  $i++;
                  $out .= "<strong>$ssid</strong>";
@@ -141,10 +141,10 @@ 
    $use_anon = $attr['internal:use_anon_outer'] [0];
    if ($use_anon) {
      $outer_user = $attr['internal:anon_local_value'][0];
-     $outer_id = $outer_user.'@'.$attr['internal:realm'][0];
+     $outer_id = $outer_user . '@' . $attr['internal:realm'][0];
    }
 //   $servers = preg_quote(implode(';',$attr['eap:server_name']));
-   $servers = implode(';',$attr['eap:server_name']);
+   $servers = implode(';', $attr['eap:server_name']);
    
    $ca_array = $attr['internal:CAs'][0];
 
@@ -153,12 +153,12 @@ 
 <EapMethod>
 ';
 
-$profile_file_contents .= '<Type xmlns="http://www.microsoft.com/provisioning/EapCommon">'.
-    $this->selected_eap["OUTER"].'</Type>
+$profile_file_contents .= '<Type xmlns="http://www.microsoft.com/provisioning/EapCommon">' .
+    $this->selected_eap["OUTER"] . '</Type>
 <VendorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorId>
 <VendorType xmlns="http://www.microsoft.com/provisioning/EapCommon">0</VendorType>
 ';
-if( $eap == EAP::$TLS) {
+if ($eap == EAP::$TLS) {
 $profile_file_contents .= '<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</AuthorId>
 </EapMethod>
 ';
@@ -174,15 +174,15 @@ 
 </eapTls:CredentialsSource>
 <eapTls:ServerValidation>
 <eapTls:DisableUserPromptForServerValidation>true</eapTls:DisableUserPromptForServerValidation>
-<eapTls:ServerNames>'.$servers.'</eapTls:ServerNames>';
-if($ca_array) {
+<eapTls:ServerNames>'.$servers . '</eapTls:ServerNames>';
+if ($ca_array) {
 foreach ($ca_array as $CA)
-    if($CA['root'])
-       $profile_file_contents .= "<eapTls:TrustedRootCA>".$CA['sha1']."</eapTls:TrustedRootCA>\n";
+    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
    $profile_file_contents .= '<eapTls:DifferentUsername>false</eapTls:DifferentUsername>';
@@ -191,8 +191,8 @@ 
 </baseEap:Eap>
 </Config>
 ';
-} elseif ( $eap == EAP::$PEAP_MSCHAP2) {
-if(isset($attr['eap:enable_nea']) && $attr['eap:enable_nea'][0] == 'on')
+} elseif ($eap == EAP::$PEAP_MSCHAP2) {
+if (isset($attr['eap:enable_nea']) && $attr['eap:enable_nea'][0] == 'on')
    $nea = 'true';
 else
    $nea = 'false';
@@ -205,11 +205,11 @@ 
 <EapType xmlns="http://www.microsoft.com/provisioning/MsPeapConnectionPropertiesV1">
 <ServerValidation>
 <DisableUserPromptForServerValidation>true</DisableUserPromptForServerValidation>
-<ServerNames>'.$servers.'</ServerNames>';
-if($ca_array) {
+<ServerNames>'.$servers . '</ServerNames>';
+if ($ca_array) {
 foreach ($ca_array as $CA)
-    if($CA['root'])
-        $w8_ext .= "<TrustedRootCA>".$CA['sha1']."</TrustedRootCA>\n";
+    if ($CA['root'])
+        $w8_ext .= "<TrustedRootCA>" . $CA['sha1'] . "</TrustedRootCA>\n";
 }
 $w8_ext .= '</ServerValidation>
 <FastReconnect>true</FastReconnect> 
@@ -220,50 +220,50 @@ 
 <UseWinLogonCredentials>false</UseWinLogonCredentials> 
 </EapType>
 </Eap>
-<EnableQuarantineChecks>'.$nea.'</EnableQuarantineChecks>
+<EnableQuarantineChecks>'.$nea . '</EnableQuarantineChecks>
 <RequireCryptoBinding>false</RequireCryptoBinding>
 ';
-if($use_anon == 1) {
-$w8_ext .='<PeapExtensions>
+if ($use_anon == 1) {
+$w8_ext .= '<PeapExtensions>
 <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/>
+$w8_ext .= '<AnonymousUserName/>
 ';
-$w8_ext .='</IdentityPrivacy>
+$w8_ext .= '</IdentityPrivacy>
 </PeapExtensions>
 ';
 }
-$w8_ext .='</EapType>
+$w8_ext .= '</EapType>
 </Eap>
 </Config>
 ';
-} elseif ( $eap == EAP::$TTLS_PAP || $eap == EAP::$TTLS_MSCHAP2) {
+} elseif ($eap == EAP::$TTLS_PAP || $eap == EAP::$TTLS_MSCHAP2) {
 $profile_file_contents .= '<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">311</AuthorId>
 </EapMethod>
 ';
 $w8_ext = '<Config xmlns="http://www.microsoft.com/provisioning/EapHostConfig">
 <EapTtls xmlns="http://www.microsoft.com/provisioning/EapTtlsConnectionPropertiesV1">
 <ServerValidation>
-<ServerNames>'.$servers.'</ServerNames> ';
-if($ca_array) {
+<ServerNames>'.$servers . '</ServerNames> ';
+if ($ca_array) {
 foreach ($ca_array as $CA)
-    if($CA['root'])
-        $w8_ext .= "<TrustedRootCAHash>".chunk_split($CA['sha1'],2,' ')."</TrustedRootCAHash>\n";
+    if ($CA['root'])
+        $w8_ext .= "<TrustedRootCAHash>" . chunk_split($CA['sha1'], 2, ' ') . "</TrustedRootCAHash>\n";
 }
-$w8_ext .='<DisablePrompt>true</DisablePrompt> 
+$w8_ext .= '<DisablePrompt>true</DisablePrompt> 
 </ServerValidation>
 <Phase2Authentication>
 ';
-if ( $eap == EAP::$TTLS_PAP) {
-   $w8_ext .='<PAPAuthentication /> ';
+if ($eap == EAP::$TTLS_PAP) {
+   $w8_ext .= '<PAPAuthentication /> ';
 }
-if ( $eap == EAP::$TTLS_MSCHAP2)  {
-   $w8_ext .='<MSCHAPv2Authentication>
+if ($eap == EAP::$TTLS_MSCHAP2) {
+   $w8_ext .= '<MSCHAPv2Authentication>
 <UseWinlogonCredentials>false</UseWinlogonCredentials>
 </MSCHAPv2Authentication>
 ';
@@ -271,24 +271,24 @@ 
 $w8_ext .= '</Phase2Authentication>
 <Phase1Identity>
 ';
-if($use_anon == 1) {
+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/>
+    $w8_ext .= '<AnonymousIdentity/>
 ';
 } else {
   $w8_ext .= '<IdentityPrivacy>false</IdentityPrivacy>
 ';
 }
-$w8_ext .='</Phase1Identity>
+$w8_ext .= '</Phase1Identity>
 </EapTtls>
 </Config>
 ';
-} elseif ( $eap == EAP::$PWD) {
+} elseif ($eap == EAP::$PWD) {
 $profile_file_contents .= '<AuthorId xmlns="http://www.microsoft.com/provisioning/EapCommon">0</AuthorId>
 </EapMethod>
 ';
@@ -297,7 +297,7 @@ 
 
 $profile_file_contents_end = '</EapHostConfig></EAPConfig>';
 $return_array = [];
-$return_array['w8'] = $profile_file_contents.$w8_ext.$profile_file_contents_end;
+$return_array['w8'] = $profile_file_contents . $w8_ext . $profile_file_contents_end;
 return $return_array;
 }
 
@@ -309,13 +309,13 @@ 
 /**
  * produce PEAP, TLS and TTLS configuration files for Windows 8
  */
-  private function writeWLANprofile($wlan_profile_name,$ssid,$auth,$encryption,$eap_config,$i) {
+  private function writeWLANprofile($wlan_profile_name, $ssid, $auth, $encryption, $eap_config, $i) {
 $profile_file_contents = '<?xml version="1.0"?>
 <WLANProfile xmlns="http://www.microsoft.com/networking/WLAN/profile/v1">
-<name>'.$wlan_profile_name.'</name>
+<name>'.$wlan_profile_name . '</name>
 <SSIDConfig>
 <SSID>
-<name>'.$ssid.'</name>
+<name>'.$ssid . '</name>
 </SSID>
 <nonBroadcast>true</nonBroadcast>
 </SSIDConfig>
@@ -325,12 +325,12 @@ 
 <MSM>
 <security>
 <authEncryption>
-<authentication>'.$auth.'</authentication>
-<encryption>'.$encryption.'</encryption>
+<authentication>'.$auth . '</authentication>
+<encryption>'.$encryption . '</encryption>
 <useOneX>true</useOneX>
 </authEncryption>
 ';
-if($auth == 'WPA2') 
+if ($auth == 'WPA2') 
 $profile_file_contents .= '<PMKCacheMode>enabled</PMKCacheMode> 
 <PMKCacheTTL>720</PMKCacheTTL> 
 <PMKCacheSize>128</PMKCacheSize> 
@@ -348,14 +348,14 @@ 
 </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) ;
+$xml_f = fopen($xml_f_name, 'w');
+fwrite($xml_f, $profile_file_contents . $eap_config['w8'] . $closing);
 fclose($xml_f);
-debug(2,"Installer has been written into directory $this->FPATH\n");
-debug(4,"WWWWLAN_Profile:$wlan_profile_name:$encryption\n");
+debug(2, "Installer has been written into directory $this->FPATH\n");
+debug(4, "WWWWLAN_Profile:$wlan_profile_name:$encryption\n");
 return("\"$wlan_profile_name\" \"$encryption\"");
 }
 
@@ -375,29 +375,29 @@ 
 </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) ;
+$xml_f = fopen($xml_f_name, 'w');
+fwrite($xml_f, $profile_file_contents . $eap_config['w8'] . $closing);
 fclose($xml_f);
-debug(2,"Installer has been written into directory $this->FPATH\n");
+debug(2, "Installer has been written into directory $this->FPATH\n");
 }
 
 
 
-private function writeMainNSH($eap,$attr) {
-debug(4,"writeMainNSH"); debug(4,$attr);
+private function writeMainNSH($eap, $attr) {
+debug(4, "writeMainNSH"); debug(4, $attr);
 $fcontents = "!define W8\n";
-if(Config::$NSIS_VERSION >= 3)
-    $fcontents .=  "Unicode true\n";
+if (Config::$NSIS_VERSION >= 3)
+    $fcontents .= "Unicode true\n";
 
 
 $EAP_OPTS = [
-PEAP=>['str'=>'PEAP','exec'=>'user'],
-TLS=>['str'=>'TLS','exec'=>'user'],
-TTLS=>['str'=>'TTLS','exec'=>'user'],
-PWD=>['str'=>'PWD','exec'=>'user'],
+PEAP=>['str'=>'PEAP', 'exec'=>'user'],
+TLS=>['str'=>'TLS', 'exec'=>'user'],
+TTLS=>['str'=>'TTLS', 'exec'=>'user'],
+PWD=>['str'=>'PWD', 'exec'=>'user'],
 ];
  
 // Uncomment the line below if you want this module to run under XP (only displaying a warning)
@@ -407,24 +407,24 @@ 
 $exec_level = $EAP_OPTS[$eap["OUTER"]]['exec'];
 $eap_str = $EAP_OPTS[$eap["OUTER"]]['str'];
 
-$fcontents .= '!define '.$eap_str;
-$fcontents .= "\n".'!define EXECLEVEL "'.$exec_level.'"';
+$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).'"
-!define VERSION "'.CAT::$VERSION_MAJOR.'.'.CAT::$VERSION_MINOR.'"
+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) . '"
+!define VERSION "'.CAT::$VERSION_MAJOR . '.' . CAT::$VERSION_MINOR . '"
 !define INSTALLER_NAME "installer.exe"
-!define LANG "'.$this->lang.'"
+!define LANG "'.$this->lang . '"
 ';
 $fcontents .= $this->msInfoFile($attr);
 
 $fcontents .= ';--------------------------------
-!define ORGANISATION "'.$this->translateString($attr['general:instname'][0], $this->code_page).'"
-!define SUPPORT "'. ((isset($attr['support:email'][0]) && $attr['support:email'][0] ) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute , $this->code_page)) .'"
-!define URL "'. ((isset($attr['support:url'][0]) && $attr['support:url'][0] ) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->code_page)) .'"
+!define ORGANISATION "'.$this->translateString($attr['general:instname'][0], $this->code_page) . '"
+!define SUPPORT "'. ((isset($attr['support:email'][0]) && $attr['support:email'][0]) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->code_page)) . '"
+!define URL "'. ((isset($attr['support:url'][0]) && $attr['support:url'][0]) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->code_page)) . '"
 
 !ifdef TLS
 ';
@@ -434,33 +434,33 @@ 
 !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');
+$f = fopen('main.nsh', 'w');
 fwrite($f, $fcontents);
 fclose($f);
 
 }
 
-private function writeProfilesNSH($P,$ca_array,$wired=0) {
-debug(4,"writeProfilesNSH");
-debug(4,$P);
+private function writeProfilesNSH($P, $ca_array, $wired = 0) {
+debug(4, "writeProfilesNSH");
+debug(4, $P);
 $fcontents = '';
-  foreach($P as $p) 
+  foreach ($P as $p) 
     $fcontents .= "!insertmacro define_wlan_profile $p\n";
 
-$f = fopen('profiles.nsh','w');
+$f = fopen('profiles.nsh', 'w');
 fwrite($f, $fcontents);
 fclose($f);
 
 $fcontents = '';
-$f = fopen('certs.nsh','w');
-if($ca_array) {
+$f = fopen('certs.nsh', 'w');
+if ($ca_array) {
 foreach ($ca_array as $CA) {
       $store = $CA['root'] ? "root" : "ca";
-      $fcontents .= '!insertmacro install_ca_cert "'.$CA['file'].'" "'.$CA['sha1'].'" "'.$store."\"\n";
+      $fcontents .= '!insertmacro install_ca_cert "' . $CA['file'] . '" "' . $CA['sha1'] . '" "' . $store . "\"\n";
     }
 fwrite($f, $fcontents);
 }
@@ -469,8 +469,8 @@ 
 
 //private function write
 
-private function copyFiles ($eap) {
-debug(4,"copyFiles start\n");
+private function copyFiles($eap) {
+debug(4, "copyFiles start\n");
    $result;
    $result = $this->copyFile('wlan_test.exe');
    $result = $this->copyFile('check_wired.cmd');
@@ -480,16 +480,16 @@ 
    $result = $this->copyFile('base64.nsh');
    $result = $result && $this->copyFile('cat32.ico');
    $result = $result && $this->copyFile('cat_150.bmp');
-   $this->translateFile('common.inc','common.nsh',$this->code_page);
-   if($eap["OUTER"] == PWD) {
-     $this->translateFile('pwd.inc','cat.NSI',$this->code_page);
+   $this->translateFile('common.inc', 'common.nsh', $this->code_page);
+   if ($eap["OUTER"] == PWD) {
+     $this->translateFile('pwd.inc', 'cat.NSI', $this->code_page);
      $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x32.msi');
      $result = $result && $this->copyFile('Aruba_Networks_EAP-pwd_x64.msi');
    } else {
-   $this->translateFile('eap_w8.inc','cat.NSI',$this->code_page);
+   $this->translateFile('eap_w8.inc', 'cat.NSI', $this->code_page);
    $result = 1;
    }
-debug(4,"copyFiles end\n");
+debug(4, "copyFiles end\n");
    return($result);
 }
 

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

devices/ms/WindowsCommon.php

Doc Comments +3 added lines

@@ -21,6 +21,9 @@
   echo preg_replace('/"/','$\"',$in);
 }
 
+/**
+ * @return string
+ */
 function sprint_nsi($in) {
   return preg_replace('/"/','$\"',$in);
 }

Indentation +61 added lines, -61 removed lines

@@ -18,11 +18,11 @@ 
  * @param string $in input string
  */
 function echo_nsi($in) {
-  echo preg_replace('/"/','$\"',$in);
+    echo preg_replace('/"/','$\"',$in);
 }
 
 function sprint_nsi($in) {
-  return preg_replace('/"/','$\"',$in);
+    return preg_replace('/"/','$\"',$in);
 }
 
 /**
@@ -35,39 +35,39 @@ 
 
 protected function prepareInstallerLang() {
     if(isset($this->LANGS[$this->lang_index])) {
-      $L = $this->LANGS[$this->lang_index];
-      $this->lang = $L['nsis'];
-      $this->code_page = 'cp'.$L['cp'];
+        $L = $this->LANGS[$this->lang_index];
+        $this->lang = $L['nsis'];
+        $this->code_page = 'cp'.$L['cp'];
     } else {
-      $this->lang = 'English';
-      $this->code_page = 'cp1252';
+        $this->lang = 'English';
+        $this->code_page = 'cp1252';
     }
 }
 
 protected function combineLogo($Logos) {
     // maximum size to which we want to resize
- $max_size= 120;
+    $max_size= 120;
 // logo wull be shited up by this much
- $vshift = 20;
- $bg_image = new Imagick('cat_bg.bmp');
- $bg_image->setFormat('BMP3');
- $bg_image_size = $bg_image->getImageGeometry();
- $logo = new Imagick($Logos[0]['name']);
- $logo_size = $logo->getImageGeometry();
- $max = max($logo_size);
- debug(4,"Logo size: "); debug(4,$logo_size); debug(4,"max=$max\n");
+    $vshift = 20;
+    $bg_image = new Imagick('cat_bg.bmp');
+    $bg_image->setFormat('BMP3');
+    $bg_image_size = $bg_image->getImageGeometry();
+    $logo = new Imagick($Logos[0]['name']);
+    $logo_size = $logo->getImageGeometry();
+    $max = max($logo_size);
+    debug(4,"Logo size: "); debug(4,$logo_size); debug(4,"max=$max\n");
 // resize logo if necessary
- if($max > $max_size) {
-   if($max == $logo_size['width'])
-      $logo->scaleImage($max_size,0);
-   else
-      $logo->scaleImage(0,$max_size);
- }
- $logo_size = $logo->getImageGeometry();
- debug(4,"New logo size: "); debug(4,$logo_size);
+    if($max > $max_size) {
+    if($max == $logo_size['width'])
+        $logo->scaleImage($max_size,0);
+    else
+        $logo->scaleImage(0,$max_size);
+    }
+    $logo_size = $logo->getImageGeometry();
+    debug(4,"New logo size: "); debug(4,$logo_size);
 // calculate logo offsets for composition with the background
- $hoffset = round(($bg_image_size['width'] - $logo_size['width'])/2);
- $voffset = round(($bg_image_size['height'] - $logo_size['height'])/2) - $vshift;
+    $hoffset = round(($bg_image_size['width'] - $logo_size['width'])/2);
+    $voffset = round(($bg_image_size['height'] - $logo_size['height'])/2) - $vshift;
 
 //logo image is put on top of the background
 $bg_image->compositeImage($logo, $logo->getImageCompose(), $hoffset, $voffset);
@@ -77,61 +77,61 @@ 
 }
 
 protected function signInstaller($attr) {
-   $e = $this->installerBasename.'.exe';
-   if($this->sign) {
-      $o = system($this->sign." installer.exe '$e' > /dev/null");
-   }
-   else
-      rename("installer.exe",$e);
-   return $e;
+    $e = $this->installerBasename.'.exe';
+    if($this->sign) {
+        $o = system($this->sign." installer.exe '$e' > /dev/null");
+    }
+    else
+        rename("installer.exe",$e);
+    return $e;
 }
 
 protected function compileNSIS() {
-   if(Config::$NSIS_VERSION >= 3)
-      $makensis = Config::$PATHS['makensis'] . " -INPUTCHARSET UTF8";
-   else
-      $makensis = Config::$PATHS['makensis']; 
-   $o = $makensis.' -V4 cat.NSI > nsis.log';
-   system($o);
-   debug(4,"compileNSIS:$o\n");
+    if(Config::$NSIS_VERSION >= 3)
+        $makensis = Config::$PATHS['makensis'] . " -INPUTCHARSET UTF8";
+    else
+        $makensis = Config::$PATHS['makensis']; 
+    $o = $makensis.' -V4 cat.NSI > nsis.log';
+    system($o);
+    debug(4,"compileNSIS:$o\n");
 }
 
 protected function msInfoFile($attr) {
- $out = '';
+    $out = '';
 if(isset($attr['support:info_file'])) {
     $out .= '!define EXTERNAL_INFO "';
 //  debug(4,"Info file type ".$attr['support:info_file'][0]['mime']."\n");
-  if ($attr['internal:info_file'][0]['mime'] == 'rtf')
-     $out = '!define LICENSE_FILE "'. $attr['internal:info_file'][0]['name'];
-  elseif( $attr['internal:info_file'][0]['mime'] == 'txt') {
-     $in_txt = file_get_contents($attr['internal:info_file'][0]['name']);
-     if(Config::$NSIS_VERSION >= 3)
+    if ($attr['internal:info_file'][0]['mime'] == 'rtf')
+        $out = '!define LICENSE_FILE "'. $attr['internal:info_file'][0]['name'];
+    elseif( $attr['internal:info_file'][0]['mime'] == 'txt') {
+        $in_txt = file_get_contents($attr['internal:info_file'][0]['name']);
+        if(Config::$NSIS_VERSION >= 3)
         $out_txt = $in_txt;
-     else
+        else
         $out_txt = iconv('UTF-8',$this->code_page.'//TRANSLIT',$in_txt);
-     if($out_txt) {
+        if($out_txt) {
         file_put_contents('info_f.txt',$out_txt);
         $out = '!define LICENSE_FILE " info_f.txt';
-     }
-  }
-  else
-     $out = '!define EXTERNAL_INFO "'. $attr['internal:info_file'][0]['name'];
+        }
+    }
+    else
+        $out = '!define EXTERNAL_INFO "'. $attr['internal:info_file'][0]['name'];
 
-  $out .= "\"\n";
+    $out .= "\"\n";
 }
- debug(4,"Info file returned: $out");
-  return $out;
+    debug(4,"Info file returned: $out");
+    return $out;
 }
 
 
 protected function writeAdditionalDeletes($P) {
-  if(count($P) == 0 )
+    if(count($P) == 0 )
     return;
-  $f = fopen('profiles.nsh','a');
-  fwrite($f,"!define AdditionalDeletes\n");
-  foreach ($P as $p)
+    $f = fopen('profiles.nsh','a');
+    fwrite($f,"!define AdditionalDeletes\n");
+    foreach ($P as $p)
     fwrite($f,"!insertmacro define_delete_profile \"$p\"\n");
-  fclose($f);
+    fclose($f);
 }
 
 
@@ -181,7 +181,7 @@ 
 'af'=>['nsis'=>"Afrikaans",'cp'=>'1252'],
 'ast'=>['nsis'=>"Asturian",'cp'=>'1252'],
 
-  ];
+    ];
 
 public $code_page;
 public $lang;

Spacing +78 added lines, -78 removed lines

@@ -18,11 +18,11 @@ 
  * @param string $in input string
  */
 function echo_nsi($in) {
-  echo preg_replace('/"/','$\"',$in);
+  echo preg_replace('/"/', '$\"', $in);
 }
 
 function sprint_nsi($in) {
-  return preg_replace('/"/','$\"',$in);
+  return preg_replace('/"/', '$\"', $in);
 }
 
 /**
@@ -34,10 +34,10 @@ 
 class WindowsCommon extends DeviceConfig {
 
 protected function prepareInstallerLang() {
-    if(isset($this->LANGS[$this->lang_index])) {
+    if (isset($this->LANGS[$this->lang_index])) {
       $L = $this->LANGS[$this->lang_index];
       $this->lang = $L['nsis'];
-      $this->code_page = 'cp'.$L['cp'];
+      $this->code_page = 'cp' . $L['cp'];
     } else {
       $this->lang = 'English';
       $this->code_page = 'cp1252';
@@ -46,7 +46,7 @@ 
 
 protected function combineLogo($Logos) {
     // maximum size to which we want to resize
- $max_size= 120;
+ $max_size = 120;
 // logo wull be shited up by this much
  $vshift = 20;
  $bg_image = new Imagick('cat_bg.bmp');
@@ -55,19 +55,19 @@ 
  $logo = new Imagick($Logos[0]['name']);
  $logo_size = $logo->getImageGeometry();
  $max = max($logo_size);
- debug(4,"Logo size: "); debug(4,$logo_size); debug(4,"max=$max\n");
+ debug(4, "Logo size: "); debug(4, $logo_size); debug(4, "max=$max\n");
 // resize logo if necessary
- if($max > $max_size) {
-   if($max == $logo_size['width'])
-      $logo->scaleImage($max_size,0);
+ if ($max > $max_size) {
+   if ($max == $logo_size['width'])
+      $logo->scaleImage($max_size, 0);
    else
-      $logo->scaleImage(0,$max_size);
+      $logo->scaleImage(0, $max_size);
  }
  $logo_size = $logo->getImageGeometry();
- debug(4,"New logo size: "); debug(4,$logo_size);
+ debug(4, "New logo size: "); debug(4, $logo_size);
 // calculate logo offsets for composition with the background
- $hoffset = round(($bg_image_size['width'] - $logo_size['width'])/2);
- $voffset = round(($bg_image_size['height'] - $logo_size['height'])/2) - $vshift;
+ $hoffset = round(($bg_image_size['width'] - $logo_size['width']) / 2);
+ $voffset = round(($bg_image_size['height'] - $logo_size['height']) / 2) - $vshift;
 
 //logo image is put on top of the background
 $bg_image->compositeImage($logo, $logo->getImageCompose(), $hoffset, $voffset);
@@ -77,109 +77,109 @@ 
 }
 
 protected function signInstaller($attr) {
-   $e = $this->installerBasename.'.exe';
-   if($this->sign) {
-      $o = system($this->sign." installer.exe '$e' > /dev/null");
+   $e = $this->installerBasename . '.exe';
+   if ($this->sign) {
+      $o = system($this->sign . " installer.exe '$e' > /dev/null");
    }
    else
-      rename("installer.exe",$e);
+      rename("installer.exe", $e);
    return $e;
 }
 
 protected function compileNSIS() {
-   if(Config::$NSIS_VERSION >= 3)
+   if (Config::$NSIS_VERSION >= 3)
       $makensis = Config::$PATHS['makensis'] . " -INPUTCHARSET UTF8";
    else
       $makensis = Config::$PATHS['makensis']; 
-   $o = $makensis.' -V4 cat.NSI > nsis.log';
+   $o = $makensis . ' -V4 cat.NSI > nsis.log';
    system($o);
-   debug(4,"compileNSIS:$o\n");
+   debug(4, "compileNSIS:$o\n");
 }
 
 protected function msInfoFile($attr) {
  $out = '';
-if(isset($attr['support:info_file'])) {
+if (isset($attr['support:info_file'])) {
     $out .= '!define EXTERNAL_INFO "';
 //  debug(4,"Info file type ".$attr['support:info_file'][0]['mime']."\n");
   if ($attr['internal:info_file'][0]['mime'] == 'rtf')
-     $out = '!define LICENSE_FILE "'. $attr['internal:info_file'][0]['name'];
-  elseif( $attr['internal:info_file'][0]['mime'] == 'txt') {
+     $out = '!define LICENSE_FILE "' . $attr['internal:info_file'][0]['name'];
+  elseif ($attr['internal:info_file'][0]['mime'] == 'txt') {
      $in_txt = file_get_contents($attr['internal:info_file'][0]['name']);
-     if(Config::$NSIS_VERSION >= 3)
+     if (Config::$NSIS_VERSION >= 3)
         $out_txt = $in_txt;
      else
-        $out_txt = iconv('UTF-8',$this->code_page.'//TRANSLIT',$in_txt);
-     if($out_txt) {
-        file_put_contents('info_f.txt',$out_txt);
+        $out_txt = iconv('UTF-8', $this->code_page . '//TRANSLIT', $in_txt);
+     if ($out_txt) {
+        file_put_contents('info_f.txt', $out_txt);
         $out = '!define LICENSE_FILE " info_f.txt';
      }
   }
   else
-     $out = '!define EXTERNAL_INFO "'. $attr['internal:info_file'][0]['name'];
+     $out = '!define EXTERNAL_INFO "' . $attr['internal:info_file'][0]['name'];
 
   $out .= "\"\n";
 }
- debug(4,"Info file returned: $out");
+ debug(4, "Info file returned: $out");
   return $out;
 }
 
 
 protected function writeAdditionalDeletes($P) {
-  if(count($P) == 0 )
+  if (count($P) == 0)
     return;
-  $f = fopen('profiles.nsh','a');
-  fwrite($f,"!define AdditionalDeletes\n");
+  $f = fopen('profiles.nsh', 'a');
+  fwrite($f, "!define AdditionalDeletes\n");
   foreach ($P as $p)
-    fwrite($f,"!insertmacro define_delete_profile \"$p\"\n");
+    fwrite($f, "!insertmacro define_delete_profile \"$p\"\n");
   fclose($f);
 }
 
 
-public $LANGS=[
-'fr'=>['nsis'=>"French",'cp'=>'1252'],
-'de'=>['nsis'=>"German",'cp'=>'1252'],
-'es'=>['nsis'=>"SpanishInternational",'cp'=>'1252'],
-'it'=>['nsis'=>"Italian",'cp'=>'1252'],
-'nl'=>['nsis'=>"Dutch",'cp'=>'1252'],
-'sv'=>['nsis'=>"Swedish",'cp'=>'1252'],
-'fi'=>['nsis'=>"Finnish",'cp'=>'1252'],
-'pl'=>['nsis'=>"Polish",'cp'=>'1250'],
-'ca'=>['nsis'=>"Catalan",'cp'=>'1252'],
-'sr'=>['nsis'=>"SerbianLatin",'cp'=>'1250'],
-'hr'=>['nsis'=>"Croatian",'cp'=>'1250'],
-'sl'=>['nsis'=>"Slovenian",'cp'=>'1250'],
-'da'=>['nsis'=>"Danish",'cp'=>'1252'],
-'nb'=>['nsis'=>"Norwegian",'cp'=>'1252'],
-'nn'=>['nsis'=>"NorwegianNynorsk",'cp'=>'1252'],
-'el'=>['nsis'=>"Greek",'cp'=>'1253'],
-'ru'=>['nsis'=>"Russian",'cp'=>'1251'],
-'pt'=>['nsis'=>"Portuguese",'cp'=>'1252'],
-'uk'=>['nsis'=>"Ukrainian",'cp'=>'1251'],
-'cs'=>['nsis'=>"Czech",'cp'=>'1250'],
-'sk'=>['nsis'=>"Slovak",'cp'=>'1250'],
-'bg'=>['nsis'=>"Bulgarian",'cp'=>'1251'],
-'hu'=>['nsis'=>"Hungarian",'cp'=>'1250'],
-'ro'=>['nsis'=>"Romanian",'cp'=>'1250'],
-'lv'=>['nsis'=>"Latvian",'cp'=>'1257'],
-'mk'=>['nsis'=>"Macedonian",'cp'=>'1251'],
-'et'=>['nsis'=>"Estonian",'cp'=>'1257'],
-'tr'=>['nsis'=>"Turkish",'cp'=>'1254'],
-'lt'=>['nsis'=>"Lithuanian",'cp'=>'1257'],
-'ar'=>['nsis'=>"Arabic",'cp'=>'1256'],
-'he'=>['nsis'=>"Hebrew",'cp'=>'1255'],
-'id'=>['nsis'=>"Indonesian",'cp'=>'1252'],
-'mn'=>['nsis'=>"Mongolian",'cp'=>'1251'],
-'sq'=>['nsis'=>"Albanian",'cp'=>'1252'],
-'br'=>['nsis'=>"Breton",'cp'=>'1252'],
-'be'=>['nsis'=>"Belarusian",'cp'=>'1251'],
-'is'=>['nsis'=>"Icelandic",'cp'=>'1252'],
-'ms'=>['nsis'=>"Malay",'cp'=>'1252'],
-'bs'=>['nsis'=>"Bosnian",'cp'=>'1250'],
-'ga'=>['nsis'=>"Irish",'cp'=>'1250'],
-'uz'=>['nsis'=>"Uzbek",'cp'=>'1251'],
-'gl'=>['nsis'=>"Galician",'cp'=>'1252'],
-'af'=>['nsis'=>"Afrikaans",'cp'=>'1252'],
-'ast'=>['nsis'=>"Asturian",'cp'=>'1252'],
+public $LANGS = [
+'fr'=>['nsis'=>"French", 'cp'=>'1252'],
+'de'=>['nsis'=>"German", 'cp'=>'1252'],
+'es'=>['nsis'=>"SpanishInternational", 'cp'=>'1252'],
+'it'=>['nsis'=>"Italian", 'cp'=>'1252'],
+'nl'=>['nsis'=>"Dutch", 'cp'=>'1252'],
+'sv'=>['nsis'=>"Swedish", 'cp'=>'1252'],
+'fi'=>['nsis'=>"Finnish", 'cp'=>'1252'],
+'pl'=>['nsis'=>"Polish", 'cp'=>'1250'],
+'ca'=>['nsis'=>"Catalan", 'cp'=>'1252'],
+'sr'=>['nsis'=>"SerbianLatin", 'cp'=>'1250'],
+'hr'=>['nsis'=>"Croatian", 'cp'=>'1250'],
+'sl'=>['nsis'=>"Slovenian", 'cp'=>'1250'],
+'da'=>['nsis'=>"Danish", 'cp'=>'1252'],
+'nb'=>['nsis'=>"Norwegian", 'cp'=>'1252'],
+'nn'=>['nsis'=>"NorwegianNynorsk", 'cp'=>'1252'],
+'el'=>['nsis'=>"Greek", 'cp'=>'1253'],
+'ru'=>['nsis'=>"Russian", 'cp'=>'1251'],
+'pt'=>['nsis'=>"Portuguese", 'cp'=>'1252'],
+'uk'=>['nsis'=>"Ukrainian", 'cp'=>'1251'],
+'cs'=>['nsis'=>"Czech", 'cp'=>'1250'],
+'sk'=>['nsis'=>"Slovak", 'cp'=>'1250'],
+'bg'=>['nsis'=>"Bulgarian", 'cp'=>'1251'],
+'hu'=>['nsis'=>"Hungarian", 'cp'=>'1250'],
+'ro'=>['nsis'=>"Romanian", 'cp'=>'1250'],
+'lv'=>['nsis'=>"Latvian", 'cp'=>'1257'],
+'mk'=>['nsis'=>"Macedonian", 'cp'=>'1251'],
+'et'=>['nsis'=>"Estonian", 'cp'=>'1257'],
+'tr'=>['nsis'=>"Turkish", 'cp'=>'1254'],
+'lt'=>['nsis'=>"Lithuanian", 'cp'=>'1257'],
+'ar'=>['nsis'=>"Arabic", 'cp'=>'1256'],
+'he'=>['nsis'=>"Hebrew", 'cp'=>'1255'],
+'id'=>['nsis'=>"Indonesian", 'cp'=>'1252'],
+'mn'=>['nsis'=>"Mongolian", 'cp'=>'1251'],
+'sq'=>['nsis'=>"Albanian", 'cp'=>'1252'],
+'br'=>['nsis'=>"Breton", 'cp'=>'1252'],
+'be'=>['nsis'=>"Belarusian", 'cp'=>'1251'],
+'is'=>['nsis'=>"Icelandic", 'cp'=>'1252'],
+'ms'=>['nsis'=>"Malay", 'cp'=>'1252'],
+'bs'=>['nsis'=>"Bosnian", 'cp'=>'1250'],
+'ga'=>['nsis'=>"Irish", 'cp'=>'1250'],
+'uz'=>['nsis'=>"Uzbek", 'cp'=>'1251'],
+'gl'=>['nsis'=>"Galician", 'cp'=>'1252'],
+'af'=>['nsis'=>"Afrikaans", 'cp'=>'1252'],
+'ast'=>['nsis'=>"Asturian", 'cp'=>'1252'],
 
   ];
 

Braces +28 added lines, -23 removed lines

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