codysnider / tt-rss

lib/gettext/gettext.php

Indentation +244 added lines, -244 removed lines

@@ -34,75 +34,75 @@ 
  * that you don't want to keep in memory)
  */
 class gettext_reader {
-  //public:
-   var $error = 0; // public variable that holds error code (0 if no error)
-
-   //private:
-  var $BYTEORDER = 0; // 0: low endian, 1: big endian
-  var $STREAM = null;
-  var $short_circuit = false;
-  var $enable_cache = false;
-  var $originals = null; // offset of original table
-  var $translations = null; // offset of translation table
-  var $pluralheader = null; // cache header field for plural forms
-  var $total = 0; // total string count
-  var $table_originals = null; // table for original strings (offsets)
-  var $table_translations = null; // table for translated strings (offsets)
-  var $cache_translations = null; // original -> translation mapping
-
-
-  /* Methods */
-
-
-  /**
-   * Reads a 32bit Integer from the Stream
-   *
-   * @access private
-   * @return Integer from the Stream
-   */
-  function readint() {
-      if ($this->BYTEORDER == 0) {
+    //public:
+    var $error = 0; // public variable that holds error code (0 if no error)
+
+    //private:
+    var $BYTEORDER = 0; // 0: low endian, 1: big endian
+    var $STREAM = null;
+    var $short_circuit = false;
+    var $enable_cache = false;
+    var $originals = null; // offset of original table
+    var $translations = null; // offset of translation table
+    var $pluralheader = null; // cache header field for plural forms
+    var $total = 0; // total string count
+    var $table_originals = null; // table for original strings (offsets)
+    var $table_translations = null; // table for translated strings (offsets)
+    var $cache_translations = null; // original -> translation mapping
+
+
+    /* Methods */
+
+
+    /**
+     * Reads a 32bit Integer from the Stream
+     *
+     * @access private
+     * @return Integer from the Stream
+     */
+    function readint() {
+        if ($this->BYTEORDER == 0) {
         // low endian
         $input = unpack('V', $this->STREAM->read(4));
         return array_shift($input);
-      } else {
+        } else {
         // big endian
         $input = unpack('N', $this->STREAM->read(4));
         return array_shift($input);
-      }
+        }
     }
 
-  function read($bytes) {
+    function read($bytes) {
     return $this->STREAM->read($bytes);
-  }
-
-  /**
-   * Reads an array of Integers from the Stream
-   *
-   * @param int count How many elements should be read
-   * @return Array of Integers
-   */
-  function readintarray($count) {
+    }
+
+    /**
+     * Reads an array of Integers from the Stream
+     *
+     * @param int count How many elements should be read
+     * @return Array of Integers
+     */
+    function readintarray($count) {
     if ($this->BYTEORDER == 0) {
         // low endian
         return unpack('V'.$count, $this->STREAM->read(4 * $count));
-      } else {
+        } else {
         // big endian
         return unpack('N'.$count, $this->STREAM->read(4 * $count));
-      }
-  }
-
-  /**
-   * Constructor
-   *
-   * @param object Reader the StreamReader object
-   * @param boolean enable_cache Enable or disable caching of strings (default on)
-   */
-  function __construct($Reader, $enable_cache = true) {
+        }
+    }
+
+    /**
+     * Constructor
+     *
+     * @param object Reader the StreamReader object
+     * @param boolean enable_cache Enable or disable caching of strings (default on)
+     */
+    function __construct($Reader, $enable_cache = true) {
     // If there isn't a StreamReader, turn on short circuit mode.
     if (!$Reader || isset($Reader->error)) {
-      $this->short_circuit = true;
-      return;
+        $this->short_circuit = true;
+        return;
     }
 
     // Caching can be turned off
@@ -114,12 +114,12 @@ 
     $this->STREAM = $Reader;
     $magic = $this->read(4);
     if ($magic == $MAGIC1) {
-      $this->BYTEORDER = 1;
+        $this->BYTEORDER = 1;
     } elseif ($magic == $MAGIC2) {
-      $this->BYTEORDER = 0;
+        $this->BYTEORDER = 0;
     } else {
-      $this->error = 1; // not MO file
-      return false;
+        $this->error = 1; // not MO file
+        return false;
     }
 
     // FIXME: Do we care about revision? We should.
@@ -128,162 +128,162 @@ 
     $this->total = $this->readint();
     $this->originals = $this->readint();
     $this->translations = $this->readint();
-  }
-
-  /**
-   * Loads the translation tables from the MO file into the cache
-   * If caching is enabled, also loads all strings into a cache
-   * to speed up translation lookups
-   *
-   * @access private
-   */
-  function load_tables() {
+    }
+
+    /**
+     * Loads the translation tables from the MO file into the cache
+     * If caching is enabled, also loads all strings into a cache
+     * to speed up translation lookups
+     *
+     * @access private
+     */
+    function load_tables() {
     if (is_array($this->cache_translations) &&
       is_array($this->table_originals) &&
       is_array($this->table_translations)) {
-          return;
+            return;
     }
 
     /* get original and translations tables */
     if (!is_array($this->table_originals)) {
-      $this->STREAM->seekto($this->originals);
-      $this->table_originals = $this->readintarray($this->total * 2);
+        $this->STREAM->seekto($this->originals);
+        $this->table_originals = $this->readintarray($this->total * 2);
     }
     if (!is_array($this->table_translations)) {
-      $this->STREAM->seekto($this->translations);
-      $this->table_translations = $this->readintarray($this->total * 2);
+        $this->STREAM->seekto($this->translations);
+        $this->table_translations = $this->readintarray($this->total * 2);
     }
 
     if ($this->enable_cache) {
-      $this->cache_translations = array();
-      /* read all strings in the cache */
-      for ($i = 0; $i < $this->total; $i++) {
+        $this->cache_translations = array();
+        /* read all strings in the cache */
+        for ($i = 0; $i < $this->total; $i++) {
         $this->STREAM->seekto($this->table_originals[$i * 2 + 2]);
         $original = $this->STREAM->read($this->table_originals[$i * 2 + 1]);
         $this->STREAM->seekto($this->table_translations[$i * 2 + 2]);
         $translation = $this->STREAM->read($this->table_translations[$i * 2 + 1]);
         $this->cache_translations[$original] = $translation;
-      }
-    }
-  }
-
-  /**
-   * Returns a string from the "originals" table
-   *
-   * @access private
-   * @param int num Offset number of original string
-   * @return string Requested string if found, otherwise ''
-   */
-  function get_original_string($num) {
+        }
+    }
+    }
+
+    /**
+     * Returns a string from the "originals" table
+     *
+     * @access private
+     * @param int num Offset number of original string
+     * @return string Requested string if found, otherwise ''
+     */
+    function get_original_string($num) {
     $length = $this->table_originals[$num * 2 + 1];
     $offset = $this->table_originals[$num * 2 + 2];
     if (! $length) {
-          return '';
+            return '';
     }
     $this->STREAM->seekto($offset);
     $data = $this->STREAM->read($length);
     return (string)$data;
-  }
-
-  /**
-   * Returns a string from the "translations" table
-   *
-   * @access private
-   * @param int num Offset number of original string
-   * @return string Requested string if found, otherwise ''
-   */
-  function get_translation_string($num) {
+    }
+
+    /**
+     * Returns a string from the "translations" table
+     *
+     * @access private
+     * @param int num Offset number of original string
+     * @return string Requested string if found, otherwise ''
+     */
+    function get_translation_string($num) {
     $length = $this->table_translations[$num * 2 + 1];
     $offset = $this->table_translations[$num * 2 + 2];
     if (! $length) {
-          return '';
+            return '';
     }
     $this->STREAM->seekto($offset);
     $data = $this->STREAM->read($length);
     return (string)$data;
-  }
-
-  /**
-   * Binary search for string
-   *
-   * @access private
-   * @param string string
-   * @param int start (internally used in recursive function)
-   * @param int end (internally used in recursive function)
-   * @return int string number (offset in originals table)
-   */
-  function find_string($string, $start = -1, $end = -1) {
+    }
+
+    /**
+     * Binary search for string
+     *
+     * @access private
+     * @param string string
+     * @param int start (internally used in recursive function)
+     * @param int end (internally used in recursive function)
+     * @return int string number (offset in originals table)
+     */
+    function find_string($string, $start = -1, $end = -1) {
     if (($start == -1) or ($end == -1)) {
-      // find_string is called with only one parameter, set start end end
-      $start = 0;
-      $end = $this->total;
+        // find_string is called with only one parameter, set start end end
+        $start = 0;
+        $end = $this->total;
     }
     if (abs($start - $end) <= 1) {
-      // We're done, now we either found the string, or it doesn't exist
-      $txt = $this->get_original_string($start);
-      if ($string == $txt) {
-              return $start;
-      } else {
-              return -1;
-      }
+        // We're done, now we either found the string, or it doesn't exist
+        $txt = $this->get_original_string($start);
+        if ($string == $txt) {
+                return $start;
+        } else {
+                return -1;
+        }
     } else if ($start > $end) {
-      // start > end -> turn around and start over
-      return $this->find_string($string, $end, $start);
+        // start > end -> turn around and start over
+        return $this->find_string($string, $end, $start);
     } else {
-      // Divide table in two parts
-      $half = (int) (($start + $end) / 2);
-      $cmp = strcmp($string, $this->get_original_string($half));
-      if ($cmp == 0) {
-              // string is exactly in the middle => return it
+        // Divide table in two parts
+        $half = (int) (($start + $end) / 2);
+        $cmp = strcmp($string, $this->get_original_string($half));
+        if ($cmp == 0) {
+                // string is exactly in the middle => return it
         return $half;
-      } else if ($cmp < 0) {
-              // The string is in the upper half
+        } else if ($cmp < 0) {
+                // The string is in the upper half
         return $this->find_string($string, $start, $half);
-      } else {
-              // The string is in the lower half
+        } else {
+                // The string is in the lower half
         return $this->find_string($string, $half, $end);
-      }
-    }
-  }
-
-  /**
-   * Translates a string
-   *
-   * @access public
-   * @param string string to be translated
-   * @return string translated string (or original, if not found)
-   */
-  function translate($string) {
+        }
+    }
+    }
+
+    /**
+     * Translates a string
+     *
+     * @access public
+     * @param string string to be translated
+     * @return string translated string (or original, if not found)
+     */
+    function translate($string) {
     if ($this->short_circuit) {
-          return $string;
+            return $string;
     }
     $this->load_tables();
 
     if ($this->enable_cache) {
-      // Caching enabled, get translated string from cache
-      if (array_key_exists($string, $this->cache_translations)) {
-              return $this->cache_translations[$string];
-      } else {
-              return $string;
-      }
+        // Caching enabled, get translated string from cache
+        if (array_key_exists($string, $this->cache_translations)) {
+                return $this->cache_translations[$string];
+        } else {
+                return $string;
+        }
     } else {
-      // Caching not enabled, try to find string
-      $num = $this->find_string($string);
-      if ($num == -1) {
-              return $string;
-      } else {
-              return $this->get_translation_string($num);
-      }
-    }
-  }
-
-  /**
-   * Sanitize plural form expression for use in PHP eval call.
-   *
-   * @access private
-   * @return string sanitized plural form expression
-   */
-  function sanitize_plural_expression($expr) {
+        // Caching not enabled, try to find string
+        $num = $this->find_string($string);
+        if ($num == -1) {
+                return $string;
+        } else {
+                return $this->get_translation_string($num);
+        }
+    }
+    }
+
+    /**
+     * Sanitize plural form expression for use in PHP eval call.
+     *
+     * @access private
+     * @return string sanitized plural form expression
+     */
+    function sanitize_plural_expression($expr) {
     // Get rid of disallowed characters.
     $expr = preg_replace('@[^a-zA-Z0-9_:;\(\)\?\|\&=!<>+*/\%-]@', '', $expr);
 
@@ -292,75 +292,75 @@ 
     $res = '';
     $p = 0;
     for ($i = 0; $i < strlen($expr); $i++) {
-      $ch = $expr[$i];
-      switch ($ch) {
-      case '?':
+        $ch = $expr[$i];
+        switch ($ch) {
+        case '?':
         $res .= ' ? (';
         $p++;
         break;
-      case ':':
+        case ':':
         $res .= ') : (';
         break;
-      case ';':
+        case ';':
         $res .= str_repeat(')', $p).';';
         $p = 0;
         break;
-      default:
+        default:
         $res .= $ch;
-      }
+        }
     }
     return $res;
-  }
-
-  /**
-   * Parse full PO header and extract only plural forms line.
-   *
-   * @access private
-   * @return string verbatim plural form header field
-   */
-  function extract_plural_forms_header_from_po_header($header) {
+    }
+
+    /**
+     * Parse full PO header and extract only plural forms line.
+     *
+     * @access private
+     * @return string verbatim plural form header field
+     */
+    function extract_plural_forms_header_from_po_header($header) {
     if (preg_match("/(^|\n)plural-forms: ([^\n]*)\n/i", $header, $regs)) {
-          $expr = $regs[2];
+            $expr = $regs[2];
     } else {
-          $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
+            $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
     }
     return $expr;
-  }
-
-  /**
-   * Get possible plural forms from MO header
-   *
-   * @access private
-   * @return string plural form header
-   */
-  function get_plural_forms() {
+    }
+
+    /**
+     * Get possible plural forms from MO header
+     *
+     * @access private
+     * @return string plural form header
+     */
+    function get_plural_forms() {
     // lets assume message number 0 is header
     // this is true, right?
     $this->load_tables();
 
     // cache header field for plural forms
     if (!is_string($this->pluralheader)) {
-      if ($this->enable_cache) {
+        if ($this->enable_cache) {
         $header = $this->cache_translations[""];
-      } else {
+        } else {
         $header = $this->get_translation_string(0);
-      }
-      $expr = $this->extract_plural_forms_header_from_po_header($header);
-      $this->pluralheader = $this->sanitize_plural_expression($expr);
+        }
+        $expr = $this->extract_plural_forms_header_from_po_header($header);
+        $this->pluralheader = $this->sanitize_plural_expression($expr);
     }
     return $this->pluralheader;
-  }
-
-  /**
-   * Detects which plural form to take
-   *
-   * @access private
-   * @param n count
-   * @return int array index of the right plural form
-   */
-  function select_string($n) {
+    }
+
+    /**
+     * Detects which plural form to take
+     *
+     * @access private
+     * @param n count
+     * @return int array index of the right plural form
+     */
+    function select_string($n) {
     if (!is_int($n)) {
-      throw new InvalidArgumentException(
+        throw new InvalidArgumentException(
         "Select_string only accepts integers: ".$n);
     }
     $string = $this->get_plural_forms();
@@ -376,24 +376,24 @@ 
         $plural = $total - 1;
     }
     return $plural;
-  }
-
-  /**
-   * Plural version of gettext
-   *
-   * @access public
-   * @param string single
-   * @param string plural
-   * @param string number
-   * @return translated plural form
-   */
-  function ngettext($single, $plural, $number) {
+    }
+
+    /**
+     * Plural version of gettext
+     *
+     * @access public
+     * @param string single
+     * @param string plural
+     * @param string number
+     * @return translated plural form
+     */
+    function ngettext($single, $plural, $number) {
     if ($this->short_circuit) {
-      if ($number != 1) {
-              return $plural;
-      } else {
-              return $single;
-      }
+        if ($number != 1) {
+                return $plural;
+        } else {
+                return $single;
+        }
     }
 
     // find out the appropriate form
@@ -404,45 +404,45 @@ 
 
 
     if ($this->enable_cache) {
-      if (!array_key_exists($key, $this->cache_translations)) {
+        if (!array_key_exists($key, $this->cache_translations)) {
         return ($number != 1) ? $plural : $single;
-      } else {
+        } else {
         $result = $this->cache_translations[$key];
         $list = explode(chr(0), $result);
         return $list[$select];
-      }
+        }
     } else {
-      $num = $this->find_string($key);
-      if ($num == -1) {
+        $num = $this->find_string($key);
+        if ($num == -1) {
         return ($number != 1) ? $plural : $single;
-      } else {
+        } else {
         $result = $this->get_translation_string($num);
         $list = explode(chr(0), $result);
         return $list[$select];
-      }
+        }
+    }
     }
-  }
 
-  function pgettext($context, $msgid) {
+    function pgettext($context, $msgid) {
     $key = $context.chr(4).$msgid;
     $ret = $this->translate($key);
     if (strpos($ret, "\004") !== false) {
-      return $msgid;
+        return $msgid;
     } else {
-      return $ret;
+        return $ret;
+    }
     }
-  }
 
-  function npgettext($context, $singular, $plural, $number) {
+    function npgettext($context, $singular, $plural, $number) {
     $key = $context.chr(4).$singular;
     $ret = $this->ngettext($key, $plural, $number);
     if (strpos($ret, "\004") !== false) {
-      return $singular;
+        return $singular;
     } else {
-      return $ret;
+        return $ret;
     }
 
-  }
+    }
 }
 
 ?>

Spacing +4 added lines, -4 removed lines

@@ -177,12 +177,12 @@ 
   function get_original_string($num) {
     $length = $this->table_originals[$num * 2 + 1];
     $offset = $this->table_originals[$num * 2 + 2];
-    if (! $length) {
+    if (!$length) {
           return '';
     }
     $this->STREAM->seekto($offset);
     $data = $this->STREAM->read($length);
-    return (string)$data;
+    return (string) $data;
   }
 
   /**
@@ -195,12 +195,12 @@ 
   function get_translation_string($num) {
     $length = $this->table_translations[$num * 2 + 1];
     $offset = $this->table_translations[$num * 2 + 2];
-    if (! $length) {
+    if (!$length) {
           return '';
     }
     $this->STREAM->seekto($offset);
     $data = $this->STREAM->read($length);
-    return (string)$data;
+    return (string) $data;
   }
 
   /**

lib/gettext/gettext.inc

Indentation +93 added lines, -93 removed lines

@@ -35,7 +35,7 @@ 
 // LC_MESSAGES is not available if php-gettext is not loaded
 // while the other constants are already available from session extension.
 if (!defined('LC_MESSAGES')) {
-  define('LC_MESSAGES', 5);
+    define('LC_MESSAGES', 5);
 }
 
 require('streams.php');
@@ -53,9 +53,9 @@ 
 
 /* Class to hold a single domain included in $text_domains. */
 class domain {
-  var $l10n;
-  var $path;
-  var $codeset;
+    var $l10n;
+    var $path;
+    var $codeset;
 }
 
 // Utility functions
@@ -64,63 +64,63 @@ 
  * Return a list of locales to try for any POSIX-style locale specification.
  */
 function get_list_of_locales($locale) {
-  /* Figure out all possible locale names and start with the most
+    /* Figure out all possible locale names and start with the most
    * specific ones.  I.e. for sr_CS.UTF-8@latin, look through all of
    * sr_CS.UTF-8@latin, sr_CS@latin, sr@latin, sr_CS.UTF-8, sr_CS, sr.
    */
-  $locale_names = array();
-  $lang = null;
-  $country = null;
-  $charset = null;
-  $modifier = null;
-  if ($locale) {
+    $locale_names = array();
+    $lang = null;
+    $country = null;
+    $charset = null;
+    $modifier = null;
+    if ($locale) {
     if (preg_match("/^(?P<lang>[a-z]{2,3})"              // language code
-                   ."(?:_(?P<country>[A-Z]{2}))?"           // country code
-                   ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?"    // charset
-                   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/", // @ modifier
-                   $locale, $matches)) {
-
-      if (isset($matches["lang"])) {
-          $lang = $matches["lang"];
-      }
-      if (isset($matches["country"])) {
-          $country = $matches["country"];
-      }
-      if (isset($matches["charset"])) {
-          $charset = $matches["charset"];
-      }
-      if (isset($matches["modifier"])) {
-          $modifier = $matches["modifier"];
-      }
-
-      if ($modifier) {
+                    ."(?:_(?P<country>[A-Z]{2}))?"           // country code
+                    ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?"    // charset
+                    ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/", // @ modifier
+                    $locale, $matches)) {
+
+        if (isset($matches["lang"])) {
+            $lang = $matches["lang"];
+        }
+        if (isset($matches["country"])) {
+            $country = $matches["country"];
+        }
+        if (isset($matches["charset"])) {
+            $charset = $matches["charset"];
+        }
+        if (isset($matches["modifier"])) {
+            $modifier = $matches["modifier"];
+        }
+
+        if ($modifier) {
         if ($country) {
-          if ($charset) {
-                      array_push($locale_names, "${lang}_$country.$charset@$modifier");
-          }
-          array_push($locale_names, "${lang}_$country@$modifier");
+            if ($charset) {
+                        array_push($locale_names, "${lang}_$country.$charset@$modifier");
+            }
+            array_push($locale_names, "${lang}_$country@$modifier");
         } elseif ($charset) {
                     array_push($locale_names, "${lang}.$charset@$modifier");
         }
         array_push($locale_names, "$lang@$modifier");
-      }
-      if ($country) {
+        }
+        if ($country) {
         if ($charset) {
-                  array_push($locale_names, "${lang}_$country.$charset");
+                    array_push($locale_names, "${lang}_$country.$charset");
         }
         array_push($locale_names, "${lang}_$country");
-      } elseif ($charset) {
+        } elseif ($charset) {
                 array_push($locale_names, "${lang}.$charset");
-      }
-      array_push($locale_names, $lang);
+        }
+        array_push($locale_names, $lang);
     }
 
     // If the locale name doesn't match POSIX style, just include it as-is.
     if (!in_array($locale, $locale_names)) {
-          array_push($locale_names, $locale);
+            array_push($locale_names, $locale);
     }
-  }
-  return $locale_names;
+    }
+    return $locale_names;
 }
 
 /**
@@ -141,19 +141,19 @@ 
         $locale_names = get_list_of_locales($locale);
         $input = null;
         foreach ($locale_names as $locale) {
-          $full_path = $bound_path.$locale."/".$subpath;
-          if (file_exists($full_path)) {
+            $full_path = $bound_path.$locale."/".$subpath;
+            if (file_exists($full_path)) {
             $input = new FileReader($full_path);
             break;
-          }
+            }
         }
 
         if (!array_key_exists($domain, $text_domains)) {
-          // Initialize an empty domain object.
-          $text_domains[$domain] = new domain();
+            // Initialize an empty domain object.
+            $text_domains[$domain] = new domain();
         }
         $text_domains[$domain]->l10n = new gettext_reader($input,
-                                                          $enable_cache);
+                                                            $enable_cache);
     }
     return $text_domains[$domain]->l10n;
 }
@@ -190,14 +190,14 @@ 
  * Convert the given string to the encoding set by bind_textdomain_codeset.
  */
 function _encode($text) {
-  $target_encoding = _get_codeset();
-  if (function_exists("mb_detect_encoding")) {
+    $target_encoding = _get_codeset();
+    if (function_exists("mb_detect_encoding")) {
     $source_encoding = mb_detect_encoding($text);
     if ($source_encoding != $target_encoding) {
-          $text = mb_convert_encoding($text, $target_encoding, $source_encoding);
+            $text = mb_convert_encoding($text, $target_encoding, $source_encoding);
+    }
     }
-  }
-  return $text;
+    return $text;
 }
 
 
@@ -207,13 +207,13 @@ 
  * Returns passed in $locale, or environment variable $LANG if $locale == ''.
  */
 function _get_default_locale($locale) {
-  if ($locale == '') {
-      // emulate variable support
+    if ($locale == '') {
+        // emulate variable support
     return getenv('LANG');
-  } else {
-      return $locale;
-  }
-  }
+    } else {
+        return $locale;
+    }
+    }
 
 /**
  * Sets a requested locale, if needed emulates it.
@@ -230,20 +230,20 @@ 
         }
     } else {
         if (function_exists('setlocale')) {
-          $ret = setlocale($category, $locale);
-          if (($locale == '' and !$ret) or // failed setting it by env
+            $ret = setlocale($category, $locale);
+            if (($locale == '' and !$ret) or // failed setting it by env
               ($locale != '' and $ret != $locale)) { // failed setting it
             // Failed setting it according to environment.
             $CURRENTLOCALE = _get_default_locale($locale);
             $EMULATEGETTEXT = 1;
-          } else {
+            } else {
             $CURRENTLOCALE = $ret;
             $EMULATEGETTEXT = 0;
-          }
+            }
         } else {
-          // No function setlocale(), emulate it all.
-          $CURRENTLOCALE = _get_default_locale($locale);
-          $EMULATEGETTEXT = 1;
+            // No function setlocale(), emulate it all.
+            $CURRENTLOCALE = _get_default_locale($locale);
+            $EMULATEGETTEXT = 1;
         }
         // Allow locale to be changed on the go for one translation domain.
         global $text_domains, $default_domain;
@@ -261,15 +261,15 @@ 
     global $text_domains;
     // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
     if (substr(php_uname(), 0, 7) == "Windows") {
-      if ($path[strlen($path) - 1] != '\\' and $path[strlen($path) - 1] != '/')
+        if ($path[strlen($path) - 1] != '\\' and $path[strlen($path) - 1] != '/')
         $path .= '\\';
     } else {
-      if ($path[strlen($path) - 1] != '/')
+        if ($path[strlen($path) - 1] != '/')
         $path .= '/';
     }
     if (!array_key_exists($domain, $text_domains)) {
-      // Initialize an empty domain object.
-      $text_domains[$domain] = new domain();
+        // Initialize an empty domain object.
+        $text_domains[$domain] = new domain();
     }
     $text_domains[$domain]->path = $path;
 }
@@ -468,35 +468,35 @@ 
     }
 function T_dcngettext($domain, $singular, $plural, $number, $category) {
     if (_check_locale_and_function()) {
-          return dcngettext($domain, $singular, $plural, $number, $category);
+            return dcngettext($domain, $singular, $plural, $number, $category);
     } else {
         return _dcngettext($domain, $singular, $plural, $number, $category);
     }
     }
 
 function T_pgettext($context, $msgid) {
-  if (_check_locale_and_function('pgettext')) {
+    if (_check_locale_and_function('pgettext')) {
         return pgettext($context, $msgid);
-  } else {
+    } else {
         return _pgettext($context, $msgid);
-  }
-  }
+    }
+    }
 
 function T_dpgettext($domain, $context, $msgid) {
-  if (_check_locale_and_function('dpgettext')) {
+    if (_check_locale_and_function('dpgettext')) {
         return dpgettext($domain, $context, $msgid);
-  } else {
+    } else {
         return _dpgettext($domain, $context, $msgid);
-  }
-  }
+    }
+    }
 
 function T_dcpgettext($domain, $context, $msgid, $category) {
-  if (_check_locale_and_function('dcpgettext')) {
+    if (_check_locale_and_function('dcpgettext')) {
         return dcpgettext($domain, $context, $msgid, $category);
-  } else {
+    } else {
         return _dcpgettext($domain, $context, $msgid, $category);
-  }
-  }
+    }
+    }
 
 function T_npgettext($context, $singular, $plural, $number) {
     if (_check_locale_and_function('npgettext')) {
@@ -507,18 +507,18 @@ 
     }
 
 function T_dnpgettext($domain, $context, $singular, $plural, $number) {
-  if (_check_locale_and_function('dnpgettext')) {
+    if (_check_locale_and_function('dnpgettext')) {
         return dnpgettext($domain, $context, $singular, $plural, $number);
-  } else {
+    } else {
         return _dnpgettext($domain, $context, $singular, $plural, $number);
-  }
-  }
+    }
+    }
 
 function T_dcnpgettext($domain, $context, $singular, $plural,
-                       $number, $category) {
+                        $number, $category) {
     if (_check_locale_and_function('dcnpgettext')) {
             return dcnpgettext($domain, $context, $singular,
-                           $plural, $number, $category);
+                            $plural, $number, $category);
     } else {
             return _dcnpgettext($domain, $context, $singular,
                             $plural, $number, $category);
@@ -576,9 +576,9 @@ 
         return _dcpgettext($domain, $context, $msgid, $category);
     }
     function dcnpgettext($domain, $context, $singular, $plural,
-                         $number, $category) {
-      return _dcnpgettext($domain, $context, $singular, $plural,
-                          $number, $category);
+                            $number, $category) {
+        return _dcnpgettext($domain, $context, $singular, $plural,
+                            $number, $category);
     }
 }
 

Braces +9 added lines, -5 removed lines

@@ -182,7 +182,9 @@ 
  */
 function _get_codeset($domain = null) {
     global $text_domains, $default_domain, $LC_CATEGORIES;
-    if (!isset($domain)) $domain = $default_domain;
+    if (!isset($domain)) {
+        $domain = $default_domain;
+    }
     return (isset($text_domains[$domain]->codeset)) ? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
 }
 
@@ -261,11 +263,13 @@ 
     global $text_domains;
     // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
     if (substr(php_uname(), 0, 7) == "Windows") {
-      if ($path[strlen($path) - 1] != '\\' and $path[strlen($path) - 1] != '/')
-        $path .= '\\';
+      if ($path[strlen($path) - 1] != '\\' and $path[strlen($path) - 1] != '/') {
+              $path .= '\\';
+      }
     } else {
-      if ($path[strlen($path) - 1] != '/')
-        $path .= '/';
+      if ($path[strlen($path) - 1] != '/') {
+              $path .= '/';
+      }
     }
     if (!array_key_exists($domain, $text_domains)) {
       // Initialize an empty domain object.

lib/phpqrcode/qrimage.php

Spacing +2 added lines, -2 removed lines

@@ -35,11 +35,11 @@
                 Header("Content-type: image/png");

                 ImagePng($image);

             } else {

-                if($saveandprint===true){

+                if ($saveandprint === true) {

                     ImagePng($image, $filename);

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

                     ImagePng($image);

-                } else{

+                } else {

                     ImagePng($image, $filename);

                 }

             }

lib/phpqrcode/qrtools.php

Indentation +7 added lines, -7 removed lines

@@ -79,9 +79,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) {

@@ -89,13 +89,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');

         }

 

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

Braces +6 added lines, -4 removed lines

@@ -62,8 +62,9 @@ 
                 

             foreach ($qrTab as $line) {

                 $arrAdd = array();

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

             }

                     

@@ -91,8 +92,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');

lib/phpqrcode/qrconst.php

Indentation +20 added lines, -20 removed lines

@@ -26,29 +26,29 @@
  * 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);

+    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.

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

-		}

-	}	
\ No newline at end of file
+    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));

+        }

+    }	
\ No newline at end of file

lib/phpqrcode/index.php

Braces +12 added lines, -8 removed lines

@@ -43,19 +43,22 @@ 
     //processing form input

     //remember to sanitize user input in real-life solution !!!

     $errorCorrectionLevel = 'L';

-    if (isset($_REQUEST['level']) && in_array($_REQUEST['level'], array('L', 'M', 'Q', 'H')))

-        $errorCorrectionLevel = $_REQUEST['level'];    

+    if (isset($_REQUEST['level']) && in_array($_REQUEST['level'], array('L', 'M', 'Q', 'H'))) {
+            $errorCorrectionLevel = $_REQUEST['level'];
+    }
 

     $matrixPointSize = 4;

-    if (isset($_REQUEST['size']))

-        $matrixPointSize = min(max((int) $_REQUEST['size'], 1), 10);

+    if (isset($_REQUEST['size'])) {
+            $matrixPointSize = min(max((int) $_REQUEST['size'], 1), 10);
+    }
 

 
     if (isset($_REQUEST['data'])) { 

     

         //it's very important!

-        if (trim($_REQUEST['data']) == '')

-            die('data cannot be empty! <a href="?">back</a>');

+        if (trim($_REQUEST['data']) == '') {
+                    die('data cannot be empty! <a href="?">back</a>');
+        }
             
         // user data

         $filename = $PNG_TEMP_DIR.'test'.md5($_REQUEST['data'].'|'.$errorCorrectionLevel.'|'.$matrixPointSize).'.png';
@@ -83,8 +86,9 @@ 
         </select>&nbsp;

         Size:&nbsp;<select name="size">';

         

-    for ($i = 1; $i <= 10; $i++)

-        echo '<option value="'.$i.'"'.(($matrixPointSize == $i) ? ' selected' : '').'>'.$i.'</option>';

+    for ($i = 1; $i <= 10; $i++) {
+            echo '<option value="'.$i.'"'.(($matrixPointSize == $i) ? ' selected' : '').'>'.$i.'</option>';
+    }
         

     echo '</select>&nbsp;

         <input type="submit" value="GENERATE"></form><hr/>';

lib/phpqrcode/qrbitstream.php

Braces +12 added lines, -8 removed lines

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

@@ -125,13 +127,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);

lib/phpqrcode/tools/merged_config.php

Indentation +1 added lines, -1 removed lines

@@ -14,4 +14,4 @@
     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

-                                                  
\ No newline at end of file
+                                                    
\ No newline at end of file

lib/phpqrcode/qrinput.php

Indentation +1 added lines, -1 removed lines

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

Switch Indentation +58 added lines, -58 removed lines

@@ -201,13 +201,13 @@ 
                 $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;

-                case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            

-                default:

-                    return 0;

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

             }

 

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

@@ -247,14 +247,14 @@ 
                     $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;

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

+                    default:

+                        break;

                     }

                     

                     if ($ret < 0)

@@ -404,14 +404,14 @@ 
             $bits = $w * 10;

             

             switch ($size - $w * 3) {

-                case 1:

-                    $bits += 4;

-                    break;

-                case 2:

-                    $bits += 7;

-                    break;

-                default:

-                    break;

+            case 1:

+                $bits += 4;

+                break;

+            case 2:

+                $bits += 7;

+                break;

+            default:

+                break;

             }

 

             return $bits;

@@ -500,14 +500,14 @@ 
                 return false;

 

             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;

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

                 

-                default:

-                    break;

+            default:

+                break;

             }

 

             return false;

@@ -548,35 +548,35 @@ 
         {

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

             switch ($mode) {

-                case QR_MODE_NUM:

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

-                    $remain = $payload - $chunks * 10;

-                    $size = $chunks * 3;

-                    if ($remain >= 7) {

-                        $size += 2;

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

-                        $size += 1;

-                    }

-                    break;

-                case QR_MODE_AN:

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

-                    $remain = $payload - $chunks * 11;

-                    $size = $chunks * 2;

-                    if ($remain >= 6) 

-                        $size++;

-                    break;

-                case QR_MODE_8:

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

-                    break;

-                case QR_MODE_KANJI:

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

-                    break;

-                case QR_MODE_STRUCTURE:

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

-                    break;

-                default:

-                    $size = 0;

-                    break;

+            case QR_MODE_NUM:

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

+                $remain = $payload - $chunks * 10;

+                $size = $chunks * 3;

+                if ($remain >= 7) {

+                    $size += 2;

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

+                    $size += 1;

+                }

+                break;

+            case QR_MODE_AN:

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

+                $remain = $payload - $chunks * 11;

+                $size = $chunks * 2;

+                if ($remain >= 6) 

+                    $size++;

+                break;

+            case QR_MODE_8:

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

+                break;

+            case QR_MODE_KANJI:

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

+                break;

+            case QR_MODE_STRUCTURE:

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

+                break;

+            default:

+                $size = 0;

+                break;

             }

             

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

Braces +33 added lines, -20 removed lines

@@ -197,8 +197,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;

@@ -257,8 +258,9 @@ 
                             break;

                     }

                     

-                    if ($ret < 0)

-                        return -1;

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

 

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

@@ -475,8 +477,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]);

@@ -496,8 +499,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;

@@ -562,8 +566,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);

@@ -580,8 +585,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;

         }

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

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

                 

-                if ($bits < 0) 

-                    return -1;

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

                 $total += $bits;

             }

@@ -614,8 +624,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) {

@@ -652,8 +663,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;

             

@@ -666,8 +678,9 @@ 
                 

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

                 

-                if ($ret < 0)

-                    return $ret;

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

             }