pradosoft / prado

framework/I18N/core/Gettext/MO.php

Doc Comments +3 added lines, -3 removed lines

@@ -86,7 +86,7 @@ 
      * _read
      *
      * @access  private
-     * @return  mixed
+     * @return  string|null
      * @param   int     $bytes
      */
     function _read($bytes = 1)
@@ -165,7 +165,7 @@ 
      * Load MO file
      *
      * @access   public
-     * @return   mixed   Returns true on success or PEAR_Error on failure.
+     * @return   boolean   Returns true on success or PEAR_Error on failure.
      * @param    string  $file
      */
     function load($file = null)
@@ -261,7 +261,7 @@ 
      * Save MO file
      *
      * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
+     * @return  boolean   Returns true on success or PEAR_Error on failure.
      * @param   string  $file
      */
     function save($file = null)

Indentation +295 added lines, -295 removed lines

@@ -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 TGettext_MO($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 TGettext_MO($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 TGettext_MO($file = '')
+    function TGettext_MO($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;
     }
 }

framework/I18N/core/Gettext/PO.php

Doc Comments +2 added lines, -2 removed lines

@@ -67,7 +67,7 @@ 
      * Load PO file
      *
      * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
+     * @return  boolean   Returns true on success or PEAR_Error on failure.
      * @param   string  $file
      */
     function load($file = null)
@@ -116,7 +116,7 @@ 
      * Save PO file
      *
      * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
+     * @return  boolean   Returns true on success or PEAR_Error on failure.
      * @param   string  $file
      */
     function save($file = null)

Indentation +110 added lines, -110 removed lines

@@ -1,20 +1,20 @@ 
 <?php
 /**
- * TGettext_PO 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.2 $  $Date: 2005/01/05 03:15:14 $
- * @package System.I18N.core
- */
+	 * TGettext_PO 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.2 $  $Date: 2005/01/05 03:15:14 $
+	 * @package System.I18N.core
+	 */
 
 // +----------------------------------------------------------------------+
 // | PEAR :: File :: Gettext :: PO                                        |
@@ -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 TGettext_PO($file = '')
-    {
-        $this->file = $file;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @access  public
+	 * @return  object      File_Gettext_PO
+	 * @param   string      path to GNU PO file
+	 */
+	function TGettext_PO($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 TGettext_PO($file = '')
+    function TGettext_PO($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/TGettext.php

Doc Comments +3 added lines, -3 removed lines

@@ -118,7 +118,7 @@ 
      *
      * @static
      * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
+     * @return  boolean   Returns true on success or PEAR_Error on failure.
      * @param   string  $pofile path to GNU PO file
      * @param   string  $mofile path to GNU MO file
      */
@@ -260,7 +260,7 @@ 
      * toMO
      *
      * @access  protected
-     * @return  object  File_Gettext_MO
+     * @return  TGettext_MO  File_Gettext_MO
      */
     function toMO()
     {
@@ -274,7 +274,7 @@ 
      * toPO
      *
      * @access  protected
-     * @return  object      File_Gettext_PO
+     * @return  TGettext_PO      File_Gettext_PO
      */
     function toPO()
     {

Indentation +224 added lines, -224 removed lines

@@ -1,20 +1,20 @@ 
 <?php
 /**
- * TGettext 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.4 $  $Date: 2005/01/09 23:36:23 $
- * @package System.I18N.core
- */
+	 * TGettext 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.4 $  $Date: 2005/01/09 23:36:23 $
+	 * @package System.I18N.core
+	 */
 
 // +----------------------------------------------------------------------+
 // | PEAR :: File :: Gettext                                              |
@@ -58,229 +58,229 @@ 
  */
 class TGettext
 {
-    /**
-     * strings
-     *
-     * associative array with all [msgid => msgstr] entries
-     *
-     * @access  protected
-     * @var     array
-    */
-    protected $strings = array();
+	/**
+	 * strings
+	 *
+	 * associative array with all [msgid => msgstr] entries
+	 *
+	 * @access  protected
+	 * @var     array
+	 */
+	protected $strings = array();
 
-    /**
-     * meta
-     *
-     * associative array containing meta
-     * information like project name or content type
-     *
-     * @access  protected
-     * @var     array
-     */
-    protected $meta = array();
+	/**
+	 * meta
+	 *
+	 * associative array containing meta
+	 * information like project name or content type
+	 *
+	 * @access  protected
+	 * @var     array
+	 */
+	protected $meta = array();
 
-    /**
-     * file path
-     *
-     * @access  protected
-     * @var     string
-     */
-    protected $file = '';
+	/**
+	 * file path
+	 *
+	 * @access  protected
+	 * @var     string
+	 */
+	protected $file = '';
 
-    /**
-     * Factory
-     *
-     * @static
-     * @access  public
-     * @return  object  Returns File_Gettext_PO or File_Gettext_MO on success
-     *                  or PEAR_Error on failure.
-     * @param   string  $format MO or PO
-     * @param   string  $file   path to GNU gettext file
-     */
-    static function factory($format, $file = '')
-    {
-        $format = strToUpper($format);
-        $filename = dirname(__FILE__).'/'.$format.'.php';
-        if(is_file($filename) == false)
-        	throw new Exception ("Class file $file not found");
+	/**
+	 * Factory
+	 *
+	 * @static
+	 * @access  public
+	 * @return  object  Returns File_Gettext_PO or File_Gettext_MO on success
+	 *                  or PEAR_Error on failure.
+	 * @param   string  $format MO or PO
+	 * @param   string  $file   path to GNU gettext file
+	 */
+	static function factory($format, $file = '')
+	{
+		$format = strToUpper($format);
+		$filename = dirname(__FILE__).'/'.$format.'.php';
+		if(is_file($filename) == false)
+			throw new Exception ("Class file $file not found");
 
-        include_once $filename;
-        $class = 'TGettext_' . $format;
+		include_once $filename;
+		$class = 'TGettext_' . $format;
 
-        return new $class($file);
-    }
+		return new $class($file);
+	}
 
-    /**
-     * poFile2moFile
-     *
-     * That's a simple fake of the 'msgfmt' console command.  It reads the
-     * contents of a GNU PO file and saves them to a GNU MO file.
-     *
-     * @static
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   string  $pofile path to GNU PO file
-     * @param   string  $mofile path to GNU MO file
-     */
-    static function poFile2moFile($pofile, $mofile)
-    {
-        if (!is_file($pofile)) {
-            throw new Exception("File $pofile doesn't exist.");
-        }
+	/**
+	 * poFile2moFile
+	 *
+	 * That's a simple fake of the 'msgfmt' console command.  It reads the
+	 * contents of a GNU PO file and saves them to a GNU MO file.
+	 *
+	 * @static
+	 * @access  public
+	 * @return  mixed   Returns true on success or PEAR_Error on failure.
+	 * @param   string  $pofile path to GNU PO file
+	 * @param   string  $mofile path to GNU MO file
+	 */
+	static function poFile2moFile($pofile, $mofile)
+	{
+		if (!is_file($pofile)) {
+			throw new Exception("File $pofile doesn't exist.");
+		}
 
-        include_once dirname(__FILE__).'/PO.php';
+		include_once dirname(__FILE__).'/PO.php';
 
-        $PO = new TGettext_PO($pofile);
-        if (true !== ($e = $PO->load())) {
-            return $e;
-        }
+		$PO = new TGettext_PO($pofile);
+		if (true !== ($e = $PO->load())) {
+			return $e;
+		}
 
-        $MO = $PO->toMO();
-        if (true !== ($e = $MO->save($mofile))) {
-            return $e;
-        }
-        unset($PO, $MO);
+		$MO = $PO->toMO();
+		if (true !== ($e = $MO->save($mofile))) {
+			return $e;
+		}
+		unset($PO, $MO);
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * prepare
-     *
-     * @static
-     * @access  protected
-     * @return  string
-     * @param   string  $string
-     * @param   bool    $reverse
-     */
-    static function prepare($string, $reverse = false)
-    {
-        if ($reverse) {
-            $smap = array('"', "\n", "\t", "\r");
-            $rmap = array('\"', '\\n"' . "\n" . '"', '\\t', '\\r');
-            return (string) str_replace($smap, $rmap, $string);
-        } else {
-        	$string = preg_replace('/"\s+"/', '', $string);
-            $smap = array('\\n', '\\r', '\\t', '\"');
-            $rmap = array("\n", "\r", "\t", '"');
-            return (string) str_replace($smap, $rmap, $string);
-        }
-    }
+	/**
+	 * prepare
+	 *
+	 * @static
+	 * @access  protected
+	 * @return  string
+	 * @param   string  $string
+	 * @param   bool    $reverse
+	 */
+	static function prepare($string, $reverse = false)
+	{
+		if ($reverse) {
+			$smap = array('"', "\n", "\t", "\r");
+			$rmap = array('\"', '\\n"' . "\n" . '"', '\\t', '\\r');
+			return (string) str_replace($smap, $rmap, $string);
+		} else {
+			$string = preg_replace('/"\s+"/', '', $string);
+			$smap = array('\\n', '\\r', '\\t', '\"');
+			$rmap = array("\n", "\r", "\t", '"');
+			return (string) str_replace($smap, $rmap, $string);
+		}
+	}
 
-    /**
-     * meta2array
-     *
-     * @static
-     * @access  public
-     * @return  array
-     * @param   string  $meta
-     */
-    static function meta2array($meta)
-    {
-        $array = array();
-        foreach (explode("\n", $meta) as $info) {
-            if ($info = trim($info)) {
-                list($key, $value) = explode(':', $info, 2);
-                $array[trim($key)] = trim($value);
-            }
-        }
-        return $array;
-    }
+	/**
+	 * meta2array
+	 *
+	 * @static
+	 * @access  public
+	 * @return  array
+	 * @param   string  $meta
+	 */
+	static function meta2array($meta)
+	{
+		$array = array();
+		foreach (explode("\n", $meta) as $info) {
+			if ($info = trim($info)) {
+				list($key, $value) = explode(':', $info, 2);
+				$array[trim($key)] = trim($value);
+			}
+		}
+		return $array;
+	}
 
-    /**
-     * toArray
-     *
-     * Returns meta info and strings as an array of a structure like that:
-     * <code>
-     *   array(
-     *       'meta' => array(
-     *           'Content-Type'      => 'text/plain; charset=iso-8859-1',
-     *           'Last-Translator'   => 'Michael Wallner <mike@iworks.at>',
-     *           'PO-Revision-Date'  => '2004-07-21 17:03+0200',
-     *           'Language-Team'     => 'German <mail@example.com>',
-     *       ),
-     *       'strings' => array(
-     *           'All rights reserved'   => 'Alle Rechte vorbehalten',
-     *           'Welcome'               => 'Willkommen',
-     *           // ...
-     *       )
-     *   )
-     * </code>
-     *
-     * @see     fromArray()
-     * @access  protected
-     * @return  array
-     */
-    function toArray()
-    {
-    	return array('meta' => $this->meta, 'strings' => $this->strings);
-    }
+	/**
+	 * toArray
+	 *
+	 * Returns meta info and strings as an array of a structure like that:
+	 * <code>
+	 *   array(
+	 *       'meta' => array(
+	 *           'Content-Type'      => 'text/plain; charset=iso-8859-1',
+	 *           'Last-Translator'   => 'Michael Wallner <mike@iworks.at>',
+	 *           'PO-Revision-Date'  => '2004-07-21 17:03+0200',
+	 *           'Language-Team'     => 'German <mail@example.com>',
+	 *       ),
+	 *       'strings' => array(
+	 *           'All rights reserved'   => 'Alle Rechte vorbehalten',
+	 *           'Welcome'               => 'Willkommen',
+	 *           // ...
+	 *       )
+	 *   )
+	 * </code>
+	 *
+	 * @see     fromArray()
+	 * @access  protected
+	 * @return  array
+	 */
+	function toArray()
+	{
+		return array('meta' => $this->meta, 'strings' => $this->strings);
+	}
 
-    /**
-     * fromArray
-     *
-     * Assigns meta info and strings from an array of a structure like that:
-     * <code>
-     *   array(
-     *       'meta' => array(
-     *           'Content-Type'      => 'text/plain; charset=iso-8859-1',
-     *           'Last-Translator'   => 'Michael Wallner <mike@iworks.at>',
-     *           'PO-Revision-Date'  => date('Y-m-d H:iO'),
-     *           'Language-Team'     => 'German <mail@example.com>',
-     *       ),
-     *       'strings' => array(
-     *           'All rights reserved'   => 'Alle Rechte vorbehalten',
-     *           'Welcome'               => 'Willkommen',
-     *           // ...
-     *       )
-     *   )
-     * </code>
-     *
-     * @see     toArray()
-     * @access  protected
-     * @return  bool
-     * @param   array       $array
-     */
-    function fromArray($array)
-    {
-    	if (!array_key_exists('strings', $array)) {
-    	    if (count($array) != 2) {
-                return false;
-    	    } else {
-    	        list($this->meta, $this->strings) = $array;
-            }
-    	} else {
-            $this->meta = @$array['meta'];
-            $this->strings = @$array['strings'];
-        }
-        return true;
-    }
+	/**
+	 * fromArray
+	 *
+	 * Assigns meta info and strings from an array of a structure like that:
+	 * <code>
+	 *   array(
+	 *       'meta' => array(
+	 *           'Content-Type'      => 'text/plain; charset=iso-8859-1',
+	 *           'Last-Translator'   => 'Michael Wallner <mike@iworks.at>',
+	 *           'PO-Revision-Date'  => date('Y-m-d H:iO'),
+	 *           'Language-Team'     => 'German <mail@example.com>',
+	 *       ),
+	 *       'strings' => array(
+	 *           'All rights reserved'   => 'Alle Rechte vorbehalten',
+	 *           'Welcome'               => 'Willkommen',
+	 *           // ...
+	 *       )
+	 *   )
+	 * </code>
+	 *
+	 * @see     toArray()
+	 * @access  protected
+	 * @return  bool
+	 * @param   array       $array
+	 */
+	function fromArray($array)
+	{
+		if (!array_key_exists('strings', $array)) {
+			if (count($array) != 2) {
+				return false;
+			} else {
+				list($this->meta, $this->strings) = $array;
+			}
+		} else {
+			$this->meta = @$array['meta'];
+			$this->strings = @$array['strings'];
+		}
+		return true;
+	}
 
-    /**
-     * toMO
-     *
-     * @access  protected
-     * @return  object  File_Gettext_MO
-     */
-    function toMO()
-    {
-        include_once dirname(__FILE__).'/MO.php';
-        $MO = new TGettext_MO;
-        $MO->fromArray($this->toArray());
-        return $MO;
-    }
+	/**
+	 * toMO
+	 *
+	 * @access  protected
+	 * @return  object  File_Gettext_MO
+	 */
+	function toMO()
+	{
+		include_once dirname(__FILE__).'/MO.php';
+		$MO = new TGettext_MO;
+		$MO->fromArray($this->toArray());
+		return $MO;
+	}
 
-    /**
-     * toPO
-     *
-     * @access  protected
-     * @return  object      File_Gettext_PO
-     */
-    function toPO()
-    {
-        include_once dirname(__FILE__).'/PO.php';
-        $PO = new TGettext_PO;
-        $PO->fromArray($this->toArray());
-        return $PO;
-    }
+	/**
+	 * toPO
+	 *
+	 * @access  protected
+	 * @return  object      File_Gettext_PO
+	 */
+	function toPO()
+	{
+		include_once dirname(__FILE__).'/PO.php';
+		$PO = new TGettext_PO;
+		$PO->fromArray($this->toArray());
+		return $PO;
+	}
 }

Spacing +33 added lines, -33 removed lines

@@ -66,7 +66,7 @@ 
      * @access  protected
      * @var     array
     */
-    protected $strings = array();
+    protected $strings=array();
 
     /**
      * meta
@@ -77,7 +77,7 @@ 
      * @access  protected
      * @var     array
      */
-    protected $meta = array();
+    protected $meta=array();
 
     /**
      * file path
@@ -85,7 +85,7 @@ 
      * @access  protected
      * @var     string
      */
-    protected $file = '';
+    protected $file='';
 
     /**
      * Factory
@@ -97,15 +97,15 @@ 
      * @param   string  $format MO or PO
      * @param   string  $file   path to GNU gettext file
      */
-    static function factory($format, $file = '')
+    static function factory($format, $file='')
     {
-        $format = strToUpper($format);
-        $filename = dirname(__FILE__).'/'.$format.'.php';
-        if(is_file($filename) == false)
-        	throw new Exception ("Class file $file not found");
+        $format=strToUpper($format);
+        $filename=dirname(__FILE__).'/'.$format.'.php';
+        if(is_file($filename)==false)
+        	throw new Exception("Class file $file not found");
 
         include_once $filename;
-        $class = 'TGettext_' . $format;
+        $class='TGettext_'.$format;
 
         return new $class($file);
     }
@@ -124,19 +124,19 @@ 
      */
     static function poFile2moFile($pofile, $mofile)
     {
-        if (!is_file($pofile)) {
+        if(!is_file($pofile)) {
             throw new Exception("File $pofile doesn't exist.");
         }
 
         include_once dirname(__FILE__).'/PO.php';
 
-        $PO = new TGettext_PO($pofile);
-        if (true !== ($e = $PO->load())) {
+        $PO=new TGettext_PO($pofile);
+        if(true!==($e=$PO->load())) {
             return $e;
         }
 
-        $MO = $PO->toMO();
-        if (true !== ($e = $MO->save($mofile))) {
+        $MO=$PO->toMO();
+        if(true!==($e=$MO->save($mofile))) {
             return $e;
         }
         unset($PO, $MO);
@@ -153,16 +153,16 @@ 
      * @param   string  $string
      * @param   bool    $reverse
      */
-    static function prepare($string, $reverse = false)
+    static function prepare($string, $reverse=false)
     {
-        if ($reverse) {
-            $smap = array('"', "\n", "\t", "\r");
-            $rmap = array('\"', '\\n"' . "\n" . '"', '\\t', '\\r');
+        if($reverse) {
+            $smap=array('"', "\n", "\t", "\r");
+            $rmap=array('\"', '\\n"'."\n".'"', '\\t', '\\r');
             return (string) str_replace($smap, $rmap, $string);
         } else {
-        	$string = preg_replace('/"\s+"/', '', $string);
-            $smap = array('\\n', '\\r', '\\t', '\"');
-            $rmap = array("\n", "\r", "\t", '"');
+        	$string=preg_replace('/"\s+"/', '', $string);
+            $smap=array('\\n', '\\r', '\\t', '\"');
+            $rmap=array("\n", "\r", "\t", '"');
             return (string) str_replace($smap, $rmap, $string);
         }
     }
@@ -177,11 +177,11 @@ 
      */
     static function meta2array($meta)
     {
-        $array = array();
-        foreach (explode("\n", $meta) as $info) {
-            if ($info = trim($info)) {
-                list($key, $value) = explode(':', $info, 2);
-                $array[trim($key)] = trim($value);
+        $array=array();
+        foreach(explode("\n", $meta) as $info) {
+            if($info=trim($info)) {
+                list($key, $value)=explode(':', $info, 2);
+                $array[trim($key)]=trim($value);
             }
         }
         return $array;
@@ -243,15 +243,15 @@ 
      */
     function fromArray($array)
     {
-    	if (!array_key_exists('strings', $array)) {
-    	    if (count($array) != 2) {
+    	if(!array_key_exists('strings', $array)) {
+    	    if(count($array)!=2) {
                 return false;
     	    } else {
-    	        list($this->meta, $this->strings) = $array;
+    	        list($this->meta, $this->strings)=$array;
             }
     	} else {
-            $this->meta = @$array['meta'];
-            $this->strings = @$array['strings'];
+            $this->meta=@$array['meta'];
+            $this->strings=@$array['strings'];
         }
         return true;
     }
@@ -265,7 +265,7 @@ 
     function toMO()
     {
         include_once dirname(__FILE__).'/MO.php';
-        $MO = new TGettext_MO;
+        $MO=new TGettext_MO;
         $MO->fromArray($this->toArray());
         return $MO;
     }
@@ -279,7 +279,7 @@ 
     function toPO()
     {
         include_once dirname(__FILE__).'/PO.php';
-        $PO = new TGettext_PO;
+        $PO=new TGettext_PO;
         $PO->fromArray($this->toArray());
         return $PO;
     }

framework/I18N/core/IMessageSource.php

Doc Comments +1 added lines

@@ -109,6 +109,7 @@
 	/**
 	 * Set the culture for this particular message source.
 	 * @param string the Culture name.
+	 * @return void
 	 */
 	function setCulture($culture);
 	

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 	 * @param string a catalogue to load
 	 * @return boolean true if loaded, false otherwise.
 	 */
-	function load($catalogue = 'messages');	
+	function load($catalogue='messages');	
 	
 	/**
 	 * Get the translation table. This includes all the loaded sections.

framework/I18N/core/MessageCache.php

Doc Comments +1 added lines, -3 removed lines

@@ -99,9 +99,7 @@
 	 * Get the data from the cache.
 	 * @param string $catalogue The translation section.
 	 * @param string $culture The translation locale, e.g. "en_AU".
-	 * @param string $filename If the source is a file, this file's modified
-	 * time is newer than the cache's modified time, no cache hit.
-	 * @return mixed Boolean FALSE if no cache hit. Otherwise, translation
+	 * @return false|string Boolean FALSE if no cache hit. Otherwise, translation
 	 * table data for the specified section and locale.
 	 */
 	public function get($catalogue, $culture, $lastmodified=0)

Spacing +13 added lines, -13 removed lines

@@ -28,7 +28,7 @@ 
 	/**
 	 * Caceh life time, default is 1 year.
 	 */
-	protected $lifetime = 3153600;
+	protected $lifetime=3153600;
 
 
 	/**
@@ -37,7 +37,7 @@ 
 	 */
 	public function __construct($cacheDir)
 	{
-		$cacheDir = $cacheDir.'/';
+		$cacheDir=$cacheDir.'/';
 
 		if(!is_dir($cacheDir))
 			throw new Exception(
@@ -48,13 +48,13 @@ 
 				'The cache directory '.$cacheDir.' must be writable '.
 				'by the server.');
 
-		$options = array(
+		$options=array(
 			'cacheDir' => $cacheDir,
 			'lifeTime' => $this->getLifeTime(),
 			'automaticSerialization' => true
 		);
 
-		$this->cache = new TCache_Lite($options);
+		$this->cache=new TCache_Lite($options);
 	}
 
 	/**
@@ -72,7 +72,7 @@ 
 	 */
 	public function setLifeTime($time)
 	{
-		$this->lifetime = (int)$time;
+		$this->lifetime=(int) $time;
 	}
 
 	/**
@@ -106,18 +106,18 @@ 
 	 */
 	public function get($catalogue, $culture, $lastmodified=0)
 	{
-		$ID = $this->getID($catalogue, $culture);
-		$group = $this->getGroup($catalogue, $culture);
+		$ID=$this->getID($catalogue, $culture);
+		$group=$this->getGroup($catalogue, $culture);
 
 		$this->cache->_setFileName($ID, $group);
 
-		$cache = $this->cache->getCacheFile();
+		$cache=$this->cache->getCacheFile();
 
-		if(is_file($cache) == false)
+		if(is_file($cache)==false)
 			return false;
 
 
-		$lastmodified = (int)$lastmodified;
+		$lastmodified=(int) $lastmodified;
 
 		if($lastmodified <= 0 || $lastmodified > filemtime($cache))
 			return false;
@@ -136,8 +136,8 @@ 
 	 */
 	public function save($data, $catalogue, $culture)
 	{
-		$ID = $this->getID($catalogue, $culture);
-		$group = $this->getGroup($catalogue, $culture);
+		$ID=$this->getID($catalogue, $culture);
+		$group=$this->getGroup($catalogue, $culture);
 
 		//echo '## Cache save: "'.$ID.'" : "'.$group.'"';
 		//echo "<br>\n";
@@ -152,7 +152,7 @@ 
 	 */
 	public function clean($catalogue, $culture)
 	{
-		$group = $this->getGroup($catalogue, $culture);
+		$group=$this->getGroup($catalogue, $culture);
 		$this->cache->clean($group);
 	}
 

framework/I18N/core/MessageFormat.php

Doc Comments +3 added lines, -2 removed lines

@@ -111,6 +111,7 @@ 
 	/** 
 	 * Sets the charset for message output.
 	 * @param string charset, default is UTF-8
+	 * @param string $charset
 	 */
 	public function setCharset($charset)
 	{
@@ -171,9 +172,9 @@ 
 
 	/**
 	 * Do string translation.
-	 * @param string the string to translate.
+	 * @param string string string to translate.
 	 * @param array a list of string to substitute.
-	 * @param string get the translation from a particular message
+	 * @param string string the translation from a particular message
 	 * catalogue.
 	 * @return string translated string.
 	 */

Spacing +23 added lines, -23 removed lines

@@ -63,25 +63,25 @@ 
 	 * A list of loaded message catalogues.
 	 * @var array 
 	 */
-	protected $catagloues = array();
+	protected $catagloues=array();
 	
 	/**
 	 * The translation messages.
 	 * @var array 
 	 */
-	protected $messages = array();
+	protected $messages=array();
 	
 	/**
 	 * A list of untranslated messages.
 	 * @var array 
 	 */
-	protected $untranslated = array();
+	protected $untranslated=array();
 	
 	/**
 	 * The prefix and suffix to append to untranslated messages.
 	 * @var array 
 	 */
-	protected $postscript = array('','');
+	protected $postscript=array('', '');
 	
 	/**
 	 * Set the default catalogue.
@@ -93,7 +93,7 @@ 
 	 * Output encoding charset
 	 * @var string
 	 */
-	protected $charset = 'UTF-8'; 
+	protected $charset='UTF-8'; 
 
 	/**
 	 * Constructor.
@@ -104,7 +104,7 @@ 
 	 */
 	function __construct(IMessageSource $source, $charset='UTF-8')
 	{
-		$this->source = $source;	
+		$this->source=$source;	
 		$this->setCharset($charset);
 	}
 
@@ -114,7 +114,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->charset = $charset;
+		$this->charset=$charset;
 	}
 
 	/**
@@ -135,13 +135,13 @@ 
 	 */
 	protected function loadCatalogue($catalogue)
 	{
-		if(in_array($catalogue,$this->catagloues))
+		if(in_array($catalogue, $this->catagloues))
 			return;
 			
 		if($this->source->load($catalogue))
 		{
-			$this->messages[$catalogue] = $this->source->read();
-			$this->catagloues[] = $catalogue;						
+			$this->messages[$catalogue]=$this->source->read();
+			$this->catagloues[]=$catalogue;						
 		}
 	}
 
@@ -158,14 +158,14 @@ 
 	 * catalogue.
 	 * @return string translated string.
 	 */
-	public function format($string,$args=array(), $catalogue=null, $charset=null) 
+	public function format($string, $args=array(), $catalogue=null, $charset=null) 
 	{
-		if(empty($charset)) $charset = $this->getCharset();
+		if(empty($charset)) $charset=$this->getCharset();
 		
 		//force args as UTF-8
 		foreach($args as $k => $v)
-			$args[$k] = I18N_toUTF8($v, $charset);
-		$s = $this->formatString(I18N_toUTF8($string, $charset),$args,$catalogue);
+			$args[$k]=I18N_toUTF8($v, $charset);
+		$s=$this->formatString(I18N_toUTF8($string, $charset), $args, $catalogue);
 		return I18N_toEncoding($s, $charset);
 	}
 
@@ -182,15 +182,15 @@ 
 		if(empty($catalogue))
 		{
 			if(empty($this->Catalogue))
-				$catalogue = 'messages';
+				$catalogue='messages';
 			else 
-				$catalogue = $this->Catalogue;
+				$catalogue=$this->Catalogue;
 		}
 				
 		$this->loadCatalogue($catalogue);
 		
 		if(empty($args))
-			$args = array();		
+			$args=array();		
 		
 		foreach($this->messages[$catalogue] as $variant)
 		{
@@ -198,14 +198,14 @@ 
 			foreach($variant as $source => $result)
 			{ 
 				// we found it, so return the target translation
-				if($source == $string)
+				if($source==$string)
 				{
 					//check if it contains only strings.
 					if(is_string($result))
-						$target = $result;
+						$target=$result;
 					else
 					{
-						$target = $result[0];
+						$target=$result[0];
 					}
 					//found, but untranslated
 					if(empty($target))
@@ -245,10 +245,10 @@ 
 	 */
 	function setUntranslatedPS($postscript)
 	{
-		if(is_array($postscript) && count($postscript)>=2)
+		if(is_array($postscript) && count($postscript) >= 2)
 		{
-			$this->postscript[0] = $postscript[0];
-			$this->postscript[1] = $postscript[1];
+			$this->postscript[0]=$postscript[0];
+			$this->postscript[1]=$postscript[1];
 		}
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -213,8 +213,7 @@
 						return 	$this->postscript[0].
 								strtr($string, $args).
 								$this->postscript[1];		
-					}
-					else
+					} else
 						return strtr($target, $args);
 				}
 			}

framework/I18N/core/MessageSource.php

Doc Comments +5 added lines

@@ -252,6 +252,7 @@ 
 	/**
 	 * Set the culture for this message source.
 	 * @param string culture name
+	 * @param string $culture
 	 */
 	public function setCulture($culture)
 	{
@@ -270,6 +271,7 @@ 
 	/**
 	 * Get the last modified unix-time for this particular catalogue+variant.
 	 * @param string catalogue+variant
+	 * @param string $source
 	 * @return int last modified in unix-time format.
 	 */
 	protected function getLastModified($source)
@@ -281,6 +283,7 @@ 
 	 * Load the message for a particular catalogue+variant.
 	 * This methods needs to implemented by subclasses.
 	 * @param string catalogue+variant.
+	 * @param string $variant
 	 * @return array of translation messages. 
 	 */
 	protected function &loadData($variant)
@@ -301,6 +304,7 @@ 
 	/**
 	 * Determine if the source is valid.
 	 * @param string catalogue+variant
+	 * @param string $source
 	 * @return boolean true if valid, false otherwise. 
 	 */
 	protected function isValidSource($source)
@@ -312,6 +316,7 @@ 
 	 * Get all the variants of a particular catalogue.
 	 * This method must be implemented by subclasses.
 	 * @param string catalogue name
+	 * @param string $catalogue
 	 * @return array list of all variants for this catalogue. 
 	 */	
 	protected function getCatalogueList($catalogue)

Indentation +8 added lines, -8 removed lines

@@ -110,15 +110,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 one of the deprecated types 'MySQL' or 'SQLite' 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 one of the deprecated types 'MySQL' or 'SQLite' 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

@@ -82,7 +82,7 @@ 
 	 * Array of translation messages.
 	 * @var array 
 	 */
-	protected $messages = array();
+	protected $messages=array();
 
 	/**
 	 * The source of message translations.
@@ -96,7 +96,7 @@ 
 	 */
 	protected $cache;
 	
-	protected $untranslated = array();
+	protected $untranslated=array();
 
 	/**
 	 * Private constructor. MessageSource must be initialized using
@@ -128,23 +128,23 @@ 
 	 */
 	static function &factory($type, $source='.', $filename='')
 	{
-		$types = array('XLIFF','gettext','Database','MySQL','SQLite');
+		$types=array('XLIFF', 'gettext', 'Database', 'MySQL', '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;
 	}
@@ -170,36 +170,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);
 				}	
@@ -235,7 +235,7 @@ 
 	 */
 	public function setCache(MessageCache $cache)
 	{
-		$this->cache = $cache;
+		$this->cache=$cache;
 	}
 	
 	/**
@@ -246,7 +246,7 @@ 
 	public function append($message)
 	{
 		if(!in_array($message, $this->untranslated))
-			$this->untranslated[] = $message;
+			$this->untranslated[]=$message;
 	}
 	
 	/**
@@ -255,7 +255,7 @@ 
 	 */
 	public function setCulture($culture)
 	{
-		$this->culture = $culture;
+		$this->culture=$culture;
 	}	
 	
 	/**

framework/I18N/core/MessageSource_Database.php

Doc Comments +2 added lines, -1 removed lines

@@ -60,6 +60,7 @@ 
 	/**
 	 * Creates the DB connection.
 	 * @param string the module ID for TDataSourceConfig
+	 * @param string $connectionID
 	 * @return TDbConnection the created DB connection
 	 * @throws TConfigurationException if module ID is invalid or empty
 	 */
@@ -185,7 +186,7 @@ 
 
 	/**
 	 * Update the catalogue last modified time.
-	 * @return boolean true if updated, false otherwise.
+	 * @return integer true if updated, false otherwise.
 	 */
 	private function updateCatalogueTime($cat_id, $variant)
 	{

Spacing +50 added lines, -50 removed lines

@@ -41,7 +41,7 @@ 
 	 */
 	function __construct($source)
 	{
-		$this->_connID= (string)$source;
+		$this->_connID=(string) $source;
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 			if($conn instanceof TDataSourceConfig)
 				return $conn->getDbConnection();
 			else
-				throw new TConfigurationException('messagesource_connectionid_invalid',$connectionID);
+				throw new TConfigurationException('messagesource_connectionid_invalid', $connectionID);
 		}
 		else
 			throw new TConfigurationException('messagesource_connectionid_required');
@@ -91,13 +91,13 @@ 
 				WHERE c.cat_id =  t.cat_id
 					AND c.name = :variant
 				ORDER BY id ASC');
-		$command->bindParameter(':variant',$variant,PDO::PARAM_STR);
+		$command->bindParameter(':variant', $variant, PDO::PARAM_STR);
 		$dataReader=$command->query();
 
-		$result = array();
+		$result=array();
 
-		foreach ($dataReader as $row)
-			$result[$row['source']] = array($row['target'],$row['id'],$row['comments']);
+		foreach($dataReader as $row)
+			$result[$row['source']]=array($row['target'], $row['id'], $row['comments']);
 
 		return $result;
 	}
@@ -112,7 +112,7 @@ 
 	{
 		$command=$this->getDBConnection()->createCommand(
 			'SELECT date_modified FROM catalogue WHERE name = :source');
-		$command->bindParameter(':source',$source,PDO::PARAM_STR);
+		$command->bindParameter(':source', $source, PDO::PARAM_STR);
 		$result=$command->queryScalar();
 		return $result ? $result : 0;
 	}
@@ -128,7 +128,7 @@ 
 	{
 		$command=$this->getDBConnection()->createCommand(
 			'SELECT COUNT(*) FROM catalogue WHERE name = :variant');
-		$command->bindParameter(':variant',$variant,PDO::PARAM_STR);
+		$command->bindParameter(':variant', $variant, PDO::PARAM_STR);
 		return $command->queryScalar()==1;
 	}
 
@@ -139,18 +139,18 @@ 
 	 */
 	protected function getCatalogueList($catalogue)
 	{
-		$variants = explode('_',$this->culture);
+		$variants=explode('_', $this->culture);
 
-		$catalogues = array($catalogue);
+		$catalogues=array($catalogue);
 
-		$variant = null;
+		$variant=null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for($i=0, $k=count($variants); $i < $k; ++$i)
 		{
 			if(isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_'.$variants[$i]:$variants[$i];
-				$catalogues[] = $catalogue.'.'.$variant;
+				$variant.=($variant) ? '_'.$variants[$i] : $variants[$i];
+				$catalogues[]=$catalogue.'.'.$variant;
 			}
 		}
 		return array_reverse($catalogues);
@@ -164,20 +164,20 @@ 
 	private function getCatalogueDetails($catalogue='messages')
 	{
 		if(empty($catalogue))
-			$catalogue = 'messages';
+			$catalogue='messages';
 
-		$variant = $catalogue.'.'.$this->culture;
+		$variant=$catalogue.'.'.$this->culture;
 
 		$command=$this->getDBConnection()->createCommand(
 			'SELECT cat_id FROM catalogue WHERE name = :variant');
-		$command->bindParameter(':variant',$variant,PDO::PARAM_STR);
+		$command->bindParameter(':variant', $variant, PDO::PARAM_STR);
 		$cat_id=$command->queryScalar();
 
-		if ($cat_id===null) return false;
+		if($cat_id===null) return false;
 
 		$command=$this->getDBConnection()->createCommand(
 			'SELECT COUNT(msg_id) FROM trans_unit WHERE cat_id = :catid ');
-		$command->bindParameter(':catid',$cat_id,PDO::PARAM_INT);
+		$command->bindParameter(':catid', $cat_id, PDO::PARAM_INT);
 		$count=$command->queryScalar();
 
 		return array($cat_id, $variant, $count);
@@ -189,11 +189,11 @@ 
 	 */
 	private function updateCatalogueTime($cat_id, $variant)
 	{
-		$time = time();
+		$time=time();
 		$command=$this->getDBConnection()->createCommand(
 			'UPDATE catalogue SET date_modified = :moddate WHERE cat_id = :catid');
-		$command->bindParameter(':moddate',$time,PDO::PARAM_INT);
-		$command->bindParameter(':catid',$cat_id,PDO::PARAM_INT);
+		$command->bindParameter(':moddate', $time, PDO::PARAM_INT);
+		$command->bindParameter(':catid', $cat_id, PDO::PARAM_INT);
 		$result=$command->execute();
 
 		if(!empty($this->cache))
@@ -211,31 +211,31 @@ 
 	 */
 	function save($catalogue='messages')
 	{
-		$messages = $this->untranslated;
+		$messages=$this->untranslated;
 
 		if(count($messages) <= 0) return false;
 
-		$details = $this->getCatalogueDetails($catalogue);
+		$details=$this->getCatalogueDetails($catalogue);
 
 		if($details)
-			list($cat_id, $variant, $count) = $details;
+			list($cat_id, $variant, $count)=$details;
 		else
 			return false;
 
 		if($cat_id <= 0) return false;
-		$inserted = 0;
+		$inserted=0;
 
-		$time = time();
+		$time=time();
 
 		$command=$this->getDBConnection()->createCommand(
 			'INSERT INTO trans_unit (cat_id,id,source,date_added) VALUES (:catid,:id,:source,:dateadded)');
-		$command->bindParameter(':catid',$cat_id,PDO::PARAM_INT);
-		$command->bindParameter(':id',$count,PDO::PARAM_INT);
-		$command->bindParameter(':source',$message,PDO::PARAM_STR);
-		$command->bindParameter(':dateadded',$time,PDO::PARAM_INT);
+		$command->bindParameter(':catid', $cat_id, PDO::PARAM_INT);
+		$command->bindParameter(':id', $count, PDO::PARAM_INT);
+		$command->bindParameter(':source', $message, PDO::PARAM_STR);
+		$command->bindParameter(':dateadded', $time, PDO::PARAM_INT);
 		foreach($messages as $message)
 		{
-			if (empty($message)) continue;
+			if(empty($message)) continue;
 			$count++; $inserted++;
 			$command->execute();
 		}
@@ -253,16 +253,16 @@ 
 	 */
 	function delete($message, $catalogue='messages')
 	{
-		$details = $this->getCatalogueDetails($catalogue);
+		$details=$this->getCatalogueDetails($catalogue);
 		if($details)
-			list($cat_id, $variant, $count) = $details;
+			list($cat_id, $variant, $count)=$details;
 		else
 			return false;
 
 		$command=$this->getDBConnection()->createCommand(
 			'DELETE FROM trans_unit WHERE cat_id = :catid AND source = :message');
-		$command->bindParameter(':catid',$cat_id,PDO::PARAM_INT);
-		$command->bindParameter(':message',$message,PDO::PARAM_STR);
+		$command->bindParameter(':catid', $cat_id, PDO::PARAM_INT);
+		$command->bindParameter(':message', $message, PDO::PARAM_STR);
 
 		return ($command->execute()==1) ? $this->updateCatalogueTime($cat_id, $variant) : false;
 
@@ -278,21 +278,21 @@ 
 	 */
 	function update($text, $target, $comments, $catalogue='messages')
 	{
-		$details = $this->getCatalogueDetails($catalogue);
+		$details=$this->getCatalogueDetails($catalogue);
 		if($details)
-			list($cat_id, $variant, $count) = $details;
+			list($cat_id, $variant, $count)=$details;
 		else
 			return false;
 
-		$time = time();
+		$time=time();
 		$command=$this->getDBConnection()->createCommand(
 			'UPDATE trans_unit SET target = :target, comments = :comments, date_modified = :datemod
 					WHERE cat_id = :catid AND source = :source');
-		$command->bindParameter(':target',$target,PDO::PARAM_STR);
-		$command->bindParameter(':comments',$comments,PDO::PARAM_STR);
-		$command->bindParameter(':datemod',$time,PDO::PARAM_INT);
-		$command->bindParameter(':catid',$cat_id,PDO::PARAM_INT);
-		$command->bindParameter(':source',$text,PDO::PARAM_STR);
+		$command->bindParameter(':target', $target, PDO::PARAM_STR);
+		$command->bindParameter(':comments', $comments, PDO::PARAM_STR);
+		$command->bindParameter(':datemod', $time, PDO::PARAM_INT);
+		$command->bindParameter(':catid', $cat_id, PDO::PARAM_INT);
+		$command->bindParameter(':source', $text, PDO::PARAM_STR);
 
 		return ($command->execute()==1) ? $this->updateCatalogueTime($cat_id, $variant) : false;
 	}
@@ -303,17 +303,17 @@ 
 	 */
 	function catalogues()
 	{
-		$command=$this->getDBConnection()->createCommand( 'SELECT name FROM catalogue ORDER BY name');
+		$command=$this->getDBConnection()->createCommand('SELECT name FROM catalogue ORDER BY name');
 		$dataReader=$command->query();
 
-		$result = array();
+		$result=array();
 
-		foreach ($dataReader as $row)
+		foreach($dataReader as $row)
 		{
-			$details = explode('.',$row[0]);
-			if(!isset($details[1])) $details[1] = null;
+			$details=explode('.', $row[0]);
+			if(!isset($details[1])) $details[1]=null;
 
-			$result[] = $details;
+			$result[]=$details;
 		}
 
 		return $result;

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

framework/I18N/core/MessageSource_gettext.php

Doc Comments +6 added lines

@@ -200,6 +200,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $MOFile
+	 */
 	private function getPOFile($MOFile)
 	{
 		$filebase = substr($MOFile, 0, strlen($MOFile)-strlen($this->dataExt));
@@ -422,6 +425,9 @@ 
 		return $catalogue;
 	}
 
+	/**
+	 * @param string $catalogue
+	 */
 	protected function createMessageTemplate($catalogue)
 	{
 		if($catalogue === null) {

Spacing +94 added lines, -94 removed lines

@@ -45,23 +45,23 @@ 
 	 * Message data filename extension.
 	 * @var string
 	 */
-	protected $dataExt = '.mo';
+	protected $dataExt='.mo';
 
 	/**
 	 * PO data filename extension
 	 * @var string
 	 */
-	protected $poExt = '.po';
+	protected $poExt='.po';
 
 	/**
 	 * Separator between culture name and source.
 	 * @var string
 	 */
-	protected $dataSeparator = '.';
+	protected $dataSeparator='.';
 
 	function __construct($source)
 	{
-		$this->source = (string)$source;
+		$this->source=(string) $source;
 	}
 
 
@@ -72,17 +72,17 @@ 
 	 */
 	protected function &loadData($filename)
 	{
-		$mo = TGettext::factory('MO',$filename);
+		$mo=TGettext::factory('MO', $filename);
 		$mo->load();
-		$result = $mo->toArray();
+		$result=$mo->toArray();
 
-		$results = array();
+		$results=array();
 		$count=0;
 		foreach($result['strings'] as $source => $target)
 		{
-			$results[$source][] = $target; //target
-			$results[$source][] = $count++; //id
-			$results[$source][] = ''; //comments
+			$results[$source][]=$target; //target
+			$results[$source][]=$count++; //id
+			$results[$source][]=''; //comments
 		}
 		return $results;
 	}
@@ -129,24 +129,24 @@ 
 	 */
 	protected function getCatalogueList($catalogue)
 	{
-		$variants = explode('_',$this->culture);
-		$source = $catalogue.$this->dataExt;
+		$variants=explode('_', $this->culture);
+		$source=$catalogue.$this->dataExt;
 
-		$catalogues = array($source);
+		$catalogues=array($source);
 
-		$variant = null;
+		$variant=null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for($i=0, $k=count($variants); $i < $k; ++$i)
 		{
 			if(isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_'.$variants[$i]:$variants[$i];
-				$catalogues[] = $catalogue.$this->dataSeparator.
+				$variant.=($variant) ? '_'.$variants[$i] : $variants[$i];
+				$catalogues[]=$catalogue.$this->dataSeparator.
 								$variant.$this->dataExt;
 			}
 		}
-		$byDir = $this->getCatalogueByDir($catalogue);
-		$catalogues = array_merge($byDir,array_reverse($catalogues));
+		$byDir=$this->getCatalogueByDir($catalogue);
+		$catalogues=array_merge($byDir, array_reverse($catalogues));
 		return $catalogues;
 	}
 
@@ -160,17 +160,17 @@ 
 	 */
 	private function getCatalogueByDir($catalogue)
 	{
-		$variants = explode('_',$this->culture);
-		$catalogues = array();
+		$variants=explode('_', $this->culture);
+		$catalogues=array();
 
-		$variant = null;
+		$variant=null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for($i=0, $k=count($variants); $i < $k; ++$i)
 		{
 			if(isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_'.$variants[$i]:$variants[$i];
-				$catalogues[] = $variant.'/'.$catalogue.$this->dataExt;
+				$variant.=($variant) ? '_'.$variants[$i] : $variants[$i];
+				$catalogues[]=$variant.'/'.$catalogue.$this->dataExt;
 			}
 		}
 		return array_reverse($catalogues);
@@ -186,14 +186,14 @@ 
 	 */
 	private function getVariants($catalogue='messages')
 	{
-		if($catalogue === null) {
-			$catalogue = 'messages';
+		if($catalogue===null) {
+			$catalogue='messages';
 		}
 
 		foreach($this->getCatalogueList($catalogue) as $variant)
 		{
-			$file = $this->getSource($variant);
-			$po = $this->getPOFile($file);
+			$file=$this->getSource($variant);
+			$po=$this->getPOFile($file);
 			if(is_file($file) || is_file($po))
 				return array($variant, $file, $po);
 		}
@@ -202,7 +202,7 @@ 
 
 	private function getPOFile($MOFile)
 	{
-		$filebase = substr($MOFile, 0, strlen($MOFile)-strlen($this->dataExt));
+		$filebase=substr($MOFile, 0, strlen($MOFile) - strlen($this->dataExt));
 		return $filebase.$this->poExt;
 	}
 
@@ -215,46 +215,46 @@ 
 	 */
 	function save($catalogue='messages')
 	{
-		$messages = $this->untranslated;
+		$messages=$this->untranslated;
 
 		if(count($messages) <= 0) return false;
 
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 
 		if($variants)
-			list($variant, $MOFile, $POFile) = $variants;
+			list($variant, $MOFile, $POFile)=$variants;
 		else
-			list($variant, $MOFile, $POFile) = $this->createMessageTemplate($catalogue);
+			list($variant, $MOFile, $POFile)=$this->createMessageTemplate($catalogue);
 
-		if(is_writable($MOFile) == false)
+		if(is_writable($MOFile)==false)
 			throw new TIOException("Unable to save to file {$MOFile}, file must be writable.");
-		if(is_writable($POFile) == false)
+		if(is_writable($POFile)==false)
 			throw new TIOException("Unable to save to file {$POFile}, file must be writable.");
 
 		//set the strings as untranslated.
-		$strings = array();
+		$strings=array();
 		foreach($messages as $message)
-			$strings[$message] = '';
+			$strings[$message]='';
 
 		//load the PO
-		$po = TGettext::factory('PO',$POFile);
+		$po=TGettext::factory('PO', $POFile);
 		$po->load();
-		$result = $po->toArray();
+		$result=$po->toArray();
 
-		$existing = count($result['strings']);
+		$existing=count($result['strings']);
 
 		//add to strings to the existing message list
-		$result['strings'] = array_merge($result['strings'],$strings);
+		$result['strings']=array_merge($result['strings'], $strings);
 
-		$new = count($result['strings']);
+		$new=count($result['strings']);
 
 		if($new > $existing)
 		{
 			//change the date 2004-12-25 12:26
-			$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
+			$result['meta']['PO-Revision-Date']=@date('Y-m-d H:i:s');
 
 			$po->fromArray($result);
-			$mo = $po->toMO();
+			$mo=$po->toMO();
 			if($po->save() && $mo->save($MOFile))
 			{
 				if(!empty($this->cache))
@@ -275,30 +275,30 @@ 
 	 */
 	function delete($message, $catalogue='messages')
 	{
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 		if($variants)
-			list($variant, $MOFile, $POFile) = $variants;
+			list($variant, $MOFile, $POFile)=$variants;
 		else
 			return false;
 
-		if(is_writable($MOFile) == false)
+		if(is_writable($MOFile)==false)
 			throw new TIOException("Unable to modify file {$MOFile}, file must be writable.");
-		if(is_writable($POFile) == false)
+		if(is_writable($POFile)==false)
 			throw new TIOException("Unable to modify file {$POFile}, file must be writable.");
 
-		$po = TGettext::factory('PO',$POFile);
+		$po=TGettext::factory('PO', $POFile);
 		$po->load();
-		$result = $po->toArray();
+		$result=$po->toArray();
 
 		foreach($result['strings'] as $string => $value)
 		{
-			if($string == $message)
+			if($string==$message)
 			{
-				$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
+				$result['meta']['PO-Revision-Date']=@date('Y-m-d H:i:s');
 				unset($result['strings'][$string]);
 
 				$po->fromArray($result);
-				$mo = $po->toMO();
+				$mo=$po->toMO();
 				if($po->save() && $mo->save($MOFile))
 				{
 					if(!empty($this->cache))
@@ -323,31 +323,31 @@ 
 	 */
 	function update($text, $target, $comments, $catalogue='messages')
 	{
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 		if($variants)
-			list($variant, $MOFile, $POFile) = $variants;
+			list($variant, $MOFile, $POFile)=$variants;
 		else
 			return false;
 
-		if(is_writable($MOFile) == false)
+		if(is_writable($MOFile)==false)
 			throw new TIOException("Unable to update file {$MOFile}, file must be writable.");
-		if(is_writable($POFile) == false)
+		if(is_writable($POFile)==false)
 			throw new TIOException("Unable to update file {$POFile}, file must be writable.");
 
 
-		$po = TGettext::factory('PO',$POFile);
+		$po=TGettext::factory('PO', $POFile);
 		$po->load();
-		$result = $po->toArray();
+		$result=$po->toArray();
 
 		foreach($result['strings'] as $string => $value)
 		{
-			if($string == $text)
+			if($string==$text)
 			{
-				$result['strings'][$string] = $target;
-				$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
+				$result['strings'][$string]=$target;
+				$result['meta']['PO-Revision-Date']=@date('Y-m-d H:i:s');
 
 				$po->fromArray($result);
-				$mo = $po->toMO();
+				$mo=$po->toMO();
 
 				if($po->save() && $mo->save($MOFile))
 				{
@@ -379,42 +379,42 @@ 
 	 * E.g. array('messages','en_AU')
 	 * @return array list of catalogues
 	 */
-	protected function getCatalogues($dir=null,$variant=null)
+	protected function getCatalogues($dir=null, $variant=null)
 	{
-		$dir = $dir?$dir:$this->source;
-		$files = scandir($dir);
+		$dir=$dir ? $dir : $this->source;
+		$files=scandir($dir);
 
-		$catalogue = array();
+		$catalogue=array();
 
 		foreach($files as $file)
 		{
 			if(is_dir($dir.'/'.$file)
-				&& preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/',$file))
+				&& preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file))
 			{
 
-				$catalogue = array_merge($catalogue,
+				$catalogue=array_merge($catalogue,
 								$this->getCatalogues($dir.'/'.$file, $file));
 			}
 
-			$pos = strpos($file,$this->dataExt);
+			$pos=strpos($file, $this->dataExt);
 
-			if($pos >0
-				&& substr($file,-1*strlen($this->dataExt)) == $this->dataExt)
+			if($pos > 0
+				&& substr($file, -1 * strlen($this->dataExt))==$this->dataExt)
 			{
-				$name = substr($file,0,$pos);
-				$dot = strrpos($name,$this->dataSeparator);
-				$culture = $variant;
-				$cat = $name;
+				$name=substr($file, 0, $pos);
+				$dot=strrpos($name, $this->dataSeparator);
+				$culture=$variant;
+				$cat=$name;
 				if(is_int($dot))
 				{
-					$culture = substr($name, $dot+1,strlen($name));
-					$cat = substr($name,0,$dot);
+					$culture=substr($name, $dot + 1, strlen($name));
+					$cat=substr($name, 0, $dot);
 				}
-				$details[0] = $cat;
-				$details[1] = $culture;
+				$details[0]=$cat;
+				$details[1]=$culture;
 
 
-				$catalogue[] = $details;
+				$catalogue[]=$details;
 			}
 		}
 		sort($catalogue);
@@ -424,29 +424,29 @@ 
 
 	protected function createMessageTemplate($catalogue)
 	{
-		if($catalogue === null) {
-			$catalogue = 'messages';
+		if($catalogue===null) {
+			$catalogue='messages';
 		}
-		$variants = $this->getCatalogueList($catalogue);
-		$variant = array_shift($variants);
-		$mo_file = $this->getSource($variant);
-		$po_file = $this->getPOFile($mo_file);
+		$variants=$this->getCatalogueList($catalogue);
+		$variant=array_shift($variants);
+		$mo_file=$this->getSource($variant);
+		$po_file=$this->getPOFile($mo_file);
 
-		$dir = dirname($mo_file);
+		$dir=dirname($mo_file);
 		if(!is_dir($dir))
 		{
 			@mkdir($dir);
-			@chmod($dir,PRADO_CHMOD);
+			@chmod($dir, PRADO_CHMOD);
 		}
 		if(!is_dir($dir))
 			throw new TException("Unable to create directory $dir");
 
-		$po = TGettext::factory('PO',$po_file);
-		$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
-		$result['strings'] = array();
+		$po=TGettext::factory('PO', $po_file);
+		$result['meta']['PO-Revision-Date']=@date('Y-m-d H:i:s');
+		$result['strings']=array();
 
 		$po->fromArray($result);
-		$mo = $po->toMO();
+		$mo=$po->toMO();
 		if($po->save() && $mo->save($mo_file))
 			return array($variant, $mo_file, $po_file);
 		else

Braces +3 added lines, -6 removed lines

@@ -260,8 +260,7 @@ 
 				if(!empty($this->cache))
 					$this->cache->clean($variant, $this->culture);
 				return true;
-			}
-			else
+			} else
 				return false;
 		}
 		return false;
@@ -304,8 +303,7 @@ 
 					if(!empty($this->cache))
 						$this->cache->clean($variant, $this->culture);
 					return true;
-				}
-				else
+				} else
 					return false;
 			}
 		}
@@ -354,8 +352,7 @@ 
 					if(!empty($this->cache))
 						$this->cache->clean($variant, $this->culture);
 					return true;
-				}
-				else
+				} else
 					return false;
 			}
 		}