pradosoft / prado

framework/Web/UI/WebControls/TStyle.php

Indentation +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 	 */
 	public function __construct($style=null)
 	{
-    parent::__construct();
+	parent::__construct();
 		if($style!==null)
 			$this->copyFrom($style);
 	}

framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php

Indentation +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
  * Parameters property of TActiveRecordCriteria.
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
-  * @package Prado\Data\ActiveRecord\Scaffold
+ * @package Prado\Data\ActiveRecord\Scaffold
  * @since 3.1
  */
 class TScaffoldListView extends TScaffoldBase

framework/Data/ActiveRecord/Scaffold/TScaffoldView.php

Indentation +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
  * the Active Record class to be displayed/edited/added.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
-  * @package Prado\Data\ActiveRecord\Scaffold
+ * @package Prado\Data\ActiveRecord\Scaffold
  * @since 3.0
  */
 class TScaffoldView extends TScaffoldBase

framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php

Indentation +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
  * xxx is the property name).
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
-  * @package Prado\Data\ActiveRecord\Scaffold
+ * @package Prado\Data\ActiveRecord\Scaffold
  * @since 3.1
  */
 class TScaffoldEditView extends TScaffoldBase

framework/Data/ActiveRecord/TActiveRecord.php

Indentation +20 added lines, -20 removed lines

@@ -1032,26 +1032,26 @@
 		return isset(self::$_relations[get_class($this)][strtolower($property)]);
 	}
 	
-        /**
-        * Return record data as array
-        * @return array of column name and column values
-        * @since 3.2.4
-        */
-        public function toArray(){
-        	$result=array();
-        	foreach($this->getRecordTableInfo()->getLowerCaseColumnNames() as $columnName){
-            		$result[$columnName]=$this->getColumnValue($columnName);
-           	}
+		/**
+		 * Return record data as array
+		 * @return array of column name and column values
+		 * @since 3.2.4
+		 */
+		public function toArray(){
+			$result=array();
+			foreach($this->getRecordTableInfo()->getLowerCaseColumnNames() as $columnName){
+					$result[$columnName]=$this->getColumnValue($columnName);
+		   	}
         
-        	return $result;
-    	}
+			return $result;
+		}
     
-    	/**
-     	* Return record data as JSON
-     	* @return JSON
-     	* @since 3.2.4
-     	*/
-    	public function toJSON(){
-        	return json_encode($this->toArray());
-    	}
+		/**
+		 * Return record data as JSON
+		 * @return JSON
+		 * @since 3.2.4
+		 */
+		public function toJSON(){
+			return json_encode($this->toArray());
+		}
 }
\ No newline at end of file

framework/I18N/TNumberFormat.php

Indentation +42 added lines, -42 removed lines

@@ -24,48 +24,48 @@
  */
 
 /**
-  * To format numbers in locale sensitive manner use
-  * <code>
-  * <com:TNumberFormat Pattern="0.##" value="2.0" />
-  * </code>
-  *
-  * Numbers can be formatted as currency, percentage, decimal or scientific
-  * numbers by specifying the Type attribute. The known types are
-  * "currency", "percentage", "decimal" and "scientific".
-  *
-  * If someone from US want to see sales figures from a store in
-  * Germany (say using the EURO currency), formatted using the german
-  * currency, you would need to use the attribute Culture="de_DE" to get
-  * the currency right, e.g. 100,00. The decimal and grouping separator is
-  * then also from the de_DE locale. This may lead to some confusion because
-  * people from US know the "," as thousand separator. Therefore a "Currency"
-  * attribute is available, so that the output from the following example
-  * results in 100.00.
-  * <code>
-  * <com:TNumberFormat Type="currency" Culture="en_US" Currency="EUR" Value="100" />
-  * </code>
-  *
-  * Namespace: System.I18N
-  *
-  * Properties
-  * - <b>Value</b>, number,
-  *   <br>Gets or sets the number to format. The tag content is used as Value
-  *   if the Value property is not specified.
-  * - <b>Type</b>, string,
-  *   <br>Gets or sets the formatting type. The valid types are
-  *    'decimal', 'currency', 'percentage' and 'scientific'.
-  * - <b>Currency</b>, string,
-  *   <br>Gets or sets the currency symbol for the currency format.
-  *   The default is 'USD' if the Currency property is not specified.
-  * - <b>Pattern</b>, string,
-  *   <br>Gets or sets the custom number formatting pattern.
-  * - <b>DefaultText</b>, string,
-  * <br>Gets or sets the default text. If Value is not set, DefaultText will be
-  * shown instead of the default currency Value/Pattern.
-  *
-  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
-  * @package Prado\I18N
-  */
+ * To format numbers in locale sensitive manner use
+ * <code>
+ * <com:TNumberFormat Pattern="0.##" value="2.0" />
+ * </code>
+ *
+ * Numbers can be formatted as currency, percentage, decimal or scientific
+ * numbers by specifying the Type attribute. The known types are
+ * "currency", "percentage", "decimal" and "scientific".
+ *
+ * If someone from US want to see sales figures from a store in
+ * Germany (say using the EURO currency), formatted using the german
+ * currency, you would need to use the attribute Culture="de_DE" to get
+ * the currency right, e.g. 100,00. The decimal and grouping separator is
+ * then also from the de_DE locale. This may lead to some confusion because
+ * people from US know the "," as thousand separator. Therefore a "Currency"
+ * attribute is available, so that the output from the following example
+ * results in 100.00.
+ * <code>
+ * <com:TNumberFormat Type="currency" Culture="en_US" Currency="EUR" Value="100" />
+ * </code>
+ *
+ * Namespace: System.I18N
+ *
+ * Properties
+ * - <b>Value</b>, number,
+ *   <br>Gets or sets the number to format. The tag content is used as Value
+ *   if the Value property is not specified.
+ * - <b>Type</b>, string,
+ *   <br>Gets or sets the formatting type. The valid types are
+ *    'decimal', 'currency', 'percentage' and 'scientific'.
+ * - <b>Currency</b>, string,
+ *   <br>Gets or sets the currency symbol for the currency format.
+ *   The default is 'USD' if the Currency property is not specified.
+ * - <b>Pattern</b>, string,
+ *   <br>Gets or sets the custom number formatting pattern.
+ * - <b>DefaultText</b>, string,
+ * <br>Gets or sets the default text. If Value is not set, DefaultText will be
+ * shown instead of the default currency Value/Pattern.
+ *
+ * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * @package Prado\I18N
+ */
 class TNumberFormat extends TI18NControl implements \Prado\IDataRenderer
 {
 	/**

framework/I18N/core/Gettext/TGettext_MO.php

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

framework/I18N/core/Gettext/TGettext_PO.php

Indentation +106 added lines, -106 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;
-    }
-
-    /**
-     * 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);
-
-        // match all msgid/msgstr entries
-        $matched = preg_match_all(
-            '/(msgid\s+("([^"]|\\\\")*?"\s*)+)\s+' .
-            '(msgstr\s+("([^"]|\\\\")*?"\s*)+)/',
-            $contents, $matches
-        );
-        unset($contents);
-
-        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);
-        }
-
-        // check for meta info
-        if (isset($this->strings[''])) {
-            $this->meta = parent::meta2array($this->strings['']);
-            unset($this->strings['']);
-        }
-
-        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;
-        }
-
-        // 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"
-            );
-        }
-
-        //done
-        @flock($fh, LOCK_UN);
-        @fclose($fh);
-        chmod($file,PRADO_CHMOD);
-        return true;
-    }
+	/**
+	 * 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 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);
+
+		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);
+		}
+
+		// check for meta info
+		if (isset($this->strings[''])) {
+			$this->meta = parent::meta2array($this->strings['']);
+			unset($this->strings['']);
+		}
+
+		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;
+		}
+
+		// 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"
+			);
+		}
+
+		//done
+		@flock($fh, LOCK_UN);
+		@fclose($fh);
+		chmod($file,PRADO_CHMOD);
+		return true;
+	}
 }

framework/I18N/core/util.php

Indentation +115 added lines, -115 removed lines

@@ -22,7 +22,7 @@ 
 	/**
 	 * For a given DSN (database connection string), return some information
 	 * about the DSN. This function comes from PEAR's DB package.
-  	 *
+	 *
 	 * LICENSE: This source file is subject to version 3.0 of the PHP license
 	 * that is available through the world-wide-web at the following URI:
 	 * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
@@ -38,120 +38,120 @@ 
 	 * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
 	 * @link       http://pear.php.net/package/DB
 	 */
-    function parseDSN($dsn)
-    {
-        if (is_array($dsn)) {
-            return $dsn;
-        }
-
-        $parsed = array(
-            'phptype'  => false,
-            'dbsyntax' => false,
-            'username' => false,
-            'password' => false,
-            'protocol' => false,
-            'hostspec' => false,
-            'port'     => false,
-            'socket'   => false,
-            'database' => false
-        );
-
-        // Find phptype and dbsyntax
-        if (($pos = strpos($dsn, '://')) !== false) {
-            $str = substr($dsn, 0, $pos);
-            $dsn = substr($dsn, $pos + 3);
-        } else {
-            $str = $dsn;
-            $dsn = null;
-        }
-
-        // Get phptype and dbsyntax
-        // $str => phptype(dbsyntax)
-        if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) {
-            $parsed['phptype']  = $arr[1];
-            $parsed['dbsyntax'] = (empty($arr[2])) ? $arr[1] : $arr[2];
-        } else {
-            $parsed['phptype']  = $str;
-            $parsed['dbsyntax'] = $str;
-        }
-
-        if (empty($dsn)) {
-            return $parsed;
-        }
-
-        // Get (if found): username and password
-        // $dsn => username:password@protocol+hostspec/database
-        if (($at = strrpos($dsn,'@')) !== false) {
-            $str = substr($dsn, 0, $at);
-            $dsn = substr($dsn, $at + 1);
-            if (($pos = strpos($str, ':')) !== false) {
-                $parsed['username'] = rawurldecode(substr($str, 0, $pos));
-                $parsed['password'] = rawurldecode(substr($str, $pos + 1));
-            } else {
-                $parsed['username'] = rawurldecode($str);
-            }
-        }
-
-        // Find protocol and hostspec
-
-        // $dsn => proto(proto_opts)/database
-        if (preg_match('|^([^(]+)\((.*?)\)/?(.*?)$|', $dsn, $match)) {
-            $proto       = $match[1];
-            $proto_opts  = (!empty($match[2])) ? $match[2] : false;
-            $dsn         = $match[3];
-
-        // $dsn => protocol+hostspec/database (old format)
-        } else {
-            if (strpos($dsn, '+') !== false) {
-                list($proto, $dsn) = explode('+', $dsn, 2);
-            }
-            if (strpos($dsn, '/') !== false) {
-                list($proto_opts, $dsn) = explode('/', $dsn, 2);
-            } else {
-                $proto_opts = $dsn;
-                $dsn = null;
-            }
-        }
-
-        // process the different protocol options
-        $parsed['protocol'] = (!empty($proto)) ? $proto : 'tcp';
-        $proto_opts = rawurldecode($proto_opts);
-        if ($parsed['protocol'] == 'tcp') {
-            if (strpos($proto_opts, ':') !== false) {
-                list($parsed['hostspec'], $parsed['port']) = explode(':', $proto_opts);
-            } else {
-                $parsed['hostspec'] = $proto_opts;
-            }
-        } elseif ($parsed['protocol'] == 'unix') {
-            $parsed['socket'] = $proto_opts;
-        }
-
-        // Get dabase if any
-        // $dsn => database
-        if (!empty($dsn)) {
-            // /database
-            if (($pos = strpos($dsn, '?')) === false) {
-                $parsed['database'] = $dsn;
-            // /database?param1=value1&param2=value2
-            } else {
-                $parsed['database'] = substr($dsn, 0, $pos);
-                $dsn = substr($dsn, $pos + 1);
-                if (strpos($dsn, '&') !== false) {
-                    $opts = explode('&', $dsn);
-                } else { // database?param1=value1
-                    $opts = array($dsn);
-                }
-                foreach ($opts as $opt) {
-                    list($key, $value) = explode('=', $opt);
-                    if (!isset($parsed[$key])) { // don't allow params overwrite
-                        $parsed[$key] = rawurldecode($value);
-                    }
-                }
-            }
-        }
-
-        return $parsed;
-    }
+	function parseDSN($dsn)
+	{
+		if (is_array($dsn)) {
+			return $dsn;
+		}
+
+		$parsed = array(
+			'phptype'  => false,
+			'dbsyntax' => false,
+			'username' => false,
+			'password' => false,
+			'protocol' => false,
+			'hostspec' => false,
+			'port'     => false,
+			'socket'   => false,
+			'database' => false
+		);
+
+		// Find phptype and dbsyntax
+		if (($pos = strpos($dsn, '://')) !== false) {
+			$str = substr($dsn, 0, $pos);
+			$dsn = substr($dsn, $pos + 3);
+		} else {
+			$str = $dsn;
+			$dsn = null;
+		}
+
+		// Get phptype and dbsyntax
+		// $str => phptype(dbsyntax)
+		if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) {
+			$parsed['phptype']  = $arr[1];
+			$parsed['dbsyntax'] = (empty($arr[2])) ? $arr[1] : $arr[2];
+		} else {
+			$parsed['phptype']  = $str;
+			$parsed['dbsyntax'] = $str;
+		}
+
+		if (empty($dsn)) {
+			return $parsed;
+		}
+
+		// Get (if found): username and password
+		// $dsn => username:password@protocol+hostspec/database
+		if (($at = strrpos($dsn,'@')) !== false) {
+			$str = substr($dsn, 0, $at);
+			$dsn = substr($dsn, $at + 1);
+			if (($pos = strpos($str, ':')) !== false) {
+				$parsed['username'] = rawurldecode(substr($str, 0, $pos));
+				$parsed['password'] = rawurldecode(substr($str, $pos + 1));
+			} else {
+				$parsed['username'] = rawurldecode($str);
+			}
+		}
+
+		// Find protocol and hostspec
+
+		// $dsn => proto(proto_opts)/database
+		if (preg_match('|^([^(]+)\((.*?)\)/?(.*?)$|', $dsn, $match)) {
+			$proto       = $match[1];
+			$proto_opts  = (!empty($match[2])) ? $match[2] : false;
+			$dsn         = $match[3];
+
+		// $dsn => protocol+hostspec/database (old format)
+		} else {
+			if (strpos($dsn, '+') !== false) {
+				list($proto, $dsn) = explode('+', $dsn, 2);
+			}
+			if (strpos($dsn, '/') !== false) {
+				list($proto_opts, $dsn) = explode('/', $dsn, 2);
+			} else {
+				$proto_opts = $dsn;
+				$dsn = null;
+			}
+		}
+
+		// process the different protocol options
+		$parsed['protocol'] = (!empty($proto)) ? $proto : 'tcp';
+		$proto_opts = rawurldecode($proto_opts);
+		if ($parsed['protocol'] == 'tcp') {
+			if (strpos($proto_opts, ':') !== false) {
+				list($parsed['hostspec'], $parsed['port']) = explode(':', $proto_opts);
+			} else {
+				$parsed['hostspec'] = $proto_opts;
+			}
+		} elseif ($parsed['protocol'] == 'unix') {
+			$parsed['socket'] = $proto_opts;
+		}
+
+		// Get dabase if any
+		// $dsn => database
+		if (!empty($dsn)) {
+			// /database
+			if (($pos = strpos($dsn, '?')) === false) {
+				$parsed['database'] = $dsn;
+			// /database?param1=value1&param2=value2
+			} else {
+				$parsed['database'] = substr($dsn, 0, $pos);
+				$dsn = substr($dsn, $pos + 1);
+				if (strpos($dsn, '&') !== false) {
+					$opts = explode('&', $dsn);
+				} else { // database?param1=value1
+					$opts = array($dsn);
+				}
+				foreach ($opts as $opt) {
+					list($key, $value) = explode('=', $opt);
+					if (!isset($parsed[$key])) { // don't allow params overwrite
+						$parsed[$key] = rawurldecode($value);
+					}
+				}
+			}
+		}
+
+		return $parsed;
+	}
     
    
 	/**