pradosoft / prado

framework/I18N/core/MessageSource.php

Indentation +8 added lines, -8 removed lines

@@ -109,15 +109,15 @@
 	/**
 	 * Factory method to instantiate a new MessageSource depending on the
 	 * source type. The allowed source types are 'XLIFF', 'gettext' and
-     * 'Database'. The source parameter depends on the source type. 
-     * For 'gettext' and 'XLIFF', 'source' should point to the directory 
-     * where the messages are stored. 
-     * For 'Database', 'source' must be a valid connection id.
-     * If a deprecated 'SQLite' type is used, 'source' must contain
-     * a valid DSN.
+	 * 'Database'. The source parameter depends on the source type. 
+	 * For 'gettext' and 'XLIFF', 'source' should point to the directory 
+	 * where the messages are stored. 
+	 * For 'Database', 'source' must be a valid connection id.
+	 * If a deprecated 'SQLite' type is used, 'source' must contain
+	 * a valid DSN.
 	 *
- 	 * Custom message source are possible by supplying the a filename parameter
- 	 * in the factory method.
+	 * Custom message source are possible by supplying the a filename parameter
+	 * in the factory method.
 	 * 
 	 * @param string the message source type.
 	 * @param string the location of the resource or the ConnectionID.

Spacing +20 added lines, -20 removed lines

@@ -81,7 +81,7 @@ 
 	 * Array of translation messages.
 	 * @var array 
 	 */
-	protected $messages = array();
+	protected $messages=array();
 
 	/**
 	 * The source of message translations.
@@ -95,7 +95,7 @@ 
 	 */
 	protected $cache;
 	
-	protected $untranslated = array();
+	protected $untranslated=array();
 
 	/**
 	 * Private constructor. MessageSource must be initialized using
@@ -127,23 +127,23 @@ 
 	 */
 	static function &factory($type, $source='.', $filename='')
 	{
-		$types = array('XLIFF','gettext','Database','SQLite');
+		$types=array('XLIFF', 'gettext', 'Database', 'SQLite');
 
 		if(empty($filename) && !in_array($type, $types))
 			throw new Exception('Invalid type "'.$type.'", valid types are '.
 				implode(', ', $types));
 		
-		$class = 'MessageSource_'.$type;
+		$class='MessageSource_'.$type;
 		
 		if(empty($filename))
-			$filename = dirname(__FILE__).'/'.$class.'.php';
+			$filename=dirname(__FILE__).'/'.$class.'.php';
 						
-		if(is_file($filename) == false)
+		if(is_file($filename)==false)
 			throw new Exception("File $filename not found");
 						
 		include_once $filename;
         
-		$obj =  new $class($source);
+		$obj=new $class($source);
 		
 		return $obj;
 	}
@@ -169,36 +169,36 @@ 
 	 */
 	function load($catalogue='messages')
 	{
-		$variants = $this->getCatalogueList($catalogue);
+		$variants=$this->getCatalogueList($catalogue);
 		
-		$this->messages = array();
+		$this->messages=array();
 		
 		foreach($variants as $variant)
 		{
-			$source = $this->getSource($variant);
+			$source=$this->getSource($variant);
 			
-			if($this->isValidSource($source) == false) continue;
+			if($this->isValidSource($source)==false) continue;
 
-			$loadData = true;
+			$loadData=true;
 			
 			if($this->cache)
 			{
-				$data = $this->cache->get($variant, 
+				$data=$this->cache->get($variant, 
 					$this->culture, $this->getLastModified($source));
 				
 				if(is_array($data))
 				{
-					$this->messages[$variant] = $data;
-					$loadData = false;
+					$this->messages[$variant]=$data;
+					$loadData=false;
 				}
 				unset($data);
 			}
 			if($loadData)
 			{
-				$data = &$this->loadData($source);
+				$data=&$this->loadData($source);
 				if(is_array($data))
 				{
-					$this->messages[$variant] = $data;
+					$this->messages[$variant]=$data;
 					if($this->cache)
 						$this->cache->save($data, $variant, $this->culture);
 				}	
@@ -234,7 +234,7 @@ 
 	 */
 	public function setCache(MessageCache $cache)
 	{
-		$this->cache = $cache;
+		$this->cache=$cache;
 	}
 	
 	/**
@@ -245,7 +245,7 @@ 
 	public function append($message)
 	{
 		if(!in_array($message, $this->untranslated))
-			$this->untranslated[] = $message;
+			$this->untranslated[]=$message;
 	}
 	
 	/**
@@ -254,7 +254,7 @@ 
 	 */
 	public function setCulture($culture)
 	{
-		$this->culture = $culture;
+		$this->culture=$culture;
 	}	
 	
 	/**

framework/I18N/core/Gettext/PO.php

Indentation +95 added lines, -95 removed lines

@@ -51,110 +51,110 @@
  */
 class TGettext_PO extends TGettext
 {
-    /**
-     * Constructor
-     *
-     * @access  public
-     * @return  object      File_Gettext_PO
-     * @param   string      path to GNU PO file
-     */
-    function __construct($file = '')
-    {
-        $this->file = $file;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @access  public
+	 * @return  object      File_Gettext_PO
+	 * @param   string      path to GNU PO file
+	 */
+	function __construct($file = '')
+	{
+		$this->file = $file;
+	}
 
-    /**
-     * Load PO file
-     *
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   string  $file
-     */
-    function load($file = null)
-    {
-        if (!isset($file)) {
-            $file = $this->file;
-        }
+	/**
+	 * Load PO file
+	 *
+	 * @access  public
+	 * @return  mixed   Returns true on success or PEAR_Error on failure.
+	 * @param   string  $file
+	 */
+	function load($file = null)
+	{
+		if (!isset($file)) {
+			$file = $this->file;
+		}
 
-        // load file
-        if (!$contents = @file($file)) {
-            return false;
-        }
-        $contents = implode('', $contents);
+		// load file
+		if (!$contents = @file($file)) {
+			return false;
+		}
+		$contents = implode('', $contents);
 
-        // match all msgid/msgstr entries
-        $matched = preg_match_all(
-            '/(msgid\s+("([^"]|\\\\")*?"\s*)+)\s+' .
-            '(msgstr\s+("([^"]|\\\\")*?"\s*)+)/',
-            $contents, $matches
-        );
-        unset($contents);
+		// match all msgid/msgstr entries
+		$matched = preg_match_all(
+			'/(msgid\s+("([^"]|\\\\")*?"\s*)+)\s+' .
+			'(msgstr\s+("([^"]|\\\\")*?"\s*)+)/',
+			$contents, $matches
+		);
+		unset($contents);
 
-        if (!$matched) {
-            return false;
-        }
+		if (!$matched) {
+			return false;
+		}
 
-        // get all msgids and msgtrs
-        for ($i = 0; $i < $matched; $i++) {
-            $msgid = preg_replace(
-                '/\s*msgid\s*"(.*)"\s*/s', '\\1', $matches[1][$i]);
-            $msgstr= preg_replace(
-                '/\s*msgstr\s*"(.*)"\s*/s', '\\1', $matches[4][$i]);
-            $this->strings[parent::prepare($msgid)] = parent::prepare($msgstr);
-        }
+		// get all msgids and msgtrs
+		for ($i = 0; $i < $matched; $i++) {
+			$msgid = preg_replace(
+				'/\s*msgid\s*"(.*)"\s*/s', '\\1', $matches[1][$i]);
+			$msgstr= preg_replace(
+				'/\s*msgstr\s*"(.*)"\s*/s', '\\1', $matches[4][$i]);
+			$this->strings[parent::prepare($msgid)] = parent::prepare($msgstr);
+		}
 
-        // check for meta info
-        if (isset($this->strings[''])) {
-            $this->meta = parent::meta2array($this->strings['']);
-            unset($this->strings['']);
-        }
+		// check for meta info
+		if (isset($this->strings[''])) {
+			$this->meta = parent::meta2array($this->strings['']);
+			unset($this->strings['']);
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Save PO file
-     *
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   string  $file
-     */
-    function save($file = null)
-    {
-        if (!isset($file)) {
-            $file = $this->file;
-        }
+	/**
+	 * Save PO file
+	 *
+	 * @access  public
+	 * @return  mixed   Returns true on success or PEAR_Error on failure.
+	 * @param   string  $file
+	 */
+	function save($file = null)
+	{
+		if (!isset($file)) {
+			$file = $this->file;
+		}
 
-        // open PO file
-        if (!is_resource($fh = @fopen($file, 'w'))) {
-            return false;
-        }
+		// open PO file
+		if (!is_resource($fh = @fopen($file, 'w'))) {
+			return false;
+		}
 
-        // lock PO file exclusively
-        if (!flock($fh, LOCK_EX)) {
-            fclose($fh);
-            return false;
-        }
-        // write meta info
-        if (count($this->meta)) {
-            $meta = 'msgid ""' . "\nmsgstr " . '""' . "\n";
-            foreach ($this->meta as $k => $v) {
-                $meta .= '"' . $k . ': ' . $v . '\n"' . "\n";
-            }
-            fwrite($fh, $meta . "\n");
-        }
-        // write strings
-        foreach ($this->strings as $o => $t) {
-            fwrite($fh,
-                'msgid "'  . parent::prepare($o, true) . '"' . "\n" .
-                'msgstr "' . parent::prepare($t, true) . '"' . "\n\n"
-            );
-        }
+		// lock PO file exclusively
+		if (!flock($fh, LOCK_EX)) {
+			fclose($fh);
+			return false;
+		}
+		// write meta info
+		if (count($this->meta)) {
+			$meta = 'msgid ""' . "\nmsgstr " . '""' . "\n";
+			foreach ($this->meta as $k => $v) {
+				$meta .= '"' . $k . ': ' . $v . '\n"' . "\n";
+			}
+			fwrite($fh, $meta . "\n");
+		}
+		// write strings
+		foreach ($this->strings as $o => $t) {
+			fwrite($fh,
+				'msgid "'  . parent::prepare($o, true) . '"' . "\n" .
+				'msgstr "' . parent::prepare($t, true) . '"' . "\n\n"
+			);
+		}
 
-        //done
-        @flock($fh, LOCK_UN);
-        @fclose($fh);
-        chmod($file,PRADO_CHMOD);
-        return true;
-    }
+		//done
+		@flock($fh, LOCK_UN);
+		@fclose($fh);
+		chmod($file,PRADO_CHMOD);
+		return true;
+	}
 }

Spacing +30 added lines, -30 removed lines

@@ -58,9 +58,9 @@ 
      * @return  object      File_Gettext_PO
      * @param   string      path to GNU PO file
      */
-    function __construct($file = '')
+    function __construct($file='')
     {
-        $this->file = $file;
+        $this->file=$file;
     }
 
     /**
@@ -70,42 +70,42 @@ 
      * @return  mixed   Returns true on success or PEAR_Error on failure.
      * @param   string  $file
      */
-    function load($file = null)
+    function load($file=null)
     {
-        if (!isset($file)) {
-            $file = $this->file;
+        if(!isset($file)) {
+            $file=$this->file;
         }
 
         // load file
-        if (!$contents = @file($file)) {
+        if(!$contents=@file($file)) {
             return false;
         }
-        $contents = implode('', $contents);
+        $contents=implode('', $contents);
 
         // match all msgid/msgstr entries
-        $matched = preg_match_all(
-            '/(msgid\s+("([^"]|\\\\")*?"\s*)+)\s+' .
+        $matched=preg_match_all(
+            '/(msgid\s+("([^"]|\\\\")*?"\s*)+)\s+'.
             '(msgstr\s+("([^"]|\\\\")*?"\s*)+)/',
             $contents, $matches
         );
         unset($contents);
 
-        if (!$matched) {
+        if(!$matched) {
             return false;
         }
 
         // get all msgids and msgtrs
-        for ($i = 0; $i < $matched; $i++) {
-            $msgid = preg_replace(
+        for($i=0; $i < $matched; $i++) {
+            $msgid=preg_replace(
                 '/\s*msgid\s*"(.*)"\s*/s', '\\1', $matches[1][$i]);
-            $msgstr= preg_replace(
+            $msgstr=preg_replace(
                 '/\s*msgstr\s*"(.*)"\s*/s', '\\1', $matches[4][$i]);
-            $this->strings[parent::prepare($msgid)] = parent::prepare($msgstr);
+            $this->strings[parent::prepare($msgid)]=parent::prepare($msgstr);
         }
 
         // check for meta info
-        if (isset($this->strings[''])) {
-            $this->meta = parent::meta2array($this->strings['']);
+        if(isset($this->strings[''])) {
+            $this->meta=parent::meta2array($this->strings['']);
             unset($this->strings['']);
         }
 
@@ -119,42 +119,42 @@ 
      * @return  mixed   Returns true on success or PEAR_Error on failure.
      * @param   string  $file
      */
-    function save($file = null)
+    function save($file=null)
     {
-        if (!isset($file)) {
-            $file = $this->file;
+        if(!isset($file)) {
+            $file=$this->file;
         }
 
         // open PO file
-        if (!is_resource($fh = @fopen($file, 'w'))) {
+        if(!is_resource($fh=@fopen($file, 'w'))) {
             return false;
         }
 
         // lock PO file exclusively
-        if (!flock($fh, LOCK_EX)) {
+        if(!flock($fh, LOCK_EX)) {
             fclose($fh);
             return false;
         }
         // write meta info
-        if (count($this->meta)) {
-            $meta = 'msgid ""' . "\nmsgstr " . '""' . "\n";
-            foreach ($this->meta as $k => $v) {
-                $meta .= '"' . $k . ': ' . $v . '\n"' . "\n";
+        if(count($this->meta)) {
+            $meta='msgid ""'."\nmsgstr ".'""'."\n";
+            foreach($this->meta as $k => $v) {
+                $meta.='"'.$k.': '.$v.'\n"'."\n";
             }
-            fwrite($fh, $meta . "\n");
+            fwrite($fh, $meta."\n");
         }
         // write strings
-        foreach ($this->strings as $o => $t) {
+        foreach($this->strings as $o => $t) {
             fwrite($fh,
-                'msgid "'  . parent::prepare($o, true) . '"' . "\n" .
-                'msgstr "' . parent::prepare($t, true) . '"' . "\n\n"
+                'msgid "'.parent::prepare($o, true).'"'."\n".
+                'msgstr "'.parent::prepare($t, true).'"'."\n\n"
             );
         }
 
         //done
         @flock($fh, LOCK_UN);
         @fclose($fh);
-        chmod($file,PRADO_CHMOD);
+        chmod($file, PRADO_CHMOD);
         return true;
     }
 }

framework/I18N/core/Gettext/MO.php

Indentation +310 added lines, -310 removed lines

@@ -1,20 +1,20 @@ 
 <?php
 /**
- * TGettext_MO class file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the BSD License.
- *
- * Copyright(c) 2004 by Qiang Xue. All rights reserved.
- *
- * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
- * The latest version of PRADO can be obtained from:
- * {@link http://prado.sourceforge.net/}
- *
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Revision: 1.3 $  $Date: 2005/08/27 03:21:12 $
- * @package System.I18N.core
- */
+	 * TGettext_MO class file.
+	 *
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the BSD License.
+	 *
+	 * Copyright(c) 2004 by Qiang Xue. All rights reserved.
+	 *
+	 * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
+	 * The latest version of PRADO can be obtained from:
+	 * {@link http://prado.sourceforge.net/}
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+	 * @version $Revision: 1.3 $  $Date: 2005/08/27 03:21:12 $
+	 * @package System.I18N.core
+	 */
 
 
 // +----------------------------------------------------------------------+
@@ -52,304 +52,304 @@ 
  */
 class TGettext_MO extends TGettext
 {
-    /**
-     * file handle
-     *
-     * @access  private
-     * @var     resource
-     */
-    protected $_handle = null;
-
-    /**
-     * big endianess
-     *
-     * Whether to write with big endian byte order.
-     *
-     * @access  public
-     * @var     bool
-     */
-    protected $writeBigEndian = false;
-
-    /**
-     * Constructor
-     *
-     * @access  public
-     * @return  object      File_Gettext_MO
-     * @param   string      $file   path to GNU MO file
-     */
-    function __construct($file = '')
-    {
-        $this->file = $file;
-    }
-
-    /**
-     * _read
-     *
-     * @access  private
-     * @return  mixed
-     * @param   int     $bytes
-     */
-    function _read($bytes = 1)
-    {
-        if (0 < $bytes = abs($bytes)) {
-            return fread($this->_handle, $bytes);
-        }
-        return null;
-    }
-
-    /**
-     * _readInt
-     *
-     * @access  private
-     * @return  int
-     * @param   bool    $bigendian
-     */
-    function _readInt($bigendian = false)
-    {
+	/**
+	 * file handle
+	 *
+	 * @access  private
+	 * @var     resource
+	 */
+	protected $_handle = null;
+
+	/**
+	 * big endianess
+	 *
+	 * Whether to write with big endian byte order.
+	 *
+	 * @access  public
+	 * @var     bool
+	 */
+	protected $writeBigEndian = false;
+
+	/**
+	 * Constructor
+	 *
+	 * @access  public
+	 * @return  object      File_Gettext_MO
+	 * @param   string      $file   path to GNU MO file
+	 */
+	function __construct($file = '')
+	{
+		$this->file = $file;
+	}
+
+	/**
+	 * _read
+	 *
+	 * @access  private
+	 * @return  mixed
+	 * @param   int     $bytes
+	 */
+	function _read($bytes = 1)
+	{
+		if (0 < $bytes = abs($bytes)) {
+			return fread($this->_handle, $bytes);
+		}
+		return null;
+	}
+
+	/**
+	 * _readInt
+	 *
+	 * @access  private
+	 * @return  int
+	 * @param   bool    $bigendian
+	 */
+	function _readInt($bigendian = false)
+	{
 		//unpack returns a reference????
 		$unpacked = unpack($bigendian ? 'N' : 'V', $this->_read(4));
-        return array_shift($unpacked);
-    }
-
-    /**
-     * _writeInt
-     *
-     * @access  private
-     * @return  int
-     * @param   int     $int
-     */
-    function _writeInt($int)
-    {
-        return $this->_write(pack($this->writeBigEndian ? 'N' : 'V', (int) $int));
-    }
-
-    /**
-     * _write
-     *
-     * @access  private
-     * @return  int
-     * @param   string  $data
-     */
-    function _write($data)
-    {
-        return fwrite($this->_handle, $data);
-    }
-
-    /**
-     * _writeStr
-     *
-     * @access  private
-     * @return  int
-     * @param   string  $string
-     */
-    function _writeStr($string)
-    {
-        return $this->_write($string . "\0");
-    }
-
-    /**
-     * _readStr
-     *
-     * @access  private
-     * @return  string
-     * @param   array   $params     associative array with offset and length
-     *                              of the string
-     */
-    function _readStr($params)
-    {
-        fseek($this->_handle, $params['offset']);
-        return $this->_read($params['length']);
-    }
-
-    /**
-     * Load MO file
-     *
-     * @access   public
-     * @return   mixed   Returns true on success or PEAR_Error on failure.
-     * @param    string  $file
-     */
-    function load($file = null)
-    {
-        if (!isset($file)) {
-            $file = $this->file;
-        }
-
-        // open MO file
-        if (!is_resource($this->_handle = @fopen($file, 'rb'))) {
-            return false;
-        }
-        // lock MO file shared
-        if (!@flock($this->_handle, LOCK_SH)) {
-            @fclose($this->_handle);
-            return false;
-        }
-
-        // read (part of) magic number from MO file header and define endianess
+		return array_shift($unpacked);
+	}
+
+	/**
+	 * _writeInt
+	 *
+	 * @access  private
+	 * @return  int
+	 * @param   int     $int
+	 */
+	function _writeInt($int)
+	{
+		return $this->_write(pack($this->writeBigEndian ? 'N' : 'V', (int) $int));
+	}
+
+	/**
+	 * _write
+	 *
+	 * @access  private
+	 * @return  int
+	 * @param   string  $data
+	 */
+	function _write($data)
+	{
+		return fwrite($this->_handle, $data);
+	}
+
+	/**
+	 * _writeStr
+	 *
+	 * @access  private
+	 * @return  int
+	 * @param   string  $string
+	 */
+	function _writeStr($string)
+	{
+		return $this->_write($string . "\0");
+	}
+
+	/**
+	 * _readStr
+	 *
+	 * @access  private
+	 * @return  string
+	 * @param   array   $params     associative array with offset and length
+	 *                              of the string
+	 */
+	function _readStr($params)
+	{
+		fseek($this->_handle, $params['offset']);
+		return $this->_read($params['length']);
+	}
+
+	/**
+	 * Load MO file
+	 *
+	 * @access   public
+	 * @return   mixed   Returns true on success or PEAR_Error on failure.
+	 * @param    string  $file
+	 */
+	function load($file = null)
+	{
+		if (!isset($file)) {
+			$file = $this->file;
+		}
+
+		// open MO file
+		if (!is_resource($this->_handle = @fopen($file, 'rb'))) {
+			return false;
+		}
+		// lock MO file shared
+		if (!@flock($this->_handle, LOCK_SH)) {
+			@fclose($this->_handle);
+			return false;
+		}
+
+		// read (part of) magic number from MO file header and define endianess
 
 		//unpack returns a reference????
 		$unpacked = unpack('c', $this->_read(4));
-        switch ($magic = array_shift($unpacked))
-        {
-            case -34:
-                $be = false;
-            break;
-
-            case -107:
-                $be = true;
-            break;
-
-            default:
-                return false;
-        }
-
-        // check file format revision - we currently only support 0
-        if (0 !== ($_rev = $this->_readInt($be))) {
-            return false;
-        }
-
-        // count of strings in this file
-        $count = $this->_readInt($be);
-
-        // offset of hashing table of the msgids
-        $offset_original = $this->_readInt($be);
-        // offset of hashing table of the msgstrs
-        $offset_translat = $this->_readInt($be);
-
-        // move to msgid hash table
-        fseek($this->_handle, $offset_original);
-        // read lengths and offsets of msgids
-        $original = array();
-        for ($i = 0; $i < $count; $i++) {
-            $original[$i] = array(
-                'length' => $this->_readInt($be),
-                'offset' => $this->_readInt($be)
-            );
-        }
-
-        // move to msgstr hash table
-        fseek($this->_handle, $offset_translat);
-        // read lengths and offsets of msgstrs
-        $translat = array();
-        for ($i = 0; $i < $count; $i++) {
-            $translat[$i] = array(
-                'length' => $this->_readInt($be),
-                'offset' => $this->_readInt($be)
-            );
-        }
-
-        // read all
-        for ($i = 0; $i < $count; $i++) {
-            $this->strings[$this->_readStr($original[$i])] =
-                $this->_readStr($translat[$i]);
-        }
-
-        // done
-        @flock($this->_handle, LOCK_UN);
-        @fclose($this->_handle);
-        $this->_handle = null;
-
-        // check for meta info
-        if (isset($this->strings[''])) {
-            $this->meta = parent::meta2array($this->strings['']);
-            unset($this->strings['']);
-        }
-
-        return true;
-    }
-
-    /**
-     * Save MO file
-     *
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   string  $file
-     */
-    function save($file = null)
-    {
-        if (!isset($file)) {
-            $file = $this->file;
-        }
-
-        // open MO file
-        if (!is_resource($this->_handle = @fopen($file, 'wb'))) {
-            return false;
-        }
-        // lock MO file exclusively
-        if (!@flock($this->_handle, LOCK_EX)) {
-            @fclose($this->_handle);
-            return false;
-        }
-
-        // write magic number
-        if ($this->writeBigEndian) {
-            $this->_write(pack('c*', 0x95, 0x04, 0x12, 0xde));
-        } else {
-            $this->_write(pack('c*', 0xde, 0x12, 0x04, 0x95));
-        }
-
-        // write file format revision
-        $this->_writeInt(0);
-
-        $count = count($this->strings) + ($meta = (count($this->meta) ? 1 : 0));
-        // write count of strings
-        $this->_writeInt($count);
-
-        $offset = 28;
-        // write offset of orig. strings hash table
-        $this->_writeInt($offset);
-
-        $offset += ($count * 8);
-        // write offset transl. strings hash table
-        $this->_writeInt($offset);
-
-        // write size of hash table (we currently ommit the hash table)
-        $this->_writeInt(0);
-
-        $offset += ($count * 8);
-        // write offset of hash table
-        $this->_writeInt($offset);
-
-        // unshift meta info
-        if ($this->meta) {
-            $meta = '';
-            foreach ($this->meta as $key => $val) {
-                $meta .= $key . ': ' . $val . "\n";
-            }
-            $strings = array('' => $meta) + $this->strings;
-        } else {
-            $strings = $this->strings;
-        }
-
-        // write offsets for original strings
-        foreach (array_keys($strings) as $o) {
-            $len = strlen($o);
-            $this->_writeInt($len);
-            $this->_writeInt($offset);
-            $offset += $len + 1;
-        }
-
-        // write offsets for translated strings
-        foreach ($strings as $t) {
-            $len = strlen($t);
-            $this->_writeInt($len);
-            $this->_writeInt($offset);
-            $offset += $len + 1;
-        }
-
-        // write original strings
-        foreach (array_keys($strings) as $o) {
-            $this->_writeStr($o);
-        }
-
-        // write translated strings
-        foreach ($strings as $t) {
-            $this->_writeStr($t);
-        }
-
-        // done
-        @flock($this->_handle, LOCK_UN);
-        @fclose($this->_handle);
-        chmod($file,PRADO_CHMOD);
-        return true;
-    }
+		switch ($magic = array_shift($unpacked))
+		{
+			case -34:
+				$be = false;
+			break;
+
+			case -107:
+				$be = true;
+			break;
+
+			default:
+				return false;
+		}
+
+		// check file format revision - we currently only support 0
+		if (0 !== ($_rev = $this->_readInt($be))) {
+			return false;
+		}
+
+		// count of strings in this file
+		$count = $this->_readInt($be);
+
+		// offset of hashing table of the msgids
+		$offset_original = $this->_readInt($be);
+		// offset of hashing table of the msgstrs
+		$offset_translat = $this->_readInt($be);
+
+		// move to msgid hash table
+		fseek($this->_handle, $offset_original);
+		// read lengths and offsets of msgids
+		$original = array();
+		for ($i = 0; $i < $count; $i++) {
+			$original[$i] = array(
+				'length' => $this->_readInt($be),
+				'offset' => $this->_readInt($be)
+			);
+		}
+
+		// move to msgstr hash table
+		fseek($this->_handle, $offset_translat);
+		// read lengths and offsets of msgstrs
+		$translat = array();
+		for ($i = 0; $i < $count; $i++) {
+			$translat[$i] = array(
+				'length' => $this->_readInt($be),
+				'offset' => $this->_readInt($be)
+			);
+		}
+
+		// read all
+		for ($i = 0; $i < $count; $i++) {
+			$this->strings[$this->_readStr($original[$i])] =
+				$this->_readStr($translat[$i]);
+		}
+
+		// done
+		@flock($this->_handle, LOCK_UN);
+		@fclose($this->_handle);
+		$this->_handle = null;
+
+		// check for meta info
+		if (isset($this->strings[''])) {
+			$this->meta = parent::meta2array($this->strings['']);
+			unset($this->strings['']);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Save MO file
+	 *
+	 * @access  public
+	 * @return  mixed   Returns true on success or PEAR_Error on failure.
+	 * @param   string  $file
+	 */
+	function save($file = null)
+	{
+		if (!isset($file)) {
+			$file = $this->file;
+		}
+
+		// open MO file
+		if (!is_resource($this->_handle = @fopen($file, 'wb'))) {
+			return false;
+		}
+		// lock MO file exclusively
+		if (!@flock($this->_handle, LOCK_EX)) {
+			@fclose($this->_handle);
+			return false;
+		}
+
+		// write magic number
+		if ($this->writeBigEndian) {
+			$this->_write(pack('c*', 0x95, 0x04, 0x12, 0xde));
+		} else {
+			$this->_write(pack('c*', 0xde, 0x12, 0x04, 0x95));
+		}
+
+		// write file format revision
+		$this->_writeInt(0);
+
+		$count = count($this->strings) + ($meta = (count($this->meta) ? 1 : 0));
+		// write count of strings
+		$this->_writeInt($count);
+
+		$offset = 28;
+		// write offset of orig. strings hash table
+		$this->_writeInt($offset);
+
+		$offset += ($count * 8);
+		// write offset transl. strings hash table
+		$this->_writeInt($offset);
+
+		// write size of hash table (we currently ommit the hash table)
+		$this->_writeInt(0);
+
+		$offset += ($count * 8);
+		// write offset of hash table
+		$this->_writeInt($offset);
+
+		// unshift meta info
+		if ($this->meta) {
+			$meta = '';
+			foreach ($this->meta as $key => $val) {
+				$meta .= $key . ': ' . $val . "\n";
+			}
+			$strings = array('' => $meta) + $this->strings;
+		} else {
+			$strings = $this->strings;
+		}
+
+		// write offsets for original strings
+		foreach (array_keys($strings) as $o) {
+			$len = strlen($o);
+			$this->_writeInt($len);
+			$this->_writeInt($offset);
+			$offset += $len + 1;
+		}
+
+		// write offsets for translated strings
+		foreach ($strings as $t) {
+			$len = strlen($t);
+			$this->_writeInt($len);
+			$this->_writeInt($offset);
+			$offset += $len + 1;
+		}
+
+		// write original strings
+		foreach (array_keys($strings) as $o) {
+			$this->_writeStr($o);
+		}
+
+		// write translated strings
+		foreach ($strings as $t) {
+			$this->_writeStr($t);
+		}
+
+		// done
+		@flock($this->_handle, LOCK_UN);
+		@fclose($this->_handle);
+		chmod($file,PRADO_CHMOD);
+		return true;
+	}
 }

Spacing +58 added lines, -58 removed lines

@@ -58,7 +58,7 @@ 
      * @access  private
      * @var     resource
      */
-    protected $_handle = null;
+    protected $_handle=null;
 
     /**
      * big endianess
@@ -68,7 +68,7 @@ 
      * @access  public
      * @var     bool
      */
-    protected $writeBigEndian = false;
+    protected $writeBigEndian=false;
 
     /**
      * Constructor
@@ -77,9 +77,9 @@ 
      * @return  object      File_Gettext_MO
      * @param   string      $file   path to GNU MO file
      */
-    function __construct($file = '')
+    function __construct($file='')
     {
-        $this->file = $file;
+        $this->file=$file;
     }
 
     /**
@@ -89,9 +89,9 @@ 
      * @return  mixed
      * @param   int     $bytes
      */
-    function _read($bytes = 1)
+    function _read($bytes=1)
     {
-        if (0 < $bytes = abs($bytes)) {
+        if(0 < $bytes=abs($bytes)) {
             return fread($this->_handle, $bytes);
         }
         return null;
@@ -104,10 +104,10 @@ 
      * @return  int
      * @param   bool    $bigendian
      */
-    function _readInt($bigendian = false)
+    function _readInt($bigendian=false)
     {
 		//unpack returns a reference????
-		$unpacked = unpack($bigendian ? 'N' : 'V', $this->_read(4));
+		$unpacked=unpack($bigendian ? 'N' : 'V', $this->_read(4));
         return array_shift($unpacked);
     }
 
@@ -144,7 +144,7 @@ 
      */
     function _writeStr($string)
     {
-        return $this->_write($string . "\0");
+        return $this->_write($string."\0");
     }
 
     /**
@@ -168,18 +168,18 @@ 
      * @return   mixed   Returns true on success or PEAR_Error on failure.
      * @param    string  $file
      */
-    function load($file = null)
+    function load($file=null)
     {
-        if (!isset($file)) {
-            $file = $this->file;
+        if(!isset($file)) {
+            $file=$this->file;
         }
 
         // open MO file
-        if (!is_resource($this->_handle = @fopen($file, 'rb'))) {
+        if(!is_resource($this->_handle=@fopen($file, 'rb'))) {
             return false;
         }
         // lock MO file shared
-        if (!@flock($this->_handle, LOCK_SH)) {
+        if(!@flock($this->_handle, LOCK_SH)) {
             @fclose($this->_handle);
             return false;
         }
@@ -187,15 +187,15 @@ 
         // read (part of) magic number from MO file header and define endianess
 
 		//unpack returns a reference????
-		$unpacked = unpack('c', $this->_read(4));
-        switch ($magic = array_shift($unpacked))
+		$unpacked=unpack('c', $this->_read(4));
+        switch($magic=array_shift($unpacked))
         {
             case -34:
-                $be = false;
+                $be=false;
             break;
 
             case -107:
-                $be = true;
+                $be=true;
             break;
 
             default:
@@ -203,24 +203,24 @@ 
         }
 
         // check file format revision - we currently only support 0
-        if (0 !== ($_rev = $this->_readInt($be))) {
+        if(0!==($_rev=$this->_readInt($be))) {
             return false;
         }
 
         // count of strings in this file
-        $count = $this->_readInt($be);
+        $count=$this->_readInt($be);
 
         // offset of hashing table of the msgids
-        $offset_original = $this->_readInt($be);
+        $offset_original=$this->_readInt($be);
         // offset of hashing table of the msgstrs
-        $offset_translat = $this->_readInt($be);
+        $offset_translat=$this->_readInt($be);
 
         // move to msgid hash table
         fseek($this->_handle, $offset_original);
         // read lengths and offsets of msgids
-        $original = array();
-        for ($i = 0; $i < $count; $i++) {
-            $original[$i] = array(
+        $original=array();
+        for($i=0; $i < $count; $i++) {
+            $original[$i]=array(
                 'length' => $this->_readInt($be),
                 'offset' => $this->_readInt($be)
             );
@@ -229,28 +229,28 @@ 
         // move to msgstr hash table
         fseek($this->_handle, $offset_translat);
         // read lengths and offsets of msgstrs
-        $translat = array();
-        for ($i = 0; $i < $count; $i++) {
-            $translat[$i] = array(
+        $translat=array();
+        for($i=0; $i < $count; $i++) {
+            $translat[$i]=array(
                 'length' => $this->_readInt($be),
                 'offset' => $this->_readInt($be)
             );
         }
 
         // read all
-        for ($i = 0; $i < $count; $i++) {
-            $this->strings[$this->_readStr($original[$i])] =
+        for($i=0; $i < $count; $i++) {
+            $this->strings[$this->_readStr($original[$i])]=
                 $this->_readStr($translat[$i]);
         }
 
         // done
         @flock($this->_handle, LOCK_UN);
         @fclose($this->_handle);
-        $this->_handle = null;
+        $this->_handle=null;
 
         // check for meta info
-        if (isset($this->strings[''])) {
-            $this->meta = parent::meta2array($this->strings['']);
+        if(isset($this->strings[''])) {
+            $this->meta=parent::meta2array($this->strings['']);
             unset($this->strings['']);
         }
 
@@ -264,24 +264,24 @@ 
      * @return  mixed   Returns true on success or PEAR_Error on failure.
      * @param   string  $file
      */
-    function save($file = null)
+    function save($file=null)
     {
-        if (!isset($file)) {
-            $file = $this->file;
+        if(!isset($file)) {
+            $file=$this->file;
         }
 
         // open MO file
-        if (!is_resource($this->_handle = @fopen($file, 'wb'))) {
+        if(!is_resource($this->_handle=@fopen($file, 'wb'))) {
             return false;
         }
         // lock MO file exclusively
-        if (!@flock($this->_handle, LOCK_EX)) {
+        if(!@flock($this->_handle, LOCK_EX)) {
             @fclose($this->_handle);
             return false;
         }
 
         // write magic number
-        if ($this->writeBigEndian) {
+        if($this->writeBigEndian) {
             $this->_write(pack('c*', 0x95, 0x04, 0x12, 0xde));
         } else {
             $this->_write(pack('c*', 0xde, 0x12, 0x04, 0x95));
@@ -290,66 +290,66 @@ 
         // write file format revision
         $this->_writeInt(0);
 
-        $count = count($this->strings) + ($meta = (count($this->meta) ? 1 : 0));
+        $count=count($this->strings) + ($meta=(count($this->meta) ? 1 : 0));
         // write count of strings
         $this->_writeInt($count);
 
-        $offset = 28;
+        $offset=28;
         // write offset of orig. strings hash table
         $this->_writeInt($offset);
 
-        $offset += ($count * 8);
+        $offset+=($count * 8);
         // write offset transl. strings hash table
         $this->_writeInt($offset);
 
         // write size of hash table (we currently ommit the hash table)
         $this->_writeInt(0);
 
-        $offset += ($count * 8);
+        $offset+=($count * 8);
         // write offset of hash table
         $this->_writeInt($offset);
 
         // unshift meta info
-        if ($this->meta) {
-            $meta = '';
-            foreach ($this->meta as $key => $val) {
-                $meta .= $key . ': ' . $val . "\n";
+        if($this->meta) {
+            $meta='';
+            foreach($this->meta as $key => $val) {
+                $meta.=$key.': '.$val."\n";
             }
-            $strings = array('' => $meta) + $this->strings;
+            $strings=array('' => $meta) + $this->strings;
         } else {
-            $strings = $this->strings;
+            $strings=$this->strings;
         }
 
         // write offsets for original strings
-        foreach (array_keys($strings) as $o) {
-            $len = strlen($o);
+        foreach(array_keys($strings) as $o) {
+            $len=strlen($o);
             $this->_writeInt($len);
             $this->_writeInt($offset);
-            $offset += $len + 1;
+            $offset+=$len + 1;
         }
 
         // write offsets for translated strings
-        foreach ($strings as $t) {
-            $len = strlen($t);
+        foreach($strings as $t) {
+            $len=strlen($t);
             $this->_writeInt($len);
             $this->_writeInt($offset);
-            $offset += $len + 1;
+            $offset+=$len + 1;
         }
 
         // write original strings
-        foreach (array_keys($strings) as $o) {
+        foreach(array_keys($strings) as $o) {
             $this->_writeStr($o);
         }
 
         // write translated strings
-        foreach ($strings as $t) {
+        foreach($strings as $t) {
             $this->_writeStr($t);
         }
 
         // done
         @flock($this->_handle, LOCK_UN);
         @fclose($this->_handle);
-        chmod($file,PRADO_CHMOD);
+        chmod($file, PRADO_CHMOD);
         return true;
     }
 }