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

Indentation +3 added lines, -3 removed lines

@@ -191,9 +191,9 @@
      * gets the language setting in CAT
      */
     static public function get_lang() {
-       if(self::$LANG === '')
-         list(self::$LANG, $xx) = self::set_lang();
-       return self::$LANG;
+        if(self::$LANG === '')
+            list(self::$LANG, $xx) = self::set_lang();
+        return self::$LANG;
     }
 
     /**

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

Braces +17 added lines, -12 removed lines

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

core/DBConnection.php

Doc Comments +4 added lines

@@ -87,6 +87,7 @@ 
     /**
      * executes a query and triggers logging to the SQL audit log if it's not a SELECT
      * @param string $querystring the query to be executed
+     * @param string $db
      * @return mixed the query result as mysqli_result object; or TRUE on non-return-value statements
      */
     public static function exec($db, $querystring) {
@@ -134,6 +135,8 @@ 
     /**
      * Checks if a raw data pointer is public data (return value FALSE) or if 
      * yes who the authorised admins to view it are (return array of user IDs)
+     * @param string $table
+     * @param string $row
      */
     public static function isDataRestricted($table, $row) {
         if ($table != "institution_option" && $table != "profile_option" && $table != "federation_option")
@@ -175,6 +178,7 @@ 
 
     /**
      * Retrieves the last auto-id of an INSERT. Needs to be called immediately after the corresponding exec() call
+     * @param string $db
      * @return int the last autoincrement-ID
      */
     public static function lastID($db) {

Braces +25 added lines, -14 removed lines

@@ -106,8 +106,9 @@ 
         }
 
         // log exact query to audit log, if it's not a SELECT
-        if (preg_match("/^SELECT/i", $querystring) == 0)
-            CAT::writeSQLAudit("[DB: " . strtoupper($db) . "] " . $querystring);
+        if (preg_match("/^SELECT/i", $querystring) == 0) {
+                    CAT::writeSQLAudit("[DB: " . strtoupper($db) . "] " . $querystring);
+        }
         return $result;
     }
 
@@ -120,14 +121,17 @@ 
      */
     public static function fetchRawDataByIndex($table, $row) {
         // only for select tables!
-        if ($table != "institution_option" && $table != "profile_option" && $table != "federation_option")
-            return FALSE;
+        if ($table != "institution_option" && $table != "profile_option" && $table != "federation_option") {
+                    return FALSE;
+        }
         $blob_query = DBConnection::exec("INST", "SELECT option_value from $table WHERE row = $row");
-        while ($a = mysqli_fetch_object($blob_query))
-            $blob = $a->option_value;
+        while ($a = mysqli_fetch_object($blob_query)) {
+                    $blob = $a->option_value;
+        }
 
-        if (!isset($blob))
-            return FALSE;
+        if (!isset($blob)) {
+                    return FALSE;
+        }
         return $blob;
     }
 
@@ -136,13 +140,17 @@ 
      * yes who the authorised admins to view it are (return array of user IDs)
      */
     public static function isDataRestricted($table, $row) {
-        if ($table != "institution_option" && $table != "profile_option" && $table != "federation_option")
-            return []; // better safe than sorry: that's an error, so assume nobody is authorised to act on that data
+        if ($table != "institution_option" && $table != "profile_option" && $table != "federation_option") {
+                    return [];
+        }
+        // better safe than sorry: that's an error, so assume nobody is authorised to act on that data
         switch ($table) {
             case "profile_option":
                 $blob_query = DBConnection::exec("INST", "SELECT profile_id from $table WHERE row = $row");
-                while ($a = mysqli_fetch_object($blob_query)) // only one row
+                while ($a = mysqli_fetch_object($blob_query)) {
+                    // only one row
                     $blobprofile = $a->profile_id;
+                }
                 // is the profile in question public?
                 $profile = new Profile($blobprofile);
                 if ($profile->getShowtime() == TRUE) { // public data
@@ -154,8 +162,10 @@ 
                 break;
             case "institution_option":
                 $blob_query = DBConnection::exec("INST", "SELECT institution_id from $table WHERE row = $row");
-                while ($a = mysqli_fetch_object($blob_query)) // only one row
+                while ($a = mysqli_fetch_object($blob_query)) {
+                    // only one row
                     $blobinst = $a->institution_id;
+                }
                 $inst = new IdP($blobinst);
                 // if at least one of the profiles belonging to the inst is public, the data is public
                 if ($inst->isOneProfileShowtime()) { // public data
@@ -209,8 +219,9 @@ 
             exit(1);
         }
 
-        if ($db == "EXTERNAL" && Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team")
-            mysqli_query($this->connection, "SET NAMES 'latin1'");
+        if ($db == "EXTERNAL" && Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") {
+                    mysqli_query($this->connection, "SET NAMES 'latin1'");
+        }
     }
 
 }

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

Indentation +421 added lines, -421 removed lines

@@ -6,10 +6,10 @@ 
 ?>
 <?php
 /**
-  * This file defines the abstract Device class
-  *
-  * @package ModuleWriting
-  */
+ * This file defines the abstract Device class
+ *
+ * @package ModuleWriting
+ */
 
 /**
  * 
@@ -46,10 +46,10 @@ 
  */
 
 abstract class DeviceConfig {
-   /**
-    * stores the path to the temporary working directory for a module instance
-    * @var string $FPATH
-    */
+    /**
+     * stores the path to the temporary working directory for a module instance
+     * @var string $FPATH
+     */
     public $FPATH;
 
     /**
@@ -58,390 +58,390 @@ 
      */
     public $specialities;
 
-   /**
+    /**
      * device module constructor should be defined by each module, but if it is not, then here is a default one
      */
 
-      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);
+        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);
     }
 
 
-   /**
-    * Set up working environment for a device module
-    *
-    * Sets up the device module environment taking into account the actual profile
-    * selected by the user in the GUI. The selected profile is passed as the
-    * Profile $profile argumant.
-    *
-    * This method needs to be called after the device instance has been created (the GUI class does that)
-    *
-    * setup performs the following tasks:
-    * - collect profile attributes and pass them as the attributes property;
-    * - create the temporary working directory
-    * - process CA certificates and store them as 'internal:CAs' attribute
-    * - process and save optional info files and store references to them in
-    *   'internal:info_file' attribute
-    * @param Profile $profile the profile object which will be passed by the caller
-    * @final not to be redefined
-    */
+    /**
+     * Set up working environment for a device module
+     *
+     * Sets up the device module environment taking into account the actual profile
+     * selected by the user in the GUI. The selected profile is passed as the
+     * Profile $profile argumant.
+     *
+     * This method needs to be called after the device instance has been created (the GUI class does that)
+     *
+     * setup performs the following tasks:
+     * - collect profile attributes and pass them as the attributes property;
+     * - create the temporary working directory
+     * - process CA certificates and store them as 'internal:CAs' attribute
+     * - process and save optional info files and store references to them in
+     *   'internal:info_file' attribute
+     * @param Profile $profile the profile object which will be passed by the caller
+     * @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");
-          error("No profile has been set");
-          exit;
-       }
-       $this->attributes = $this->getProfileAttributes($profile);
-       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');
-       $CAs = [];
-       if(isset($this->attributes['eap:ca_file'])) {
-       foreach ($this->attributes['eap:ca_file'] as $ca) {
-          if($c = X509::processCertificate($ca))
-             $CAs[] = $c;
-          }
-          $this->attributes['internal:CAs'][0]=$CAs;
-       }
-       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']))
-          $this->attributes['internal:logo_file'] = 
-             $this->saveLogoFile($this->attributes['general:logo_file']);
-       $this->attributes['internal:SSID'] = $this->getSSIDs()['add'];;
-       $this->attributes['internal:remove_SSID'] = $this->getSSIDs()['del'];;
-       $this->attributes['internal:consortia'] = $this->getConsortia();
-       $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']);
-       CAT::set_locale($olddomain);
-
-       if($this->signer && $this->options['sign'])
-         $this->sign = CAT::$root . '/signer/'. $this->signer;
-       $this->installerBasename = $this->getInstallerBasename();
+        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) {
+            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');
+        $CAs = [];
+        if(isset($this->attributes['eap:ca_file'])) {
+        foreach ($this->attributes['eap:ca_file'] as $ca) {
+            if($c = X509::processCertificate($ca))
+                $CAs[] = $c;
+            }
+            $this->attributes['internal:CAs'][0]=$CAs;
+        }
+        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']))
+            $this->attributes['internal:logo_file'] = 
+                $this->saveLogoFile($this->attributes['general:logo_file']);
+        $this->attributes['internal:SSID'] = $this->getSSIDs()['add'];;
+        $this->attributes['internal:remove_SSID'] = $this->getSSIDs()['del'];;
+        $this->attributes['internal:consortia'] = $this->getConsortia();
+        $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']);
+        CAT::set_locale($olddomain);
+
+        if($this->signer && $this->options['sign'])
+            $this->sign = CAT::$root . '/signer/'. $this->signer;
+        $this->installerBasename = $this->getInstallerBasename();
     }
 
-  /**
-    * Selects the preferred eap method based on profile EAP configuration and device EAP capabilities
-    *
-    * @param array eap_array an array of eap methods supported by a given device
-    * @return the best matching EAP type for the profile; or 0 if no match was found
-    */   
-   public function getPreferredEapType($eap_array) {
-     foreach ($eap_array as $eap) {
-         if(in_array($eap,$this->supportedEapMethods)) {
+    /**
+     * Selects the preferred eap method based on profile EAP configuration and device EAP capabilities
+     *
+     * @param array eap_array an array of eap methods supported by a given device
+     * @return the best matching EAP type for the profile; or 0 if no match was found
+     */   
+    public function getPreferredEapType($eap_array) {
+        foreach ($eap_array as $eap) {
+            if(in_array($eap,$this->supportedEapMethods)) {
             $this->selected_eap = $eap;
             debug(4,"Selected EAP:");
             debug(4,$eap);
             return($eap);
-         }
-     }
-     return(0);
-   }
-  /**
-    * prepare usage information for the installer
-    * every device module should override this method
-    *
-    * @return String HTML text to be displayed
-    */ 
-   public function writeDeviceInfo() {
-     return _("Sorry, this should not happen - no additional information is available");
-   }
-
-  /**
-    *  Copy a file from the module location to the temporary directory.
-    *
-    * If the second argument is provided then the file will be saved under the name 
-    * taken form this argument. If only one parameter is given, source and destination
-    * filenames are the same
-    * Source file can be located either in the Files subdirectory or in the sibdirectory of Files
-    * 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
-    *
-    * @return bool result of the copy operation
-    * @final not to be redefined
-    */
-   final protected function copyFile($source_name, $output_name = 0) {
-      if  ( $output_name === 0)
+            }
+        }
+        return(0);
+    }
+    /**
+     * prepare usage information for the installer
+     * every device module should override this method
+     *
+     * @return String HTML text to be displayed
+     */ 
+    public function writeDeviceInfo() {
+        return _("Sorry, this should not happen - no additional information is available");
+    }
+
+    /**
+     *  Copy a file from the module location to the temporary directory.
+     *
+     * If the second argument is provided then the file will be saved under the name 
+     * taken form this argument. If only one parameter is given, source and destination
+     * filenames are the same
+     * Source file can be located either in the Files subdirectory or in the sibdirectory of Files
+     * 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
+     *
+     * @return bool result of the copy operation
+     * @final not to be redefined
+     */
+    final protected function copyFile($source_name, $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;
-      else {
+        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");
         return(FALSE);
-      }
-      debug(4,"Copying $source to $output_name\n");
-      $result = copy($source,"$output_name");
-      if(! $result )
+        }
+        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); 
-   }
-
-
-  /**
-    *  Copy a file from the module location to the temporary directory aplying transcoding.
-    *
-    * Transcoding is only required for Windows installers, and no Unicode support
-    * in NSIS (NSIS version below 3)
-    * Trancoding is only applied if the third optional parameter is set and nonzero
-    * If Config::$NSIS_VERSION is set to 3 or more, no transcoding will be applied
-    * regardless of the third parameter value.
-    * If the second argument is provided and is not equal to 0, then the file will be
-    * saved under the name taken from this argument.
-    * If only one parameter is given or the second is equal to 0, source and destination
-    * filenames are the same.
-    * The third 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.
-    * Source file can be located either in the Files subdirectory or in the sibdirectory of Files
-    * 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
-    *
-    * @final not to be redefined
-    */
-
-   final protected function translateFile($source_name, $output_name = 0, $encoding = 0) {
-      if(Config::$NSIS_VERSION >= 3)
+        return($result); 
+    }
+
+
+    /**
+     *  Copy a file from the module location to the temporary directory aplying transcoding.
+     *
+     * Transcoding is only required for Windows installers, and no Unicode support
+     * in NSIS (NSIS version below 3)
+     * Trancoding is only applied if the third optional parameter is set and nonzero
+     * If Config::$NSIS_VERSION is set to 3 or more, no transcoding will be applied
+     * regardless of the third parameter value.
+     * If the second argument is provided and is not equal to 0, then the file will be
+     * saved under the name taken from this argument.
+     * If only one parameter is given or the second is equal to 0, source and destination
+     * filenames are the same.
+     * The third 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.
+     * Source file can be located either in the Files subdirectory or in the sibdirectory of Files
+     * 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
+     *
+     * @final not to be redefined
+     */
+
+    final protected function translateFile($source_name, $output_name = 0, $encoding = 0) {
+        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");
-      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;
-      include($source);
-      $output = ob_get_clean();
-      if($encoding) {
+        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;
+        include($source);
+        $output = ob_get_clean();
+        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);
-      fclose($f);
-      debug(4,"translateFile($source, $output_name, $encoding) end\n");
-   }
-
-
-  /**
-    * Transcode a string adding double quotes escaping
-    *
-    * Transcoding is only required for Windows installers, and no Unicode support
-    * in NSIS (NSIS version below 3)
-    * Trancoding is only applied if the third optional parameter is set and nonzero
-    * If Config::$NSIS_VERSION is set to 3 or more, no transcoding will be applied
-    * regardless of the second parameter value.
-    * 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
-    */
-
-   final protected function translateString($source_string,$encoding = 0) {
-      if(Config::$NSIS_VERSION >= 3)
+            $output = $output_c;
+        }
+        $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");
+    }
+
+
+    /**
+     * Transcode a string adding double quotes escaping
+     *
+     * Transcoding is only required for Windows installers, and no Unicode support
+     * in NSIS (NSIS version below 3)
+     * Trancoding is only applied if the third optional parameter is set and nonzero
+     * If Config::$NSIS_VERSION is set to 3 or more, no transcoding will be applied
+     * regardless of the second parameter value.
+     * 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
+     */
+
+    final protected function translateString($source_string,$encoding = 0) {
+        if(Config::$NSIS_VERSION >= 3)
         $encoding = 0;
-      if($encoding)
+        if($encoding)
         $output_c = iconv('UTF-8',$encoding.'//TRANSLIT',$source_string);
-      else
+        else
         $output_c = $source_string;
-      if($output_c) 
-         $source_string  = str_replace('"','$\\"',$output_c);
-      else
-         debug(2,"Failed to convert string $source_string\n");
-      return $source_string;
-   }
-
-
-  /**
-   * Save certificate files in either DER or PEM format
-   *
-   * Certificate files will be saved in the module working directory.
-   * @param string $format  only "der" and "pem" are currently allowed
-   * @return array an array of arrays or FALSE on error
-   * saved certificate file names are avalable under the 'file' index
-   * additional array entries are indexed as 'sha1', 'md5', and 'root'.
-   * sha1 and md5 are correcponding certificate hashes
-   * root is set to 1 for the CA roor certicicate and 0 otherwise
-  */ 
-   final protected function saveCertificateFiles($format) {
-     if($format == 'der' || $format == 'pam') {
-       $i = 0;
-       $CA_files = [];
-       $ca_array = $this->attributes['internal:CAs'][0];
-       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")
+        if($output_c) 
+            $source_string  = str_replace('"','$\\"',$output_c);
+        else
+            debug(2,"Failed to convert string $source_string\n");
+        return $source_string;
+    }
+
+
+    /**
+     * Save certificate files in either DER or PEM format
+     *
+     * Certificate files will be saved in the module working directory.
+     * @param string $format  only "der" and "pem" are currently allowed
+     * @return array an array of arrays or FALSE on error
+     * saved certificate file names are avalable under the 'file' index
+     * additional array entries are indexed as 'sha1', 'md5', and 'root'.
+     * sha1 and md5 are correcponding certificate hashes
+     * root is set to 1 for the CA roor certicicate and 0 otherwise
+     */ 
+    final protected function saveCertificateFiles($format) {
+        if($format == 'der' || $format == 'pam') {
+        $i = 0;
+        $CA_files = [];
+        $ca_array = $this->attributes['internal:CAs'][0];
+        if(! $ca_array)
+            return(FALSE);
+        foreach ($ca_array as $CA) {
+            $f = fopen("cert-$i.crt","w");
+            if(! $f) die("problem opening the file\n");
+            if($format == "pem")
             fwrite($f,$CA['pem']);
-         else
+            else
             fwrite($f,$CA['der']);
-         fclose($f);
-         $C = [];
-         $C['file'] = "cert-$i.crt";
-         $C['sha1'] = $CA['sha1'];
-         $C['md5'] = $CA['md5'];
-         $C['root'] = $CA['root'];
-         $CA_files[] = $C;
-         $i++;
-       }
-       return($CA_files);
-     } else {
-       debug(2, 'incorrect format value specified');
-       return(FALSE);
-     }
+            fclose($f);
+            $C = [];
+            $C['file'] = "cert-$i.crt";
+            $C['sha1'] = $CA['sha1'];
+            $C['md5'] = $CA['md5'];
+            $C['root'] = $CA['root'];
+            $CA_files[] = $C;
+            $i++;
+        }
+        return($CA_files);
+        } else {
+        debug(2, 'incorrect format value specified');
+        return(FALSE);
+        }
       
-   }
-
-   /**
-    * Generate installer filename base.
-    * Device module should use this name adding an extension.
-    * Normally the device identifier follows the Consortium name.
-    * The sting taken for the device identifier equals (by default) to the index in the listDevices array,
-    * but can be overriden with the 'device_id' device option.
-    */
-   private function getInstallerBasename() {
-      $replace_pattern = '/[ ()\/\'"]+/';
-      debug(4,"getInstallerBasename1:".$this->attributes['general:instname'][0]."\n");
-      $inst = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', $this->attributes['general:instname'][0]));
-      debug(4,"getInstallerBasename2:$inst\n");
-      $Inst_a = explode('_',$inst);
-      if(count($Inst_a) > 2) {
-         $inst = '';
-         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'][0])) {
-             $prof = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', $this->attributes['profile:name'][0]));
-             $prof = preg_replace('/_+$/','',$prof);
-             return $c_name. '-'. $this->getDeviceId() . $inst .'-'. $prof;
-         }
-      }
-      return $c_name. '-'. $this->getDeviceId() . $inst;
-  }
-
-  private function getDeviceId() {
+    }
+
+    /**
+     * Generate installer filename base.
+     * Device module should use this name adding an extension.
+     * Normally the device identifier follows the Consortium name.
+     * The sting taken for the device identifier equals (by default) to the index in the listDevices array,
+     * but can be overriden with the 'device_id' device option.
+     */
+    private function getInstallerBasename() {
+        $replace_pattern = '/[ ()\/\'"]+/';
+        debug(4,"getInstallerBasename1:".$this->attributes['general:instname'][0]."\n");
+        $inst = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', $this->attributes['general:instname'][0]));
+        debug(4,"getInstallerBasename2:$inst\n");
+        $Inst_a = explode('_',$inst);
+        if(count($Inst_a) > 2) {
+            $inst = '';
+            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'][0])) {
+                $prof = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', $this->attributes['profile:name'][0]));
+                $prof = preg_replace('/_+$/','',$prof);
+                return $c_name. '-'. $this->getDeviceId() . $inst .'-'. $prof;
+            }
+        }
+        return $c_name. '-'. $this->getDeviceId() . $inst;
+    }
+
+    private function getDeviceId() {
     $d_id = $this->device_id;
     if(isset($this->options['device_id'])) 
-      $d_id = $this->options['device_id'];
+        $d_id = $this->options['device_id'];
     if($d_id !== '')
-      $d_id .= '-';
+        $d_id .= '-';
     return $d_id;
-  }
+    }
 
 
-  private function getSSIDs() {
+    private function getSSIDs() {
     $S['add']=[];
     $S['del']=[];
     if (isset(Config::$CONSORTIUM['ssid'])) {
-       foreach (Config::$CONSORTIUM['ssid'] as $ssid) {
+        foreach (Config::$CONSORTIUM['ssid'] as $ssid) {
         if(isset(Config::$CONSORTIUM['tkipsupport']) && Config::$CONSORTIUM['tkipsupport'] == TRUE)
-          $S['add'][$ssid] = 'TKIP';
+            $S['add'][$ssid] = 'TKIP';
         else {
-          $S['add'][$ssid] = 'AES';
-          $S['del'][$ssid] = 'TKIP';
+            $S['add'][$ssid] = 'AES';
+            $S['del'][$ssid] = 'TKIP';
+        }
         }
-       }
     }
     if(isset($this->attributes['media:SSID'])) {
-      $SSID = $this->attributes['media:SSID'];
+        $SSID = $this->attributes['media:SSID'];
 
-      foreach($SSID as $ssid)
-         $S['add'][$ssid] = 'AES';
-      }
+        foreach($SSID as $ssid)
+            $S['add'][$ssid] = 'AES';
+        }
     if(isset($this->attributes['media:SSID_with_legacy'])) {
-      $SSID = $this->attributes['media:SSID_with_legacy'];
-      foreach($SSID as $ssid)
-         $S['add'][$ssid] = 'TKIP';
+        $SSID = $this->attributes['media:SSID_with_legacy'];
+        foreach($SSID as $ssid)
+            $S['add'][$ssid] = 'TKIP';
     }
     if(isset($this->attributes['media:remove_SSID'])) {
-      $SSID = $this->attributes['media:remove_SSID'];
-      foreach($SSID as $ssid)
-         $S['del'][$ssid] = 'DEL';
+        $SSID = $this->attributes['media:remove_SSID'];
+        foreach($SSID as $ssid)
+            $S['del'][$ssid] = 'DEL';
     }
     return $S;
-  }
+    }
 
-  private function getConsortia() {
-      $OIs = [];
-      $OIs = array_merge($OIs, Config::$CONSORTIUM['interworking-consortium-oi']);
-      if (isset($this->attributes['media:consortium_OI']))
-          foreach ($this->attributes['media:consortium_OI'] as $new_oi)
+    private function getConsortia() {
+        $OIs = [];
+        $OIs = array_merge($OIs, Config::$CONSORTIUM['interworking-consortium-oi']);
+        if (isset($this->attributes['media:consortium_OI']))
+            foreach ($this->attributes['media:consortium_OI'] as $new_oi)
             $OIs[] = $new_oi;
-      return $OIs;
-  }
+        return $OIs;
+    }
   
-  /**
-   * An array with shorthand definitions for MIME types
-   * @var array
-   */
-  private $mime_extensions = [
-     'text/plain' => 'txt',
-     'text/rtf' => 'rtf',
-     'application/pdf' =>'pdf',
-  ];
-
-  private function saveLogoFile($Logos) {
+    /**
+     * An array with shorthand definitions for MIME types
+     * @var array
+     */
+    private $mime_extensions = [
+        'text/plain' => 'txt',
+        'text/rtf' => 'rtf',
+        'application/pdf' =>'pdf',
+    ];
+
+    private function saveLogoFile($Logos) {
     $i=0;
     $returnarray= [];
     foreach ($Logos as $blob) {
-      $finfo = new finfo(FILEINFO_MIME_TYPE);
-      $mime = $finfo->buffer($blob);
-      if(preg_match('/^image\/(.*)/',$mime,$m))
+        $finfo = new finfo(FILEINFO_MIME_TYPE);
+        $mime = $finfo->buffer($blob);
+        if(preg_match('/^image\/(.*)/',$mime,$m))
         $ext = $m[1];
-      else
+        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");
-          die("problem opening the file\n");
-      }
-      fwrite($f,$blob);
-      fclose($f);
-      $returnarray[]= ['name'=>$f_name,'mime'=>$ext];
-      $i++;
+        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);
+        fclose($f);
+        $returnarray[]= ['name'=>$f_name,'mime'=>$ext];
+        $i++;
     }
     return($returnarray);
-  }
+    }
 
 
-  private function saveInfoFile($blob) {
+    private function saveInfoFile($blob) {
     $finfo = new finfo(FILEINFO_MIME_TYPE);
     $mime = $finfo->buffer($blob);
     $ext = isset($this->mime_extensions[$mime]) ? $this->mime_extensions[$mime] : 'usupported';
@@ -451,43 +451,43 @@ 
     fwrite($f,$blob);
     fclose($f);
     return(['name'=>'local-info.'.$ext,'mime'=>$ext]);
-  }
-
-  private function getProfileAttributes(Profile $profile) {
-     $eaps = $profile->getEapMethodsinOrderOfPreference(1);
-     if($eap = $this->getPreferredEapType($eaps)) {
-          $a = $profile->getCollapsedAttributes($eap);
-          $a['eap'] = $eap;
-          $a['all_eaps'] = $eaps;
-          return($a);
-     } else {
-       error("No supported eap types found for this profile.");
-       return(FALSE);
-  }
-  }
+    }
+
+    private function getProfileAttributes(Profile $profile) {
+        $eaps = $profile->getEapMethodsinOrderOfPreference(1);
+        if($eap = $this->getPreferredEapType($eaps)) {
+            $a = $profile->getCollapsedAttributes($eap);
+            $a['eap'] = $eap;
+            $a['all_eaps'] = $eaps;
+            return($a);
+        } else {
+        error("No supported eap types found for this profile.");
+        return(FALSE);
+    }
+    }
 /**
-  * dumps attributes for debugging purposes
-  *
-  * dumpAttibutes method is supplied for debuging purposes, it simply dumps the attribute array
-  * to a file with name passed in the attribute.
-  * @param string $file the output file name
-  */
-  protected function dumpAttibutes($file) {
+     * dumps attributes for debugging purposes
+     *
+     * dumpAttibutes method is supplied for debuging purposes, it simply dumps the attribute array
+     * to a file with name passed in the attribute.
+     * @param string $file the output file name
+     */
+    protected function dumpAttibutes($file) {
         ob_start();
         print_r($this->attributes);
         $output = ob_get_clean();
         $f = fopen($file,"w");
         fwrite($f,$output);
         fclose($f);
-  }
+    }
 /** 
- * placeholder for the main device method
- *
- */
+     * placeholder for the main device method
+     *
+     */
 
-  protected function writeInstaller() {
-     return("download path");
-  }
+    protected function writeInstaller() {
+        return("download path");
+    }
 
 /**
  * Array passing all options to the device module.
@@ -521,76 +521,76 @@ 
  * @see X509::processCertificate()
  * @var array $attributes
  */
-  public $attributes;
+    public $attributes;
 /**
-  * stores the path to the module source location and is used 
-  * by copyFile and translateFile
-  * the only reason for it to be a public variable ies that it is set by the DeviceFactory class
-  * module_path should not be used by module drivers.
-  * @var string 
-  */
-  public $module_path;
+     * stores the path to the module source location and is used 
+     * by copyFile and translateFile
+     * the only reason for it to be a public variable ies that it is set by the DeviceFactory class
+     * module_path should not be used by module drivers.
+     * @var string 
+     */
+    public $module_path;
 
 /**
  * The optimal EAP type
  *
  */ 
 /**
-  * optimal EAP method selected given profile and device
-  * @var EAP::constant
-  */
-  public $selected_eap;
+ * optimal EAP method selected given profile and device
+ * @var EAP::constant
+ */
+    public $selected_eap;
 /**
-  * the path to the profile signing program
-  * device modules which require signing should use this property to exec the signer
-  * the signer program must accept two arguments - input and output file names
-  * the signer program mus operate in the local directory and filenames are relative to this
-  * directory
-  *
-  *@var string
-  */
-  public $sign;
-  public $signer;
+     * the path to the profile signing program
+     * device modules which require signing should use this property to exec the signer
+     * the signer program must accept two arguments - input and output file names
+     * the signer program mus operate in the local directory and filenames are relative to this
+     * directory
+     *
+     *@var string
+     */
+    public $sign;
+    public $signer;
 /**
- * the string referencing the language (index ot the Config::$LANGUAGES array).
- * It is set to the current language and may be used by the device module to
- * set its language
- *
- *@var string
- */
-  public $lang_index;
-  /**
-   * The string identifier of the device (don't show this to users)
-   * @var string
-   */
-  public $device_id;
-
-  /**
-   * See devices-template.php for a list of available options
-   * @var array
-   */
-  public $options;
-
-  /**
-   * This string will be shown if no support email was configured by the admin
-   * 
-   * @var string 
-   */
-  public static $support_email_substitute;
-
-  /**
-   * This string will be shown if no support URL was configured by the admin
-   * 
-   * @var string 
-   */
-  public static $support_url_substitute;
-
-  /**
-   * This string should be used by all installer modules to set the 
-   * installer file basename.
-   *
-   * @var string 
-   */
-  public static $installerBasename;
+     * the string referencing the language (index ot the Config::$LANGUAGES array).
+     * It is set to the current language and may be used by the device module to
+     * set its language
+     *
+     *@var string
+     */
+    public $lang_index;
+    /**
+     * The string identifier of the device (don't show this to users)
+     * @var string
+     */
+    public $device_id;
+
+    /**
+     * See devices-template.php for a list of available options
+     * @var array
+     */
+    public $options;
+
+    /**
+     * This string will be shown if no support email was configured by the admin
+     * 
+     * @var string 
+     */
+    public static $support_email_substitute;
+
+    /**
+     * This string will be shown if no support URL was configured by the admin
+     * 
+     * @var string 
+     */
+    public static $support_url_substitute;
+
+    /**
+     * This string should be used by all installer modules to set the 
+     * installer file basename.
+     *
+     * @var string 
+     */
+    public static $installerBasename;
 }
 ?>

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";
@@ -334,42 +334,42 @@ 
     */
    private function getInstallerBasename() {
       $replace_pattern = '/[ ()\/\'"]+/';
-      debug(4,"getInstallerBasename1:".$this->attributes['general:instname'][0]."\n");
+      debug(4, "getInstallerBasename1:" . $this->attributes['general:instname'][0] . "\n");
       $inst = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', $this->attributes['general:instname'][0]));
-      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'][0])) {
+      if ($this->attributes['internal:profile_count'][0] > 1) {
+         if (!empty($this->attributes['profile:name']) && !empty($this->attributes['profile:name'][0])) {
              $prof = iconv("UTF-8", "US-ASCII//TRANSLIT", preg_replace($replace_pattern, '_', $this->attributes['profile:name'][0]));
-             $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';
@@ -377,20 +377,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;
@@ -416,25 +416,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);
@@ -445,17 +445,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;
@@ -476,8 +476,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);
   }
 /** 

Braces +93 added lines, -66 removed lines

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

core/Federation.php

Doc Comments +1 added lines, -1 removed lines

@@ -661,7 +661,7 @@
      * This function retrieves the federation attributes. If called with the optional parameter, only attribute values for the attribute
      * name in $option_name are retrieved; otherwise, all attributes are retrieved.
      *
-     * @param string $option_name optionally, the name of the attribute that is to be retrieved
+     * @param integer $option_name optionally, the name of the attribute that is to be retrieved
      * @return array of arrays of attributes which were set for this IdP
      */
     public function getAttributes($option_name = 0) {

Indentation +4 added lines, -4 removed lines

@@ -678,10 +678,10 @@
     }
     
         /**
-     * deletes all attributes in this federation except the _file ones, these are reported as array
-     *
-     * @return array list of row id's of file-based attributes which weren't deleted
-     */
+         * deletes all attributes in this federation except the _file ones, these are reported as array
+         *
+         * @return array list of row id's of file-based attributes which weren't deleted
+         */
     public function beginFlushAttributes() {
         DBConnection::exec(Federation::$DB_TYPE, "DELETE FROM federation_option WHERE federation_id = '$this->identifier' AND option_name NOT LIKE '%_file'");
         $exec_q = DBConnection::exec(Federation::$DB_TYPE, "SELECT row FROM federation_option WHERE federation_id = '$this->identifier'");

Spacing +3 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
         
         $retstring = "";
         if (!$astablerows)
-            $retstring .= "<federation id='" . ( $federationid == NULL ? "ALL" : $federationid ) . "' ts='$timestamp'>\n";
+            $retstring .= "<federation id='" . ($federationid == NULL ? "ALL" : $federationid) . "' ts='$timestamp'>\n";
 
         foreach (Devices::listDevices() as $index => $device_array) {
             $query = "SELECT SUM(downloads_admin) AS admin, SUM(downloads_user) AS user FROM downloads, profile, institution WHERE device_id = '$index' AND downloads.profile_id = profile.profile_id AND profile.inst_id = institution.inst_id ";
@@ -87,9 +87,9 @@ 
                 if ($astablerows)
                     $retstring .= "<td>" . $device_array['display'] . "</td>";
                 $retstring .= ($astablerows ? "<td>" : "    <downloads group='admin'>");
-                $retstring .= ( $a->admin === NULL ? "0" : $a->admin);
+                $retstring .= ($a->admin === NULL ? "0" : $a->admin);
                 $retstring .= ($astablerows ? "</td><td>" : "</downloads>\n    <downloads group='user'>");
-                $retstring .= ( $a->user === NULL ? "0" : $a->user);
+                $retstring .= ($a->user === NULL ? "0" : $a->user);
                 $retstring .= ($astablerows ? "</td>" : "</downloads>\n");
                 $gross_admin = $gross_admin + $a->admin;
                 $gross_user = $gross_user + $a->user;

Braces +79 added lines, -55 removed lines

@@ -73,8 +73,9 @@ 
         $timestamp = date("Y-m-d") . "T" . date("H:i:s");
         
         $retstring = "";
-        if (!$astablerows)
-            $retstring .= "<federation id='" . ( $federationid == NULL ? "ALL" : $federationid ) . "' ts='$timestamp'>\n";
+        if (!$astablerows) {
+                    $retstring .= "<federation id='" . ( $federationid == NULL ? "ALL" : $federationid ) . "' ts='$timestamp'>\n";
+        }
 
         foreach (Devices::listDevices() as $index => $device_array) {
             $query = "SELECT SUM(downloads_admin) AS admin, SUM(downloads_user) AS user FROM downloads, profile, institution WHERE device_id = '$index' AND downloads.profile_id = profile.profile_id AND profile.inst_id = institution.inst_id ";
@@ -84,8 +85,9 @@ 
             $retstring .= ($astablerows ? "<tr>" : "  <device name='" . $device_array['display'] . "'>\n");
             $admin_query = DBConnection::exec("INST", $query);
             while ($a = mysqli_fetch_object($admin_query)) {
-                if ($astablerows)
-                    $retstring .= "<td>" . $device_array['display'] . "</td>";
+                if ($astablerows) {
+                                    $retstring .= "<td>" . $device_array['display'] . "</td>";
+                }
                 $retstring .= ($astablerows ? "<td>" : "    <downloads group='admin'>");
                 $retstring .= ( $a->admin === NULL ? "0" : $a->admin);
                 $retstring .= ($astablerows ? "</td><td>" : "</downloads>\n    <downloads group='user'>");
@@ -97,16 +99,18 @@ 
             $retstring .= ($astablerows ? "</tr>" : "  </device>\n");
         }
         $retstring .= ($astablerows ? "<tr>" : "  <total>\n");
-        if ($astablerows)
-            $retstring .= "<td><strong>TOTAL</ts>";
+        if ($astablerows) {
+                    $retstring .= "<td><strong>TOTAL</ts>";
+        }
         $retstring .= ($astablerows ? "<td><strong>" : "    <downloads group='admin'>");
         $retstring .= $gross_admin;
         $retstring .= ($astablerows ? "</strong></td><td><strong>" : "</downloads>\n    <downloads group='user'>");
         $retstring .= $gross_user;
         $retstring .= ($astablerows ? "</strong></td>" : "</downloads>\n");
         $retstring .= ($astablerows ? "</tr>" : "  </total>\n");
-        if (!$astablerows)
-            $retstring .= "</federation>\n";
+        if (!$astablerows) {
+                    $retstring .= "</federation>\n";
+        }
 
         return $retstring;
     }
@@ -437,8 +441,9 @@ 
         $level = DBConnection::escape_value(Federation::$DB_TYPE, $level);
         $mail = DBConnection::escape_value(Federation::$DB_TYPE, $mail);
 
-        if ($owner_id != "PENDING")
-            DBConnection::exec(Federation::$DB_TYPE, "INSERT INTO ownership (user_id,institution_id, blesslevel, orig_mail) VALUES('$owner_id', $identifier, '$level', '$mail')");
+        if ($owner_id != "PENDING") {
+                    DBConnection::exec(Federation::$DB_TYPE, "INSERT INTO ownership (user_id,institution_id, blesslevel, orig_mail) VALUES('$owner_id', $identifier, '$level', '$mail')");
+        }
         return $identifier;
     }
 
@@ -485,13 +490,16 @@ 
 
     public function listFederationAdmins() {
         $returnarray = [];
-        if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") // SW: APPROVED
+        if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") {
+            // SW: APPROVED
             $admins = DBConnection::exec("USER", "SELECT eptid as user_id FROM view_admin WHERE role = 'fedadmin' AND realm = '" . strtolower($this->identifier) . "'");
-        else
-            $admins = DBConnection::exec("USER", "SELECT user_id FROM user_options WHERE option_name = 'user:fedadmin' AND option_value = '" . strtoupper($this->identifier) . "'");
+        } else {
+                    $admins = DBConnection::exec("USER", "SELECT user_id FROM user_options WHERE option_name = 'user:fedadmin' AND option_value = '" . strtoupper($this->identifier) . "'");
+        }
 
-        while ($a = mysqli_fetch_object($admins))
-            $returnarray[] = $a->user_id;
+        while ($a = mysqli_fetch_object($admins)) {
+                    $returnarray[] = $a->user_id;
+        }
         return $returnarray;
     }
 
@@ -499,10 +507,11 @@ 
         $returnarray = [];
         $countrysuffix = "";
         
-        if ($this->identifier != "")
-            $countrysuffix = " WHERE country = '" . strtolower($this->identifier) . "'";
-        else
-            $countrysuffix = "";
+        if ($this->identifier != "") {
+                    $countrysuffix = " WHERE country = '" . strtolower($this->identifier) . "'";
+        } else {
+                    $countrysuffix = "";
+        }
         
         if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") { // SW: APPROVED
             $usedarray = [];
@@ -515,15 +524,18 @@ 
                                                                                                       WHERE external_db_uniquehandle IS NOT NULL 
                                                                                                       AND invite_created >= TIMESTAMPADD(DAY, -1, NOW()) 
                                                                                                       AND used = 0");
-            while ($a = mysqli_fetch_object($already_used))
-                $usedarray[] = $a->external_db_id;
-            while ($a = mysqli_fetch_object($pending_invite))
-                if (!in_array($a->external_db_uniquehandle, $usedarray))
+            while ($a = mysqli_fetch_object($already_used)) {
+                            $usedarray[] = $a->external_db_id;
+            }
+            while ($a = mysqli_fetch_object($pending_invite)) {
+                            if (!in_array($a->external_db_uniquehandle, $usedarray))
                     $usedarray[] = $a->external_db_uniquehandle;
+            }
             while ($a = mysqli_fetch_object($externals)) {
                 if ($unmapped_only === TRUE) {
-                    if (in_array($a->id, $usedarray))
-                        continue;
+                    if (in_array($a->id, $usedarray)) {
+                                            continue;
+                    }
                 }
                 $names = explode('#', $a->collapsed_name);
                 // trim name list to current best language match
@@ -547,8 +559,9 @@ 
                     $matches = [];
                     preg_match("/^n: (.*), e: (.*), p: .*$/", $contact, $matches);
                     if ($matches[2] != "") {
-                        if ($mailnames != "")
-                            $mailnames .= ", ";
+                        if ($mailnames != "") {
+                                                    $mailnames .= ", ";
+                        }
                         // extracting real names is nice, but the <> notation
                         // really gets screwed up on POSTs and HTML safety
                         // so better not do this; use only mail addresses
@@ -567,10 +580,11 @@ 
     public static function getExternalDBEntityDetails($external_id, $realm = NULL) {
         $list = [];
         if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") { // SW: APPROVED
-            if ($realm !== NULL)
-                $scanforrealm = "OR inst_realm LIKE '%$realm%'";
-            else
-                $scanforrealm = "";
+            if ($realm !== NULL) {
+                            $scanforrealm = "OR inst_realm LIKE '%$realm%'";
+            } else {
+                            $scanforrealm = "";
+            }
             $info_list = DBConnection::exec("EXTERNAL", "SELECT name AS collapsed_name, inst_realm as realmlist, contact AS collapsed_contact, country FROM view_active_idp_institution WHERE id_institution = $external_id $scanforrealm");
             // split names and contacts into proper pairs
             while ($a = mysqli_fetch_object($info_list)) {
@@ -604,14 +618,16 @@ 
         $query = "SELECT distinct institution.inst_id AS inst_id, institution.country AS country,
                      group_concat(concat_ws('===',institution_option.option_name,LEFT(institution_option.option_value,200)) separator '---') AS options
                      FROM institution ";
-        if ($active_only == 1)
-            $query .= "JOIN profile ON institution.inst_id = profile.inst_id ";
+        if ($active_only == 1) {
+                    $query .= "JOIN profile ON institution.inst_id = profile.inst_id ";
+        }
         $query .= "JOIN institution_option ON institution.inst_id = institution_option.institution_id ";
         $query .= "WHERE (institution_option.option_name = 'general:instname' 
                           OR institution_option.option_name = 'general:geo_coordinates'
                           OR institution_option.option_name = 'general:logo_file') ";
-        if ($active_only == 1)
-            $query .= "AND profile.showtime = 1 ";
+        if ($active_only == 1) {
+                    $query .= "AND profile.showtime = 1 ";
+        }
 
         if ($country) {
             // escape the parameter
@@ -624,34 +640,41 @@ 
         while ($a = mysqli_fetch_object($allIDPs)) {
             $O = explode('---', $a->options);
             $A = [];
-            if (isset($geo))
-                unset($geo);
-            if (isset($names))
-                unset($names);
+            if (isset($geo)) {
+                            unset($geo);
+            }
+            if (isset($names)) {
+                            unset($names);
+            }
             $A['entityID'] = $a->inst_id;
             $A['country'] = strtoupper($a->country);
             foreach ($O as $o) {
                 $opt = explode('===', $o);
-                if ($opt[0] == 'general:logo_file')
-                    $A['icon'] = $a->inst_id;
+                if ($opt[0] == 'general:logo_file') {
+                                    $A['icon'] = $a->inst_id;
+                }
                 if ($opt[0] == 'general:geo_coordinates') {
                     $at1 = unserialize($opt[1]);
-                    if (!isset($geo))
-                        $geo = [];
+                    if (!isset($geo)) {
+                                            $geo = [];
+                    }
                     $geo[] = $at1;
                 }
                 if ($opt[0] == 'general:instname') {
-                    if (!isset($names))
-                        $names = [];
+                    if (!isset($names)) {
+                                            $names = [];
+                    }
                     $names[] = ['value' => $opt[1]];
                 }
             }
             $name = getLocalisedValue($names, CAT::get_lang());
-            if (!$name)
-                continue;
+            if (!$name) {
+                            continue;
+            }
             $A['title'] = $name;
-            if (isset($geo))
-                $A['geo'] = $geo;
+            if (isset($geo)) {
+                            $A['geo'] = $geo;
+            }
             $returnarray[] = $A;
         }
         return $returnarray;
@@ -667,12 +690,12 @@ 
     public function getAttributes($option_name = 0) {
         if ($option_name) {
             $returnarray = Array();
-            foreach ($this->priv_attributes as $the_attr)
-                if ($the_attr['name'] == $option_name)
+            foreach ($this->priv_attributes as $the_attr) {
+                            if ($the_attr['name'] == $option_name)
                     $returnarray[] = $the_attr;
+            }
             return $returnarray;
-        }
-        else {
+        } else {
             return $this->priv_attributes;
         }
     }
@@ -686,8 +709,9 @@ 
         DBConnection::exec(Federation::$DB_TYPE, "DELETE FROM federation_option WHERE federation_id = '$this->identifier' AND option_name NOT LIKE '%_file'");
         $exec_q = DBConnection::exec(Federation::$DB_TYPE, "SELECT row FROM federation_option WHERE federation_id = '$this->identifier'");
         $return_array = [];
-        while ($a = mysqli_fetch_object($exec_q))
-            $return_array[$a->row] = "KILLME";
+        while ($a = mysqli_fetch_object($exec_q)) {
+                    $return_array[$a->row] = "KILLME";
+        }
         return $return_array;
     }
 

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) 

Indentation +16 added lines, -16 removed lines

@@ -180,32 +180,32 @@ 
 function createTemporaryDirectory($purpose = 'installer',$fail = 1) {
         $name = md5(time().rand());
         switch($purpose) {
-           case 'installer':
+            case 'installer':
              $path = CAT::$root.'/var/installer_cache';
-             break;
-           case 'logo':
+                break;
+            case 'logo':
              $path = CAT::$root.'/web/downloads/logos';
-             break;
-           case 'test':
+                break;
+            case 'test':
              $path = CAT::$root.'/var/tmp';
-             break;
-           default:
+                break;
+            default:
              error("unable to create temporary directory for unknown purpose: $purpose\n");
-             exit;
+                exit;
         }
         $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  {
+            if($fail) {
+                error("unable to create temporary directory: $tmp_dir\n");
+                exit;
+            } else  {
             debug(4, "Directory creation failed for $tmp_dir\n");
             return ['base'=>$path,'dir'=>'',$name=>''];
-          }
+            }
         } else
-         debug(4, "Directory created: $tmp_dir\n");
-     return ['base'=>$path,'dir'=>$tmp_dir,'name'=>$name];
+            debug(4, "Directory created: $tmp_dir\n");
+        return ['base'=>$path,'dir'=>$tmp_dir,'name'=>$name];
 }
 
 function png_inject_consortium_logo ($inputpngstring, $symbolsize = 12, $marginsymbols = 4) {
@@ -236,7 +236,7 @@ 
     $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);
+    // 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);
     return ob_get_clean();

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

Braces +40 added lines, -30 removed lines

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

core/IdP.php

Doc Comments +3 added lines, -2 removed lines

@@ -68,6 +68,7 @@ 
      * Cannot be used to define a new IdP in the database! This happens via Federation::newIdP()
      *
      * @param integer $i_id the database row identifier
+     * @return string
      */
     public function __construct($i_id) {
         debug(3, "--- BEGIN Constructing new IdP object ... ---\n");
@@ -247,7 +248,7 @@ 
      * This function retrieves the IdP-wide attributes. If called with the optional parameter, only attribute values for the attribute
      * name in $option_name are retrieved; otherwise, all attributes are retrieved.
      *
-     * @param string $option_name optionally, the name of the attribute that is to be retrieved
+     * @param integer $option_name optionally, the name of the attribute that is to be retrieved
      * @return array of arrays of attributes which were set for this IdP
      */
     public function getAttributes($option_name = 0) {
@@ -318,7 +319,7 @@ 
      * Adds a new profile to this IdP.
      * Only creates the DB entry for the Profile. If you want to add attributes later, see Profile::addAttribute().
      *
-     * @return object new Profile object if successful, or FALSE if an error occured
+     * @return Profile|null new Profile object if successful, or FALSE if an error occured
      */
     public function newProfile() {
         DBConnection::exec(IdP::$DB_TYPE, "INSERT INTO profile (inst_id) VALUES($this->identifier)");

Indentation +4 added lines, -4 removed lines

@@ -118,10 +118,10 @@
             }
         }
         $this->priv_attributes[] = ["name" => "internal:country", 
-                                         "value" => $this->federation, 
-                                         "level" => "IdP", 
-                                         "row" => 0, 
-                                         "flag" => NULL];
+                                            "value" => $this->federation, 
+                                            "level" => "IdP", 
+                                            "row" => 0, 
+                                            "flag" => NULL];
 
         $this->name = getLocalisedValue($this->getAttributes('general:instname', 0, 0), CAT::get_lang());
         debug(3, "--- END Constructing new IdP object ... ---\n");

Braces +72 added lines, -52 removed lines

@@ -136,8 +136,9 @@ 
      */
     public function listProfiles($active_only = 0) {
         $query = "SELECT profile_id FROM profile WHERE inst_id = $this->identifier";
-        if ($active_only)
-            $query .= " AND showtime = 1";
+        if ($active_only) {
+                    $query .= " AND showtime = 1";
+        }
         $allProfiles = DBConnection::exec(IdP::$DB_TYPE, $query);
         $returnarray = [];
         while ($a = mysqli_fetch_object($allProfiles)) {
@@ -152,24 +153,27 @@ 
         // migration phase: are there NULLs in the profile list sufficient_config column?
         // if so, run prepShowtime on all profiles
         $needTreatment = DBConnection::exec(IdP::$DB_TYPE, "SELECT profile_id FROM profile WHERE inst_id = $this->identifier AND sufficient_config IS NULL");
-        if (mysqli_num_rows($needTreatment) > 0)
-            foreach ($this->listProfiles() as $prof)
+        if (mysqli_num_rows($needTreatment) > 0) {
+                    foreach ($this->listProfiles() as $prof)
                 $prof->prepShowtime();
+        }
        
         // now, just look in the DB
         $allProfiles = DBConnection::exec(IdP::$DB_TYPE, "SELECT profile_id FROM profile WHERE inst_id = $this->identifier AND sufficient_config = 1");
-        if (mysqli_num_rows($allProfiles) > 0)
-            return TRUE;
-        else
-            return FALSE;
+        if (mysqli_num_rows($allProfiles) > 0) {
+                    return TRUE;
+        } else {
+                    return FALSE;
+        }
     }
 
     public function isOneProfileShowtime() {
         $allProfiles = DBConnection::exec(IdP::$DB_TYPE, "SELECT profile_id FROM profile WHERE inst_id = $this->identifier AND showtime = 1");
-        if (mysqli_num_rows($allProfiles) > 0)
-            return TRUE;
-        else
-            return FALSE;
+        if (mysqli_num_rows($allProfiles) > 0) {
+                    return TRUE;
+        } else {
+                    return FALSE;
+        }
         
     }
     
@@ -177,16 +181,21 @@ 
         $allProfiles = DBConnection::exec(IdP::$DB_TYPE, "SELECT status_dns, status_cert, status_reachability, status_TLS, last_status_check FROM profile WHERE inst_id = $this->identifier AND sufficient_config = 1");
         $returnarray = ['dns' => RETVAL_SKIPPED, 'cert' => L_OK, 'reachability' => RETVAL_SKIPPED, 'TLS' => RETVAL_SKIPPED, 'checktime' => NULL];
         while ($a = mysqli_fetch_object($allProfiles)) {
-            if ($a->status_dns < $returnarray['dns'])
-                $returnarray['dns'] = $a->status_dns;
-            if ($a->status_reachability < $returnarray['reachability'])
-                $returnarray['reachability'] = $a->status_reachability;
-            if ($a->status_TLS < $returnarray['TLS'])
-                $returnarray['TLS'] = $a->status_TLS;
-            if ($a->status_cert < $returnarray['cert'])
-                $returnarray['cert'] = $a->status_cert;
-            if ($a->last_status_check > $returnarray['checktime'])
-                $returnarray['checktime'] = $a->last_status_check;
+            if ($a->status_dns < $returnarray['dns']) {
+                            $returnarray['dns'] = $a->status_dns;
+            }
+            if ($a->status_reachability < $returnarray['reachability']) {
+                            $returnarray['reachability'] = $a->status_reachability;
+            }
+            if ($a->status_TLS < $returnarray['TLS']) {
+                            $returnarray['TLS'] = $a->status_TLS;
+            }
+            if ($a->status_cert < $returnarray['cert']) {
+                            $returnarray['cert'] = $a->status_cert;
+            }
+            if ($a->last_status_check > $returnarray['checktime']) {
+                            $returnarray['checktime'] = $a->last_status_check;
+            }
         }
         return $returnarray;
     }
@@ -199,8 +208,9 @@ 
     public function owner() {
         $returnarray = [];
         $admins = DBConnection::exec(IdP::$DB_TYPE, "SELECT user_id, orig_mail, blesslevel FROM ownership WHERE institution_id = $this->identifier ORDER BY user_id");
-        while ($a = mysqli_fetch_object($admins))
-            $returnarray[] = ['ID' => $a->user_id, 'MAIL' => $a->orig_mail, 'LEVEL' => $a->blesslevel];
+        while ($a = mysqli_fetch_object($admins)) {
+                    $returnarray[] = ['ID' => $a->user_id, 'MAIL' => $a->orig_mail, 'LEVEL' => $a->blesslevel];
+        }
         return $returnarray;
     }
 
@@ -253,12 +263,12 @@ 
     public function getAttributes($option_name = 0) {
         if ($option_name) {
             $returnarray = [];
-            foreach ($this->priv_attributes as $the_attr)
-                if ($the_attr['name'] == $option_name)
+            foreach ($this->priv_attributes as $the_attr) {
+                            if ($the_attr['name'] == $option_name)
                     $returnarray[] = $the_attr;
+            }
             return $returnarray;
-        }
-        else {
+        } else {
             return $this->priv_attributes;
         }
     }
@@ -273,8 +283,9 @@ 
         $this->updateFreshness();
         $exec_q = DBConnection::exec(IdP::$DB_TYPE, "SELECT row FROM institution_option WHERE institution_id = $this->identifier");
         $return_array = [];
-        while ($a = mysqli_fetch_object($exec_q))
-            $return_array[$a->row] = "KILLME";
+        while ($a = mysqli_fetch_object($exec_q)) {
+                    $return_array[$a->row] = "KILLME";
+        }
         return $return_array;
     }
 
@@ -324,10 +335,11 @@ 
         DBConnection::exec(IdP::$DB_TYPE, "INSERT INTO profile (inst_id) VALUES($this->identifier)");
         $identifier = DBConnection::lastID(IdP::$DB_TYPE);
 
-        if ($identifier > 0)
-            return new Profile($identifier, $this);
-        else
-            return NULL;
+        if ($identifier > 0) {
+                    return new Profile($identifier, $this);
+        } else {
+                    return NULL;
+        }
     }
 
     /**
@@ -335,13 +347,15 @@ 
      */
     public function destroy() {
         /* delete all profiles */
-        foreach ($this->listProfiles() as $profile)
-            $profile->destroy();
+        foreach ($this->listProfiles() as $profile) {
+                    $profile->destroy();
+        }
         /* double-check that all profiles are gone */
         $profiles = $this->listProfiles();
 
-        if (count($profiles) > 0)
-            die("This IdP shouldn't have any profiles any more!");
+        if (count($profiles) > 0) {
+                    die("This IdP shouldn't have any profiles any more!");
+        }
 
         DBConnection::exec(IdP::$DB_TYPE, "DELETE FROM ownership WHERE institution_id = $this->identifier");
         DBConnection::exec(IdP::$DB_TYPE, "DELETE FROM institution_option WHERE institution_id = $this->identifier");
@@ -380,13 +394,15 @@ 
             $candidate_list = DBConnection::exec("EXTERNAL", "SELECT id_institution AS id, name AS collapsed_name FROM view_active_idp_institution WHERE country = '" . strtolower($this->federation) . "'");
 
             $already_used = DBConnection::exec(IdP::$DB_TYPE, "SELECT DISTINCT external_db_id FROM institution WHERE external_db_id IS NOT NULL AND external_db_syncstate = " . EXTERNAL_DB_SYNCSTATE_SYNCED);
-            while ($a = mysqli_fetch_object($already_used))
-                $usedarray[] = $a->external_db_id;
+            while ($a = mysqli_fetch_object($already_used)) {
+                            $usedarray[] = $a->external_db_id;
+            }
 
             // and split them into ID, LANG, NAME pairs
             while ($a = mysqli_fetch_object($candidate_list)) {
-                if (in_array($a->id, $usedarray))
-                    continue;
+                if (in_array($a->id, $usedarray)) {
+                                    continue;
+                }
                 $names = explode('#', $a->collapsed_name);
                 foreach ($names as $name) {
                     $perlang = explode(': ', $name, 2);
@@ -396,12 +412,14 @@ 
             // now see if any of the languages in CAT match any of those in the external DB
             $mynames = $this->getAttributes("general:instname");
             $matching_candidates = [];
-            foreach ($mynames as $onename)
-                foreach ($list as $listentry) {
+            foreach ($mynames as $onename) {
+                            foreach ($list as $listentry) {
                     $unserialised = unserialize($onename['value']);
-                    if (($unserialised['lang'] == $listentry['lang'] || $unserialised['lang'] == "C") && $unserialised['content'] == $listentry['name'])
-                        if (array_search($listentry['ID'], $matching_candidates) === FALSE)
+            }
+                    if (($unserialised['lang'] == $listentry['lang'] || $unserialised['lang'] == "C") && $unserialised['content'] == $listentry['name']) {
+                                            if (array_search($listentry['ID'], $matching_candidates) === FALSE)
                             $matching_candidates[] = $listentry['ID'];
+                    }
                 }
 
             return $matching_candidates;
@@ -441,10 +459,11 @@ 
      */
     public function getExternalDBEntityDetails() {
         $external_id = $this->getExternalDBId();
-        if ($external_id !== FALSE)
-            return Federation::getExternalDBEntityDetails($external_id);
-        else
-            return [];
+        if ($external_id !== FALSE) {
+                    return Federation::getExternalDBEntityDetails($external_id);
+        } else {
+                    return [];
+        }
     }
 
     public function setExternalDBId($identifier) {
@@ -452,8 +471,9 @@ 
         if (Config::$CONSORTIUM['name'] == "eduroam" && isset(Config::$CONSORTIUM['deployment-voodoo']) && Config::$CONSORTIUM['deployment-voodoo'] == "Operations Team") { // SW: APPROVED
             $already_used = DBConnection::exec(IdP::$DB_TYPE, "SELECT DISTINCT external_db_id FROM institution WHERE external_db_id = '$identifier' AND external_db_syncstate = " . EXTERNAL_DB_SYNCSTATE_SYNCED);
 
-            if (mysqli_num_rows($already_used) == 0)
-                DBConnection::exec(IdP::$DB_TYPE, "UPDATE institution SET external_db_id = '$identifier', external_db_syncstate = " . EXTERNAL_DB_SYNCSTATE_SYNCED . " WHERE inst_id = $this->identifier");
+            if (mysqli_num_rows($already_used) == 0) {
+                            DBConnection::exec(IdP::$DB_TYPE, "UPDATE institution SET external_db_id = '$identifier', external_db_syncstate = " . EXTERNAL_DB_SYNCSTATE_SYNCED . " WHERE inst_id = $this->identifier");
+            }
         }
     }
 

core/Options.php

Doc Comments +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
      * 
      * @assert ("user") == Array("user:email","user:fedadmin","user:realname")
      * 
-     * @param string $class_name optionally specifies the class of options to be listed (class is the part of the option name before the : sign)
+     * @param integer $class_name optionally specifies the class of options to be listed (class is the part of the option name before the : sign)
      * @return array of options
      */
     public function availableOptions($class_name = 0) {

Indentation +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
  */
 class Options {
     
-   /**
+    /**
      * database which this class queries by default
      * 
      * @var string

Spacing +9 added lines, -9 removed lines

@@ -77,15 +77,15 @@ 
      */
     private function __construct() {
         $this->type_db = [];
-        debug(3,"--- BEGIN constructing Options instance ---\n");
+        debug(3, "--- BEGIN constructing Options instance ---\n");
         $options = DBConnection::exec(Options::$DB_TYPE, "SELECT name,type,flag from profile_option_dict ORDER BY name");
-        while($a = mysqli_fetch_object($options))
-            $this->type_db[$a->name]       =  ["type" => $a->type, "flag" => $a->flag];
-        $this->type_db["general:logo_url"] =  ["type" => "string", "flag" => NULL];
-        $this->type_db["eap:ca_url"]       =  ["type" => "string", "flag" => NULL];
-        $this->type_db["internal:country"] =  ["type" => "string", "flag" => NULL];
+        while ($a = mysqli_fetch_object($options))
+            $this->type_db[$a->name]       = ["type" => $a->type, "flag" => $a->flag];
+        $this->type_db["general:logo_url"] = ["type" => "string", "flag" => NULL];
+        $this->type_db["eap:ca_url"]       = ["type" => "string", "flag" => NULL];
+        $this->type_db["internal:country"] = ["type" => "string", "flag" => NULL];
 
-        debug(3,"--- END constructing Options instance ---\n");
+        debug(3, "--- END constructing Options instance ---\n");
     }
     
     /**
@@ -99,13 +99,13 @@ 
      */
     public function availableOptions($class_name = 0) {
         $temporary_array = [];
-        debug(3,"CLASSNAME IS $class_name\n");
+        debug(3, "CLASSNAME IS $class_name\n");
         
         foreach (array_keys($this->type_db) as $name) {
             if ($class_name === 0) {
                 $temporary_array[] = $name;
             } else {
-                if ( preg_match('/^'.$class_name.':/', $name) > 0 ) {
+                if (preg_match('/^' . $class_name . ':/', $name) > 0) {
                         $temporary_array[] = $name;
                 }
             }

Braces +3 added lines, -2 removed lines

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

core/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)

         {

 

Indentation +40 added lines, -40 removed lines

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

  */

  

-	// Encoding modes

+    // Encoding modes

 	 

-	define('QR_MODE_NUL', -1);

-	define('QR_MODE_NUM', 0);

-	define('QR_MODE_AN', 1);

-	define('QR_MODE_8', 2);

-	define('QR_MODE_KANJI', 3);

-	define('QR_MODE_STRUCTURE', 4);

-

-	// Levels of error correction.

-

-	define('QR_ECLEVEL_L', 0);

-	define('QR_ECLEVEL_M', 1);

-	define('QR_ECLEVEL_Q', 2);

-	define('QR_ECLEVEL_H', 3);

+    define('QR_MODE_NUL', -1);

+    define('QR_MODE_NUM', 0);

+    define('QR_MODE_AN', 1);

+    define('QR_MODE_8', 2);

+    define('QR_MODE_KANJI', 3);

+    define('QR_MODE_STRUCTURE', 4);

+

+    // Levels of error correction.

+

+    define('QR_ECLEVEL_L', 0);

+    define('QR_ECLEVEL_M', 1);

+    define('QR_ECLEVEL_Q', 2);

+    define('QR_ECLEVEL_H', 3);

 	

-	// Supported output formats

+    // Supported output formats

 	

-	define('QR_FORMAT_TEXT', 0);

-	define('QR_FORMAT_PNG',  1);

+    define('QR_FORMAT_TEXT', 0);

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

-		}

-	}	

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

+        }

+    }	

 

 

 

@@ -211,9 +211,9 @@ 
         //----------------------------------------------------------------------

         public static function buildCache()

         {

-			QRtools::markTime('before_build_cache');

+            QRtools::markTime('before_build_cache');

 			

-			$mask = new QRmask();

+            $mask = new QRmask();

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

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

                 if (QR_IMAGE) {

@@ -221,13 +221,13 @@ 
                     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++)

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

+                $width = count($frame);

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

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

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

             }

 			

-			QRtools::markTime('after_build_cache');

+            QRtools::markTime('after_build_cache');

         }

 

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

@@ -647,10 +647,10 @@ 
 

         // Version information pattern -----------------------------------------

 

-		// Version information pattern (BCH coded).

+        // Version information pattern (BCH coded).

         // See Table 1 in Appendix D (pp.68) of JIS X0510:2004.

         

-		// size: [QRSPEC_VERSION_MAX - 6]

+        // size: [QRSPEC_VERSION_MAX - 6]

 		

         public static $versionPattern = [

             0x07c94, 0x085bc, 0x09a99, 0x0a4d3, 0x0bbf6, 0x0c762, 0x0d847, 0x0e60d,

@@ -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,

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

  */

  

-	define('N1', 3);

-	define('N2', 3);

-	define('N3', 40);

-	define('N4', 10);

+    define('N1', 3);

+    define('N2', 3);

+    define('N3', 40);

+    define('N4', 10);

 

-	class QRmask {

+    class QRmask {

 	

-		public $runLength = [];

+        public $runLength = [];

 		

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

-		public function __construct() 

+        //----------------------------------------------------------------------

+        public function __construct() 

         {

             $this->runLength = array_fill(0, QRSPEC_WIDTH_MAX + 1, 0);

         }

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

             

Braces +194 added lines, -109 removed lines

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

             $barcode_array = [];

             

-            if (!is_array($mode))

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

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

             $eccLevel = 'L';

                 

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

             foreach ($qrTab as $line) {

                 $arrAdd = [];

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

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

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

             }

                     

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

 				$width = count($frame);

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

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

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

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

 			

 			QRtools::markTime('after_build_cache');

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

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

             

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

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

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

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

         }

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

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

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

-                if($words >= $size) 

-                    return $i;

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

 

             return -1;

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

         public static function lengthIndicator($mode, $version)

         {

-            if ($mode == QR_MODE_STRUCTURE)

-                return 0;

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

             if ($version <= 9) {

                 $l = 0;

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

         public static function maximumWords($mode, $version)

         {

-            if($mode == QR_MODE_STRUCTURE) 

-                return 3;

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

             if($version <= 9) {

                 $l = 0;

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

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

         {

-            if($version < 2)

-                return;

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

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

             if($d < 0) {

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

         public static function getVersionPattern($version)

         {

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

-                return 0;

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

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

         }

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

         public static function getFormatInfo($mask, $level)

         {

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

-                return 0;

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

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

-                return 0;                

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

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

         }

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

         public static function newFrame($version)

         {

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

-                return null;

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

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

                 

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

             }

             

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

-                return null;

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

             return self::$frames[$version];

         }

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

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

                     ImagePng($image);

-                }else{

+                } else{

                     ImagePng($image, $filename);

                 }

             }

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

             $bits = 0;

 

-            if($version == 0) 

-                $version = 1;

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

             switch($this->mode) {

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

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

                     }

                     

-                    if($ret < 0)

-                        return -1;

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

 

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

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

         public static function checkModeKanji($size, $data)

         {

-            if($size & 1)

-                return false;

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

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

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

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

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

         {

-            if($size <= 0) 

-                return false;

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

             switch($mode) {

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

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

                     $remain = $payload - $chunks * 11;

                     $size = $chunks * 2;

-                    if($remain >= 6) 

-                        $size++;

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

                 case QR_MODE_8:

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

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

             

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

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

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

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

             return $size;

         }

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

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

                 

-                if($bits < 0) 

-                    return -1;

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

                 $total += $bits;

             }

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

                 $bits = $this->createBitStream();

                 

-                if($bits < 0) 

-                    return -1;

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

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

                 if($ver < 0) {

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

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

             

-            if($ret < 0) 

-                return $ret;

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

             $padlen = $maxwords - $words;

             

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

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

                 

-                if($ret < 0)

-                    return $ret;

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

             }

 

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

         public function appendNum($bits, $num)

         {

-            if ($bits == 0) 

-                return 0;

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

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

             

-            if(is_null($b))

-                return -1;

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

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

             unset($b);

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

         public function appendBytes($size, $data)

         {

-            if ($size == 0) 

-                return 0;

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

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

             

-            if(is_null($b))

-                return -1;

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

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

             unset($b);

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

         public static function isdigitat($str, $pos)

         {    

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

-                return false;

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

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

         }

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

         public static function isalnumat($str, $pos)

         {

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

-                return false;

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

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

         }

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

         public function identifyMode($pos)

         {

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

-                return QR_MODE_NUL;

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

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

             

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

             

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

-            if($ret < 0)

-                return -1;

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

             return $run;

         }

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

 

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

-            if($ret < 0)

-                return -1;

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

             return $run;

         }

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

             

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

-            if($ret < 0)

-                return -1;

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

             return $run;

         }

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

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

             

-            if($ret < 0)

-                return -1;

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

             return $run;

         }

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

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

             {

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

-                    return 0;

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

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

                 

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

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

                     case QR_MODE_KANJI:

-                        if ($hint == QR_MODE_KANJI)

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

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

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

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

                 

                 }

 

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

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

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

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

             }

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

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

             

-            if(!$casesensitive)

-                $split->toUpper();

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

             return $split->splitString();

         }

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

             

             // Check parameter ranges

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

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

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

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

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

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

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

 

             $rs = new QRrsItem();

             $rs->mm = $symsize;

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

             

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

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

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

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

             return $rs;

         }

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

         {

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

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

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

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

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

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

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

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

                 return $rs;

             }

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

             $codeArr = [];

             

-            foreach ($bitFrame as $line)

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

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

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

         }

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

             

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

-            foreach ($codeLines as $line)

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

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

             return $codeArr;

         }

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

                 } else {

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

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

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

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

                 }

             } else {

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

             }

 

-            if ($maskGenOnly)

-                return;

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

             $d = $s;

 

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

                 $frameY = $frame[$y];

                 

-                if ($y>0)

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

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

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

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

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

             }

 

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

-                return 0;

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

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

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

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

             

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

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

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

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

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

 

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

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

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

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

             if($ret < 0) {

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

 

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

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

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

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

             if($ret < 0) {

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

                     }

                 }

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

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

                 $this->x = $x;

                 $this->y = $y;

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

                 ob_end_clean();

                 

-                if ($err != '')

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

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

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

                 

core/Profile.php

Doc Comments +11 added lines, -9 removed lines

@@ -73,7 +73,7 @@ 
      * supported EAP types from the DB and stores them in the priv_ arrays.
      * 
      * @param int $p_id identifier of the profile in the DB
-     * @param IdP $idp_object optionally, the institution to which this Profile belongs. Saves the construction of the IdP instance. If omitted, an extra query and instantiation is executed to find out.
+     * @param integer $idp_object optionally, the institution to which this Profile belongs. Saves the construction of the IdP instance. If omitted, an extra query and instantiation is executed to find out.
      */
     public function __construct($p_id, $idp_object = 0) {
         debug(3, "--- BEGIN Constructing new Profile object ... ---\n");
@@ -372,6 +372,8 @@ 
      * 
      * @param string device the device identifier string
      * @param string path the path where the new installer can be found
+     * @param string $device
+     * @param string $path
      */
     public function updateCache($device, $path,$mime) {
         $device = DBConnection::escape_value(Profile::$DB_TYPE, $device);
@@ -384,9 +386,9 @@ 
     /**
      * Log a new download for our stats
      * 
-     * @param device the device id string
-     * @param area either admin or user
-     * @return TRUE if incrementing worked, FALSE if not
+     * @param device string device id string
+     * @param area string admin or user
+     * @return boolean if incrementing worked, FALSE if not
      */
     public function incrementDownloadStats($device, $area) {
         $device = DBConnection::escape_value(Profile::$DB_TYPE, $device);
@@ -399,7 +401,7 @@ 
 
     /**
      * Retrieve current download stats from database, either for one specific device or for all devices
-     * @param string $device the device id string
+     * @param integer $device the device id string
      * @return mixed user downloads of this profile; if device is given, returns the counter as int, otherwise an array with devicename => counter
      */
     public function getUserDownloadStats($device = 0) {
@@ -464,7 +466,7 @@ 
      * @param string $attr_name name of the attribute to set
      * @param string $attr_value value of the attribute to set
      * @param int $eap_type identifier of the EAP type in the database. 0 if the attribute is valid for all EAP types.
-     * @param string $device identifier of the device in the databse. Omit the argument if attribute is valid for all devices.
+     * @param integer $device identifier of the device in the databse. Omit the argument if attribute is valid for all devices.
      */
     public function addAttribute($attr_name, $attr_value, $eap_type, $device = 0) {
         $attr_name = DBConnection::escape_value(Profile::$DB_TYPE, $attr_name);
@@ -574,7 +576,7 @@ 
     /** Returns an array of the profile's attributes.
      * 
      * @param string option_name the name of a specific option. If set, only returns option values for this option name
-     * @param eapmethod the EAP type, in array ("OUTER/INNER") notation. If set, returns only attributes which are specific to that EAP type
+     * @param eapmethod integer EAP type, in array ("OUTER/INNER") notation. If set, returns only attributes which are specific to that EAP type
      * @param string device the device ID string. If set, returns only attributes which are specific to that device
      * @return array attributes of the profile
      */
@@ -658,7 +660,7 @@ 
     /**
      * list all devices marking their availabiblity and possible redirects
      *
-     * @param string $locale for text-based attributes, either returns values for the default value, or if specified here, in the locale specified
+     * @param integer $locale for text-based attributes, either returns values for the default value, or if specified here, in the locale specified
      * @return array of device ids display names and their status
      */
     public function listDevices($locale = 0) {
@@ -713,7 +715,7 @@ 
      * as wel as the chosen language.
      * can be called with an optional $eap argument
      * 
-     * @param array $eap if specified, retrieves attributes specific to the given EAP type
+     * @param integer $eap if specified, retrieves attributes specific to the given EAP type
      * @return array list of attributes in collapsed style (index is the attrib name, value is an array of different values)
      */
     public function getCollapsedAttributes($eap = 0) {

Indentation +15 added lines, -15 removed lines

@@ -680,27 +680,27 @@
             $redirect_url = getLocalisedValue($this->getAttributes("device-specific:redirect", 0, $d), $locale);
             $dev_status = AVAILABLE;
             if(isset($D['options']) && isset($D['options']['message']) && $D['options']['message']) 
-               $message = $D['options']['message'];
+                $message = $D['options']['message'];
             else
-               $message = 0;
+                $message = 0;
 
             if ($redirect_url === 0) {
                 if(isset($D['options']) && isset($D['options']['redirect']) && $D['options']['redirect']) {
-                   $dev_status = HIDDEN;
+                    $dev_status = HIDDEN;
                 }  else {
-                   $eap = $dev->getPreferredEapType($preferred_eap);
-                   if ($eap) {
-                       if (isset($EAP_options["eap-specific:customtext"][serialize($eap)]))
-                           $eap_customtext = $EAP_options["eap-specific:customtext"][serialize($eap)];
-                       else {
-                           $eap_customtext = getLocalisedValue($this->getAttributes("eap-specific:customtext", $eap, 0), $locale);
-                           $EAP_options["eap-specific:customtext"][serialize($eap)] = $eap_customtext;
-                       }
-                       $device_customtext = getLocalisedValue($this->getAttributes("device-specific:customtext", 0, $d), $locale);
-                   } else {
+                    $eap = $dev->getPreferredEapType($preferred_eap);
+                    if ($eap) {
+                        if (isset($EAP_options["eap-specific:customtext"][serialize($eap)]))
+                            $eap_customtext = $EAP_options["eap-specific:customtext"][serialize($eap)];
+                        else {
+                            $eap_customtext = getLocalisedValue($this->getAttributes("eap-specific:customtext", $eap, 0), $locale);
+                            $EAP_options["eap-specific:customtext"][serialize($eap)] = $eap_customtext;
+                        }
+                        $device_customtext = getLocalisedValue($this->getAttributes("device-specific:customtext", 0, $d), $locale);
+                    } else {
                     $dev_status = UNAVAILABLE;
-                   }
-               }
+                    }
+                }
             }
             $returnarray[] = ['id' => $d, 'display' => $D['display'], 'status' => $dev_status, 'redirect' => $redirect_url, 'eap_customtext' => $eap_customtext, 'device_customtext' => $device_customtext, 'message' => $message, 'options'=>$D['options']];
         }

Spacing +13 added lines, -13 removed lines

@@ -120,7 +120,7 @@ 
                 $temparray[] = [
                     "name" => $a->option_name,
                     "value" => $a->option_value,
-                    "level" => ($a->device_id == NULL && $a->method == 0 ? "Profile" : "Method" ),
+                    "level" => ($a->device_id == NULL && $a->method == 0 ? "Profile" : "Method"),
                     "row" => $a->row,
                     "device" => $a->device_id,
                     "flag" => $optinfo['flag'],
@@ -141,8 +141,8 @@ 
 
                 $temparray[] = [
                     "name" => $a->option_name,
-                    "value" => ( $lang == "" ? $content : serialize(['lang' => $lang, 'content' => $content])),
-                    "level" => ($a->device_id == NULL && $a->method == 0 ? "Profile" : "Method" ),
+                    "value" => ($lang == "" ? $content : serialize(['lang' => $lang, 'content' => $content])),
+                    "level" => ($a->device_id == NULL && $a->method == 0 ? "Profile" : "Method"),
                     "row" => $a->row,
                     "flag" => $optinfo['flag'],
                     "device" => $a->device_id,
@@ -355,7 +355,7 @@ 
             if ($lc = mysqli_fetch_object($exec_update)->last_change) {
                 if ($lc < $cache->tm) {
                     debug(4, "Installer cached:$cache->download_path\n");
-                    return(['cache'=>$cache->download_path,'mime'=>$cache->mime]);
+                    return(['cache'=>$cache->download_path, 'mime'=>$cache->mime]);
                 }
                 else
                     return NULL;
@@ -373,7 +373,7 @@ 
      * @param string device the device identifier string
      * @param string path the path where the new installer can be found
      */
-    public function updateCache($device, $path,$mime) {
+    public function updateCache($device, $path, $mime) {
         $device = DBConnection::escape_value(Profile::$DB_TYPE, $device);
         $path   = DBConnection::escape_value(Profile::$DB_TYPE, $path);
         DBConnection::exec(Profile::$DB_TYPE, "INSERT INTO downloads (profile_id,device_id,download_path,mime,lang,installer_time) 
@@ -471,7 +471,7 @@ 
         $attr_value = DBConnection::escape_value(Profile::$DB_TYPE, $attr_value);
         
         DBConnection::exec(Profile::$DB_TYPE, "INSERT INTO profile_option (profile_id, option_name, option_value, eap_method_id" . ($device !== 0 ? ",device_id" : "") . ") 
-                          VALUES(". $this->identifier . ", '$attr_name', '$attr_value', $eap_type" . ($device !== 0 ? ",'". DBConnection::escape_value(Profile::$DB_TYPE, $device) . "'" : "" ) . ")");
+                          VALUES(". $this->identifier . ", '$attr_name', '$attr_value', $eap_type" . ($device !== 0 ? ",'" . DBConnection::escape_value(Profile::$DB_TYPE, $device) . "'" : "") . ")");
         $this->updateFreshness();
     }
 
@@ -524,20 +524,20 @@ 
      * @param string $localpart the username
      *
      */
-    public function setRealmCheckUser($shallwe,$localpart = NULL) {
+    public function setRealmCheckUser($shallwe, $localpart = NULL) {
         DBConnection::exec(Profile::$DB_TYPE, 
                 "UPDATE profile SET checkuser_outer = " . ($shallwe == true ? "1" : "0") . 
-                ( $localpart !== NULL ? ", checkuser_value = '$localpart' " : "") .
+                ($localpart !== NULL ? ", checkuser_value = '$localpart' " : "") .
                 " WHERE profile_id = $this->identifier");
     }
 
     /** should username be verified or even prefilled?
      * 
      */
-    public function setInputVerificationPreference($verify,$hint) {
+    public function setInputVerificationPreference($verify, $hint) {
         DBConnection::exec(Profile::$DB_TYPE, 
                 "UPDATE profile SET verify_userinput_suffix = " . ($verify == true ? "1" : "0") . 
-                ", hint_userinput_suffix = ". ($hint == true ? "1" : "0") .
+                ", hint_userinput_suffix = " . ($hint == true ? "1" : "0") .
                 " WHERE profile_id = $this->identifier");
     }
     
@@ -679,15 +679,15 @@ 
             $dev = $factory->device;
             $redirect_url = getLocalisedValue($this->getAttributes("device-specific:redirect", 0, $d), $locale);
             $dev_status = AVAILABLE;
-            if(isset($D['options']) && isset($D['options']['message']) && $D['options']['message']) 
+            if (isset($D['options']) && isset($D['options']['message']) && $D['options']['message']) 
                $message = $D['options']['message'];
             else
                $message = 0;
 
             if ($redirect_url === 0) {
-                if(isset($D['options']) && isset($D['options']['redirect']) && $D['options']['redirect']) {
+                if (isset($D['options']) && isset($D['options']['redirect']) && $D['options']['redirect']) {
                    $dev_status = HIDDEN;
-                }  else {
+                } else {
                    $eap = $dev->getPreferredEapType($preferred_eap);
                    if ($eap) {
                        if (isset($EAP_options["eap-specific:customtext"][serialize($eap)]))

Braces +120 added lines, -88 removed lines

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