GEANT / CAT

core/CAT.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +9 added lines, -9 removed lines

@@ -73,12 +73,12 @@ 
 
 
         if (CAT::$RELEASE_VERSION) {
-            $temp_version = "CAT-".CAT::$VERSION_MAJOR.".".CAT::$VERSION_MINOR;
+            $temp_version = "CAT-" . CAT::$VERSION_MAJOR . "." . CAT::$VERSION_MINOR;
             if (CAT::$VERSION_PATCH != 0)
-                    $temp_version .= ".".CAT::$VERSION_PATCH;
+                    $temp_version .= "." . CAT::$VERSION_PATCH;
             if (CAT::$VERSION_EXTRA != "")
-                $temp_version .= "-".CAT::$VERSION_EXTRA;
-            CAT::$VERSION = sprintf(_("Release %s"), $temp_version );
+                $temp_version .= "-" . CAT::$VERSION_EXTRA;
+            CAT::$VERSION = sprintf(_("Release %s"), $temp_version);
         }
         else
             CAT::$VERSION = _("Unreleased SVN Revision");
@@ -191,7 +191,7 @@ 
      * gets the language setting in CAT
      */
     static public function get_lang() {
-       if(self::$LANG === '')
+       if (self::$LANG === '')
          list(self::$LANG, $xx) = self::set_lang();
        return self::$LANG;
     }
@@ -239,9 +239,9 @@ 
             case "MOD": // modified existing object
             case "DEL": // deleted an object
                 ob_start();
-                printf("%-015s",microtime(TRUE));
+                printf("%-015s", microtime(TRUE));
                 print " ($category) ";
-                print_r(" ".$user.": ".$message."\n");
+                print_r(" " . $user . ": " . $message . "\n");
                 $output = ob_get_clean();
                 if (Config::$PATHS['logdir']) {
                     $f = fopen(Config::$PATHS['logdir'] . "/audit-activity.log", "a");
@@ -268,8 +268,8 @@ 
         $logtext1 = preg_replace("/[\n\r]/", "", $query);
         $logtext = preg_replace("/ +/", " ", $logtext1);
         ob_start();
-        printf("%-015s",microtime(TRUE));
-        print(" ".$logtext."\n");
+        printf("%-015s", microtime(TRUE));
+        print(" " . $logtext . "\n");
         $output = ob_get_clean();
         if (Config::$PATHS['logdir']) {
             $f = fopen(Config::$PATHS['logdir'] . "/audit-SQL.log", "a");

core/DeviceConfig.php

Doc Comments +2 added lines, -5 removed lines

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

Spacing +103 added lines, -103 removed lines

@@ -63,9 +63,9 @@ 
      */
 
       public function __construct() {
-      $this->supportedEapMethods  = [EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP];
-      debug(4,"This device supports the following EAP methods: ");
-      debug(4,$this->supportedEapMethods);
+      $this->supportedEapMethods = [EAP::$TLS, EAP::$PEAP_MSCHAP2, EAP::$TTLS_PAP];
+      debug(4, "This device supports the following EAP methods: ");
+      debug(4, $this->supportedEapMethods);
     }
 
 
@@ -88,50 +88,50 @@ 
     * @final not to be redefined
     */
     final public function setup(Profile $profile) {
-       debug(4,"module setup start\n");
-       if(! $profile instanceof Profile) {
-          debug(2,"No profile has been set\n");
+       debug(4, "module setup start\n");
+       if (!$profile instanceof Profile) {
+          debug(2, "No profile has been set\n");
           error("No profile has been set");
           exit;
        }
        $this->attributes = $this->getProfileAttributes($profile);
-       if(! $this->selected_eap) {
+       if (!$this->selected_eap) {
           error("No EAP type specified.");
           exit;
        }
        // create temporary directory, its full path will be saved in $this->FPATH;
        $T = createTemporaryDirectory('installer');
        $this->FPATH = $T['dir'];
-       mkdir($T['dir'].'/tmp');
-       chdir($T['dir'].'/tmp');
+       mkdir($T['dir'] . '/tmp');
+       chdir($T['dir'] . '/tmp');
        $CAs = [];
-       if(isset($this->attributes['eap:ca_file'])) {
+       if (isset($this->attributes['eap:ca_file'])) {
        foreach ($this->attributes['eap:ca_file'] as $ca) {
-          if($c = X509::processCertificate($ca))
+          if ($c = X509::processCertificate($ca))
              $CAs[] = $c;
           }
-          $this->attributes['internal:CAs'][0]=$CAs;
+          $this->attributes['internal:CAs'][0] = $CAs;
        }
-       if(isset($this->attributes['support:info_file'])) {
+       if (isset($this->attributes['support:info_file'])) {
           $this->attributes['internal:info_file'][0] = 
              $this->saveInfoFile($this->attributes['support:info_file'][0]);
        }
-       if(isset($this->attributes['general:logo_file']))
+       if (isset($this->attributes['general:logo_file']))
           $this->attributes['internal:logo_file'] = 
              $this->saveLogoFile($this->attributes['general:logo_file']);
-       $this->attributes['internal:SSID'] = $this->getSSIDs()['add'];;
-       $this->attributes['internal:remove_SSID'] = $this->getSSIDs()['del'];;
+       $this->attributes['internal:SSID'] = $this->getSSIDs()['add']; ;
+       $this->attributes['internal:remove_SSID'] = $this->getSSIDs()['del']; ;
        $this->attributes['internal:consortia'] = $this->getConsortia();
        $this->lang_index = CAT::get_lang();
        // phpMD says the below is not needed. Wow.
        // $idp = new IdP($profile->institution);
        $olddomain = CAT::set_locale("core");
-       $this->support_email_substitute = sprintf(_("your local %s support"),Config::$CONSORTIUM['name']);
-       $this->support_url_substitute = sprintf(_("your local %s support page"),Config::$CONSORTIUM['name']);
+       $this->support_email_substitute = sprintf(_("your local %s support"), Config::$CONSORTIUM['name']);
+       $this->support_url_substitute = sprintf(_("your local %s support page"), Config::$CONSORTIUM['name']);
        CAT::set_locale($olddomain);
 
-       if($this->signer && $this->options['sign'])
-         $this->sign = CAT::$root . '/signer/'. $this->signer;
+       if ($this->signer && $this->options['sign'])
+         $this->sign = CAT::$root . '/signer/' . $this->signer;
        $this->installerBasename = $this->getInstallerBasename();
     }
 
@@ -143,10 +143,10 @@ 
     */   
    public function getPreferredEapType($eap_array) {
      foreach ($eap_array as $eap) {
-         if(in_array($eap,$this->supportedEapMethods)) {
+         if (in_array($eap, $this->supportedEapMethods)) {
             $this->selected_eap = $eap;
-            debug(4,"Selected EAP:");
-            debug(4,$eap);
+            debug(4, "Selected EAP:");
+            debug(4, $eap);
             return($eap);
          }
      }
@@ -178,22 +178,22 @@ 
     * @final not to be redefined
     */
    final protected function copyFile($source_name, $output_name = 0) {
-      if  ( $output_name === 0)
+      if ($output_name === 0)
         $output_name = $source_name;
 
-      debug(4,"fileCopy($source_name, $output_name)\n");
-      if(is_file($this->module_path.'/Files/'.$this->device_id.'/'.$source_name))
-         $source = $this->module_path.'/Files/'.$this->device_id.'/'.$source_name;
-      elseif(is_file($this->module_path.'/Files/'.$source_name))
-         $source = $this->module_path.'/Files/'.$source_name;
+      debug(4, "fileCopy($source_name, $output_name)\n");
+      if (is_file($this->module_path . '/Files/' . $this->device_id . '/' . $source_name))
+         $source = $this->module_path . '/Files/' . $this->device_id . '/' . $source_name;
+      elseif (is_file($this->module_path . '/Files/' . $source_name))
+         $source = $this->module_path . '/Files/' . $source_name;
       else {
-        debug(2,"fileCopy:reqested file $source_name does not exist\n");
+        debug(2, "fileCopy:reqested file $source_name does not exist\n");
         return(FALSE);
       }
-      debug(4,"Copying $source to $output_name\n");
-      $result = copy($source,"$output_name");
-      if(! $result )
-        debug(2,"fileCopy($source_name, $output_name) failed\n");
+      debug(4, "Copying $source to $output_name\n");
+      $result = copy($source, "$output_name");
+      if (!$result)
+        debug(2, "fileCopy($source_name, $output_name) failed\n");
       return($result); 
    }
 
@@ -223,31 +223,31 @@ 
     */
 
    final protected function translateFile($source_name, $output_name = 0, $encoding = 0) {
-      if(Config::$NSIS_VERSION >= 3)
+      if (Config::$NSIS_VERSION >= 3)
         $encoding = 0;
-      if  ( $output_name === 0)
+      if ($output_name === 0)
         $output_name = $source_name;
 
-      debug(4,"translateFile($source_name, $output_name, $encoding)\n");
+      debug(4, "translateFile($source_name, $output_name, $encoding)\n");
       ob_start();
-      debug(4,$this->module_path.'/Files/'.$this->device_id.'/'.$source_name."\n");
-      if(is_file($this->module_path.'/Files/'.$this->device_id.'/'.$source_name))
-         $source = $this->module_path.'/Files/'.$this->device_id.'/'.$source_name;
-      elseif(is_file($this->module_path.'/Files/'.$source_name))
-         $source = $this->module_path.'/Files/'.$source_name;
+      debug(4, $this->module_path . '/Files/' . $this->device_id . '/' . $source_name . "\n");
+      if (is_file($this->module_path . '/Files/' . $this->device_id . '/' . $source_name))
+         $source = $this->module_path . '/Files/' . $this->device_id . '/' . $source_name;
+      elseif (is_file($this->module_path . '/Files/' . $source_name))
+         $source = $this->module_path . '/Files/' . $source_name;
       include($source);
       $output = ob_get_clean();
-      if($encoding) {
-        $output_c = iconv('UTF-8',$encoding.'//TRANSLIT',$output);
-        if($output_c)
+      if ($encoding) {
+        $output_c = iconv('UTF-8', $encoding . '//TRANSLIT', $output);
+        if ($output_c)
            $output = $output_c;
       }
-      $f = fopen("$output_name","w");
-      if(! $f)
-         debug(2,"translateFile($source, $output_name, $encoding) failed\n");
-      fwrite($f,$output);
+      $f = fopen("$output_name", "w");
+      if (!$f)
+         debug(2, "translateFile($source, $output_name, $encoding) failed\n");
+      fwrite($f, $output);
       fclose($f);
-      debug(4,"translateFile($source, $output_name, $encoding) end\n");
+      debug(4, "translateFile($source, $output_name, $encoding) end\n");
    }
 
 
@@ -268,17 +268,17 @@ 
     * @final not to be redefined
     */
 
-   final protected function translateString($source_string,$encoding = 0) {
-      if(Config::$NSIS_VERSION >= 3)
+   final protected function translateString($source_string, $encoding = 0) {
+      if (Config::$NSIS_VERSION >= 3)
         $encoding = 0;
-      if($encoding)
-        $output_c = iconv('UTF-8',$encoding.'//TRANSLIT',$source_string);
+      if ($encoding)
+        $output_c = iconv('UTF-8', $encoding . '//TRANSLIT', $source_string);
       else
         $output_c = $source_string;
-      if($output_c) 
-         $source_string  = str_replace('"','$\\"',$output_c);
+      if ($output_c) 
+         $source_string = str_replace('"', '$\\"', $output_c);
       else
-         debug(2,"Failed to convert string $source_string\n");
+         debug(2, "Failed to convert string $source_string\n");
       return $source_string;
    }
 
@@ -295,19 +295,19 @@ 
    * root is set to 1 for the CA roor certicicate and 0 otherwise
   */ 
    final protected function saveCertificateFiles($format) {
-     if($format == 'der' || $format == 'pam') {
+     if ($format == 'der' || $format == 'pam') {
        $i = 0;
        $CA_files = [];
        $ca_array = $this->attributes['internal:CAs'][0];
-       if(! $ca_array)
+       if (!$ca_array)
          return(FALSE);
        foreach ($ca_array as $CA) {
-         $f = fopen("cert-$i.crt","w");
-         if(! $f) die("problem opening the file\n");
-         if($format == "pem")
-            fwrite($f,$CA['pem']);
+         $f = fopen("cert-$i.crt", "w");
+         if (!$f) die("problem opening the file\n");
+         if ($format == "pem")
+            fwrite($f, $CA['pem']);
          else
-            fwrite($f,$CA['der']);
+            fwrite($f, $CA['der']);
          fclose($f);
          $C = [];
          $C['file'] = "cert-$i.crt";
@@ -335,42 +335,42 @@ 
    private function getInstallerBasename() {
       $replace_pattern = '/[ ()\/\'"]+/';
       $lang_pointer = Config::$LANGUAGES[$this->lang_index]['latin_based'] == TRUE ? 0 : 1;
-      debug(4,"getInstallerBasename1:".$this->attributes['general:instname'][$lang_pointer]."\n");
+      debug(4, "getInstallerBasename1:" . $this->attributes['general:instname'][$lang_pointer] . "\n");
       $inst = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', $this->attributes['general:instname'][$lang_pointer]));
-      debug(4,"getInstallerBasename2:$inst\n");
-      $Inst_a = explode('_',$inst);
-      if(count($Inst_a) > 2) {
+      debug(4, "getInstallerBasename2:$inst\n");
+      $Inst_a = explode('_', $inst);
+      if (count($Inst_a) > 2) {
          $inst = '';
-         foreach($Inst_a as $i)
+         foreach ($Inst_a as $i)
            $inst .= $i[0];
       }   
       $c_name = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', Config::$CONSORTIUM['name']));
-      if($this->attributes['internal:profile_count'][0] > 1) {
-         if(!empty($this->attributes['profile:name']) && ! empty($this->attributes['profile:name'][$lang_pointer])) {
+      if ($this->attributes['internal:profile_count'][0] > 1) {
+         if (!empty($this->attributes['profile:name']) && !empty($this->attributes['profile:name'][$lang_pointer])) {
              $prof = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', $this->attributes['profile:name'][$lang_pointer]));
-             $prof = preg_replace('/_+$/','',$prof);
-             return $c_name. '-'. $this->getDeviceId() . $inst .'-'. $prof;
+             $prof = preg_replace('/_+$/', '', $prof);
+             return $c_name . '-' . $this->getDeviceId() . $inst . '-' . $prof;
          }
       }
-      return $c_name. '-'. $this->getDeviceId() . $inst;
+      return $c_name . '-' . $this->getDeviceId() . $inst;
   }
 
   private function getDeviceId() {
     $d_id = $this->device_id;
-    if(isset($this->options['device_id'])) 
+    if (isset($this->options['device_id'])) 
       $d_id = $this->options['device_id'];
-    if($d_id !== '')
+    if ($d_id !== '')
       $d_id .= '-';
     return $d_id;
   }
 
 
   private function getSSIDs() {
-    $S['add']=[];
-    $S['del']=[];
+    $S['add'] = [];
+    $S['del'] = [];
     if (isset(Config::$CONSORTIUM['ssid'])) {
        foreach (Config::$CONSORTIUM['ssid'] as $ssid) {
-        if(isset(Config::$CONSORTIUM['tkipsupport']) && Config::$CONSORTIUM['tkipsupport'] == TRUE)
+        if (isset(Config::$CONSORTIUM['tkipsupport']) && Config::$CONSORTIUM['tkipsupport'] == TRUE)
           $S['add'][$ssid] = 'TKIP';
         else {
           $S['add'][$ssid] = 'AES';
@@ -378,20 +378,20 @@ 
         }
        }
     }
-    if(isset($this->attributes['media:SSID'])) {
+    if (isset($this->attributes['media:SSID'])) {
       $SSID = $this->attributes['media:SSID'];
 
-      foreach($SSID as $ssid)
+      foreach ($SSID as $ssid)
          $S['add'][$ssid] = 'AES';
       }
-    if(isset($this->attributes['media:SSID_with_legacy'])) {
+    if (isset($this->attributes['media:SSID_with_legacy'])) {
       $SSID = $this->attributes['media:SSID_with_legacy'];
-      foreach($SSID as $ssid)
+      foreach ($SSID as $ssid)
          $S['add'][$ssid] = 'TKIP';
     }
-    if(isset($this->attributes['media:remove_SSID'])) {
+    if (isset($this->attributes['media:remove_SSID'])) {
       $SSID = $this->attributes['media:remove_SSID'];
-      foreach($SSID as $ssid)
+      foreach ($SSID as $ssid)
          $S['del'][$ssid] = 'DEL';
     }
     return $S;
@@ -417,25 +417,25 @@ 
   ];
 
   private function saveLogoFile($Logos) {
-    $i=0;
-    $returnarray= [];
+    $i = 0;
+    $returnarray = [];
     foreach ($Logos as $blob) {
       $finfo = new finfo(FILEINFO_MIME_TYPE);
       $mime = $finfo->buffer($blob);
-      if(preg_match('/^image\/(.*)/',$mime,$m))
+      if (preg_match('/^image\/(.*)/', $mime, $m))
         $ext = $m[1];
       else
         $ext = 'unsupported';
-      debug(4,"saveLogoFile: $mime : $ext\n");
-      $f_name = 'logo-'.$i.'.'.$ext;
-      $f = fopen($f_name,"w");
-      if(! $f) {
-          debug(2,"saveLogoFile failed for: $f_name\n");
+      debug(4, "saveLogoFile: $mime : $ext\n");
+      $f_name = 'logo-' . $i . '.' . $ext;
+      $f = fopen($f_name, "w");
+      if (!$f) {
+          debug(2, "saveLogoFile failed for: $f_name\n");
           die("problem opening the file\n");
       }
-      fwrite($f,$blob);
+      fwrite($f, $blob);
       fclose($f);
-      $returnarray[]= ['name'=>$f_name,'mime'=>$ext];
+      $returnarray[] = ['name'=>$f_name, 'mime'=>$ext];
       $i++;
     }
     return($returnarray);
@@ -446,17 +446,17 @@ 
     $finfo = new finfo(FILEINFO_MIME_TYPE);
     $mime = $finfo->buffer($blob);
     $ext = isset($this->mime_extensions[$mime]) ? $this->mime_extensions[$mime] : 'usupported';
-    debug(4,"saveInfoFile: $mime : $ext\n");
-    $f = fopen('local-info.'.$ext,"w");
-    if(! $f) die("problem opening the file\n");
-    fwrite($f,$blob);
+    debug(4, "saveInfoFile: $mime : $ext\n");
+    $f = fopen('local-info.' . $ext, "w");
+    if (!$f) die("problem opening the file\n");
+    fwrite($f, $blob);
     fclose($f);
-    return(['name'=>'local-info.'.$ext,'mime'=>$ext]);
+    return(['name'=>'local-info.' . $ext, 'mime'=>$ext]);
   }
 
   private function getProfileAttributes(Profile $profile) {
      $eaps = $profile->getEapMethodsinOrderOfPreference(1);
-     if($eap = $this->getPreferredEapType($eaps)) {
+     if ($eap = $this->getPreferredEapType($eaps)) {
           $a = $profile->getCollapsedAttributes($eap);
           $a['eap'] = $eap;
           $a['all_eaps'] = $eaps;
@@ -477,8 +477,8 @@ 
         ob_start();
         print_r($this->attributes);
         $output = ob_get_clean();
-        $f = fopen($file,"w");
-        fwrite($f,$output);
+        $f = fopen($file, "w");
+        fwrite($f, $output);
         fclose($f);
   }
 /** 

core/Helper.php

Doc Comments +2 added lines, -1 removed lines

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

Spacing +26 added lines, -26 removed lines

@@ -177,65 +177,65 @@
  * @param $fail (default true) decides if a creation failure should cause an error
  * @return - the tupple full directory path, directory name
  */
-function createTemporaryDirectory($purpose = 'installer',$fail = 1) {
-        $name = md5(time().rand());
-        switch($purpose) {
+function createTemporaryDirectory($purpose = 'installer', $fail = 1) {
+        $name = md5(time() . rand());
+        switch ($purpose) {
            case 'installer':
-             $path = CAT::$root.'/var/installer_cache';
+             $path = CAT::$root . '/var/installer_cache';
              break;
            case 'logo':
-             $path = CAT::$root.'/web/downloads/logos';
+             $path = CAT::$root . '/web/downloads/logos';
              break;
            case 'test':
-             $path = CAT::$root.'/var/tmp';
+             $path = CAT::$root . '/var/tmp';
              break;
            default:
              error("unable to create temporary directory for unknown purpose: $purpose\n");
              exit;
         }
-        $tmp_dir = $path .'/'. $name;
-        debug(4,"temp dir: $purpose : $tmp_dir\n");
-        if(! mkdir($tmp_dir,0700, true)) {
-          if($fail) {
+        $tmp_dir = $path . '/' . $name;
+        debug(4, "temp dir: $purpose : $tmp_dir\n");
+        if (!mkdir($tmp_dir, 0700, true)) {
+          if ($fail) {
              error("unable to create temporary directory: $tmp_dir\n");
              exit;
-          } else  {
+          } else {
             debug(4, "Directory creation failed for $tmp_dir\n");
-            return ['base'=>$path,'dir'=>'',$name=>''];
+            return ['base'=>$path, 'dir'=>'', $name=>''];
           }
         } else
          debug(4, "Directory created: $tmp_dir\n");
-     return ['base'=>$path,'dir'=>$tmp_dir,'name'=>$name];
+     return ['base'=>$path, 'dir'=>$tmp_dir, 'name'=>$name];
 }
 
-function png_inject_consortium_logo ($inputpngstring, $symbolsize = 12, $marginsymbols = 4) {
+function png_inject_consortium_logo($inputpngstring, $symbolsize = 12, $marginsymbols = 4) {
     $inputgd = imagecreatefromstring($inputpngstring);
     
-    debug(4,"Consortium logo is at: ".CAT::$root."/web/resources/images/consortium_logo_large.png");
-    $logogd = imagecreatefrompng(CAT::$root."/web/resources/images/consortium_logo_large.png");
+    debug(4, "Consortium logo is at: " . CAT::$root . "/web/resources/images/consortium_logo_large.png");
+    $logogd = imagecreatefrompng(CAT::$root . "/web/resources/images/consortium_logo_large.png");
     
-    $sizeinput = [imagesx($inputgd),imagesy($inputgd)];
-    $sizelogo = [imagesx($logogd),imagesy($logogd)];
+    $sizeinput = [imagesx($inputgd), imagesy($inputgd)];
+    $sizelogo = [imagesx($logogd), imagesy($logogd)];
     // Q level QR-codes can sustain 25% "damage"
     // make our logo cover approx 15% of area to be sure; mind that there's a $symbolsize * $marginsymbols pixel white border around each edge
-    $totalpixels = ($sizeinput[0] - $symbolsize*$marginsymbols) * ($sizeinput[1] - $symbolsize*$marginsymbols);
+    $totalpixels = ($sizeinput[0] - $symbolsize * $marginsymbols) * ($sizeinput[1] - $symbolsize * $marginsymbols);
     $totallogopixels = ($sizelogo[0]) * ($sizelogo[1]);
     $maxoccupy = $totalpixels * 0.04;
     // find out how much we have to scale down logo to reach 10% QR estate
     $scale = sqrt($maxoccupy / $totallogopixels);
-    debug(4,"Scaling info: $scale, $maxoccupy, $totallogopixels\n");
+    debug(4, "Scaling info: $scale, $maxoccupy, $totallogopixels\n");
     // determine final pixel size - round to multitude of $symbolsize to match exact symbol boundary
     $targetwidth = $symbolsize * round($sizelogo[0] * $scale / $symbolsize);
     $targetheight = $symbolsize * round($sizelogo[1] * $scale / $symbolsize);
     // paint white below the logo, in case it has transparencies (looks bad)
     // have one symbol in each direction extra white space
-    $whiteimage = imagecreate($targetwidth+2*$symbolsize, $targetheight+2*$symbolsize);
-    imagecolorallocate($whiteimage, 255,255,255);
+    $whiteimage = imagecreate($targetwidth + 2 * $symbolsize, $targetheight + 2 * $symbolsize);
+    imagecolorallocate($whiteimage, 255, 255, 255);
     // also make sure the initial placement is a multitude of 12; otherwise "two half" symbols might be affected
-    $targetplacementx = $symbolsize * round(($sizeinput[0] / 2 - ($targetwidth - $symbolsize) / 2)/$symbolsize);
-    $targetplacementy = $symbolsize * round(($sizeinput[1] / 2 - ($targetheight - $symbolsize) / 2)/$symbolsize);
-    imagecopyresized($inputgd, $whiteimage, $targetplacementx-$symbolsize, $targetplacementy-$symbolsize, 0, 0, $targetwidth+2*$symbolsize, $targetheight+2*$symbolsize, $targetwidth+2*$symbolsize, $targetheight+2*$symbolsize);
-    imagecopyresized($inputgd, $logogd,     $targetplacementx, $targetplacementy, 0, 0, $targetwidth   , $targetheight   , $sizelogo[0]   , $sizelogo[1]);
+    $targetplacementx = $symbolsize * round(($sizeinput[0] / 2 - ($targetwidth - $symbolsize) / 2) / $symbolsize);
+    $targetplacementy = $symbolsize * round(($sizeinput[1] / 2 - ($targetheight - $symbolsize) / 2) / $symbolsize);
+    imagecopyresized($inputgd, $whiteimage, $targetplacementx - $symbolsize, $targetplacementy - $symbolsize, 0, 0, $targetwidth + 2 * $symbolsize, $targetheight + 2 * $symbolsize, $targetwidth + 2 * $symbolsize, $targetheight + 2 * $symbolsize);
+    imagecopyresized($inputgd, $logogd, $targetplacementx, $targetplacementy, 0, 0, $targetwidth, $targetheight, $sizelogo[0], $sizelogo[1]);
  // imagecopyresized($dst_image, $src_image, $dst_x,                               $dst_y,                                $src_x, $src_y, $dst_w,       $dst_h,        $src_w,       $src_h);
     ob_start();
     imagepng($inputgd);

core/phpqrcode.php

Doc Comments +108 added lines

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

 	

 	class qrstr {

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

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

 		}

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

 

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

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

         {

             if (QR_LOG_DIR !== false) {

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

         

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

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

         {

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

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

         

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

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

         {

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

         }

         

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

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

         {

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

         }

         

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

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

         {

 

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

         // CACHEABLE!!!

         

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

         {

             if (count($spec) < 5) {

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

         

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

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

         {

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

         }

         

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

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

         {

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

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

         

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

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

         {

             try {

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

         

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

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

         {

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

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

         

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

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

         {

             try {

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

         

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

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

         {

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

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

         

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

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

         {

             $bits = 0;

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

         

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

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

         {

             $bits = $bstream->size();

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

 

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

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

         {

             $this->dataStr  = $dataStr;

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

         

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

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

         {    

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

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

         

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

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

         {

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

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

         

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

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

         {

             $p = 0;

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

         

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

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

         {

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

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

         

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

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

         {

             $codeArr = [];

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

         

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

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

         {

             $demerit = 0;

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

         

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

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

         {

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

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

         

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

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

         {

             if(string == NULL) {

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

 

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

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

         {

 

Spacing +512 added lines, -512 removed lines

@@ -93,11 +93,11 @@ 
 	// Supported output formats

 	

 	define('QR_FORMAT_TEXT', 0);

-	define('QR_FORMAT_PNG',  1);

+	define('QR_FORMAT_PNG', 1);

 	

 	class qrstr {

 		public static function set(&$srctab, $x, $y, $repl, $replLen = false) {

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

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

 		}

 	}	

 

@@ -114,15 +114,15 @@ 
  * Config file, tuned-up for merged verion

  */

      

-    define('QR_CACHEABLE', false);       // use cache - more disk reads but less CPU power, masks and format templates are stored there

-    define('QR_CACHE_DIR', false);       // used when QR_CACHEABLE === true

-    define('QR_LOG_DIR', false);         // default error logs dir   

+    define('QR_CACHEABLE', false); // use cache - more disk reads but less CPU power, masks and format templates are stored there

+    define('QR_CACHE_DIR', false); // used when QR_CACHEABLE === true

+    define('QR_LOG_DIR', false); // default error logs dir   

     

-    define('QR_FIND_BEST_MASK', true);                                                          // if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code

-    define('QR_FIND_FROM_RANDOM', 2);                                                       // if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly

-    define('QR_DEFAULT_MASK', 2);                                                               // when QR_FIND_BEST_MASK === false

+    define('QR_FIND_BEST_MASK', true); // if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code

+    define('QR_FIND_FROM_RANDOM', 2); // if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly

+    define('QR_DEFAULT_MASK', 2); // when QR_FIND_BEST_MASK === false

                                                   

-    define('QR_PNG_MAXIMUM_SIZE',  1024);                                                       // maximum allowed png image width (in pixels), tune to make sure GD and PHP can handle such big images

+    define('QR_PNG_MAXIMUM_SIZE', 1024); // maximum allowed png image width (in pixels), tune to make sure GD and PHP can handle such big images

                                                   

 

 

@@ -163,8 +163,8 @@ 
             $len = count($frame);

             foreach ($frame as &$frameLine) {

                 

-                for($i=0; $i<$len; $i++) {

-                    $frameLine[$i] = (ord($frameLine[$i])&1)?'1':'0';

+                for ($i = 0; $i < $len; $i++) {

+                    $frameLine[$i] = (ord($frameLine[$i]) & 1) ? '1' : '0';

                 }

             }

             

@@ -194,8 +194,8 @@ 
                 

             foreach ($qrTab as $line) {

                 $arrAdd = [];

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

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

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

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

                 $barcode_array['bcode'][] = $arrAdd;

             }

                     

@@ -214,16 +214,16 @@ 
 			QRtools::markTime('before_build_cache');

 			

 			$mask = new QRmask();

-            for ($a=1; $a <= QRSPEC_VERSION_MAX; $a++) {

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

                 $frame = QRspec::newFrame($a);

                 if (QR_IMAGE) {

-                    $fileName = QR_CACHE_DIR.'frame_'.$a.'.png';

+                    $fileName = QR_CACHE_DIR . 'frame_' . $a . '.png';

                     QRimage::png(self::binarize($frame), $fileName, 1, 0);

                 }

 				

 				$width = count($frame);

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

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

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

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

             }

 			

@@ -236,9 +236,9 @@ 
             if (QR_LOG_DIR !== false) {

                 if ($err != '') {

                     if ($outfile !== false) {

-                        file_put_contents(QR_LOG_DIR.basename($outfile).'-errors.txt', date('Y-m-d H:i:s').': '.$err, FILE_APPEND);

+                        file_put_contents(QR_LOG_DIR . basename($outfile) . '-errors.txt', date('Y-m-d H:i:s') . ': ' . $err, FILE_APPEND);

                     } else {

-                        file_put_contents(QR_LOG_DIR.'errors.txt', date('Y-m-d H:i:s').': '.$err, FILE_APPEND);

+                        file_put_contents(QR_LOG_DIR . 'errors.txt', date('Y-m-d H:i:s') . ': ' . $err, FILE_APPEND);

                     }

                 }    

             }

@@ -248,9 +248,9 @@ 
         public static function dumpMask($frame) 

         {

             $width = count($frame);

-            for($y=0;$y<$width;$y++) {

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

-                    echo ord($frame[$y][$x]).',';

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

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

+                    echo ord($frame[$y][$x]) . ',';

                 }

             }

         }

@@ -259,7 +259,7 @@ 
         public static function markTime($markerId)

         {

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

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

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

             

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

                 $GLOBALS['qr_time_bench'] = [];

@@ -280,9 +280,9 @@ 
                     <thead><tr style="border-bottom:1px solid silver"><td colspan="2" style="text-align:center">BENCHMARK</td></tr></thead>

                     <tbody>';

 

-            foreach($GLOBALS['qr_time_bench'] as $markerId=>$thisTime) {

+            foreach ($GLOBALS['qr_time_bench'] as $markerId=>$thisTime) {

                 if ($p > 0) {

-                    echo '<tr><th style="text-align:right">till '.$markerId.': </th><td>'.number_format($thisTime-$lastTime, 6).'s</td></tr>';

+                    echo '<tr><th style="text-align:right">till ' . $markerId . ': </th><td>' . number_format($thisTime - $lastTime, 6) . 's</td></tr>';

                 } else {

                     $startTime = $thisTime;

                 }

@@ -292,7 +292,7 @@ 
             }

             

             echo '</tbody><tfoot>

-                <tr style="border-top:2px solid black"><th style="text-align:right">TOTAL: </th><td>'.number_format($lastTime-$startTime, 6).'s</td></tr>

+                <tr style="border-top:2px solid black"><th style="text-align:right">TOTAL: </th><td>'.number_format($lastTime - $startTime, 6) . 's</td></tr>

             </tfoot>

             </table>';

         }

@@ -344,57 +344,57 @@ 
  */

  

     define('QRSPEC_VERSION_MAX', 40);

-    define('QRSPEC_WIDTH_MAX',   177);

+    define('QRSPEC_WIDTH_MAX', 177);

 

-    define('QRCAP_WIDTH',        0);

-    define('QRCAP_WORDS',        1);

-    define('QRCAP_REMINDER',     2);

-    define('QRCAP_EC',           3);

+    define('QRCAP_WIDTH', 0);

+    define('QRCAP_WORDS', 1);

+    define('QRCAP_REMINDER', 2);

+    define('QRCAP_EC', 3);

 

     class QRspec {

     

         public static $capacity = [

-            [  0,    0, 0, [   0,    0,    0,    0]],

-            [ 21,   26, 0, [   7,   10,   13,   17]], // 1

-            [ 25,   44, 7, [  10,   16,   22,   28]],

-            [ 29,   70, 7, [  15,   26,   36,   44]],

-            [ 33,  100, 7, [  20,   36,   52,   64]],

-            [ 37,  134, 7, [  26,   48,   72,   88]], // 5

-            [ 41,  172, 7, [  36,   64,   96,  112]],

-            [ 45,  196, 0, [  40,   72,  108,  130]],

-            [ 49,  242, 0, [  48,   88,  132,  156]],

-            [ 53,  292, 0, [  60,  110,  160,  192]],

-            [ 57,  346, 0, [  72,  130,  192,  224]], //10

-            [ 61,  404, 0, [  80,  150,  224,  264]],

-            [ 65,  466, 0, [  96,  176,  260,  308]],

-            [ 69,  532, 0, [ 104,  198,  288,  352]],

-            [ 73,  581, 3, [ 120,  216,  320,  384]],

-            [ 77,  655, 3, [ 132,  240,  360,  432]], //15

-            [ 81,  733, 3, [ 144,  280,  408,  480]],

-            [ 85,  815, 3, [ 168,  308,  448,  532]],

-            [ 89,  901, 3, [ 180,  338,  504,  588]],

-            [ 93,  991, 3, [ 196,  364,  546,  650]],

-            [ 97, 1085, 3, [ 224,  416,  600,  700]], //20

-            [101, 1156, 4, [ 224,  442,  644,  750]],

-            [105, 1258, 4, [ 252,  476,  690,  816]],

-            [109, 1364, 4, [ 270,  504,  750,  900]],

-            [113, 1474, 4, [ 300,  560,  810,  960]],

-            [117, 1588, 4, [ 312,  588,  870, 1050]], //25

-            [121, 1706, 4, [ 336,  644,  952, 1110]],

-            [125, 1828, 4, [ 360,  700, 1020, 1200]],

-            [129, 1921, 3, [ 390,  728, 1050, 1260]],

-            [133, 2051, 3, [ 420,  784, 1140, 1350]],

-            [137, 2185, 3, [ 450,  812, 1200, 1440]], //30

-            [141, 2323, 3, [ 480,  868, 1290, 1530]],

-            [145, 2465, 3, [ 510,  924, 1350, 1620]],

-            [149, 2611, 3, [ 540,  980, 1440, 1710]],

-            [153, 2761, 3, [ 570, 1036, 1530, 1800]],

-            [157, 2876, 0, [ 570, 1064, 1590, 1890]], //35

-            [161, 3034, 0, [ 600, 1120, 1680, 1980]],

-            [165, 3196, 0, [ 630, 1204, 1770, 2100]],

-            [169, 3362, 0, [ 660, 1260, 1860, 2220]],

-            [173, 3532, 0, [ 720, 1316, 1950, 2310]],

-            [177, 3706, 0, [ 750, 1372, 2040, 2430]] //40

+            [0, 0, 0, [0, 0, 0, 0]],

+            [21, 26, 0, [7, 10, 13, 17]], // 1

+            [25, 44, 7, [10, 16, 22, 28]],

+            [29, 70, 7, [15, 26, 36, 44]],

+            [33, 100, 7, [20, 36, 52, 64]],

+            [37, 134, 7, [26, 48, 72, 88]], // 5

+            [41, 172, 7, [36, 64, 96, 112]],

+            [45, 196, 0, [40, 72, 108, 130]],

+            [49, 242, 0, [48, 88, 132, 156]],

+            [53, 292, 0, [60, 110, 160, 192]],

+            [57, 346, 0, [72, 130, 192, 224]], //10

+            [61, 404, 0, [80, 150, 224, 264]],

+            [65, 466, 0, [96, 176, 260, 308]],

+            [69, 532, 0, [104, 198, 288, 352]],

+            [73, 581, 3, [120, 216, 320, 384]],

+            [77, 655, 3, [132, 240, 360, 432]], //15

+            [81, 733, 3, [144, 280, 408, 480]],

+            [85, 815, 3, [168, 308, 448, 532]],

+            [89, 901, 3, [180, 338, 504, 588]],

+            [93, 991, 3, [196, 364, 546, 650]],

+            [97, 1085, 3, [224, 416, 600, 700]], //20

+            [101, 1156, 4, [224, 442, 644, 750]],

+            [105, 1258, 4, [252, 476, 690, 816]],

+            [109, 1364, 4, [270, 504, 750, 900]],

+            [113, 1474, 4, [300, 560, 810, 960]],

+            [117, 1588, 4, [312, 588, 870, 1050]], //25

+            [121, 1706, 4, [336, 644, 952, 1110]],

+            [125, 1828, 4, [360, 700, 1020, 1200]],

+            [129, 1921, 3, [390, 728, 1050, 1260]],

+            [133, 2051, 3, [420, 784, 1140, 1350]],

+            [137, 2185, 3, [450, 812, 1200, 1440]], //30

+            [141, 2323, 3, [480, 868, 1290, 1530]],

+            [145, 2465, 3, [510, 924, 1350, 1620]],

+            [149, 2611, 3, [540, 980, 1440, 1710]],

+            [153, 2761, 3, [570, 1036, 1530, 1800]],

+            [157, 2876, 0, [570, 1064, 1590, 1890]], //35

+            [161, 3034, 0, [600, 1120, 1680, 1980]],

+            [165, 3196, 0, [630, 1204, 1770, 2100]],

+            [169, 3362, 0, [660, 1260, 1860, 2220]],

+            [173, 3532, 0, [720, 1316, 1950, 2310]],

+            [177, 3706, 0, [750, 1372, 2040, 2430]] //40

         ];

         

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

@@ -425,9 +425,9 @@ 
         public static function getMinimumVersion($size, $level)

         {

 

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

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

-                if($words >= $size) 

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

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

+                if ($words >= $size) 

                     return $i;

             }

 

@@ -438,9 +438,9 @@ 
         

         public static $lengthTableBits = [

             [10, 12, 14],

-            [ 9, 11, 13],

-            [ 8, 16, 16],

-            [ 8, 10, 12]

+            [9, 11, 13],

+            [8, 16, 16],

+            [8, 10, 12]

         ];

         

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

@@ -463,12 +463,12 @@ 
         //----------------------------------------------------------------------

         public static function maximumWords($mode, $version)

         {

-            if($mode == QR_MODE_STRUCTURE) 

+            if ($mode == QR_MODE_STRUCTURE) 

                 return 3;

                 

-            if($version <= 9) {

+            if ($version <= 9) {

                 $l = 0;

-            } else if($version <= 26) {

+            } else if ($version <= 26) {

                 $l = 1;

             } else {

                 $l = 2;

@@ -477,7 +477,7 @@ 
             $bits = self::$lengthTableBits[$mode][$l];

             $words = (1 << $bits) - 1;

             

-            if($mode == QR_MODE_KANJI) {

+            if ($mode == QR_MODE_KANJI) {

                 $words *= 2; // the number of bytes is required

             }

 

@@ -489,47 +489,47 @@ 
         // See Table 12-16 (pp.30-36), JIS X0510:2004.

 

         public static $eccTable = [

-            [[ 0,  0], [ 0,  0], [ 0,  0], [ 0,  0]],

-            [[ 1,  0], [ 1,  0], [ 1,  0], [ 1,  0]], // 1

-            [[ 1,  0], [ 1,  0], [ 1,  0], [ 1,  0]],

-            [[ 1,  0], [ 1,  0], [ 2,  0], [ 2,  0]],

-            [[ 1,  0], [ 2,  0], [ 2,  0], [ 4,  0]],

-            [[ 1,  0], [ 2,  0], [ 2,  2], [ 2,  2]], // 5

-            [[ 2,  0], [ 4,  0], [ 4,  0], [ 4,  0]],

-            [[ 2,  0], [ 4,  0], [ 2,  4], [ 4,  1]],

-            [[ 2,  0], [ 2,  2], [ 4,  2], [ 4,  2]],

-            [[ 2,  0], [ 3,  2], [ 4,  4], [ 4,  4]],

-            [[ 2,  2], [ 4,  1], [ 6,  2], [ 6,  2]], //10

-            [[ 4,  0], [ 1,  4], [ 4,  4], [ 3,  8]],

-            [[ 2,  2], [ 6,  2], [ 4,  6], [ 7,  4]],

-            [[ 4,  0], [ 8,  1], [ 8,  4], [12,  4]],

-            [[ 3,  1], [ 4,  5], [11,  5], [11,  5]],

-            [[ 5,  1], [ 5,  5], [ 5,  7], [11,  7]], //15

-            [[ 5,  1], [ 7,  3], [15,  2], [ 3, 13]],

-            [[ 1,  5], [10,  1], [ 1, 15], [ 2, 17]],

-            [[ 5,  1], [ 9,  4], [17,  1], [ 2, 19]],

-            [[ 3,  4], [ 3, 11], [17,  4], [ 9, 16]],

-            [[ 3,  5], [ 3, 13], [15,  5], [15, 10]], //20

-            [[ 4,  4], [17,  0], [17,  6], [19,  6]],

-            [[ 2,  7], [17,  0], [ 7, 16], [34,  0]],

-            [[ 4,  5], [ 4, 14], [11, 14], [16, 14]],

-            [[ 6,  4], [ 6, 14], [11, 16], [30,  2]],

-            [[ 8,  4], [ 8, 13], [ 7, 22], [22, 13]], //25

-            [[10,  2], [19,  4], [28,  6], [33,  4]],

-            [[ 8,  4], [22,  3], [ 8, 26], [12, 28]],

-            [[ 3, 10], [ 3, 23], [ 4, 31], [11, 31]],

-            [[ 7,  7], [21,  7], [ 1, 37], [19, 26]],

-            [[ 5, 10], [19, 10], [15, 25], [23, 25]], //30

-            [[13,  3], [ 2, 29], [42,  1], [23, 28]],

-            [[17,  0], [10, 23], [10, 35], [19, 35]],

-            [[17,  1], [14, 21], [29, 19], [11, 46]],

-            [[13,  6], [14, 23], [44,  7], [59,  1]],

-            [[12,  7], [12, 26], [39, 14], [22, 41]], //35

-            [[ 6, 14], [ 6, 34], [46, 10], [ 2, 64]],

-            [[17,  4], [29, 14], [49, 10], [24, 46]],

-            [[ 4, 18], [13, 32], [48, 14], [42, 32]],

-            [[20,  4], [40,  7], [43, 22], [10, 67]],

-            [[19,  6], [18, 31], [34, 34], [20, 61]],//40

+            [[0, 0], [0, 0], [0, 0], [0, 0]],

+            [[1, 0], [1, 0], [1, 0], [1, 0]], // 1

+            [[1, 0], [1, 0], [1, 0], [1, 0]],

+            [[1, 0], [1, 0], [2, 0], [2, 0]],

+            [[1, 0], [2, 0], [2, 0], [4, 0]],

+            [[1, 0], [2, 0], [2, 2], [2, 2]], // 5

+            [[2, 0], [4, 0], [4, 0], [4, 0]],

+            [[2, 0], [4, 0], [2, 4], [4, 1]],

+            [[2, 0], [2, 2], [4, 2], [4, 2]],

+            [[2, 0], [3, 2], [4, 4], [4, 4]],

+            [[2, 2], [4, 1], [6, 2], [6, 2]], //10

+            [[4, 0], [1, 4], [4, 4], [3, 8]],

+            [[2, 2], [6, 2], [4, 6], [7, 4]],

+            [[4, 0], [8, 1], [8, 4], [12, 4]],

+            [[3, 1], [4, 5], [11, 5], [11, 5]],

+            [[5, 1], [5, 5], [5, 7], [11, 7]], //15

+            [[5, 1], [7, 3], [15, 2], [3, 13]],

+            [[1, 5], [10, 1], [1, 15], [2, 17]],

+            [[5, 1], [9, 4], [17, 1], [2, 19]],

+            [[3, 4], [3, 11], [17, 4], [9, 16]],

+            [[3, 5], [3, 13], [15, 5], [15, 10]], //20

+            [[4, 4], [17, 0], [17, 6], [19, 6]],

+            [[2, 7], [17, 0], [7, 16], [34, 0]],

+            [[4, 5], [4, 14], [11, 14], [16, 14]],

+            [[6, 4], [6, 14], [11, 16], [30, 2]],

+            [[8, 4], [8, 13], [7, 22], [22, 13]], //25

+            [[10, 2], [19, 4], [28, 6], [33, 4]],

+            [[8, 4], [22, 3], [8, 26], [12, 28]],

+            [[3, 10], [3, 23], [4, 31], [11, 31]],

+            [[7, 7], [21, 7], [1, 37], [19, 26]],

+            [[5, 10], [19, 10], [15, 25], [23, 25]], //30

+            [[13, 3], [2, 29], [42, 1], [23, 28]],

+            [[17, 0], [10, 23], [10, 35], [19, 35]],

+            [[17, 1], [14, 21], [29, 19], [11, 46]],

+            [[13, 6], [14, 23], [44, 7], [59, 1]],

+            [[12, 7], [12, 26], [39, 14], [22, 41]], //35

+            [[6, 14], [6, 34], [46, 10], [2, 64]],

+            [[17, 4], [29, 14], [49, 10], [24, 46]],

+            [[4, 18], [13, 32], [48, 14], [42, 32]],

+            [[20, 4], [40, 7], [43, 22], [10, 67]],

+            [[19, 6], [18, 31], [34, 34], [20, 61]], //40

         ];                                                                       

 

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

@@ -538,7 +538,7 @@ 
         public static function getEccSpec($version, $level, array &$spec)

         {

             if (count($spec) < 5) {

-                $spec = [0,0,0,0,0];

+                $spec = [0, 0, 0, 0, 0];

             }

 

             $b1   = self::$eccTable[$version][$level][0];

@@ -546,16 +546,16 @@ 
             $data = self::getDataLength($version, $level);

             $ecc  = self::getECCLength($version, $level);

 

-            if($b2 == 0) {

+            if ($b2 == 0) {

                 $spec[0] = $b1;

-                $spec[1] = (int)($data / $b1);

-                $spec[2] = (int)($ecc / $b1);

+                $spec[1] = (int) ($data / $b1);

+                $spec[2] = (int) ($ecc / $b1);

                 $spec[3] = 0; 

                 $spec[4] = 0;

             } else {

                 $spec[0] = $b1;

-                $spec[1] = (int)($data / ($b1 + $b2));

-                $spec[2] = (int)($ecc  / ($b1 + $b2));

+                $spec[1] = (int) ($data / ($b1 + $b2));

+                $spec[2] = (int) ($ecc / ($b1 + $b2));

                 $spec[3] = $b2;

                 $spec[4] = $spec[1] + 1;

             }

@@ -571,9 +571,9 @@ 
         // See Table 1 in Appendix E (pp.71) of JIS X0510:2004.

          

         public static $alignmentPattern = [      

-            [ 0,  0],

-            [ 0,  0], [18,  0], [22,  0], [26,  0], [30,  0], // 1- 5

-            [34,  0], [22, 38], [24, 42], [26, 46], [28, 50], // 6-10

+            [0, 0],

+            [0, 0], [18, 0], [22, 0], [26, 0], [30, 0], // 1- 5

+            [34, 0], [22, 38], [24, 42], [26, 46], [28, 50], // 6-10

             [30, 54], [32, 58], [34, 62], [26, 46], [26, 48], //11-15

             [26, 50], [30, 54], [30, 56], [30, 58], [34, 62], //16-20

             [28, 50], [26, 50], [30, 54], [28, 54], [32, 58], //21-25

@@ -599,28 +599,28 @@ 
                 "\xa1\xa1\xa1\xa1\xa1"

             ];                        

             

-            $yStart = $oy-2;         

-            $xStart = $ox-2;

+            $yStart = $oy - 2;         

+            $xStart = $ox - 2;

             

-            for($y=0; $y<5; $y++) {

-                QRstr::set($frame, $xStart, $yStart+$y, $finder[$y]);

+            for ($y = 0; $y < 5; $y++) {

+                QRstr::set($frame, $xStart, $yStart + $y, $finder[$y]);

             }

         }

 

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

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

         {

-            if($version < 2)

+            if ($version < 2)

                 return;

 

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

-            if($d < 0) {

+            if ($d < 0) {

                 $w = 2;

             } else {

-                $w = (int)(($width - self::$alignmentPattern[$version][0]) / $d + 2);

+                $w = (int) (($width - self::$alignmentPattern[$version][0]) / $d + 2);

             }

 

-            if($w * $w - 3 == 1) {

+            if ($w * $w - 3 == 1) {

                 $x = self::$alignmentPattern[$version][0];

                 $y = self::$alignmentPattern[$version][0];

                 self::putAlignmentMarker($frame, $x, $y);

@@ -628,16 +628,16 @@ 
             }

 

             $cx = self::$alignmentPattern[$version][0];

-            for($x=1; $x<$w - 1; $x++) {

+            for ($x = 1; $x < $w - 1; $x++) {

                 self::putAlignmentMarker($frame, 6, $cx);

-                self::putAlignmentMarker($frame, $cx,  6);

+                self::putAlignmentMarker($frame, $cx, 6);

                 $cx += $d;

             }

 

             $cy = self::$alignmentPattern[$version][0];

-            for($y=0; $y<$w-1; $y++) {

+            for ($y = 0; $y < $w - 1; $y++) {

                 $cx = self::$alignmentPattern[$version][0];

-                for($x=0; $x<$w-1; $x++) {

+                for ($x = 0; $x < $w - 1; $x++) {

                     self::putAlignmentMarker($frame, $cx, $cy);

                     $cx += $d;

                 }

@@ -663,10 +663,10 @@ 
         //----------------------------------------------------------------------

         public static function getVersionPattern($version)

         {

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

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

                 return 0;

 

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

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

         }

 

         // Format information --------------------------------------------------

@@ -681,10 +681,10 @@ 
 

         public static function getFormatInfo($mask, $level)

         {

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

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

                 return 0;

                 

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

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

                 return 0;                

 

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

@@ -713,8 +713,8 @@ 
                 "\xc1\xc1\xc1\xc1\xc1\xc1\xc1"

             ];                            

             

-            for($y=0; $y<7; $y++) {

-                QRstr::set($frame, $ox, $oy+$y, $finder[$y]);

+            for ($y = 0; $y < 7; $y++) {

+                QRstr::set($frame, $ox, $oy + $y, $finder[$y]);

             }

         }

 

@@ -722,7 +722,7 @@ 
         public static function createFrame($version)

         {

             $width = self::$capacity[$version][QRCAP_WIDTH];

-            $frameLine = str_repeat ("\0", $width);

+            $frameLine = str_repeat("\0", $width);

             $frame = array_fill(0, $width, $frameLine);

 

             // Finder pattern

@@ -733,7 +733,7 @@ 
             // Separator

             $yOffset = $width - 7;

             

-            for($y=0; $y<7; $y++) {

+            for ($y = 0; $y < 7; $y++) {

                 $frame[$y][7] = "\xc0";

                 $frame[$y][$width - 8] = "\xc0";

                 $frame[$yOffset][7] = "\xc0";

@@ -743,7 +743,7 @@ 
             $setPattern = str_repeat("\xc0", 8);

             

             QRstr::set($frame, 0, 7, $setPattern);

-            QRstr::set($frame, $width-8, 7, $setPattern);

+            QRstr::set($frame, $width - 8, 7, $setPattern);

             QRstr::set($frame, 0, $width - 8, $setPattern);

         

             // Format info

@@ -753,38 +753,38 @@ 
             

             $yOffset = $width - 8;

 

-            for($y=0; $y<8; $y++,$yOffset++) {

+            for ($y = 0; $y < 8; $y++, $yOffset++) {

                 $frame[$y][8] = "\x84";

                 $frame[$yOffset][8] = "\x84";

             }

 

             // Timing pattern  

             

-            for($i=1; $i<$width-15; $i++) {

-                $frame[6][7+$i] = chr(0x90 | ($i & 1));

-                $frame[7+$i][6] = chr(0x90 | ($i & 1));

+            for ($i = 1; $i < $width - 15; $i++) {

+                $frame[6][7 + $i] = chr(0x90 | ($i & 1));

+                $frame[7 + $i][6] = chr(0x90 | ($i & 1));

             }

             

             // Alignment pattern  

             self::putAlignmentPattern($version, $frame, $width);

             

             // Version information 

-            if($version >= 7) {

+            if ($version >= 7) {

                 $vinf = self::getVersionPattern($version);

 

                 $v = $vinf;

                 

-                for($x=0; $x<6; $x++) {

-                    for($y=0; $y<3; $y++) {

-                        $frame[($width - 11)+$y][$x] = chr(0x88 | ($v & 1));

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

+                    for ($y = 0; $y < 3; $y++) {

+                        $frame[($width - 11) + $y][$x] = chr(0x88 | ($v & 1));

                         $v = $v >> 1;

                     }

                 }

 

                 $v = $vinf;

-                for($y=0; $y<6; $y++) {

-                    for($x=0; $x<3; $x++) {

-                        $frame[$y][$x+($width - 11)] = chr(0x88 | ($v & 1));

+                for ($y = 0; $y < 6; $y++) {

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

+                        $frame[$y][$x + ($width - 11)] = chr(0x88 | ($v & 1));

                         $v = $v >> 1;

                     }

                 }

@@ -818,16 +818,16 @@ 
             } else {

             

                 foreach ($frame as &$frameLine) {

-                    $frameLine = join('<span class="m">&nbsp;</span>',  explode("\xc0", $frameLine));

+                    $frameLine = join('<span class="m">&nbsp;</span>', explode("\xc0", $frameLine));

                     $frameLine = join('<span class="m">&#9618;</span>', explode("\xc1", $frameLine));

-                    $frameLine = join('<span class="p">&nbsp;</span>',  explode("\xa0", $frameLine));

+                    $frameLine = join('<span class="p">&nbsp;</span>', explode("\xa0", $frameLine));

                     $frameLine = join('<span class="p">&#9618;</span>', explode("\xa1", $frameLine));

                     $frameLine = join('<span class="s">&#9671;</span>', explode("\x84", $frameLine)); //format 0

                     $frameLine = join('<span class="s">&#9670;</span>', explode("\x85", $frameLine)); //format 1

                     $frameLine = join('<span class="x">&#9762;</span>', explode("\x81", $frameLine)); //special bit

-                    $frameLine = join('<span class="c">&nbsp;</span>',  explode("\x90", $frameLine)); //clock 0

+                    $frameLine = join('<span class="c">&nbsp;</span>', explode("\x90", $frameLine)); //clock 0

                     $frameLine = join('<span class="c">&#9719;</span>', explode("\x91", $frameLine)); //clock 1

-                    $frameLine = join('<span class="f">&nbsp;</span>',  explode("\x88", $frameLine)); //version

+                    $frameLine = join('<span class="f">&nbsp;</span>', explode("\x88", $frameLine)); //version

                     $frameLine = join('<span class="f">&#9618;</span>', explode("\x89", $frameLine)); //version

                     $frameLine = join('&#9830;', explode("\x01", $frameLine));

                     $frameLine = join('&#8901;', explode("\0", $frameLine));

@@ -865,12 +865,12 @@ 
         //----------------------------------------------------------------------

         public static function newFrame($version)

         {

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

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

                 return null;

 

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

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

                 

-                $fileName = QR_CACHE_DIR.'frame_'.$version.'.dat';

+                $fileName = QR_CACHE_DIR . 'frame_' . $version . '.dat';

                 

                 if (QR_CACHEABLE) {

                     if (file_exists($fileName)) {

@@ -884,22 +884,22 @@ 
                 }

             }

             

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

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

                 return null;

 

             return self::$frames[$version];

         }

 

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

-        public static function rsBlockNum($spec)     { return $spec[0] + $spec[3]; }

-        public static function rsBlockNum1($spec)    { return $spec[0]; }

-        public static function rsDataCodes1($spec)   { return $spec[1]; }

-        public static function rsEccCodes1($spec)    { return $spec[2]; }

-        public static function rsBlockNum2($spec)    { return $spec[3]; }

-        public static function rsDataCodes2($spec)   { return $spec[4]; }

-        public static function rsEccCodes2($spec)    { return $spec[2]; }

-        public static function rsDataLength($spec)   { return ($spec[0] * $spec[1]) + ($spec[3] * $spec[4]);    }

-        public static function rsEccLength($spec)    { return ($spec[0] + $spec[3]) * $spec[2]; }

+        public static function rsBlockNum($spec) { return $spec[0] + $spec[3]; }

+        public static function rsBlockNum1($spec) { return $spec[0]; }

+        public static function rsDataCodes1($spec) { return $spec[1]; }

+        public static function rsEccCodes1($spec) { return $spec[2]; }

+        public static function rsBlockNum2($spec) { return $spec[3]; }

+        public static function rsDataCodes2($spec) { return $spec[4]; }

+        public static function rsEccCodes2($spec) { return $spec[2]; }

+        public static function rsDataLength($spec) { return ($spec[0] * $spec[1]) + ($spec[3] * $spec[4]); }

+        public static function rsEccLength($spec) { return ($spec[0] + $spec[3]) * $spec[2]; }

         

     }

 

@@ -938,7 +938,7 @@ 
     class QRimage {

     

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

-        public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=FALSE) 

+        public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4, $saveandprint = FALSE) 

         {

             $image = self::image($frame, $pixelPerPoint, $outerFrame);

             

@@ -949,11 +949,11 @@ 
                 $output = ob_get_clean();

                 return $output;

             } else {

-                if($saveandprint===TRUE){

+                if ($saveandprint === TRUE) {

                     ImagePng($image, $filename);

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

                     ImagePng($image);

-                }else{

+                } else {

                     ImagePng($image, $filename);

                 }

             }

@@ -982,25 +982,25 @@ 
             $h = count($frame);

             $w = strlen($frame[0]);

             

-            $imgW = $w + 2*$outerFrame;

-            $imgH = $h + 2*$outerFrame;

+            $imgW = $w + 2 * $outerFrame;

+            $imgH = $h + 2 * $outerFrame;

             

-            $base_image =ImageCreate($imgW, $imgH);

+            $base_image = ImageCreate($imgW, $imgH);

             

-            $col[0] = ImageColorAllocate($base_image,255,255,255);

-            $col[1] = ImageColorAllocate($base_image,0,0,0);

+            $col[0] = ImageColorAllocate($base_image, 255, 255, 255);

+            $col[1] = ImageColorAllocate($base_image, 0, 0, 0);

 

             imagefill($base_image, 0, 0, $col[0]);

 

-            for($y=0; $y<$h; $y++) {

-                for($x=0; $x<$w; $x++) {

+            for ($y = 0; $y < $h; $y++) {

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

                     if ($frame[$y][$x] == '1') {

-                        ImageSetPixel($base_image,$x+$outerFrame,$y+$outerFrame,$col[1]); 

+                        ImageSetPixel($base_image, $x + $outerFrame, $y + $outerFrame, $col[1]); 

                     }

                 }

             }

             

-            $target_image =ImageCreate($imgW * $pixelPerPoint, $imgH * $pixelPerPoint);

+            $target_image = ImageCreate($imgW * $pixelPerPoint, $imgH * $pixelPerPoint);

             ImageCopyResized($target_image, $base_image, 0, 0, 0, 0, $imgW * $pixelPerPoint, $imgH * $pixelPerPoint, $imgW, $imgH);

             ImageDestroy($base_image);

             

@@ -1041,7 +1041,7 @@ 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

  */

  

-    define('STRUCTURE_HEADER_BITS',  20);

+    define('STRUCTURE_HEADER_BITS', 20);

     define('MAX_STRUCTURED_SYMBOLS', 16);

 

     class QRinputItem {

@@ -1056,11 +1056,11 @@ 
             $setData = array_slice($data, 0, $size);

             

             if (count($setData) < $size) {

-                $setData = array_merge($setData, array_fill(0,$size-count($setData),0));

+                $setData = array_merge($setData, array_fill(0, $size - count($setData), 0));

             }

         

-            if(!QRinput::check($mode, $size, $setData)) {

-                throw new Exception('Error m:'.$mode.',s:'.$size.',d:'.join(',',$setData));

+            if (!QRinput::check($mode, $size, $setData)) {

+                throw new Exception('Error m:' . $mode . ',s:' . $size . ',d:' . join(',', $setData));

                 return null;

             }

             

@@ -1075,26 +1075,26 @@ 
         {

             try {

             

-                $words = (int)($this->size / 3);

+                $words = (int) ($this->size / 3);

                 $bs = new QRbitstream();

                 

                 $val = 0x1;

                 $bs->appendNum(4, $val);

                 $bs->appendNum(QRspec::lengthIndicator(QR_MODE_NUM, $version), $this->size);

 

-                for($i=0; $i<$words; $i++) {

-                    $val  = (ord($this->data[$i*3  ]) - ord('0')) * 100;

-                    $val += (ord($this->data[$i*3+1]) - ord('0')) * 10;

-                    $val += (ord($this->data[$i*3+2]) - ord('0'));

+                for ($i = 0; $i < $words; $i++) {

+                    $val  = (ord($this->data[$i * 3]) - ord('0')) * 100;

+                    $val += (ord($this->data[$i * 3 + 1]) - ord('0')) * 10;

+                    $val += (ord($this->data[$i * 3 + 2]) - ord('0'));

                     $bs->appendNum(10, $val);

                 }

 

-                if($this->size - $words * 3 == 1) {

-                    $val = ord($this->data[$words*3]) - ord('0');

+                if ($this->size - $words * 3 == 1) {

+                    $val = ord($this->data[$words * 3]) - ord('0');

                     $bs->appendNum(4, $val);

-                } else if($this->size - $words * 3 == 2) {

-                    $val  = (ord($this->data[$words*3  ]) - ord('0')) * 10;

-                    $val += (ord($this->data[$words*3+1]) - ord('0'));

+                } else if ($this->size - $words * 3 == 2) {

+                    $val  = (ord($this->data[$words * 3]) - ord('0')) * 10;

+                    $val += (ord($this->data[$words * 3 + 1]) - ord('0'));

                     $bs->appendNum(7, $val);

                 }

 

@@ -1110,20 +1110,20 @@ 
         public function encodeModeAn($version)

         {

             try {

-                $words = (int)($this->size / 2);

+                $words = (int) ($this->size / 2);

                 $bs = new QRbitstream();

                 

                 $bs->appendNum(4, 0x02);

                 $bs->appendNum(QRspec::lengthIndicator(QR_MODE_AN, $version), $this->size);

 

-                for($i=0; $i<$words; $i++) {

-                    $val  = (int)QRinput::lookAnTable(ord($this->data[$i*2  ])) * 45;

-                    $val += (int)QRinput::lookAnTable(ord($this->data[$i*2+1]));

+                for ($i = 0; $i < $words; $i++) {

+                    $val  = (int) QRinput::lookAnTable(ord($this->data[$i * 2])) * 45;

+                    $val += (int) QRinput::lookAnTable(ord($this->data[$i * 2 + 1]));

 

                     $bs->appendNum(11, $val);

                 }

 

-                if($this->size & 1) {

+                if ($this->size & 1) {

                     $val = QRinput::lookAnTable(ord($this->data[$words * 2]));

                     $bs->appendNum(6, $val);

                 }

@@ -1145,7 +1145,7 @@ 
                 $bs->appendNum(4, 0x4);

                 $bs->appendNum(QRspec::lengthIndicator(QR_MODE_8, $version), $this->size);

 

-                for($i=0; $i<$this->size; $i++) {

+                for ($i = 0; $i < $this->size; $i++) {

                     $bs->appendNum(8, ord($this->data[$i]));

                 }

 

@@ -1165,11 +1165,11 @@ 
                 $bs = new QRbitrtream();

                 

                 $bs->appendNum(4, 0x8);

-                $bs->appendNum(QRspec::lengthIndicator(QR_MODE_KANJI, $version), (int)($this->size / 2));

+                $bs->appendNum(QRspec::lengthIndicator(QR_MODE_KANJI, $version), (int) ($this->size / 2));

 

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

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

-                    if($val <= 0x9ffc) {

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

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

+                    if ($val <= 0x9ffc) {

                         $val -= 0x8140;

                     } else {

                         $val -= 0xc140;

@@ -1193,7 +1193,7 @@ 
         public function encodeModeStructure()

         {

             try {

-                $bs =  new QRbitstream();

+                $bs = new QRbitstream();

                 

                 $bs->appendNum(4, 0x03);

                 $bs->appendNum(4, ord($this->data[1]) - 1);

@@ -1213,14 +1213,14 @@ 
         {

             $bits = 0;

 

-            if($version == 0) 

+            if ($version == 0) 

                 $version = 1;

 

-            switch($this->mode) {

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

-                case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size);    break;

-                case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size);    break;

-                case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size);break;

+            switch ($this->mode) {

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

+                case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size); break;

+                case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size); break;

+                case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size); break;

                 case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            

                 default:

                     return 0;

@@ -1228,7 +1228,7 @@ 
 

             $l = QRspec::lengthIndicator($this->mode, $version);

             $m = 1 << $l;

-            $num = (int)(($this->size + $m - 1) / $m);

+            $num = (int) (($this->size + $m - 1) / $m);

 

             $bits += $num * (4 + $l);

 

@@ -1243,7 +1243,7 @@ 
                 unset($this->bstream);

                 $words = QRspec::maximumWords($this->mode, $version);

                 

-                if($this->size > $words) {

+                if ($this->size > $words) {

                 

                     $st1 = new QRinputItem($this->mode, $words, $this->data);

                     $st2 = new QRinputItem($this->mode, $this->size - $words, array_slice($this->data, $words));

@@ -1262,18 +1262,18 @@ 
                     

                     $ret = 0;

                     

-                    switch($this->mode) {

-                        case QR_MODE_NUM:        $ret = $this->encodeModeNum($version);    break;

-                        case QR_MODE_AN:        $ret = $this->encodeModeAn($version);    break;

-                        case QR_MODE_8:            $ret = $this->encodeMode8($version);    break;

-                        case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version);break;

-                        case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure();    break;

+                    switch ($this->mode) {

+                        case QR_MODE_NUM:        $ret = $this->encodeModeNum($version); break;

+                        case QR_MODE_AN:        $ret = $this->encodeModeAn($version); break;

+                        case QR_MODE_8:            $ret = $this->encodeMode8($version); break;

+                        case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version); break;

+                        case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure(); break;

                         

                         default:

                             break;

                     }

                     

-                    if($ret < 0)

+                    if ($ret < 0)

                         return -1;

                 }

 

@@ -1315,7 +1315,7 @@ 
         //----------------------------------------------------------------------

         public function setVersion($version)

         {

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

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

                 throw new Exception('Invalid version no');

                 return -1;

             }

@@ -1334,7 +1334,7 @@ 
         //----------------------------------------------------------------------

         public function setErrorCorrectionLevel($level)

         {

-            if($level > QR_ECLEVEL_H) {

+            if ($level > QR_ECLEVEL_H) {

                 throw new Exception('Invalid ECLEVEL');

                 return -1;

             }

@@ -1366,11 +1366,11 @@ 
         

         public function insertStructuredAppendHeader($size, $index, $parity)

         {

-            if( $size > MAX_STRUCTURED_SYMBOLS ) {

+            if ($size > MAX_STRUCTURED_SYMBOLS) {

                 throw new Exception('insertStructuredAppendHeader wrong size');

             }

             

-            if( $index <= 0 || $index > MAX_STRUCTURED_SYMBOLS ) {

+            if ($index <= 0 || $index > MAX_STRUCTURED_SYMBOLS) {

                 throw new Exception('insertStructuredAppendHeader wrong index');

             }

 

@@ -1390,9 +1390,9 @@ 
         {

             $parity = 0;

             

-            foreach($this->items as $item) {

-                if($item->mode != QR_MODE_STRUCTURE) {

-                    for($i=$item->size-1; $i>=0; $i--) {

+            foreach ($this->items as $item) {

+                if ($item->mode != QR_MODE_STRUCTURE) {

+                    for ($i = $item->size - 1; $i >= 0; $i--) {

                         $parity ^= $item->data[$i];

                     }

                 }

@@ -1404,8 +1404,8 @@ 
         //----------------------------------------------------------------------

         public static function checkModeNum($size, $data)

         {

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

-                if((ord($data[$i]) < ord('0')) || (ord($data[$i]) > ord('9'))){

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

+                if ((ord($data[$i]) < ord('0')) || (ord($data[$i]) > ord('9'))) {

                     return false;

                 }

             }

@@ -1416,10 +1416,10 @@ 
         //----------------------------------------------------------------------

         public static function estimateBitsModeNum($size)

         {

-            $w = (int)$size / 3;

+            $w = (int) $size / 3;

             $bits = $w * 10;

             

-            switch($size - $w * 3) {

+            switch ($size - $w * 3) {

                 case 1:

                     $bits += 4;

                     break;

@@ -1438,7 +1438,7 @@ 
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

             36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43,

-             0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1,

+             0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1,

             -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,

             25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,

             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

@@ -1448,13 +1448,13 @@ 
         //----------------------------------------------------------------------

         public static function lookAnTable($c)

         {

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

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

         }

         

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

         public static function checkModeAn($size, $data)

         {

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

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

                 if (self::lookAnTable(ord($data[$i])) == -1) {

                     return false;

                 }

@@ -1466,10 +1466,10 @@ 
         //----------------------------------------------------------------------

         public static function estimateBitsModeAn($size)

         {

-            $w = (int)($size / 2);

+            $w = (int) ($size / 2);

             $bits = $w * 11;

             

-            if($size & 1) {

+            if ($size & 1) {

                 $bits += 6;

             }

 

@@ -1485,18 +1485,18 @@ 
         //----------------------------------------------------------------------

         public function estimateBitsModeKanji($size)

         {

-            return (int)(($size / 2) * 13);

+            return (int) (($size / 2) * 13);

         }

         

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

         public static function checkModeKanji($size, $data)

         {

-            if($size & 1)

+            if ($size & 1)

                 return false;

 

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

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

-                if( $val < 0x8140 

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

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

+                if ($val < 0x8140 

                 || ($val > 0x9ffc && $val < 0xe040) 

                 || $val > 0xebbf) {

                     return false;

@@ -1512,12 +1512,12 @@ 
 

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

         {

-            if($size <= 0) 

+            if ($size <= 0) 

                 return false;

 

-            switch($mode) {

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

-                case QR_MODE_AN:        return self::checkModeAn($size, $data);    break;

+            switch ($mode) {

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

+                case QR_MODE_AN:        return self::checkModeAn($size, $data); break;

                 case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;

                 case QR_MODE_8:         return true; break;

                 case QR_MODE_STRUCTURE: return true; break;

@@ -1535,7 +1535,7 @@ 
         {

             $bits = 0;

 

-            foreach($this->items as $item) {

+            foreach ($this->items as $item) {

                 $bits += $item->estimateBitStreamSizeOfEntry($version);

             }

 

@@ -1550,7 +1550,7 @@ 
             do {

                 $prev = $version;

                 $bits = $this->estimateBitStreamSize($prev);

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

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

                 if ($version < 0) {

                     return -1;

                 }

@@ -1563,32 +1563,32 @@ 
         public static function lengthOfCode($mode, $version, $bits)

         {

             $payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);

-            switch($mode) {

+            switch ($mode) {

                 case QR_MODE_NUM:

-                    $chunks = (int)($payload / 10);

+                    $chunks = (int) ($payload / 10);

                     $remain = $payload - $chunks * 10;

                     $size = $chunks * 3;

-                    if($remain >= 7) {

+                    if ($remain >= 7) {

                         $size += 2;

-                    } else if($remain >= 4) {

+                    } else if ($remain >= 4) {

                         $size += 1;

                     }

                     break;

                 case QR_MODE_AN:

-                    $chunks = (int)($payload / 11);

+                    $chunks = (int) ($payload / 11);

                     $remain = $payload - $chunks * 11;

                     $size = $chunks * 2;

-                    if($remain >= 6) 

+                    if ($remain >= 6) 

                         $size++;

                     break;

                 case QR_MODE_8:

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

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

                     break;

                 case QR_MODE_KANJI:

-                    $size = (int)(($payload / 13) * 2);

+                    $size = (int) (($payload / 13) * 2);

                     break;

                 case QR_MODE_STRUCTURE:

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

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

                     break;

                 default:

                     $size = 0;

@@ -1596,8 +1596,8 @@ 
             }

             

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

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

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

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

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

 

             return $size;

         }

@@ -1607,10 +1607,10 @@ 
         {

             $total = 0;

 

-            foreach($this->items as $item) {

+            foreach ($this->items as $item) {

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

                 

-                if($bits < 0) 

+                if ($bits < 0) 

                     return -1;

                     

                 $total += $bits;

@@ -1623,21 +1623,21 @@ 
         public function convertData()

         {

             $ver = $this->estimateVersion();

-            if($ver > $this->getVersion()) {

+            if ($ver > $this->getVersion()) {

                 $this->setVersion($ver);

             }

 

-            for(;;) {

+            for (;;) {

                 $bits = $this->createBitStream();

                 

-                if($bits < 0) 

+                if ($bits < 0) 

                     return -1;

                     

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

-                if($ver < 0) {

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

+                if ($ver < 0) {

                     throw new Exception('WRONG VERSION');

                     return -1;

-                } else if($ver > $this->getVersion()) {

+                } else if ($ver > $this->getVersion()) {

                     $this->setVersion($ver);

                 } else {

                     break;

@@ -1663,26 +1663,26 @@ 
             }

 

             $bits += 4;

-            $words = (int)(($bits + 7) / 8);

+            $words = (int) (($bits + 7) / 8);

 

             $padding = new QRbitstream();

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

             

-            if($ret < 0) 

+            if ($ret < 0) 

                 return $ret;

 

             $padlen = $maxwords - $words;

             

-            if($padlen > 0) {

+            if ($padlen > 0) {

                 

                 $padbuf = [];

-                for($i=0; $i<$padlen; $i++) {

-                    $padbuf[$i] = ($i&1)?0x11:0xec;

+                for ($i = 0; $i < $padlen; $i++) {

+                    $padbuf[$i] = ($i & 1) ? 0x11 : 0xec;

                 }

                 

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

                 

-                if($ret < 0)

+                if ($ret < 0)

                     return $ret;

                 

             }

@@ -1695,15 +1695,15 @@ 
         //----------------------------------------------------------------------

         public function mergeBitStream()

         {

-            if($this->convertData() < 0) {

+            if ($this->convertData() < 0) {

                 return null;

             }

 

             $bstream = new QRbitstream();

             

-            foreach($this->items as $item) {

+            foreach ($this->items as $item) {

                 $ret = $bstream->append($item->bstream);

-                if($ret < 0) {

+                if ($ret < 0) {

                     return null;

                 }

             }

@@ -1717,12 +1717,12 @@ 
 

             $bstream = $this->mergeBitStream();

             

-            if($bstream == null) {

+            if ($bstream == null) {

                 return null;

             }

             

             $ret = $this->appendPaddingBit($bstream);

-            if($ret < 0) {

+            if ($ret < 0) {

                 return null;

             }

 

@@ -1733,7 +1733,7 @@ 
         public function getByteStream()

         {

             $bstream = $this->getBitStream();

-            if($bstream == null) {

+            if ($bstream == null) {

                 return null;

             }

             

@@ -1801,8 +1801,8 @@ 
             $bstream->allocate($bits);

             

             $mask = 1 << ($bits - 1);

-            for($i=0; $i<$bits; $i++) {

-                if($num & $mask) {

+            for ($i = 0; $i < $bits; $i++) {

+                if ($num & $mask) {

                     $bstream->data[$i] = 1;

                 } else {

                     $bstream->data[$i] = 0;

@@ -1818,12 +1818,12 @@ 
         {

             $bstream = new QRbitstream();

             $bstream->allocate($size * 8);

-            $p=0;

+            $p = 0;

 

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

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

                 $mask = 0x80;

-                for($j=0; $j<8; $j++) {

-                    if($data[$i] & $mask) {

+                for ($j = 0; $j < 8; $j++) {

+                    if ($data[$i] & $mask) {

                         $bstream->data[$p] = 1;

                     } else {

                         $bstream->data[$p] = 0;

@@ -1843,11 +1843,11 @@ 
                 return -1;

             }

             

-            if($arg->size() == 0) {

+            if ($arg->size() == 0) {

                 return 0;

             }

             

-            if($this->size() == 0) {

+            if ($this->size() == 0) {

                 $this->data = $arg->data;

                 return 0;

             }

@@ -1865,7 +1865,7 @@ 
 

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

             

-            if(is_null($b))

+            if (is_null($b))

                 return -1;

 

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

@@ -1882,7 +1882,7 @@ 
 

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

             

-            if(is_null($b))

+            if (is_null($b))

                 return -1;

 

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

@@ -1897,18 +1897,18 @@ 
         

             $size = $this->size();

 

-            if($size == 0) {

+            if ($size == 0) {

                 return [];

             }

             

-            $data = array_fill(0, (int)(($size + 7) / 8), 0);

-            $bytes = (int)($size / 8);

+            $data = array_fill(0, (int) (($size + 7) / 8), 0);

+            $bytes = (int) ($size / 8);

 

             $p = 0;

             

-            for($i=0; $i<$bytes; $i++) {

+            for ($i = 0; $i < $bytes; $i++) {

                 $v = 0;

-                for($j=0; $j<8; $j++) {

+                for ($j = 0; $j < 8; $j++) {

                     $v = $v << 1;

                     $v |= $this->data[$p];

                     $p++;

@@ -1916,9 +1916,9 @@ 
                 $data[$i] = $v;

             }

             

-            if($size & 7) {

+            if ($size & 7) {

                 $v = 0;

-                for($j=0; $j<($size & 7); $j++) {

+                for ($j = 0; $j < ($size & 7); $j++) {

                     $v = $v << 1;

                     $v |= $this->data[$p];

                     $p++;

@@ -1990,7 +1990,7 @@ 
             if ($pos >= strlen($str))

                 return false;

             

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

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

         }

         

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

@@ -2010,17 +2010,17 @@ 
                 

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

             

-            if(self::isdigitat($this->dataStr, $pos)) {

+            if (self::isdigitat($this->dataStr, $pos)) {

                 return QR_MODE_NUM;

-            } else if(self::isalnumat($this->dataStr, $pos)) {

+            } else if (self::isalnumat($this->dataStr, $pos)) {

                 return QR_MODE_AN;

-            } else if($this->modeHint == QR_MODE_KANJI) {

+            } else if ($this->modeHint == QR_MODE_KANJI) {

             

-                if ($pos+1 < strlen($this->dataStr)) 

+                if ($pos + 1 < strlen($this->dataStr)) 

                 {

-                    $d = $this->dataStr[$pos+1];

+                    $d = $this->dataStr[$pos + 1];

                     $word = (ord($c) << 8) | ord($d);

-                    if(($word >= 0x8140 && $word <= 0x9ffc) || ($word >= 0xe040 && $word <= 0xebbf)) {

+                    if (($word >= 0x8140 && $word <= 0x9ffc) || ($word >= 0xe040 && $word <= 0xebbf)) {

                         return QR_MODE_KANJI;

                     }

                 }

@@ -2035,32 +2035,32 @@ 
             $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());

 

             $p = 0;

-            while(self::isdigitat($this->dataStr, $p)) {

+            while (self::isdigitat($this->dataStr, $p)) {

                 $p++;

             }

             

             $run = $p;

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

             

-            if($mode == QR_MODE_8) {

+            if ($mode == QR_MODE_8) {

                 $dif = QRinput::estimateBitsModeNum($run) + 4 + $ln

                      + QRinput::estimateBitsMode8(1)         // + 4 + l8

                      - QRinput::estimateBitsMode8($run + 1); // - 4 - l8

-                if($dif > 0) {

+                if ($dif > 0) {

                     return $this->eat8();

                 }

             }

-            if($mode == QR_MODE_AN) {

+            if ($mode == QR_MODE_AN) {

                 $dif = QRinput::estimateBitsModeNum($run) + 4 + $ln

                      + QRinput::estimateBitsModeAn(1)        // + 4 + la

-                     - QRinput::estimateBitsModeAn($run + 1);// - 4 - la

-                if($dif > 0) {

+                     - QRinput::estimateBitsModeAn($run + 1); // - 4 - la

+                if ($dif > 0) {

                     return $this->eatAn();

                 }

             }

             

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

-            if($ret < 0)

+            if ($ret < 0)

                 return -1;

 

             return $run;

@@ -2069,15 +2069,15 @@ 
         //----------------------------------------------------------------------

         public function eatAn()

         {

-            $la = QRspec::lengthIndicator(QR_MODE_AN,  $this->input->getVersion());

+            $la = QRspec::lengthIndicator(QR_MODE_AN, $this->input->getVersion());

             $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());

 

             $p = 0;

             

-            while(self::isalnumat($this->dataStr, $p)) {

-                if(self::isdigitat($this->dataStr, $p)) {

+            while (self::isalnumat($this->dataStr, $p)) {

+                if (self::isdigitat($this->dataStr, $p)) {

                     $q = $p;

-                    while(self::isdigitat($this->dataStr, $q)) {

+                    while (self::isdigitat($this->dataStr, $q)) {

                         $q++;

                     }

                     

@@ -2085,7 +2085,7 @@ 
                          + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln

                          - QRinput::estimateBitsModeAn($q); // - 4 - la

                          

-                    if($dif < 0) {

+                    if ($dif < 0) {

                         break;

                     } else {

                         $p = $q;

@@ -2097,17 +2097,17 @@ 
 

             $run = $p;

 

-            if(!self::isalnumat($this->dataStr, $p)) {

+            if (!self::isalnumat($this->dataStr, $p)) {

                 $dif = QRinput::estimateBitsModeAn($run) + 4 + $la

                      + QRinput::estimateBitsMode8(1) // + 4 + l8

                       - QRinput::estimateBitsMode8($run + 1); // - 4 - l8

-                if($dif > 0) {

+                if ($dif > 0) {

                     return $this->eat8();

                 }

             }

 

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

-            if($ret < 0)

+            if ($ret < 0)

                 return -1;

 

             return $run;

@@ -2118,12 +2118,12 @@ 
         {

             $p = 0;

             

-            while($this->identifyMode($p) == QR_MODE_KANJI) {

+            while ($this->identifyMode($p) == QR_MODE_KANJI) {

                 $p += 2;

             }

             

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

-            if($ret < 0)

+            if ($ret < 0)

                 return -1;

 

             return $run;

@@ -2138,34 +2138,34 @@ 
             $p = 1;

             $dataStrLen = strlen($this->dataStr);

             

-            while($p < $dataStrLen) {

+            while ($p < $dataStrLen) {

                 

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

-                if($mode == QR_MODE_KANJI) {

+                if ($mode == QR_MODE_KANJI) {

                     break;

                 }

-                if($mode == QR_MODE_NUM) {

+                if ($mode == QR_MODE_NUM) {

                     $q = $p;

-                    while(self::isdigitat($this->dataStr, $q)) {

+                    while (self::isdigitat($this->dataStr, $q)) {

                         $q++;

                     }

                     $dif = QRinput::estimateBitsMode8($p) // + 4 + l8

                          + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln

                          - QRinput::estimateBitsMode8($q); // - 4 - l8

-                    if($dif < 0) {

+                    if ($dif < 0) {

                         break;

                     } else {

                         $p = $q;

                     }

-                } else if($mode == QR_MODE_AN) {

+                } else if ($mode == QR_MODE_AN) {

                     $q = $p;

-                    while(self::isalnumat($this->dataStr, $q)) {

+                    while (self::isalnumat($this->dataStr, $q)) {

                         $q++;

                     }

                     $dif = QRinput::estimateBitsMode8($p)  // + 4 + l8

                          + QRinput::estimateBitsModeAn($q - $p) + 4 + $la

                          - QRinput::estimateBitsMode8($q); // - 4 - l8

-                    if($dif < 0) {

+                    if ($dif < 0) {

                         break;

                     } else {

                         $p = $q;

@@ -2178,7 +2178,7 @@ 
             $run = $p;

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

             

-            if($ret < 0)

+            if ($ret < 0)

                 return -1;

 

             return $run;

@@ -2189,7 +2189,7 @@ 
         {

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

             {

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

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

                     return 0;

 

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

@@ -2206,8 +2206,8 @@ 
                 

                 }

 

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

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

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

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

                 

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

             }

@@ -2219,9 +2219,9 @@ 
             $stringLen = strlen($this->dataStr);

             $p = 0;

             

-            while ($p<$stringLen) {

+            while ($p < $stringLen) {

                 $mode = self::identifyMode(substr($this->dataStr, $p), $this->modeHint);

-                if($mode == QR_MODE_KANJI) {

+                if ($mode == QR_MODE_KANJI) {

                     $p += 2;

                 } else {

                     if (ord($this->dataStr[$p]) >= ord('a') && ord($this->dataStr[$p]) <= ord('z')) {

@@ -2237,13 +2237,13 @@ 
         //----------------------------------------------------------------------

         public static function splitStringToQRinput($string, QRinput $input, $modeHint, $casesensitive = true)

         {

-            if(is_null($string) || $string == '\0' || $string == '') {

+            if (is_null($string) || $string == '\0' || $string == '') {

                 throw new Exception('empty string!!!');

             }

 

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

             

-            if(!$casesensitive)

+            if (!$casesensitive)

                 $split->toUpper();

                 

             return $split->splitString();

@@ -2288,16 +2288,16 @@ 
  

     class QRrsItem {

     

-        public $mm;                  // Bits per symbol 

-        public $nn;                  // Symbols per block (= (1<<mm)-1) 

-        public $alpha_to = [];  // log lookup table 

-        public $index_of = [];  // Antilog lookup table 

-        public $genpoly = [];   // Generator polynomial 

-        public $nroots;              // Number of generator roots = number of parity symbols 

-        public $fcr;                 // First consecutive root, index form 

-        public $prim;                // Primitive element, index form 

-        public $iprim;               // prim-th root of 1, index form 

-        public $pad;                 // Padding bytes in shortened block 

+        public $mm; // Bits per symbol 

+        public $nn; // Symbols per block (= (1<<mm)-1) 

+        public $alpha_to = []; // log lookup table 

+        public $index_of = []; // Antilog lookup table 

+        public $genpoly = []; // Generator polynomial 

+        public $nroots; // Number of generator roots = number of parity symbols 

+        public $fcr; // First consecutive root, index form 

+        public $prim; // Primitive element, index form 

+        public $iprim; // prim-th root of 1, index form 

+        public $pad; // Padding bytes in shortened block 

         public $gfpoly;

     

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

@@ -2321,47 +2321,47 @@ 
             $rs = null;

             

             // Check parameter ranges

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

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

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

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

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

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

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

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

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

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

 

             $rs = new QRrsItem();

             $rs->mm = $symsize;

-            $rs->nn = (1<<$symsize)-1;

+            $rs->nn = (1 << $symsize) - 1;

             $rs->pad = $pad;

 

-            $rs->alpha_to = array_fill(0, $rs->nn+1, 0);

-            $rs->index_of = array_fill(0, $rs->nn+1, 0);

+            $rs->alpha_to = array_fill(0, $rs->nn + 1, 0);

+            $rs->index_of = array_fill(0, $rs->nn + 1, 0);

           

             // PHP style macro replacement ;)

-            $NN =& $rs->nn;

-            $A0 =& $NN;

+            $NN = & $rs->nn;

+            $A0 = & $NN;

             

             // Generate Galois field lookup tables

             $rs->index_of[0] = $A0; // log(zero) = -inf

             $rs->alpha_to[$A0] = 0; // alpha**-inf = 0

             $sr = 1;

           

-            for($i=0; $i<$rs->nn; $i++) {

+            for ($i = 0; $i < $rs->nn; $i++) {

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

                 $rs->alpha_to[$i] = $sr;

                 $sr <<= 1;

-                if($sr & (1<<$symsize)) {

+                if ($sr & (1 << $symsize)) {

                     $sr ^= $gfpoly;

                 }

                 $sr &= $rs->nn;

             }

             

-            if($sr != 1){

+            if ($sr != 1) {

                 // field generator polynomial is not primitive!

                 $rs = NULL;

                 return $rs;

             }

 

             /* Form RS code generator polynomial from its roots */

-            $rs->genpoly = array_fill(0, $nroots+1, 0);

+            $rs->genpoly = array_fill(0, $nroots + 1, 0);

         

             $rs->fcr = $fcr;

             $rs->prim = $prim;

@@ -2369,21 +2369,21 @@ 
             $rs->gfpoly = $gfpoly;

 

             /* Find prim-th root of 1, used in decoding */

-            for($iprim=1;($iprim % $prim) != 0;$iprim += $rs->nn)

+            for ($iprim = 1; ($iprim % $prim) != 0; $iprim += $rs->nn)

             ; // intentional empty-body loop!

             

-            $rs->iprim = (int)($iprim / $prim);

+            $rs->iprim = (int) ($iprim / $prim);

             $rs->genpoly[0] = 1;

             

-            for ($i = 0,$root=$fcr*$prim; $i < $nroots; $i++, $root += $prim) {

-                $rs->genpoly[$i+1] = 1;

+            for ($i = 0, $root = $fcr * $prim; $i < $nroots; $i++, $root += $prim) {

+                $rs->genpoly[$i + 1] = 1;

 

                 // Multiply rs->genpoly[] by  @**(root + x)

                 for ($j = $i; $j > 0; $j--) {

                     if ($rs->genpoly[$j] != 0) {

-                        $rs->genpoly[$j] = $rs->genpoly[$j-1] ^ $rs->alpha_to[$rs->modnn($rs->index_of[$rs->genpoly[$j]] + $root)];

+                        $rs->genpoly[$j] = $rs->genpoly[$j - 1] ^ $rs->alpha_to[$rs->modnn($rs->index_of[$rs->genpoly[$j]] + $root)];

                     } else {

-                        $rs->genpoly[$j] = $rs->genpoly[$j-1];

+                        $rs->genpoly[$j] = $rs->genpoly[$j - 1];

                     }

                 }

                 // rs->genpoly[0] can never be zero

@@ -2400,38 +2400,38 @@ 
         //----------------------------------------------------------------------

         public function encode_rs_char($data, &$parity)

         {

-            $MM       =& $this->mm;

-            $NN       =& $this->nn;

-            $ALPHA_TO =& $this->alpha_to;

-            $INDEX_OF =& $this->index_of;

-            $GENPOLY  =& $this->genpoly;

-            $NROOTS   =& $this->nroots;

-            $FCR      =& $this->fcr;

-            $PRIM     =& $this->prim;

-            $IPRIM    =& $this->iprim;

-            $PAD      =& $this->pad;

-            $A0       =& $NN;

+            $MM       = & $this->mm;

+            $NN       = & $this->nn;

+            $ALPHA_TO = & $this->alpha_to;

+            $INDEX_OF = & $this->index_of;

+            $GENPOLY  = & $this->genpoly;

+            $NROOTS   = & $this->nroots;

+            $FCR      = & $this->fcr;

+            $PRIM     = & $this->prim;

+            $IPRIM    = & $this->iprim;

+            $PAD      = & $this->pad;

+            $A0       = & $NN;

 

             $parity = array_fill(0, $NROOTS, 0);

 

-            for($i=0; $i< ($NN-$NROOTS-$PAD); $i++) {

+            for ($i = 0; $i < ($NN - $NROOTS - $PAD); $i++) {

                 

                 $feedback = $INDEX_OF[$data[$i] ^ $parity[0]];

-                if($feedback != $A0) {      

+                if ($feedback != $A0) {      

                     // feedback term is non-zero

             

                     // This line is unnecessary when GENPOLY[NROOTS] is unity, as it must

                     // always be for the polynomials constructed by init_rs()

                     $feedback = $this->modnn($NN - $GENPOLY[$NROOTS] + $feedback);

             

-                    for($j=1;$j<$NROOTS;$j++) {

-                        $parity[$j] ^= $ALPHA_TO[$this->modnn($feedback + $GENPOLY[$NROOTS-$j])];

+                    for ($j = 1; $j < $NROOTS; $j++) {

+                        $parity[$j] ^= $ALPHA_TO[$this->modnn($feedback + $GENPOLY[$NROOTS - $j])];

                     }

                 }

                 

                 // Shift 

                 array_shift($parity);

-                if($feedback != $A0) {

+                if ($feedback != $A0) {

                     array_push($parity, $ALPHA_TO[$this->modnn($feedback + $GENPOLY[0])]);

                 } else {

                     array_push($parity, 0);

@@ -2449,13 +2449,13 @@ 
         //----------------------------------------------------------------------

         public static function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad)

         {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 

                 return $rs;

             }

@@ -2519,10 +2519,10 @@ 
         public function writeFormatInformation($width, &$frame, $mask, $level)

         {

             $blacks = 0;

-            $format =  QRspec::getFormatInfo($mask, $level);

+            $format = QRspec::getFormatInfo($mask, $level);

 

-            for($i=0; $i<8; $i++) {

-                if($format & 1) {

+            for ($i = 0; $i < 8; $i++) {

+                if ($format & 1) {

                     $blacks += 2;

                     $v = 0x85;

                 } else {

@@ -2530,7 +2530,7 @@ 
                 }

                 

                 $frame[8][$width - 1 - $i] = chr($v);

-                if($i < 6) {

+                if ($i < 6) {

                     $frame[$i][8] = chr($v);

                 } else {

                     $frame[$i + 1][8] = chr($v);

@@ -2538,8 +2538,8 @@ 
                 $format = $format >> 1;

             }

             

-            for($i=0; $i<7; $i++) {

-                if($format & 1) {

+            for ($i = 0; $i < 7; $i++) {

+                if ($format & 1) {

                     $blacks += 2;

                     $v = 0x85;

                 } else {

@@ -2547,7 +2547,7 @@ 
                 }

                 

                 $frame[$width - 7 + $i][8] = chr($v);

-                if($i == 0) {

+                if ($i == 0) {

                     $frame[8][7] = chr($v);

                 } else {

                     $frame[8][6 - $i] = chr($v);

@@ -2560,27 +2560,27 @@ 
         }

         

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

-        public function mask0($x, $y) { return ($x+$y)&1;                       }

-        public function mask1($x, $y) { return ($y&1);                          }

-        public function mask2($x, $y) { return ($x%3);                          }

-        public function mask3($x, $y) { return ($x+$y)%3;                       }

-        public function mask4($x, $y) { return (((int)($y/2))+((int)($x/3)))&1; }

-        public function mask5($x, $y) { return (($x*$y)&1)+($x*$y)%3;           }

-        public function mask6($x, $y) { return ((($x*$y)&1)+($x*$y)%3)&1;       }

-        public function mask7($x, $y) { return ((($x*$y)%3)+(($x+$y)&1))&1;     }

+        public function mask0($x, $y) { return ($x + $y) & 1; }

+        public function mask1($x, $y) { return ($y & 1); }

+        public function mask2($x, $y) { return ($x % 3); }

+        public function mask3($x, $y) { return ($x + $y) % 3; }

+        public function mask4($x, $y) { return (((int) ($y / 2)) + ((int) ($x / 3))) & 1; }

+        public function mask5($x, $y) { return (($x * $y) & 1) + ($x * $y) % 3; }

+        public function mask6($x, $y) { return ((($x * $y) & 1) + ($x * $y) % 3) & 1; }

+        public function mask7($x, $y) { return ((($x * $y) % 3) + (($x + $y) & 1)) & 1; }

         

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

         private function generateMaskNo($maskNo, $width, $frame)

         {

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

             

-            for($y=0; $y<$width; $y++) {

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

-                    if(ord($frame[$y][$x]) & 0x80) {

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

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

+                    if (ord($frame[$y][$x]) & 0x80) {

                         $bitMask[$y][$x] = 0;

                     } else {

-                        $maskFunc = call_user_func([$this, 'mask'.$maskNo], $x, $y);

-                        $bitMask[$y][$x] = ($maskFunc == 0)?1:0;

+                        $maskFunc = call_user_func([$this, 'mask' . $maskNo], $x, $y);

+                        $bitMask[$y][$x] = ($maskFunc == 0) ? 1 : 0;

                     }

                     

                 }

@@ -2618,15 +2618,15 @@ 
             $b = 0;

             $bitMask = [];

             

-            $fileName = QR_CACHE_DIR.'mask_'.$maskNo.DIRECTORY_SEPARATOR.'mask_'.$width.'_'.$maskNo.'.dat';

+            $fileName = QR_CACHE_DIR . 'mask_' . $maskNo . DIRECTORY_SEPARATOR . 'mask_' . $width . '_' . $maskNo . '.dat';

 

             if (QR_CACHEABLE) {

                 if (file_exists($fileName)) {

                     $bitMask = self::unserial(file_get_contents($fileName));

                 } else {

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

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

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

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

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

                     file_put_contents($fileName, self::serial($bitMask));

                 }

             } else {

@@ -2638,12 +2638,12 @@ 
                 

             $d = $s;

 

-            for($y=0; $y<$width; $y++) {

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

-                    if($bitMask[$y][$x] == 1) {

-                        $d[$y][$x] = chr(ord($s[$y][$x]) ^ (int)$bitMask[$y][$x]);

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

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

+                    if ($bitMask[$y][$x] == 1) {

+                        $d[$y][$x] = chr(ord($s[$y][$x]) ^ (int) $bitMask[$y][$x]);

                     }

-                    $b += (int)(ord($d[$y][$x]) & 1);

+                    $b += (int) (ord($d[$y][$x]) & 1);

                 }

             }

 

@@ -2665,21 +2665,21 @@ 
         {

             $demerit = 0;

 

-            for($i=0; $i<$length; $i++) {

+            for ($i = 0; $i < $length; $i++) {

                 

-                if($this->runLength[$i] >= 5) {

+                if ($this->runLength[$i] >= 5) {

                     $demerit += (N1 + ($this->runLength[$i] - 5));

                 }

-                if($i & 1) {

-                    if(($i >= 3) && ($i < ($length-2)) && ($this->runLength[$i] % 3 == 0)) {

-                        $fact = (int)($this->runLength[$i] / 3);

-                        if(($this->runLength[$i-2] == $fact) &&

-                           ($this->runLength[$i-1] == $fact) &&

-                           ($this->runLength[$i+1] == $fact) &&

-                           ($this->runLength[$i+2] == $fact)) {

-                            if(($this->runLength[$i-3] < 0) || ($this->runLength[$i-3] >= (4 * $fact))) {

+                if ($i & 1) {

+                    if (($i >= 3) && ($i < ($length - 2)) && ($this->runLength[$i] % 3 == 0)) {

+                        $fact = (int) ($this->runLength[$i] / 3);

+                        if (($this->runLength[$i - 2] == $fact) &&

+                           ($this->runLength[$i - 1] == $fact) &&

+                           ($this->runLength[$i + 1] == $fact) &&

+                           ($this->runLength[$i + 2] == $fact)) {

+                            if (($this->runLength[$i - 3] < 0) || ($this->runLength[$i - 3] >= (4 * $fact))) {

                                 $demerit += N3;

-                            } else if((($i+3) >= $length) || ($this->runLength[$i+3] >= (4 * $fact))) {

+                            } else if ((($i + 3) >= $length) || ($this->runLength[$i + 3] >= (4 * $fact))) {

                                 $demerit += N3;

                             }

                         }

@@ -2695,30 +2695,30 @@ 
             $head = 0;

             $demerit = 0;

 

-            for($y=0; $y<$width; $y++) {

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

                 $head = 0;

                 $this->runLength[0] = 1;

                 

                 $frameY = $frame[$y];

                 

-                if ($y>0)

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

+                if ($y > 0)

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

                 

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

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

-                        $b22 = ord($frameY[$x]) & ord($frameY[$x-1]) & ord($frameYM[$x]) & ord($frameYM[$x-1]);

-                        $w22 = ord($frameY[$x]) | ord($frameY[$x-1]) | ord($frameYM[$x]) | ord($frameYM[$x-1]);

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

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

+                        $b22 = ord($frameY[$x]) & ord($frameY[$x - 1]) & ord($frameYM[$x]) & ord($frameYM[$x - 1]);

+                        $w22 = ord($frameY[$x]) | ord($frameY[$x - 1]) | ord($frameYM[$x]) | ord($frameYM[$x - 1]);

                         

-                        if(($b22 | ($w22 ^ 1))&1) {                                                                     

+                        if (($b22 | ($w22 ^ 1)) & 1) {                                                                     

                             $demerit += N2;

                         }

                     }

-                    if(($x == 0) && (ord($frameY[$x]) & 1)) {

+                    if (($x == 0) && (ord($frameY[$x]) & 1)) {

                         $this->runLength[0] = -1;

                         $head = 1;

                         $this->runLength[$head] = 1;

-                    } else if($x > 0) {

-                        if((ord($frameY[$x]) ^ ord($frameY[$x-1])) & 1) {

+                    } else if ($x > 0) {

+                        if ((ord($frameY[$x]) ^ ord($frameY[$x - 1])) & 1) {

                             $head++;

                             $this->runLength[$head] = 1;

                         } else {

@@ -2727,20 +2727,20 @@ 
                     }

                 }

     

-                $demerit += $this->calcN1N3($head+1);

+                $demerit += $this->calcN1N3($head + 1);

             }

 

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

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

                 $head = 0;

                 $this->runLength[0] = 1;

                 

-                for($y=0; $y<$width; $y++) {

-                    if($y == 0 && (ord($frame[$y][$x]) & 1)) {

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

+                    if ($y == 0 && (ord($frame[$y][$x]) & 1)) {

                         $this->runLength[0] = -1;

                         $head = 1;

                         $this->runLength[$head] = 1;

-                    } else if($y > 0) {

-                        if((ord($frame[$y][$x]) ^ ord($frame[$y-1][$x])) & 1) {

+                    } else if ($y > 0) {

+                        if ((ord($frame[$y][$x]) ^ ord($frame[$y - 1][$x])) & 1) {

                             $head++;

                             $this->runLength[$head] = 1;

                         } else {

@@ -2749,7 +2749,7 @@ 
                     }

                 }

             

-                $demerit += $this->calcN1N3($head+1);

+                $demerit += $this->calcN1N3($head + 1);

             }

 

             return $demerit;

@@ -2763,13 +2763,13 @@ 
             $bestMaskNum = 0;

             $bestMask = [];

             

-            $checked_masks = [0,1,2,3,4,5,6,7];

+            $checked_masks = [0, 1, 2, 3, 4, 5, 6, 7];

             

             if (QR_FIND_FROM_RANDOM !== false) {

             

-                $howManuOut = 8-(QR_FIND_FROM_RANDOM % 9);

-                for ($i = 0; $i <  $howManuOut; $i++) {

-                    $remPos = rand (0, count($checked_masks)-1);

+                $howManuOut = 8 - (QR_FIND_FROM_RANDOM % 9);

+                for ($i = 0; $i < $howManuOut; $i++) {

+                    $remPos = rand(0, count($checked_masks) - 1);

                     unset($checked_masks[$remPos]);

                     $checked_masks = array_values($checked_masks);

                 }

@@ -2778,18 +2778,18 @@ 
             

             $bestMask = $frame;

              

-            foreach($checked_masks as $i) {

+            foreach ($checked_masks as $i) {

                 $mask = array_fill(0, $width, str_repeat("\0", $width));

 

                 $demerit = 0;

                 $blacks = 0;

                 $blacks  = $this->makeMaskNo($i, $width, $frame, $mask);

                 $blacks += $this->writeFormatInformation($width, $mask, $i, $level);

-                $blacks  = (int)(100 * $blacks / ($width * $width));

-                $demerit = (int)((int)(abs($blacks - 50) / 5) * N4);

+                $blacks  = (int) (100 * $blacks / ($width * $width));

+                $demerit = (int) ((int) (abs($blacks - 50) / 5) * N4);

                 $demerit += $this->evaluateSymbol($width, $mask);

                 

-                if($demerit < $minDemerit) {

+                if ($demerit < $minDemerit) {

                     $minDemerit = $demerit;

                     $bestMask = $mask;

                     $bestMaskNum = $i;

@@ -2869,10 +2869,10 @@ 
         //----------------------------------------------------------------------

         public function __construct(QRinput $input)

         {

-            $spec = [0,0,0,0,0];

+            $spec = [0, 0, 0, 0, 0];

             

             $this->datacode = $input->getByteStream();

-            if(is_null($this->datacode)) {

+            if (is_null($this->datacode)) {

                 throw new Exception('null imput string');

             }

 

@@ -2886,7 +2886,7 @@ 
             $this->blocks = QRspec::rsBlockNum($spec);

             

             $ret = $this->init($spec);

-            if($ret < 0) {

+            if ($ret < 0) {

                 throw new Exception('block alloc error');

                 return null;

             }

@@ -2905,29 +2905,29 @@ 
             $blockNo = 0;

             $dataPos = 0;

             $eccPos = 0;

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

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

-                $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el,  $ecc, $rs);

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

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

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

+                $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el, $ecc, $rs);

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

                 

                 $dataPos += $dl;

                 $eccPos += $el;

                 $blockNo++;

             }

 

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

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

                 return 0;

 

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

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

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

             

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

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

             

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

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

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

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

                 $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el, $ecc, $rs);

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

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

                 

                 $dataPos += $dl;

                 $eccPos += $el;

@@ -2942,14 +2942,14 @@ 
         {

             $ret;

 

-            if($this->count < $this->dataLength) {

+            if ($this->count < $this->dataLength) {

                 $row = $this->count % $this->blocks;

                 $col = $this->count / $this->blocks;

-                if($col >= $this->rsblocks[0]->dataLength) {

+                if ($col >= $this->rsblocks[0]->dataLength) {

                     $row += $this->b1;

                 }

                 $ret = $this->rsblocks[$row]->data[$col];

-            } else if($this->count < $this->dataLength + $this->eccLength) {

+            } else if ($this->count < $this->dataLength + $this->eccLength) {

                 $row = ($this->count - $this->dataLength) % $this->blocks;

                 $col = ($this->count - $this->dataLength) / $this->blocks;

                 $ret = $this->rsblocks[$row]->ecc[$col];

@@ -2973,10 +2973,10 @@ 
         //----------------------------------------------------------------------

         public function encodeMask(QRinput $input, $mask)

         {

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

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

                 throw new Exception('wrong version');

             }

-            if($input->getErrorCorrectionLevel() > QR_ECLEVEL_H) {

+            if ($input->getErrorCorrectionLevel() > QR_ECLEVEL_H) {

                 throw new Exception('wrong level');

             }

 

@@ -2989,15 +2989,15 @@ 
             $frame = QRspec::newFrame($version);

             

             $filler = new FrameFiller($width, $frame);

-            if(is_null($filler)) {

+            if (is_null($filler)) {

                 return NULL;

             }

 

             // inteleaved data and ecc codes

-            for($i=0; $i<$raw->dataLength + $raw->eccLength; $i++) {

+            for ($i = 0; $i < $raw->dataLength + $raw->eccLength; $i++) {

                 $code = $raw->getCode();

                 $bit = 0x80;

-                for($j=0; $j<8; $j++) {

+                for ($j = 0; $j < 8; $j++) {

                     $addr = $filler->next();

                     $filler->setFrameAt($addr, 0x02 | (($bit & $code) != 0));

                     $bit = $bit >> 1;

@@ -3010,7 +3010,7 @@ 
             

             // remainder bits

             $j = QRspec::getRemainder($version);

-            for($i=0; $i<$j; $i++) {

+            for ($i = 0; $i < $j; $i++) {

                 $addr = $filler->next();

                 $filler->setFrameAt($addr, 0x02);

             }

@@ -3021,7 +3021,7 @@ 
             

             // masking

             $maskObj = new QRmask();

-            if($mask < 0) {

+            if ($mask < 0) {

             

                 if (QR_FIND_BEST_MASK) {

                     $masked = $maskObj->mask($width, $frame, $input->getErrorCorrectionLevel());

@@ -3032,7 +3032,7 @@ 
                 $masked = $maskObj->makeMask($width, $frame, $mask, $input->getErrorCorrectionLevel());

             }

             

-            if($masked == NULL) {

+            if ($masked == NULL) {

                 return NULL;

             }

             

@@ -3054,16 +3054,16 @@ 
         //----------------------------------------------------------------------

         public function encodeString8bit($string, $version, $level)

         {

-            if(string == NULL) {

+            if (string == NULL) {

                 throw new Exception('empty string!');

                 return NULL;

             }

 

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

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

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

 

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

-            if($ret < 0) {

+            if ($ret < 0) {

                 unset($input);

                 return NULL;

             }

@@ -3074,16 +3074,16 @@ 
         public function encodeString($string, $version, $level, $hint, $casesensitive)

         {

 

-            if($hint != QR_MODE_8 && $hint != QR_MODE_KANJI) {

+            if ($hint != QR_MODE_8 && $hint != QR_MODE_KANJI) {

                 throw new Exception('bad hint');

                 return NULL;

             }

 

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

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

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

 

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

-            if($ret < 0) {

+            if ($ret < 0) {

                 return NULL;

             }

 

@@ -3091,10 +3091,10 @@ 
         }

         

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

-        public static function png($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint=false) 

+        public static function png($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint = false) 

         {

             $enc = QRencode::factory($level, $size, $margin);

-            return $enc->encodePNG($text, $outfile, $saveandprint=false);

+            return $enc->encodePNG($text, $outfile, $saveandprint = false);

         }

 

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

@@ -3151,7 +3151,7 @@ 
         {

             do {

             

-                if($this->bit == -1) {

+                if ($this->bit == -1) {

                     $this->bit = 0;

                     return ['x'=>$this->x, 'y'=>$this->y];

                 }

@@ -3160,7 +3160,7 @@ 
                 $y = $this->y;

                 $w = $this->width;

 

-                if($this->bit == 0) {

+                if ($this->bit == 0) {

                     $x--;

                     $this->bit++;

                 } else {

@@ -3169,33 +3169,33 @@ 
                     $this->bit--;

                 }

 

-                if($this->dir < 0) {

-                    if($y < 0) {

+                if ($this->dir < 0) {

+                    if ($y < 0) {

                         $y = 0;

                         $x -= 2;

                         $this->dir = 1;

-                        if($x == 6) {

+                        if ($x == 6) {

                             $x--;

                             $y = 9;

                         }

                     }

                 } else {

-                    if($y == $w) {

+                    if ($y == $w) {

                         $y = $w - 1;

                         $x -= 2;

                         $this->dir = -1;

-                        if($x == 6) {

+                        if ($x == 6) {

                             $x--;

                             $y -= 8;

                         }

                     }

                 }

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

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

 

                 $this->x = $x;

                 $this->y = $y;

 

-            } while(ord($this->frame[$y][$x]) & 0x80);

+            } while (ord($this->frame[$y][$x]) & 0x80);

                         

             return ['x'=>$x, 'y'=>$y];

         }

@@ -3225,7 +3225,7 @@ 
             $enc->size = $size;

             $enc->margin = $margin;

             

-            switch ($level.'') {

+            switch ($level . '') {

                 case '0':

                 case '1':

                 case '2':

@@ -3258,7 +3258,7 @@ 
         {

             $code = new QRcode();

 

-            if($this->eightbit) {

+            if ($this->eightbit) {

                 $code->encodeString8bit($intext, $this->version, $this->level);

             } else {

                 $code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive);

@@ -3272,7 +3272,7 @@ 
         {

             $code = new QRcode();

 

-            if($this->eightbit) {

+            if ($this->eightbit) {

                 $code->encodeString8bit($intext, $this->version, $this->level);

             } else {

                 $code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive);

@@ -3280,7 +3280,7 @@ 
             

             QRtools::markTime('after_encode');

             

-            if ($outfile!== false) {

+            if ($outfile !== false) {

                 file_put_contents($outfile, join("\n", QRtools::binarize($code->data)));

             } else {

                 return QRtools::binarize($code->data);

@@ -3288,7 +3288,7 @@ 
         }

         

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

-        public function encodePNG($intext, $outfile = false,$saveandprint=false) 

+        public function encodePNG($intext, $outfile = false, $saveandprint = false) 

         {

             try {

             

@@ -3300,9 +3300,9 @@ 
                 if ($err != '')

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

                 

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

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

                 

-                return QRimage::png($tab, $outfile, min(max(1, $this->size), $maxSize), $this->margin,$saveandprint);

+                return QRimage::png($tab, $outfile, min(max(1, $this->size), $maxSize), $this->margin, $saveandprint);

             

             } catch (Exception $e) {

             

core/RADIUSTests.php

Doc Comments +7 added lines, -4 removed lines

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

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

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

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

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,6 +675,6 @@ 
 private $i_path;
   
 }
-function profile_sort($P1,$P2) {
+function profile_sort($P1, $P2) {
    return strcasecmp($P1->name, $P2->name);
 } 
\ No newline at end of file

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

@@ -170,13 +170,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']);
             $caSanitized = substr($ca['pem'], 27, strlen($ca['pem']) - 27 - 25 - 1);
-            debug(2,$caSanitized."\n");
+            debug(2, $caSanitized . "\n");
             // remove \n
             $caSanitized = str_replace("\n", "", $caSanitized);
             $jsonArray["Certificates"][] = ["GUID" => "{" . $ca['uuid'] . "}", "Type" => "Authority", "X509" => $caSanitized];
-            debug(2,$caSanitized."\n");
+            debug(2, $caSanitized . "\n");
         }
                 
         $outputJson = json_encode($jsonArray, JSON_PRETTY_PRINT);

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

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