UB-Mannheim / PalMA

php-gettext/gettext.php

Doc Comments +10 added lines, -1 removed lines

@@ -72,6 +72,9 @@ 
       }
     }
 
+  /**
+   * @param integer $bytes
+   */
   function read($bytes) {
     return $this->STREAM->read($bytes);
   }
@@ -80,6 +83,7 @@ 
    * Reads an array of Integers from the Stream
    *
    * @param int count How many elements should be read
+   * @param integer $count
    * @return Array of Integers
    */
   function readintarray($count) {
@@ -97,6 +101,7 @@ 
    *
    * @param object Reader the StreamReader object
    * @param boolean enable_cache Enable or disable caching of strings (default on)
+   * @param FileReader|null $Reader
    */
   function __construct($Reader, $enable_cache = true) {
     // If there isn't a StreamReader, turn on short circuit mode.
@@ -171,6 +176,7 @@ 
    *
    * @access private
    * @param int num Offset number of original string
+   * @param integer $num
    * @return string Requested string if found, otherwise ''
    */
   function get_original_string($num) {
@@ -188,6 +194,7 @@ 
    *
    * @access private
    * @param int num Offset number of original string
+   * @param integer $num
    * @return string Requested string if found, otherwise ''
    */
   function get_translation_string($num) {
@@ -273,6 +280,7 @@ 
    * Sanitize plural form expression for use in PHP eval call.
    *
    * @access private
+   * @param string $expr
    * @return string sanitized plural form expression
    */
   function sanitize_plural_expression($expr) {
@@ -370,7 +378,8 @@ 
    * @param string single
    * @param string plural
    * @param string number
-   * @return translated plural form
+   * @param string $single
+   * @return string plural form
    */
   function ngettext($single, $plural, $number) {
     if ($this->short_circuit) {

Indentation +224 added lines, -224 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,154 +128,154 @@ 
     $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)
+        // 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
+        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)
+        // 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)
+        else if ($cmp < 0)
         // The string is in the upper half
         return $this->find_string($string, $start, $half);
-      else
+        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))
+        // Caching enabled, get translated string from cache
+        if (array_key_exists($string, $this->cache_translations))
         return $this->cache_translations[$string];
-      else
+        else
         return $string;
     } else {
-      // Caching not enabled, try to find string
-      $num = $this->find_string($string);
-      if ($num == -1)
+        // Caching not enabled, try to find string
+        $num = $this->find_string($string);
+        if ($num == -1)
         return $string;
-      else
+        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) {
+    }
+
+    /**
+     * 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);
 
@@ -284,72 +284,72 @@ 
     $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) {
     $string = $this->get_plural_forms();
     $string = str_replace('nplurals',"\$total",$string);
     $string = str_replace("n",$n,$string);
@@ -361,22 +361,22 @@ 
     eval("$string");
     if ($plural >= $total) $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)
+        if ($number != 1)
         return $plural;
-      else
+        else
         return $single;
     }
 
@@ -388,45 +388,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 +35 added lines, -35 removed lines

@@ -38,17 +38,17 @@ 
    var $error = 0; // public variable that holds error code (0 if no error)
 
    //private:
-  var $BYTEORDER = 0;        // 0: low endian, 1: big endian
+  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
+  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 */
@@ -63,11 +63,11 @@ 
   function readint() {
       if ($this->BYTEORDER == 0) {
         // low endian
-        $input=unpack('V', $this->STREAM->read(4));
+        $input = unpack('V', $this->STREAM->read(4));
         return array_shift($input);
       } else {
         // big endian
-        $input=unpack('N', $this->STREAM->read(4));
+        $input = unpack('N', $this->STREAM->read(4));
         return array_shift($input);
       }
     }
@@ -85,10 +85,10 @@ 
   function readintarray($count) {
     if ($this->BYTEORDER == 0) {
         // low endian
-        return unpack('V'.$count, $this->STREAM->read(4 * $count));
+        return unpack('V' . $count, $this->STREAM->read(4 * $count));
       } else {
         // big endian
-        return unpack('N'.$count, $this->STREAM->read(4 * $count));
+        return unpack('N' . $count, $this->STREAM->read(4 * $count));
       }
   }
 
@@ -100,7 +100,7 @@ 
    */
   function __construct($Reader, $enable_cache = true) {
     // If there isn't a StreamReader, turn on short circuit mode.
-    if (! $Reader || isset($Reader->error) ) {
+    if (!$Reader || isset($Reader->error)) {
       $this->short_circuit = true;
       return;
     }
@@ -154,13 +154,13 @@ 
     }
 
     if ($this->enable_cache) {
-      $this->cache_translations = array ();
+      $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->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;
       }
     }
@@ -174,13 +174,13 @@ 
    * @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)
+    $length = $this->table_originals[$num * 2+1];
+    $offset = $this->table_originals[$num * 2+2];
+    if (!$length)
       return '';
     $this->STREAM->seekto($offset);
     $data = $this->STREAM->read($length);
-    return (string)$data;
+    return (string) $data;
   }
 
   /**
@@ -191,13 +191,13 @@ 
    * @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)
+    $length = $this->table_translations[$num * 2+1];
+    $offset = $this->table_translations[$num * 2+2];
+    if (!$length)
       return '';
     $this->STREAM->seekto($offset);
     $data = $this->STREAM->read($length);
-    return (string)$data;
+    return (string) $data;
   }
 
   /**
@@ -215,7 +215,7 @@ 
       $start = 0;
       $end = $this->total;
     }
-    if (abs($start - $end) <= 1) {
+    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)
@@ -227,7 +227,7 @@ 
       return $this->find_string($string, $end, $start);
     } else {
       // Divide table in two parts
-      $half = (int)(($start + $end) / 2);
+      $half = (int) (($start+$end) / 2);
       $cmp = strcmp($string, $this->get_original_string($half));
       if ($cmp == 0)
         // string is exactly in the middle => return it
@@ -294,7 +294,7 @@ 
         $res .= ') : (';
         break;
       case ';':
-        $res .= str_repeat( ')', $p) . ';';
+        $res .= str_repeat(')', $p) . ';';
         $p = 0;
         break;
       default:
@@ -330,7 +330,7 @@ 
     $this->load_tables();
 
     // cache header field for plural forms
-    if (! is_string($this->pluralheader)) {
+    if (!is_string($this->pluralheader)) {
       if ($this->enable_cache) {
         $header = $this->cache_translations[""];
       } else {
@@ -351,15 +351,15 @@ 
    */
   function select_string($n) {
     $string = $this->get_plural_forms();
-    $string = str_replace('nplurals',"\$total",$string);
-    $string = str_replace("n",$n,$string);
-    $string = str_replace('plural',"\$plural",$string);
+    $string = str_replace('nplurals', "\$total", $string);
+    $string = str_replace("n", $n, $string);
+    $string = str_replace('plural', "\$plural", $string);
 
     $total = 0;
     $plural = 0;
 
     eval("$string");
-    if ($plural >= $total) $plural = $total - 1;
+    if ($plural >= $total) $plural = $total-1;
     return $plural;
   }
 
@@ -388,7 +388,7 @@ 
 
 
     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 {
         $result = $this->cache_translations[$key];

Braces +47 added lines, -35 removed lines

@@ -140,8 +140,9 @@ 
   function load_tables() {
     if (is_array($this->cache_translations) &&
       is_array($this->table_originals) &&
-      is_array($this->table_translations))
-      return;
+      is_array($this->table_translations)) {
+          return;
+    }
 
     /* get original and translations tables */
     if (!is_array($this->table_originals)) {
@@ -176,8 +177,9 @@ 
   function get_original_string($num) {
     $length = $this->table_originals[$num * 2 + 1];
     $offset = $this->table_originals[$num * 2 + 2];
-    if (! $length)
-      return '';
+    if (! $length) {
+          return '';
+    }
     $this->STREAM->seekto($offset);
     $data = $this->STREAM->read($length);
     return (string)$data;
@@ -193,8 +195,9 @@ 
   function get_translation_string($num) {
     $length = $this->table_translations[$num * 2 + 1];
     $offset = $this->table_translations[$num * 2 + 2];
-    if (! $length)
-      return '';
+    if (! $length) {
+          return '';
+    }
     $this->STREAM->seekto($offset);
     $data = $this->STREAM->read($length);
     return (string)$data;
@@ -218,10 +221,11 @@ 
     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;
+      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);
@@ -229,15 +233,16 @@ 
       // 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
+      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);
+      }
     }
   }
 
@@ -249,23 +254,26 @@ 
    * @return string translated string (or original, if not found)
    */
   function translate($string) {
-    if ($this->short_circuit)
-      return $string;
+    if ($this->short_circuit) {
+          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;
+      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);
+      if ($num == -1) {
+              return $string;
+      } else {
+              return $this->get_translation_string($num);
+      }
     }
   }
 
@@ -311,10 +319,11 @@ 
    * @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];
-    else
-      $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
+    if (preg_match("/(^|\n)plural-forms: ([^\n]*)\n/i", $header, $regs)) {
+          $expr = $regs[2];
+    } else {
+          $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
+    }
     return $expr;
   }
 
@@ -359,7 +368,9 @@ 
     $plural = 0;
 
     eval("$string");
-    if ($plural >= $total) $plural = $total - 1;
+    if ($plural >= $total) {
+        $plural = $total - 1;
+    }
     return $plural;
   }
 
@@ -374,10 +385,11 @@ 
    */
   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

php-gettext/streams.php

Doc Comments +3 added lines

@@ -86,6 +86,9 @@
   var $_fd;
   var $_length;
 
+  /**
+   * @param string $filename
+   */
   function __construct($filename) {
     if (file_exists($filename)) {
 

Indentation +68 added lines, -68 removed lines

@@ -21,146 +21,146 @@
 */
 
 
-  // Simple class to wrap file streams, string streams, etc.
-  // seek is essential, and it should be byte stream
+    // Simple class to wrap file streams, string streams, etc.
+    // seek is essential, and it should be byte stream
 class StreamReader {
-  // should return a string [FIXME: perhaps return array of bytes?]
-  function read($bytes) {
+    // should return a string [FIXME: perhaps return array of bytes?]
+    function read($bytes) {
     return false;
-  }
+    }
 
-  // should return new position
-  function seekto($position) {
+    // should return new position
+    function seekto($position) {
     return false;
-  }
+    }
 
-  // returns current position
-  function currentpos() {
+    // returns current position
+    function currentpos() {
     return false;
-  }
+    }
 
-  // returns length of entire stream (limit for seekto()s)
-  function length() {
+    // returns length of entire stream (limit for seekto()s)
+    function length() {
     return false;
-  }
+    }
 };
 
 class StringReader {
-  var $_pos;
-  var $_str;
+    var $_pos;
+    var $_str;
 
-  function __construct($str='') {
+    function __construct($str='') {
     $this->_str = $str;
     $this->_pos = 0;
-  }
+    }
 
-  function read($bytes) {
+    function read($bytes) {
     $data = substr($this->_str, $this->_pos, $bytes);
     $this->_pos += $bytes;
     if (strlen($this->_str)<$this->_pos)
-      $this->_pos = strlen($this->_str);
+        $this->_pos = strlen($this->_str);
 
     return $data;
-  }
+    }
 
-  function seekto($pos) {
+    function seekto($pos) {
     $this->_pos = $pos;
     if (strlen($this->_str)<$this->_pos)
-      $this->_pos = strlen($this->_str);
+        $this->_pos = strlen($this->_str);
     return $this->_pos;
-  }
+    }
 
-  function currentpos() {
+    function currentpos() {
     return $this->_pos;
-  }
+    }
 
-  function length() {
+    function length() {
     return strlen($this->_str);
-  }
+    }
 
 };
 
 
 class FileReader {
-  var $_pos;
-  var $_fd;
-  var $_length;
+    var $_pos;
+    var $_fd;
+    var $_length;
 
-  function __construct($filename) {
+    function __construct($filename) {
     if (file_exists($filename)) {
 
-      $this->_length=filesize($filename);
-      $this->_pos = 0;
-      $this->_fd = fopen($filename,'rb');
-      if (!$this->_fd) {
+        $this->_length=filesize($filename);
+        $this->_pos = 0;
+        $this->_fd = fopen($filename,'rb');
+        if (!$this->_fd) {
         $this->error = 3; // Cannot read file, probably permissions
         return false;
-      }
+        }
     } else {
-      $this->error = 2; // File doesn't exist
-      return false;
+        $this->error = 2; // File doesn't exist
+        return false;
+    }
     }
-  }
 
-  function read($bytes) {
+    function read($bytes) {
     if ($bytes) {
-      fseek($this->_fd, $this->_pos);
+        fseek($this->_fd, $this->_pos);
 
-      // PHP 5.1.1 does not read more than 8192 bytes in one fread()
-      // the discussions at PHP Bugs suggest it's the intended behaviour
-      $data = '';
-      while ($bytes > 0) {
+        // PHP 5.1.1 does not read more than 8192 bytes in one fread()
+        // the discussions at PHP Bugs suggest it's the intended behaviour
+        $data = '';
+        while ($bytes > 0) {
         $chunk  = fread($this->_fd, $bytes);
         $data  .= $chunk;
         $bytes -= strlen($chunk);
-      }
-      $this->_pos = ftell($this->_fd);
+        }
+        $this->_pos = ftell($this->_fd);
 
-      return $data;
+        return $data;
     } else return '';
-  }
+    }
 
-  function seekto($pos) {
+    function seekto($pos) {
     fseek($this->_fd, $pos);
     $this->_pos = ftell($this->_fd);
     return $this->_pos;
-  }
+    }
 
-  function currentpos() {
+    function currentpos() {
     return $this->_pos;
-  }
+    }
 
-  function length() {
+    function length() {
     return $this->_length;
-  }
+    }
 
-  function close() {
+    function close() {
     fclose($this->_fd);
-  }
+    }
 
 };
 
 // Preloads entire file in memory first, then creates a StringReader
 // over it (it assumes knowledge of StringReader internals)
 class CachedFileReader extends StringReader {
-  function __construct($filename) {
+    function __construct($filename) {
     if (file_exists($filename)) {
 
-      $length=filesize($filename);
-      $fd = fopen($filename,'rb');
+        $length=filesize($filename);
+        $fd = fopen($filename,'rb');
 
-      if (!$fd) {
+        if (!$fd) {
         $this->error = 3; // Cannot read file, probably permissions
         return false;
-      }
-      $this->_str = fread($fd, $length);
-      fclose($fd);
+        }
+        $this->_str = fread($fd, $length);
+        fclose($fd);
 
     } else {
-      $this->error = 2; // File doesn't exist
-      return false;
+        $this->error = 2; // File doesn't exist
+        return false;
+    }
     }
-  }
 };
 
 

Spacing +7 added lines, -7 removed lines

@@ -49,7 +49,7 @@ 
   var $_pos;
   var $_str;
 
-  function __construct($str='') {
+  function __construct($str = '') {
     $this->_str = $str;
     $this->_pos = 0;
   }
@@ -57,7 +57,7 @@ 
   function read($bytes) {
     $data = substr($this->_str, $this->_pos, $bytes);
     $this->_pos += $bytes;
-    if (strlen($this->_str)<$this->_pos)
+    if (strlen($this->_str) < $this->_pos)
       $this->_pos = strlen($this->_str);
 
     return $data;
@@ -65,7 +65,7 @@ 
 
   function seekto($pos) {
     $this->_pos = $pos;
-    if (strlen($this->_str)<$this->_pos)
+    if (strlen($this->_str) < $this->_pos)
       $this->_pos = strlen($this->_str);
     return $this->_pos;
   }
@@ -89,9 +89,9 @@ 
   function __construct($filename) {
     if (file_exists($filename)) {
 
-      $this->_length=filesize($filename);
+      $this->_length = filesize($filename);
       $this->_pos = 0;
-      $this->_fd = fopen($filename,'rb');
+      $this->_fd = fopen($filename, 'rb');
       if (!$this->_fd) {
         $this->error = 3; // Cannot read file, probably permissions
         return false;
@@ -146,8 +146,8 @@ 
   function __construct($filename) {
     if (file_exists($filename)) {
 
-      $length=filesize($filename);
-      $fd = fopen($filename,'rb');
+      $length = filesize($filename);
+      $fd = fopen($filename, 'rb');
 
       if (!$fd) {
         $this->error = 3; // Cannot read file, probably permissions

Braces +9 added lines, -5 removed lines

@@ -57,16 +57,18 @@ 
   function read($bytes) {
     $data = substr($this->_str, $this->_pos, $bytes);
     $this->_pos += $bytes;
-    if (strlen($this->_str)<$this->_pos)
-      $this->_pos = strlen($this->_str);
+    if (strlen($this->_str)<$this->_pos) {
+          $this->_pos = strlen($this->_str);
+    }
 
     return $data;
   }
 
   function seekto($pos) {
     $this->_pos = $pos;
-    if (strlen($this->_str)<$this->_pos)
-      $this->_pos = strlen($this->_str);
+    if (strlen($this->_str)<$this->_pos) {
+          $this->_pos = strlen($this->_str);
+    }
     return $this->_pos;
   }
 
@@ -117,7 +119,9 @@ 
       $this->_pos = ftell($this->_fd);
 
       return $data;
-    } else return '';
+    } else {
+        return '';
+    }
   }
 
   function seekto($pos) {

SSVNCDaemon.php

Doc Comments +15 added lines

@@ -46,6 +46,9 @@ 
         return $handle;
     }
 
+    /**
+     * @param resource $handle
+     */
     protected function readLog($handle)
     {
         print("\n[Daemon]: +++ readLog() +++");
@@ -116,6 +119,9 @@ 
 
     }
 
+    /**
+     * @param string $buffer
+     */
     protected function parseIP($buffer)
     {
         $ip = "";
@@ -134,6 +140,9 @@ 
         return $ip;
     }
 
+    /**
+     * @param string $buffer
+     */
     protected function parseHostname($buffer)
     {
         $hostname = "";
@@ -152,6 +161,9 @@ 
         return $hostname;
     }
 
+    /**
+     * @param string $line
+     */
     protected function parseExit($line)
     {
         $exit = 0;
@@ -196,6 +208,9 @@ 
 
     }
 
+    /**
+     * @param integer $id
+     */
     protected function sendVncWindowToNuc($id, $vncclient)
     {
         print("\n[Daemon]: +++sendVncWindowToNuc() +++ ");

Spacing +20 added lines, -20 removed lines

@@ -72,18 +72,18 @@ 
             $hostname = $this->parseHostname($buffer);
             $exit = $this->parseExit($buffer);
 
-            if ($ip!="") {
+            if ($ip != "") {
                 $client["ip"] = $ip;
             }
-            if ($hostname!="") {
+            if ($hostname != "") {
                 $client["hostname"] = $hostname;
             }
-            if ($exit!=0) {
+            if ($exit != 0) {
                 $client["exit"] = $exit;
             }
 
             if (strstr($buffer, 'create_image') && $client["ip"] != "" &&
-            $client["hostname"]!="" ) {
+            $client["hostname"] != "") {
 
                 // add client
                 $this->addClient($client["ip"], $client["hostname"]);
@@ -102,7 +102,7 @@ 
                 }
             }
 
-            $halt=$this->_CONNECTIONS;
+            $halt = $this->_CONNECTIONS;
 
             if ($halt == -1) {
                 exit(0);
@@ -121,13 +121,13 @@ 
         $ip = "";
         $line = $buffer;
         if (strpos($line, "Reverse VNC connection from IP")) {
-            $line=trim($line);
-            $item=explode(":", $line);
-            $ip=trim($item[1]);
-            $ip=preg_replace('/\W\W\d{4}\/\d{2}\/\d{2} \d{2}/', '', $ip);
+            $line = trim($line);
+            $item = explode(":", $line);
+            $ip = trim($item[1]);
+            $ip = preg_replace('/\W\W\d{4}\/\d{2}\/\d{2} \d{2}/', '', $ip);
         }
 
-        if ($ip!="") {
+        if ($ip != "") {
             print("\nFOUND IP: " . $ip . "\n");
         }
 
@@ -139,13 +139,13 @@ 
         $hostname = "";
         $line = $buffer;
         if (strpos($line, "Hostname")) {
-            $line=trim($line);
-            $item=explode(":", $line);
-            $hostname=trim($item[1]);
-            $hostname=preg_replace('/\.uni\-mannheim\.de/', '', $hostname);
+            $line = trim($line);
+            $item = explode(":", $line);
+            $hostname = trim($item[1]);
+            $hostname = preg_replace('/\.uni\-mannheim\.de/', '', $hostname);
         }
 
-        if ($hostname!="") {
+        if ($hostname != "") {
             print("\nFOUND HOSTNAME: " . $hostname . "\n");
         }
 
@@ -159,7 +159,7 @@ 
             $exit = 1;
         }
 
-        if ($exit!=0) {
+        if ($exit != 0) {
             print("\nCLIENT HAS DISCONNECTED " . $exit . "\n");
         }
 
@@ -175,9 +175,9 @@ 
                         "exit" => 0
                         );
         if (count($this->_VNC_CLIENTS) == 0) {
-            $id=1;
+            $id = 1;
         } else {
-            $id=count($this->_VNC_CLIENTS) + 1;
+            $id = count($this->_VNC_CLIENTS)+1;
         }
 
         $this->_VNC_CLIENTS[$id] = $vncclient;
@@ -191,7 +191,7 @@ 
 
         $this->_CONNECTIONS++;
 
-        print("\n active connections: ".$this->_CONNECTIONS+1);
+        print("\n active connections: " . $this->_CONNECTIONS+1);
         print("\n all saved clients: " . serialize($this->_VNC_CLIENTS));
 
     }
@@ -303,7 +303,7 @@ 
 
         foreach ($inactive_vnc_window_ids as $inactive_win_id) {
             // define vnc-id
-            $inactive_vnc_id = $db->querySingle("SELECT file FROM window WHERE win_id='".$inactive_win_id."'");
+            $inactive_vnc_id = $db->querySingle("SELECT file FROM window WHERE win_id='" . $inactive_win_id . "'");
 
             // delete from database (send to control.php)
             $curl = curl_init();

DBConnector.class.php

Indentation +1 added lines, -1 removed lines

@@ -387,7 +387,7 @@
     // {AFTER | BEFORE} {DELETE | INSERT | UPDATE } ON table
     //~ $db->exec("CREATE TRIGGER dbchange AFTER UPDATE ON user
                 //~ BEGIN
-                  //~ dbModifiedCallback();
+                    //~ dbModifiedCallback();
                 //~ END");
     //~ $db = new DBConnector('palma.db');
     echo "Tables=" . $db->querySingle('SELECT count(*) FROM sqlite_master WHERE type="table"') . "\n";

Spacing +7 added lines, -7 removed lines

@@ -116,7 +116,7 @@ 
         if (count($next_ids) > 0) {
             $next = $next_ids[0];
         } else {
-            $next = $this->querySingle('SELECT MAX(id) FROM window') + 1;
+            $next = $this->querySingle('SELECT MAX(id) FROM window')+1;
         }
         return $next;
     }
@@ -140,7 +140,7 @@ 
         // TODO: Support more than one address for a given username.
         $this->exec("INSERT OR IGNORE INTO user VALUES (NULL, '$username', 1, 0)");
         $usercount = $this->querySingle("SELECT COUNT(*) FROM user");
-        $userid = $this->querySingle("SELECT userid from user where name='".$username."'");
+        $userid = $this->querySingle("SELECT userid from user where name='" . $username . "'");
         $this->exec("INSERT INTO address VALUES ('$userid', '$address', '$device')");
         trace("user $username connected with $device, $usercount user(s) now connected");
         if ($usercount == 1) {
@@ -233,13 +233,13 @@ 
 
     public function getWindowState($window_id)
     {
-        $state = @$this->querySingle('SELECT state FROM window WHERE win_id="'.$window_id.'"');
+        $state = @$this->querySingle('SELECT state FROM window WHERE win_id="' . $window_id . '"');
         return $state;
     }
 
     public function setWindowState($window_id, $state)
     {
-        $this->exec('UPDATE window SET state="'.$state.'" WHERE win_id="'.$window_id.'"');
+        $this->exec('UPDATE window SET state="' . $state . '" WHERE win_id="' . $window_id . '"');
     }
 
     public function insertWindow($window)
@@ -257,7 +257,7 @@ 
 
     public function deleteWindow($window_id)
     {
-        $this->exec('DELETE FROM window WHERE win_id="'.$window_id.'"');
+        $this->exec('DELETE FROM window WHERE win_id="' . $window_id . '"');
     }
 
     /*
@@ -268,12 +268,12 @@ 
 
     public function deleteDebug($table, $id, $gt)
     {
-        $this->exec('DELETE FROM '.$table.' WHERE '.$id.' >"'.$gt.'"');
+        $this->exec('DELETE FROM ' . $table . ' WHERE ' . $id . ' >"' . $gt . '"');
     }
 
     public function updateWindow($window_id, $field, $value)
     {
-        $this->exec('UPDATE window SET '.$field.'="'.$value.'" WHERE win_id="'.$window_id.'"');
+        $this->exec('UPDATE window SET ' . $field . '="' . $value . '" WHERE win_id="' . $window_id . '"');
     }
 }
 

upload.php

Indentation +6 added lines, -6 removed lines

@@ -81,14 +81,14 @@
     $targetFile = "file:///$targetFile";
 }
 
-  // Get information of application for uploaded file.
-  require_once ('FileHandler.class.php');
-  $handler = FileHandler::getFileHandler($targetFile);
+    // Get information of application for uploaded file.
+    require_once ('FileHandler.class.php');
+    $handler = FileHandler::getFileHandler($targetFile);
 
-  // create window object and send to nuc
+    // create window object and send to nuc
 
-  $dt = new DateTime();
-  $date = $dt->format('Y-m-d H:i:s');
+    $dt = new DateTime();
+    $date = $dt->format('Y-m-d H:i:s');
 
     $window = array(
         "id" => "",

Switch Indentation +12 added lines, -12 removed lines

@@ -49,18 +49,18 @@
     $f = fopen($targetFile, 'w');
     if ($f) {
         switch ($error) {
-            case UPLOAD_ERR_INI_SIZE:
-                $message = __("This file is too large.");
-                break;
-            case UPLOAD_ERR_FORM_SIZE:
-                $message = __("Large files are not supported.");
-                break;
-            case UPLOAD_ERR_PARTIAL:
-                $message = __("File was only partially uploaded.");
-                break;
-            default:
-                $message = sprintf(__("Error code %s."), $error);
-                break;
+        case UPLOAD_ERR_INI_SIZE:
+            $message = __("This file is too large.");
+            break;
+        case UPLOAD_ERR_FORM_SIZE:
+            $message = __("Large files are not supported.");
+            break;
+        case UPLOAD_ERR_PARTIAL:
+            $message = __("File was only partially uploaded.");
+            break;
+        default:
+            $message = sprintf(__("Error code %s."), $error);
+            break;
         }
         fprintf($f, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\"");
         fprintf($f, "\"http://www.w3.org/TR/html4/strict.dtd\">");

php-gettext/gettext.inc

Indentation +72 added lines, -72 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,50 +64,50 @@ 
  * 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)) {
+                    ."(?:_(?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 (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 ($modifier) {
         if ($country) {
-          if ($charset)
+            if ($charset)
             array_push($locale_names, "${lang}_$country.$charset@$modifier");
-          array_push($locale_names, "${lang}_$country@$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)
-          array_push($locale_names, "${lang}.$charset");
-      array_push($locale_names, $lang);
+        } elseif ($charset)
+            array_push($locale_names, "${lang}.$charset");
+        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);
-  }
-  return $locale_names;
+        array_push($locale_names, $locale);
+    }
+    return $locale_names;
 }
 
 /**
@@ -126,19 +126,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;
 }
@@ -191,9 +191,9 @@ 
  * 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
+    else
     return $locale;
 }
 
@@ -211,20 +211,20 @@ 
             return _setlocale($category, $CURRENTLOCALE);
     } 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;
@@ -242,15 +242,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;
 }
@@ -427,29 +427,29 @@ 
 }
 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'))
-      return pgettext($context, $msgid);
-  else
-      return _pgettext($context, $msgid);
+    if (_check_locale_and_function('pgettext'))
+        return pgettext($context, $msgid);
+    else
+        return _pgettext($context, $msgid);
 }
 
 function T_dpgettext($domain, $context, $msgid) {
-  if (_check_locale_and_function('dpgettext'))
-      return dpgettext($domain, $context, $msgid);
-  else
-      return _dpgettext($domain, $context, $msgid);
+    if (_check_locale_and_function('dpgettext'))
+        return dpgettext($domain, $context, $msgid);
+    else
+        return _dpgettext($domain, $context, $msgid);
 }
 
 function T_dcpgettext($domain, $context, $msgid, $category) {
-  if (_check_locale_and_function('dcpgettext'))
-      return dcpgettext($domain, $context, $msgid, $category);
-  else
-      return _dcpgettext($domain, $context, $msgid, $category);
+    if (_check_locale_and_function('dcpgettext'))
+        return dcpgettext($domain, $context, $msgid, $category);
+    else
+        return _dcpgettext($domain, $context, $msgid, $category);
 }
 
 function T_npgettext($context, $singular, $plural, $number) {
@@ -460,17 +460,17 @@ 
 }
 
 function T_dnpgettext($domain, $context, $singular, $plural, $number) {
-  if (_check_locale_and_function('dnpgettext'))
-      return dnpgettext($domain, $context, $singular, $plural, $number);
-  else
-      return _dnpgettext($domain, $context, $singular, $plural, $number);
+    if (_check_locale_and_function('dnpgettext'))
+        return dnpgettext($domain, $context, $singular, $plural, $number);
+    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);
@@ -527,9 +527,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);
     }
 }
 

Spacing +7 added lines, -7 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');
@@ -77,7 +77,7 @@ 
     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
+                   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/", // @ modifier
                    $locale, $matches)) {
 
       if (isset($matches["lang"])) $lang = $matches["lang"];
@@ -113,7 +113,7 @@ 
 /**
  * Utility function to get a StreamReader for the given text domain.
  */
-function _get_reader($domain=null, $category=5, $enable_cache=true) {
+function _get_reader($domain = null, $category = 5, $enable_cache = true) {
     global $text_domains, $default_domain, $LC_CATEGORIES;
     if (!isset($domain)) $domain = $default_domain;
     if (!isset($text_domains[$domain]->l10n)) {
@@ -121,7 +121,7 @@ 
         $locale = _setlocale(LC_MESSAGES, 0);
         $bound_path = isset($text_domains[$domain]->path) ?
           $text_domains[$domain]->path : './';
-        $subpath = $LC_CATEGORIES[$category] ."/$domain.mo";
+        $subpath = $LC_CATEGORIES[$category] . "/$domain.mo";
 
         $locale_names = get_list_of_locales($locale);
         $input = null;
@@ -154,7 +154,7 @@ 
 /**
  * Checks if the current locale is supported on this system.
  */
-function _check_locale_and_function($function=false) {
+function _check_locale_and_function($function = false) {
     global $EMULATEGETTEXT;
     if ($function and !function_exists($function))
         return false;
@@ -164,10 +164,10 @@ 
 /**
  * Get the codeset for the given domain.
  */
-function _get_codeset($domain=null) {
+function _get_codeset($domain = null) {
     global $text_domains, $default_domain, $LC_CATEGORIES;
     if (!isset($domain)) $domain = $default_domain;
-    return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
+    return (isset($text_domains[$domain]->codeset)) ? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
 }
 
 /**

Braces +147 added lines, -95 removed lines

@@ -80,32 +80,45 @@ 
                    ."(?:@(?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 (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");
+          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");
+        } elseif ($charset) {
+                    array_push($locale_names, "${lang}.$charset@$modifier");
+        }
         array_push($locale_names, "$lang@$modifier");
       }
       if ($country) {
-        if ($charset)
-          array_push($locale_names, "${lang}_$country.$charset");
+        if ($charset) {
+                  array_push($locale_names, "${lang}_$country.$charset");
+        }
         array_push($locale_names, "${lang}_$country");
-      } elseif ($charset)
-          array_push($locale_names, "${lang}.$charset");
+      } elseif ($charset) {
+                array_push($locale_names, "${lang}.$charset");
+      }
       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);
+    if (!in_array($locale, $locale_names)) {
+          array_push($locale_names, $locale);
+    }
   }
   return $locale_names;
 }
@@ -115,7 +128,9 @@ 
  */
 function _get_reader($domain=null, $category=5, $enable_cache=true) {
     global $text_domains, $default_domain, $LC_CATEGORIES;
-    if (!isset($domain)) $domain = $default_domain;
+    if (!isset($domain)) {
+        $domain = $default_domain;
+    }
     if (!isset($text_domains[$domain]->l10n)) {
         // get the current locale
         $locale = _setlocale(LC_MESSAGES, 0);
@@ -156,8 +171,9 @@ 
  */
 function _check_locale_and_function($function=false) {
     global $EMULATEGETTEXT;
-    if ($function and !function_exists($function))
-        return false;
+    if ($function and !function_exists($function)) {
+            return false;
+    }
     return !$EMULATEGETTEXT;
 }
 
@@ -166,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');
 }
 
@@ -178,8 +196,7 @@ 
     $target_encoding = _get_codeset();
     if ($source_encoding != $target_encoding) {
         return mb_convert_encoding($text, $target_encoding, $source_encoding);
-    }
-    else {
+    } else {
         return $text;
     }
 }
@@ -191,11 +208,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.
@@ -203,12 +222,13 @@ 
 function _setlocale($category, $locale) {
     global $CURRENTLOCALE, $EMULATEGETTEXT;
     if ($locale === 0) { // use === to differentiate between string "0"
-        if ($CURRENTLOCALE != '')
-            return $CURRENTLOCALE;
-        else
-            // obey LANG variable, maybe extend to support all of LC_* vars
+        if ($CURRENTLOCALE != '') {
+                    return $CURRENTLOCALE;
+        } else {
+                    // obey LANG variable, maybe extend to support all of LC_* vars
             // even if we tried to read locale without setting it first
             return _setlocale($category, $CURRENTLOCALE);
+        }
     } else {
         if (function_exists('setlocale')) {
           $ret = setlocale($category, $locale);
@@ -242,11 +262,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.
@@ -385,96 +407,126 @@ 
 }
 
 function T_bindtextdomain($domain, $path) {
-    if (_check_locale_and_function()) return bindtextdomain($domain, $path);
-    else return _bindtextdomain($domain, $path);
-}
+    if (_check_locale_and_function()) {
+        return bindtextdomain($domain, $path);
+    } else {
+        return _bindtextdomain($domain, $path);
+    }
+    }
 function T_bind_textdomain_codeset($domain, $codeset) {
     // bind_textdomain_codeset is available only in PHP 4.2.0+
-    if (_check_locale_and_function('bind_textdomain_codeset'))
-        return bind_textdomain_codeset($domain, $codeset);
-    else return _bind_textdomain_codeset($domain, $codeset);
-}
+    if (_check_locale_and_function('bind_textdomain_codeset')) {
+            return bind_textdomain_codeset($domain, $codeset);
+    } else {
+        return _bind_textdomain_codeset($domain, $codeset);
+    }
+    }
 function T_textdomain($domain) {
-    if (_check_locale_and_function()) return textdomain($domain);
-    else return _textdomain($domain);
-}
+    if (_check_locale_and_function()) {
+        return textdomain($domain);
+    } else {
+        return _textdomain($domain);
+    }
+    }
 function T_gettext($msgid) {
-    if (_check_locale_and_function()) return gettext($msgid);
-    else return _gettext($msgid);
-}
+    if (_check_locale_and_function()) {
+        return gettext($msgid);
+    } else {
+        return _gettext($msgid);
+    }
+    }
 function T_($msgid) {
-    if (_check_locale_and_function()) return _($msgid);
+    if (_check_locale_and_function()) {
+        return _($msgid);
+    }
     return __($msgid);
 }
 function T_ngettext($singular, $plural, $number) {
-    if (_check_locale_and_function())
-        return ngettext($singular, $plural, $number);
-    else return _ngettext($singular, $plural, $number);
-}
+    if (_check_locale_and_function()) {
+            return ngettext($singular, $plural, $number);
+    } else {
+        return _ngettext($singular, $plural, $number);
+    }
+    }
 function T_dgettext($domain, $msgid) {
-    if (_check_locale_and_function()) return dgettext($domain, $msgid);
-    else return _dgettext($domain, $msgid);
-}
+    if (_check_locale_and_function()) {
+        return dgettext($domain, $msgid);
+    } else {
+        return _dgettext($domain, $msgid);
+    }
+    }
 function T_dngettext($domain, $singular, $plural, $number) {
-    if (_check_locale_and_function())
-        return dngettext($domain, $singular, $plural, $number);
-    else return _dngettext($domain, $singular, $plural, $number);
-}
+    if (_check_locale_and_function()) {
+            return dngettext($domain, $singular, $plural, $number);
+    } else {
+        return _dngettext($domain, $singular, $plural, $number);
+    }
+    }
 function T_dcgettext($domain, $msgid, $category) {
-    if (_check_locale_and_function())
-        return dcgettext($domain, $msgid, $category);
-    else return _dcgettext($domain, $msgid, $category);
-}
+    if (_check_locale_and_function()) {
+            return dcgettext($domain, $msgid, $category);
+    } else {
+        return _dcgettext($domain, $msgid, $category);
+    }
+    }
 function T_dcngettext($domain, $singular, $plural, $number, $category) {
-    if (_check_locale_and_function())
-      return dcngettext($domain, $singular, $plural, $number, $category);
-    else return _dcngettext($domain, $singular, $plural, $number, $category);
-}
+    if (_check_locale_and_function()) {
+          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'))
-      return pgettext($context, $msgid);
-  else
-      return _pgettext($context, $msgid);
-}
+  if (_check_locale_and_function('pgettext')) {
+        return pgettext($context, $msgid);
+  } else {
+        return _pgettext($context, $msgid);
+  }
+  }
 
 function T_dpgettext($domain, $context, $msgid) {
-  if (_check_locale_and_function('dpgettext'))
-      return dpgettext($domain, $context, $msgid);
-  else
-      return _dpgettext($domain, $context, $msgid);
-}
+  if (_check_locale_and_function('dpgettext')) {
+        return dpgettext($domain, $context, $msgid);
+  } else {
+        return _dpgettext($domain, $context, $msgid);
+  }
+  }
 
 function T_dcpgettext($domain, $context, $msgid, $category) {
-  if (_check_locale_and_function('dcpgettext'))
-      return dcpgettext($domain, $context, $msgid, $category);
-  else
-      return _dcpgettext($domain, $context, $msgid, $category);
-}
+  if (_check_locale_and_function('dcpgettext')) {
+        return dcpgettext($domain, $context, $msgid, $category);
+  } else {
+        return _dcpgettext($domain, $context, $msgid, $category);
+  }
+  }
 
 function T_npgettext($context, $singular, $plural, $number) {
-    if (_check_locale_and_function('npgettext'))
-        return npgettext($context, $singular, $plural, $number);
-    else
-        return _npgettext($context, $singular, $plural, $number);
-}
+    if (_check_locale_and_function('npgettext')) {
+            return npgettext($context, $singular, $plural, $number);
+    } else {
+            return _npgettext($context, $singular, $plural, $number);
+    }
+    }
 
 function T_dnpgettext($domain, $context, $singular, $plural, $number) {
-  if (_check_locale_and_function('dnpgettext'))
-      return dnpgettext($domain, $context, $singular, $plural, $number);
-  else
-      return _dnpgettext($domain, $context, $singular, $plural, $number);
-}
+  if (_check_locale_and_function('dnpgettext')) {
+        return dnpgettext($domain, $context, $singular, $plural, $number);
+  } else {
+        return _dnpgettext($domain, $context, $singular, $plural, $number);
+  }
+  }
 
 function T_dcnpgettext($domain, $context, $singular, $plural,
                        $number, $category) {
-    if (_check_locale_and_function('dcnpgettext'))
-        return dcnpgettext($domain, $context, $singular,
+    if (_check_locale_and_function('dcnpgettext')) {
+            return dcnpgettext($domain, $context, $singular,
                            $plural, $number, $category);
-    else
-        return _dcnpgettext($domain, $context, $singular,
+    } else {
+            return _dcnpgettext($domain, $context, $singular,
                             $plural, $number, $category);
-}
+    }
+    }
 
 
 

download.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 if (file_exists($filepath)) {
     // file exists: return file for download
     header('Content-Type: application/octet-stream');
-    header('Content-Disposition: attachment; filename="'.addslashes($filename).'"');
+    header('Content-Disposition: attachment; filename="' . addslashes($filename) . '"');
     readfile($filepath);
 } else {
     // file does not exist: 404 Not Found

examples/screensaver/pictureshow.php

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
     if (is_dir($pictures)) {
         $filelist = scandir($pictures);
         sort($filelist, SORT_NATURAL);
-        foreach($filelist as $file) {
+        foreach ($filelist as $file) {
             $picture = "$pictures/$file";
             if (is_file($picture)) {
                 echo("<li style=\"background-image: url('$picture'); background-repeat: no-repeat\"></li>\n");

FileHandler.class.php

Indentation +3 added lines, -3 removed lines

@@ -62,9 +62,9 @@
     function getControls()
     {
         return FileHandler::CURSOR | FileHandler::ZOOM |
-               FileHandler::HOME | FileHandler::END |
-               FileHandler::PRIOR | FileHandler::NEXT |
-               FileHandler::DOWNLOAD;
+                FileHandler::HOME | FileHandler::END |
+                FileHandler::PRIOR | FileHandler::NEXT |
+                FileHandler::DOWNLOAD;
     }
     function show($path)
     {

Spacing +8 added lines, -8 removed lines

@@ -89,7 +89,7 @@ 
 
     // Shortcuts for combinations of controls.
     const CURSOR = 15; // UP | DOWN | LEFT | RIGHT
-    const ZOOM = 48;   // ZOOMIN | ZOOMOUT
+    const ZOOM = 48; // ZOOMIN | ZOOMOUT
     const ALL = 2047;
 
     // up down left right zoomin zoomout home end prior next download
@@ -108,27 +108,27 @@ 
         // $params;
         // echo $ftype;
         if ($ftype === 'pdf') {
-            $fhandler='/usr/bin/zathura';
+            $fhandler = '/usr/bin/zathura';
 
         } elseif ($ftype === 'gif' || $ftype === 'jpg' || $ftype === 'png') {
-            $fhandler='/usr/bin/eog';
+            $fhandler = '/usr/bin/eog';
 
         } elseif ($ftype === 'doc' || $ftype === 'docx' || $ftype === 'odt' || $ftype === 'txt') {
-            $fhandler='/usr/bin/libreoffice --writer -o -n --nologo --norestore --view';
+            $fhandler = '/usr/bin/libreoffice --writer -o -n --nologo --norestore --view';
 
         } elseif ($ftype === 'ppt' || $ftype === 'pptx' || $ftype === 'pps' || $ftype === 'ppsx' || $ftype === 'odp') {
             // optional --show (presentation mode)
-            $fhandler='/usr/bin/libreoffice --impress -o -n --nologo --norestore --view';
+            $fhandler = '/usr/bin/libreoffice --impress -o -n --nologo --norestore --view';
 
         } elseif ($ftype === 'xls' || $ftype === 'xlsx' || $ftype === 'ods') {
-            $fhandler='/usr/bin/libreoffice --calc -o -n --nologo --norestore --view';
+            $fhandler = '/usr/bin/libreoffice --calc -o -n --nologo --norestore --view';
 
         } elseif ($ftype === 'html' || $ftype === 'url') {
-            $fhandler='/usr/bin/dwb --override-restore';
+            $fhandler = '/usr/bin/dwb --override-restore';
 
         } elseif ($ftype === 'mpg' || $ftype === 'mpeg' || $ftype === 'avi' ||
                   $ftype === 'mp3' || $ftype === 'mp4') {
-            $fhandler='/usr/bin/cvlc --no-audio';
+            $fhandler = '/usr/bin/cvlc --no-audio';
         }
 
         /*